diff --git a/.cargo/audit.toml b/.cargo/audit.toml
deleted file mode 100644
index 2b47b1e63..000000000
--- a/.cargo/audit.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-[advisories]
-ignore = [
-  "RUSTSEC-2023-0071", # issue bd8af7a5e3fd02c0963d7550a5cc2cab00950775
-]
diff --git a/.config/nextest.toml b/.config/nextest.toml
deleted file mode 100644
index 1cd9d3880..000000000
--- a/.config/nextest.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-# We want the tests to stop running if they are running
-# longer than 1min
-[profile.default]
-slow-timeout = { period = "30s", terminate-after = 2, grace-period = "10s" }
diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index 09390f135..000000000
--- a/.dockerignore
+++ /dev/null
@@ -1,4 +0,0 @@
-target
-scripts
-debian
-systemd
diff --git a/.env.seed b/.env.seed
deleted file mode 100644
index 804388566..000000000
--- a/.env.seed
+++ /dev/null
@@ -1,2 +0,0 @@
-RADICLE_DOMAIN=seed.radicle.xyz
-RADICLE_NODE_OPTIONS=--force
diff --git a/.envrc b/.envrc
deleted file mode 100644
index 3550a30f2..000000000
--- a/.envrc
+++ /dev/null
@@ -1 +0,0 @@
-use flake
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index b9b9daf6b..000000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target
-/radicle-cli/target
-/build/artifacts
diff --git a/.gitsigners b/.gitsigners
deleted file mode 100644
index 3c77d28ed..000000000
--- a/.gitsigners
+++ /dev/null
@@ -1,11 +0,0 @@
-cloudhead ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL460KIEccS4881p7PPpiiQBsxF+H5tgC6De6crw9rbU
-adaszko ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7gBkM8PwWFe5tiJkCXdYvrYSKapm8MSNVzjJWBy7DL
-fintohaps ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOl44zVBYvu1Uhmq9nshhic4r1Moz5fdNOoWTtdJrUwd
-erikli ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBrJyJTwj/xG7F7qY0HDFXbb8A+xNNH8eILQ8hlvKW7/
-slack-coder ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDJhzdajJ/SzvIlpywXRiXU5K3oxNjCoDawwIiSAJrbU
-sebastinez ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFw+wCPZUh8OndhgavJMSZluorVvzJjz22PH81XrkvIu
-zlatan ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPE9CnXiiTVCbXGQJSgZuboN4aPzNw4klqp/6/+djcD5
-rudolfs ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPueml1FxzjvwbD7vRZfwoaoyuxLy0L+WLBwSNiVoJe5
-dave ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEyzfcjfYYBnTLWEZYjsHUW1Pczg6HN0BHMWmoV5dg96
-canndrew ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICGRGjNA2OMOCbrEKIIO7cUvArmryX18XQB2AH+czSTb
-yorgos ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILc7h6NDgUUORlg/M9n9jq5EK5o76PKtyWBDEAc/ogrs
diff --git a/.radicle/native.yaml b/.radicle/native.yaml
deleted file mode 100644
index 5c79e3952..000000000
--- a/.radicle/native.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-shell: |
-  cargo --version
-  rustc --version
-
-  cargo fmt --check
-  cargo clippy --all-targets --workspace -- --deny clippy::all
-  cargo build --all-targets --workspace
-  cargo doc --workspace
-  cargo test --workspace --no-fail-fast
diff --git a/0 b/0
new file mode 100644
index 000000000..53f6f083c
--- /dev/null
+++ b/0
@@ -0,0 +1 @@
+{"base":"e130b4dc06ca02a035519e1ea86ffeafc788866f","description":"This fixes the following issues:\n- 111cf90 (`handler` is not async-signal-safe)\n- c8e0300 (`libc::signal` should not be used)\n- b91c6c3 (Mutex can cause signals to be missed)\n\nThe changes are all only internal to `radicle-signals`, and the API of\n`radicle-signals` is the same as before, and uses of it don't need to be\nand aren't changed.\n\nSee the commit's message that describes its changes.\nSee the comments in the new code.\nSee the below:\n\nAll those issues are fixed by a different internal approach that:\n- Uses only atomic counters and a semaphore from within the signal\n  handlers, ensuring async-signal-safety portably.\n- Uses `libc::sigaction` instead.  With `SA_RESTART`, which preserves\n  the same behavior as the prior use of `libc::signal` on all the OSs\n  that https://radicle.xyz/ provides prebuilt binaries for, and which\n  now ensures consistent behavior across all further OSs.\n- Does not access the mutex from within the signal handlers, and\n  separates the management of the mutex'ed global state from the\n  processing of signals receipts that sends the notifications over a\n  channel.\n- Has an additional internal thread that blocks on the semaphore, and,\n  upon wakes, takes the counters' latest values, and, for those signals\n  that have newly been delivered, sends notifications over the\n  user-provided channel.\n\nAll of this approach is provided via a new external dependency, the\n`signals_receipts` crate, written by myself, that provides and manages\nit all in a very easy-to-use way.  The justification for having a new\nexternal dependency is:\n\nIt was found that all the parts for this approach are better provided as\nlibraries (crates), because: that significantly shortens and simplifies\n`radicle-signals`; they are entirely reusable for other various\nprojects; their internal workings need to be encapsulated; and they're\nnot something that the Radicle team should be expected to take on the\nmaintenance of.  I, as the maintainer, expect the maintenance burden to\nbe minimal and rare and my understanding to not fade too much, and I\nexpect that any team member could reasonably familiarize with it all if\nneeded, due to the medium-small size, limited, and already-complete\nnature of these crates and due to the extensive comments in them.\n\nIt was also found that no lesser approach could be truly robust and\nportable while still preserving the preexisting API and use cases of\n`radicle-signals`.  The approach I settled on does achieve that and does\npreserve those.\n\nFurther information about the approach can be found in the crates'\nREADMEs and documentation:\nhttps://crates.io/crates/signals_receipts\nhttps://crates.io/crates/sem_safe\n\nTo my knowledge, the only alternative for comparable robustness and\nportability would be the `signal_hook` crate which has more use in the\nRust ecosystem.  After evaluating it, I decided against it because:\n1. It can't fully uninstall the signal handlers at the OS-process level\n   (it can only emulate that (without perfect fidelity, IIUC)), and not\n   being able to do so would've been a more disruptive change to the\n   preexisting, and perhaps future, uses of `radicle-signals` that have\n   been doing, and might want to do, full uninstalling.  Whereas,\n   `signals_receipts` does fully uninstall.\n2. It doesn't provide the ability to send over channels.  Achieving that\n   would've required an additional internal thread to do such, but\n   having an ad-hoc approach to managing that, *with the uninstalling\n   and re-installing*, would've been error-prone.  Whereas,\n   `signals_receipts` does provide the ability to send over channels,\n   and it automatically manages its internal thread robustly.\n3. It has other substantial features that aren't needed by\n   `radicle-signals`, but those would've had to be carried in the object\n   code just to use its iterator that builds on them.  Whereas,\n   `signals_receipts` carries only what's needed.\n4. It uses the \"self-pipe trick\" which is a hack (albeit a reliable\n   one).  Whereas, `signals_receipts` uses semaphores which are more\n   modern and are intended for signal handling.\n\nI've confirmed this patch builds cleanly for all the currently supported\nplatforms:\n`x86_64-unknown-linux-musl`\n`aarch64-unknown-linux-musl`\n`x86_64-apple-darwin`\n`aarch64-apple-darwin`\nAs well as for:\n`x86_64-unknown-linux-gnu`\n\nI have tested this patch in these ways:\n- The dependency crates, `signals_receipts` & `sem_safe`, that provide\n  the new approach, have thorough tests and have been confirmed by me to\n  work correctly on numerous POSIX OSs (see their READMEs).  (Their\n  portability is broader than Radicle's current support, and so will\n  assist in broadening its support.)  I've also done thorough debugger\n  stepping of their code paths.\n- I've conducted functional testing of the direct uses of\n  `radicle-signals`, using the new approach of this patch, on Linux and\n  macOS, x86-64.\n- I've done thorough debugger stepping of the code paths of the direct\n  uses of `radicle-signals`, including of the various possibilities due\n  to differences in thread-scheduling races.\n- I've spent considerable time reasoning about the dependency crates and\n  the preexisting uses of `radicle-signals`.\n\nThe uses of `radicle-signals` that I tested are:\n- `radicle-node`: Simple use in `main.rs` & `runtime.rs` that only\n  installs once with a bounded channel and never uninstalls.\n- `radicle-term`: Uses in `spinner.rs` & `pager.rs` that uninstall after\n  installing with unbounded channels and that could be invoked multiple\n  times within the same process and thus could do re-installing.\n- `rad-cli-demo`: Uses `radicle-term` spinner & pager.\n\nThe indirect uses of `radicle-signals` that I haven't tested yet are:\n- `radicle-cli`: Uses `radicle-term` spinner & pager in numerous places\n  that seemed equivalent enough to what I have tested.\n\nThe uses should be tested on AArch64 for at least the OSs that Radicle\nsupports (Linux & macOS), which I haven't done yet.  There's no reason\nto expect any issues with that, since OSs provide the same APIs and\nsemantics for the relevant aspects of signal handling regardless of CPU\narchitecture.  I'd need to find access to such machines.\n\nI can test the remaining uses, if there's interest in accepting this\ncontribution.  Or, it might be good for someone from the team to test\nthose as part of reviewing this.\n\nIf you have any questions, I'm happy to respond to them.","oid":"08844cf18464bb36690472da7c4d56563d164aa0","type":"revision"}
\ No newline at end of file
diff --git a/1 b/1
new file mode 100644
index 000000000..71ef71e35
--- /dev/null
+++ b/1
@@ -0,0 +1 @@
+{"target":"delegates","title":"signals: Use `signals_receipts` crate instead","type":"edit"}
\ No newline at end of file
diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
deleted file mode 100644
index a777d16da..000000000
--- a/ARCHITECTURE.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# ARCHITECTURE
-
-See the [Protocol Guide](https://radicle.xyz/guides/protocol).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index d706d4c4c..000000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,236 +0,0 @@
-# CONTRIBUTING
-
-Contributions are very welcome. When contributing code, please follow these
-simple guidelines.
-
-* Follow the coding guidelines when proposing code changes ([see below](#code-style)).
-* Write properly formatted git commits messages ([see below](#writing-git-commit-messages)).
-* Read the DCO and if you are contributing a significant amount of code, make sure your commits are signed off, using `git commit -s`.
-* Contribute code via a Radicle Patch, by following the [guide][].
-* If it's a feature addition or major change, check with the maintainers first
-  before submitting a patch. We wouldn't want you to waste your time!
-* If you need help or would like to discuss your changes, come to our community chat on [Zulip][zulip].
-
-[guide]: https://radicle.xyz/guides/user#working-with-patches
-[zulip]: https://radicle.zulipchat.com
-
-## Submitting patches
-
-Patch formatting follows the same rules as commit formatting. See below.
-
-## Linting & formatting
-
-Always check your code with the linter (`clippy`), by running:
-
-    $ cargo clippy --workspace --tests
-
-And make sure your code is formatted with, using:
-
-    $ cargo fmt
-
-Finally, ensure there is no trailing whitespace anywhere.
-
-## Running tests
-
-Make sure all tests are passing with:
-
-    $ cargo test --workspace
-
-## Checking the docs
-
-If you make documentation changes, you may want to check whether there are any
-warnings or errors:
-
-    $ cargo doc --workspace --all-features
-
-## Code style
-
-The following code guidelines will help make code review smoother.
-
-### Use of `unwrap` and `expect`
-
-Use `unwrap` only in either of three circumstances:
-
-1. Based on manual static analysis, you've concluded that it's impossible for
-the code to panic; so unwrapping is *safe*. An example would be:
-
-        let list = vec![a, b, c];
-        let first = list.first().unwrap();
-
-2. The panic caused by `unwrap` would indicate a bug in the software, and it
-would be impossible to continue in that case.
-
-3. The `unwrap` is part of test code, ie. `cfg!(test)` is `true`.
-
-In the first and second case, document `unwrap` call sites with a comment prefixed
-with `SAFETY:` that explains why it's safe to unwrap, eg.
-
-    // SAFETY: Node IDs are valid ref strings.
-    let r = RefString::try_from(node.to_string()).unwrap();
-
-Use `expect` only if the function expects certain invariants that were not met,
-either due to bad inputs, or a problem with the environment; and include the
-expectation in the message. For example:
-
-    logger::init(log::Level::Debug)
-        .expect("logger must only be initialized once");
-
-### Module imports
-
-Modules are declared at the top of the file, before the imports. Public modules
-are separated from private modules with a blank line:
-
-    mod git;
-    mod storage;
-
-    pub mod refs;
-
-    use std::time;
-    use std::process;
-
-    ...
-
-Imports are organized in groups, from least specific to more specific:
-
-    use std::collections::HashMap;   // First, `std` imports.
-    use std::process;
-    use std::time;
-
-    use git_ref_format as format;    // Then, external dependencies.
-    use once_cell::sync::Lazy;
-
-    use crate::crypto::PublicKey;    // Finally, local crate imports.
-    use crate::storage::refs::Refs;
-    use crate::storage::RemoteId;
-
-### Variable naming
-
-Use short 1-letter names when the variable scope is only a few lines, or the context is
-obvious, eg.
-
-    if let Some(e) = result.err() {
-        ...
-    }
-
-Use 1-word names for function parameters or variables that have larger scopes:
-
-    pub fn commit(repo: &Repository, sig: &Signature) -> Result<Commit, Error> {
-        ...
-    }
-
-Use the most descriptive names for globals:
-
-    pub const KEEP_ALIVE_DELTA: LocalDuration = LocalDuration::from_secs(30);
-
-### Function naming
-
-Stay concise. Use the function doc comment to describe
-what the function does, not the name. Keep in mind functions are in the
-context of the parent module and/or object and repeating that would be
-redundant.
-
-### Logging
-
-When writing log statements, always include a `target` and include enough
-context in the log message that it is useful on its own, eg.
-
-    debug!(target: "service", "Routing table updated for {rid} with seed {nid}");
-
-Check the file you are working on for what the `target` name should be; most
-logs should be at the *debug* level.
-
-## Dependencies
-
-Before adding any code dependencies, check with the maintainers if this is okay.
-In general, we try not to add external dependencies unless it's necessary.
-Dependencies increase counter-party risk, build-time, attack surface, and
-make code harder to audit.
-
-## Documentation
-
-Public types and functions should be documented. Modules *may* be documented,
-if you see the need.
-
-Code comments should usually be full english sentences, and add missing context
-for the reader:
-
-    // Ensure that our inventory is recorded in our routing table, and we are tracking
-    // all of it. It can happen that inventory is not properly tracked if for eg. the
-    // user creates a new repository while the node is stopped.
-    for rid in self.storage.inventory()? {
-        ...
-
-## Proposing changes
-
-When proposing changes via a patch:
-
-* Isolate changes in separate commits to make the review process easier.
-* Don't make unrelated changes, unless it happens to be an obvious improvement to
-  code you are touching anyway ("boyscout rule").
-* Rebase on `master` when needed.
-* Keep your changesets small, specific and uncontroversial, so that they can be
-  merged more quickly.
-* If the change is substantial or requires re-architecting certain parts of the
-  codebase, write a proposal in English first, and get consensus on that before
-  proposing the code changes.
-
-**Preparing commits**
-
-1. Each commit in your patch must pass all the tests, lints and checks. This is
-   so that they can be built into binaries and to make git bisecting possible.
-2. Do not include any commits that are fixes or refactorings of previous patch
-   commits. These should be squashed to the minimal diff required to make the
-   change, unless it's helpful to make a large change over multiple commits,
-   while still respecting (1). Do not include `fixup!` commits either.
-3. A commit *may* include a category prefix such as `cli:` or `node:` if it
-   mainly concerns a certain area of the codebase. For example. These prefixes
-   should usually be the name of the crate, minus any common prefix. Eg.
-   `cli:`, and *not* `radicle-cli:`. For documentation, you can use `docs:`,
-   and for CI-related files, you can use `ci:`.
-
-To help with the above, use `git commit --amend` and `git rebase -i`. You can
-also interactively construct a commit from a working tree using `git add -p`.
-
-## Writing commit messages
-
-A properly formed git commit subject line should always be able to complete the
-following sentence:
-
-     If applied, this commit will _____
-
-In addition, it should be capitalized and *must not* include a period.
-
-For example, the following message is well formed:
-
-     Add support for .gif files
-
-While these ones are **not**: `Adding support for .gif files`,
-`Added support for .gif files`, `add support for .gif files`.
-
-When it comes to formatting, here's a model git commit message[1]:
-
-     Capitalized, short (50 chars or less) summary
-
-     More detailed explanatory text, if necessary.  Wrap it to about 72
-     characters or so.  In some contexts, the first line is treated as the
-     subject of an email and the rest of the text as the body.  The blank
-     line separating the summary from the body is critical (unless you omit
-     the body entirely); tools like rebase can get confused if you run the
-     two together.
-
-     Write your commit message in the imperative: "Fix bug" and not "Fixed bug"
-     or "Fixes bug."  This convention matches up with commit messages generated
-     by commands like git merge and git revert.
-
-     Further paragraphs come after blank lines.
-
-     - Bullet points are okay, too.
-
-     - Typically a hyphen or asterisk is used for the bullet, followed by a
-       single space, with blank lines in between, but conventions vary here.
-
-     - Use a hanging indent.
-
----
-
-[1]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
diff --git a/Cargo.lock b/Cargo.lock
deleted file mode 100644
index 4c44e481d..000000000
--- a/Cargo.lock
+++ /dev/null
@@ -1,3273 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "aead"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
-dependencies = [
- "crypto-common",
- "generic-array",
-]
-
-[[package]]
-name = "aes"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
-dependencies = [
- "cfg-if",
- "cipher",
- "cpufeatures",
-]
-
-[[package]]
-name = "aes-gcm"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
-dependencies = [
- "aead",
- "aes",
- "cipher",
- "ctr",
- "ghash",
- "subtle",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "amplify"
-version = "4.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e711289a6cb28171b4f0e6c8019c69ff9476050508dc082167575d458ff74d0"
-dependencies = [
- "amplify_derive",
- "amplify_num",
- "ascii",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "amplify_derive"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759dcbfaf94d838367a86d493ec34ccc8aa6fe365cb7880d6bf89006de24d9c1"
-dependencies = [
- "amplify_syn",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "amplify_num"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04c009c5c4de814911b177e2ea59e4930bb918978ed3cce4900d846a6ceb0838"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "amplify_syn"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7736fb8d473c0d83098b5bac44df6a561e20470375cd8bcae30516dc889fd62a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "anstream"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
-dependencies = [
- "anstyle",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.82"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
-
-[[package]]
-name = "arc-swap"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
-
-[[package]]
-name = "ascii"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"
-
-[[package]]
-name = "autocfg"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
-
-[[package]]
-name = "base-x"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
-
-[[package]]
-name = "base16ct"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
-
-[[package]]
-name = "base32"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa"
-
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
-[[package]]
-name = "base64ct"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
-
-[[package]]
-name = "bcrypt-pbkdf"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aeac2e1fe888769f34f05ac343bbef98b14d1ffb292ab69d4608b3abc86f2a2"
-dependencies = [
- "blowfish",
- "pbkdf2",
- "sha2",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "bloomy"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "489d2af57852b78a86478273ac6a1ef912061b6af3a439694c49f309f6ea3bdd"
-dependencies = [
- "siphasher 0.3.11",
-]
-
-[[package]]
-name = "blowfish"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7"
-dependencies = [
- "byteorder",
- "cipher",
-]
-
-[[package]]
-name = "bstr"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
-dependencies = [
- "memchr",
- "regex-automata",
- "serde",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "cbc"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
-dependencies = [
- "cipher",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.95"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b"
-dependencies = [
- "jobserver",
- "libc",
- "once_cell",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chacha20"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
-dependencies = [
- "cfg-if",
- "cipher",
- "cpufeatures",
-]
-
-[[package]]
-name = "chacha20poly1305"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
-dependencies = [
- "aead",
- "chacha20",
- "cipher",
- "poly1305",
- "zeroize",
-]
-
-[[package]]
-name = "chrono"
-version = "0.4.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "num-traits",
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "cipher"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
-dependencies = [
- "crypto-common",
- "inout",
- "zeroize",
-]
-
-[[package]]
-name = "colorchoice"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
-
-[[package]]
-name = "colored"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8"
-dependencies = [
- "lazy_static",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "const-oid"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
-
-[[package]]
-name = "crypto-bigint"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
-dependencies = [
- "generic-array",
- "rand_core",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "rand_core",
- "typenum",
-]
-
-[[package]]
-name = "ct-codecs"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df"
-
-[[package]]
-name = "ctr"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
-dependencies = [
- "cipher",
-]
-
-[[package]]
-name = "cypheraddr"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba5c54d2ad4ab9941383519471b75d12abc1a7b4779265e233168f2703a730d9"
-dependencies = [
- "amplify",
- "base32",
- "cyphergraphy",
- "sha3",
-]
-
-[[package]]
-name = "cyphergraphy"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67c16c8ef5ddcdab57aab83fd8e770540ea3682ccdae09642c63575b0da2184"
-dependencies = [
- "amplify",
- "ec25519",
- "multibase",
- "sha2",
-]
-
-[[package]]
-name = "cyphernet"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac949369884a7a1d802cc669821269c707be8cec4d65043382e253733d2e62e1"
-dependencies = [
- "cypheraddr",
- "cyphergraphy",
- "noise-framework",
- "socks5-client",
-]
-
-[[package]]
-name = "data-encoding"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
-
-[[package]]
-name = "data-encoding-macro"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20c01c06f5f429efdf2bae21eb67c28b3df3cf85b7dd2d8ef09c0838dac5d33e"
-dependencies = [
- "data-encoding",
- "data-encoding-macro-internal",
-]
-
-[[package]]
-name = "data-encoding-macro-internal"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0047d07f2c89b17dd631c80450d69841a6b5d7fb17278cbc43d7e4cfcf2576f3"
-dependencies = [
- "data-encoding",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "der"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
-dependencies = [
- "const-oid",
- "zeroize",
-]
-
-[[package]]
-name = "deranged"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
-dependencies = [
- "powerfmt",
-]
-
-[[package]]
-name = "diff"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "const-oid",
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "dyn-clone"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
-
-[[package]]
-name = "ec25519"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfd533a2fc01178c738c99412ae1f7e1ad2cb37c2e14bfd87e9d4618171c825"
-dependencies = [
- "ct-codecs",
- "ed25519",
- "getrandom",
-]
-
-[[package]]
-name = "ecdsa"
-version = "0.16.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
-dependencies = [
- "der",
- "digest",
- "elliptic-curve",
- "rfc6979",
- "signature 2.2.0",
- "spki",
-]
-
-[[package]]
-name = "ed25519"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
-dependencies = [
- "signature 1.6.4",
-]
-
-[[package]]
-name = "either"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
-
-[[package]]
-name = "elliptic-curve"
-version = "0.13.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
-dependencies = [
- "base16ct",
- "crypto-bigint",
- "digest",
- "ff",
- "generic-array",
- "group",
- "pkcs8",
- "rand_core",
- "sec1",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "errno"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "escargot"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f474c6844cbd04e783d0f25757583db4f491770ca618bedf2fb01815fc79939"
-dependencies = [
- "log",
- "once_cell",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "faster-hex"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183"
-
-[[package]]
-name = "fastrand"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
-
-[[package]]
-name = "ff"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
-dependencies = [
- "rand_core",
- "subtle",
-]
-
-[[package]]
-name = "filetime"
-version = "0.2.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "flate2"
-version = "1.0.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
-[[package]]
-name = "form_urlencoded"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
- "zeroize",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "ghash"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
-dependencies = [
- "opaque-debug",
- "polyval",
-]
-
-[[package]]
-name = "git-ref-format"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "137adab7111fcb575db6f07dae3a7d37f3c2630878954c9931f7135dfa33eeef"
-dependencies = [
- "git-ref-format-core",
- "git-ref-format-macro",
-]
-
-[[package]]
-name = "git-ref-format-core"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebb6549ddc63ba5722acb98c823b0eccb7f8b979407bd2a8fd616f581ae50982"
-dependencies = [
- "bstr",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "git-ref-format-macro"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18ffd0101a3bd9a3aba39602b8b20751ddb7ee11596debb58be3074209dad2ae"
-dependencies = [
- "git-ref-format-core",
- "proc-macro-error",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "git2"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
-dependencies = [
- "bitflags 2.5.0",
- "libc",
- "libgit2-sys",
- "log",
- "url",
-]
-
-[[package]]
-name = "gix-actor"
-version = "0.31.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0e454357e34b833cc3a00b6efbbd3dd4d18b24b9fb0c023876ec2645e8aa3f2"
-dependencies = [
- "bstr",
- "gix-date",
- "gix-utils",
- "itoa",
- "thiserror",
- "winnow",
-]
-
-[[package]]
-name = "gix-chunk"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45c8751169961ba7640b513c3b24af61aa962c967aaf04116734975cd5af0c52"
-dependencies = [
- "thiserror",
-]
-
-[[package]]
-name = "gix-command"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90009020dc4b3de47beed28e1334706e0a330ddd17f5cfeb097df3b15a54b77"
-dependencies = [
- "bstr",
- "gix-path",
- "gix-trace",
- "shell-words",
-]
-
-[[package]]
-name = "gix-commitgraph"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "133b06f67f565836ec0c473e2116a60fb74f80b6435e21d88013ac0e3c60fc78"
-dependencies = [
- "bstr",
- "gix-chunk",
- "gix-features",
- "gix-hash",
- "memmap2",
- "thiserror",
-]
-
-[[package]]
-name = "gix-config-value"
-version = "0.14.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbd06203b1a9b33a78c88252a625031b094d9e1b647260070c25b09910c0a804"
-dependencies = [
- "bitflags 2.5.0",
- "bstr",
- "gix-path",
- "libc",
- "thiserror",
-]
-
-[[package]]
-name = "gix-credentials"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c70146183bd3c7119329a3c7392d1aa0e0adbe48d727f4df31828fe6d8fdaa1"
-dependencies = [
- "bstr",
- "gix-command",
- "gix-config-value",
- "gix-path",
- "gix-prompt",
- "gix-sec",
- "gix-trace",
- "gix-url",
- "thiserror",
-]
-
-[[package]]
-name = "gix-date"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eed6931f21491ee0aeb922751bd7ec97b4b2fe8fbfedcb678e2a2dce5f3b8c0"
-dependencies = [
- "bstr",
- "itoa",
- "thiserror",
- "time",
-]
-
-[[package]]
-name = "gix-diff"
-version = "0.44.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1996d5c8a305b59709467d80617c9fde48d9d75fd1f4179ea970912630886c9d"
-dependencies = [
- "bstr",
- "gix-hash",
- "gix-object",
- "thiserror",
-]
-
-[[package]]
-name = "gix-features"
-version = "0.38.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac7045ac9fe5f9c727f38799d002a7ed3583cd777e3322a7c4b43e3cf437dc69"
-dependencies = [
- "crc32fast",
- "flate2",
- "gix-hash",
- "gix-trace",
- "gix-utils",
- "libc",
- "prodash",
- "sha1_smol",
- "thiserror",
- "walkdir",
-]
-
-[[package]]
-name = "gix-fs"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6adf99c27cdf17b1c4d77680c917e0d94d8783d4e1c73d3be0d1d63107163d7a"
-dependencies = [
- "fastrand",
- "gix-features",
- "gix-utils",
-]
-
-[[package]]
-name = "gix-hash"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93d7df7366121b5018f947a04d37f034717e113dcf9ccd85c34b58e57a74d5e"
-dependencies = [
- "faster-hex",
- "thiserror",
-]
-
-[[package]]
-name = "gix-hashtable"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ddf80e16f3c19ac06ce415a38b8591993d3f73aede049cb561becb5b3a8e242"
-dependencies = [
- "gix-hash",
- "hashbrown",
- "parking_lot",
-]
-
-[[package]]
-name = "gix-object"
-version = "0.42.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25da2f46b4e7c2fa7b413ce4dffb87f69eaf89c2057e386491f4c55cadbfe386"
-dependencies = [
- "bstr",
- "gix-actor",
- "gix-date",
- "gix-features",
- "gix-hash",
- "gix-utils",
- "gix-validate",
- "itoa",
- "smallvec",
- "thiserror",
- "winnow",
-]
-
-[[package]]
-name = "gix-odb"
-version = "0.61.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20d384fe541d93d8a3bb7d5d5ef210780d6df4f50c4e684ccba32665a5e3bc9b"
-dependencies = [
- "arc-swap",
- "gix-date",
- "gix-features",
- "gix-fs",
- "gix-hash",
- "gix-object",
- "gix-pack",
- "gix-path",
- "gix-quote",
- "parking_lot",
- "tempfile",
- "thiserror",
-]
-
-[[package]]
-name = "gix-pack"
-version = "0.51.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e0594491fffe55df94ba1c111a6566b7f56b3f8d2e1efc750e77d572f5f5229"
-dependencies = [
- "gix-chunk",
- "gix-diff",
- "gix-features",
- "gix-hash",
- "gix-hashtable",
- "gix-object",
- "gix-path",
- "gix-tempfile",
- "gix-traverse",
- "memmap2",
- "parking_lot",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "gix-packetline"
-version = "0.17.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b70486beda0903b6d5b65dfa6e40585098cdf4e6365ca2dff4f74c387354a515"
-dependencies = [
- "bstr",
- "faster-hex",
- "gix-trace",
- "thiserror",
-]
-
-[[package]]
-name = "gix-path"
-version = "0.10.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d23d5bbda31344d8abc8de7c075b3cf26e5873feba7c4a15d916bce67382bd9"
-dependencies = [
- "bstr",
- "gix-trace",
- "home",
- "once_cell",
- "thiserror",
-]
-
-[[package]]
-name = "gix-prompt"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5325eb17ce7b5e5d25dec5c2315d642a09d55b9888b3bf46b7d72e1621a55d8"
-dependencies = [
- "gix-command",
- "gix-config-value",
- "parking_lot",
- "rustix",
- "thiserror",
-]
-
-[[package]]
-name = "gix-protocol"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aed3bb6179835a3250403baa9d7022579e559fc45f2efc416d9de1a14b5acf11"
-dependencies = [
- "bstr",
- "gix-credentials",
- "gix-date",
- "gix-features",
- "gix-hash",
- "gix-transport",
- "gix-utils",
- "maybe-async",
- "thiserror",
- "winnow",
-]
-
-[[package]]
-name = "gix-quote"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbff4f9b9ea3fa7a25a70ee62f545143abef624ac6aa5884344e70c8b0a1d9ff"
-dependencies = [
- "bstr",
- "gix-utils",
- "thiserror",
-]
-
-[[package]]
-name = "gix-revwalk"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b030ccaab71af141f537e0225f19b9e74f25fefdba0372246b844491cab43e0"
-dependencies = [
- "gix-commitgraph",
- "gix-date",
- "gix-hash",
- "gix-hashtable",
- "gix-object",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "gix-sec"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fddc27984a643b20dd03e97790555804f98cf07404e0e552c0ad8133266a79a1"
-dependencies = [
- "bitflags 2.5.0",
- "gix-path",
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "gix-tempfile"
-version = "14.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "006acf5a613e0b5cf095d8e4b3f48c12a60d9062aa2b2dd105afaf8344a5600c"
-dependencies = [
- "gix-fs",
- "libc",
- "once_cell",
- "parking_lot",
- "tempfile",
-]
-
-[[package]]
-name = "gix-trace"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f924267408915fddcd558e3f37295cc7d6a3e50f8bd8b606cee0808c3915157e"
-
-[[package]]
-name = "gix-transport"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d2f783b2fe86bf2a8cf1f3b8669d65b01ab4932f32cc0101d3893e1b16a3bd6"
-dependencies = [
- "bstr",
- "gix-command",
- "gix-features",
- "gix-packetline",
- "gix-quote",
- "gix-sec",
- "gix-url",
- "thiserror",
-]
-
-[[package]]
-name = "gix-traverse"
-version = "0.39.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e499a18c511e71cf4a20413b743b9f5bcf64b3d9e81e9c3c6cd399eae55a8840"
-dependencies = [
- "bitflags 2.5.0",
- "gix-commitgraph",
- "gix-date",
- "gix-hash",
- "gix-hashtable",
- "gix-object",
- "gix-revwalk",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "gix-url"
-version = "0.27.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0db829ebdca6180fbe32be7aed393591df6db4a72dbbc0b8369162390954d1cf"
-dependencies = [
- "bstr",
- "gix-features",
- "gix-path",
- "home",
- "thiserror",
- "url",
-]
-
-[[package]]
-name = "gix-utils"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35192df7fd0fa112263bad8021e2df7167df4cc2a6e6d15892e1e55621d3d4dc"
-dependencies = [
- "fastrand",
- "unicode-normalization",
-]
-
-[[package]]
-name = "gix-validate"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82c27dd34a49b1addf193c92070bcbf3beaf6e10f16a78544de6372e146a0acf"
-dependencies = [
- "bstr",
- "thiserror",
-]
-
-[[package]]
-name = "group"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
-dependencies = [
- "ff",
- "rand_core",
- "subtle",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
-]
-
-[[package]]
-name = "home"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "idna"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
-dependencies = [
- "equivalent",
- "hashbrown",
-]
-
-[[package]]
-name = "inout"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
-dependencies = [
- "block-padding",
- "generic-array",
-]
-
-[[package]]
-name = "inquire"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fddf93031af70e75410a2511ec04d49e758ed2f26dad3404a934e0fb45cc12a"
-dependencies = [
- "bitflags 2.5.0",
- "dyn-clone",
- "fxhash",
- "newline-converter",
- "once_cell",
- "tempfile",
- "termion 2.0.3",
- "unicode-segmentation",
- "unicode-width",
-]
-
-[[package]]
-name = "io-reactor"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77d78c3e630f04a61ec86ba171c0bbd161434a7f2e8e4a67728320d4ce7c6c79"
-dependencies = [
- "amplify",
- "crossbeam-channel",
- "libc",
- "popol",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-
-[[package]]
-name = "jobserver"
-version = "0.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "js-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "keccak"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
-dependencies = [
- "cpufeatures",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-dependencies = [
- "spin",
-]
-
-[[package]]
-name = "lexopt"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401"
-
-[[package]]
-name = "libc"
-version = "0.2.155"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
-
-[[package]]
-name = "libgit2-sys"
-version = "0.17.0+1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
-dependencies = [
- "cc",
- "libc",
- "libz-sys",
- "pkg-config",
-]
-
-[[package]]
-name = "libm"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
-
-[[package]]
-name = "libredox"
-version = "0.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607"
-dependencies = [
- "bitflags 2.5.0",
- "libc",
- "redox_syscall",
-]
-
-[[package]]
-name = "libz-sys"
-version = "1.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
-
-[[package]]
-name = "localtime"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "016a009e0bb8ba6e3229fb74bf11a8fe6ef24542cc6ef35ef38863ac13f96d87"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
-
-[[package]]
-name = "maybe-async"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.60",
-]
-
-[[package]]
-name = "memchr"
-version = "2.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
-
-[[package]]
-name = "memmap2"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "multibase"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b3539ec3c1f04ac9748a260728e855f261b4977f5c3406612c884564f329404"
-dependencies = [
- "base-x",
- "data-encoding",
- "data-encoding-macro",
-]
-
-[[package]]
-name = "netservices"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af0f91a10aaddcc3b76770c3bf5c17680829aa0828e5ffc69c62d58bfbe9c48c"
-dependencies = [
- "amplify",
- "cyphernet",
- "io-reactor",
- "libc",
- "rand",
- "socket2",
-]
-
-[[package]]
-name = "newline-converter"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b6b097ecb1cbfed438542d16e84fd7ad9b0c76c8a65b7f9039212a3d14dc7f"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "noise-framework"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b57e96e713d599dc58755d0e5bb2238908a63e13f624f70c8345fdb7d8b51bae"
-dependencies = [
- "amplify",
- "chacha20poly1305",
- "cyphergraphy",
-]
-
-[[package]]
-name = "nonempty"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff7ac1e5ea23db6d61ad103e91864675049644bf47c35912336352fa4e9c109"
-
-[[package]]
-name = "nonempty"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "995defdca0a589acfdd1bd2e8e3b896b4d4f7675a31fd14c32611440c7f608e6"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "normalize-line-endings"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
-
-[[package]]
-name = "num-bigint-dig"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
-dependencies = [
- "byteorder",
- "lazy_static",
- "libm",
- "num-integer",
- "num-iter",
- "num-traits",
- "rand",
- "smallvec",
- "zeroize",
-]
-
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
-dependencies = [
- "autocfg",
- "libm",
-]
-
-[[package]]
-name = "num_threads"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "numtoa"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
-
-[[package]]
-name = "once_cell"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
-
-[[package]]
-name = "p256"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
-dependencies = [
- "ecdsa",
- "elliptic-curve",
- "primeorder",
- "sha2",
-]
-
-[[package]]
-name = "p384"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
-dependencies = [
- "ecdsa",
- "elliptic-curve",
- "primeorder",
- "sha2",
-]
-
-[[package]]
-name = "p521"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc9e2161f1f215afdfce23677034ae137bbd45016a880c2eb3ba8eb95f085b2"
-dependencies = [
- "base16ct",
- "ecdsa",
- "elliptic-curve",
- "primeorder",
- "rand_core",
- "sha2",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "pbkdf2"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
-dependencies = [
- "digest",
- "hmac",
-]
-
-[[package]]
-name = "pem-rfc7468"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
-dependencies = [
- "base64ct",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "pkcs1"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
-dependencies = [
- "der",
- "pkcs8",
- "spki",
-]
-
-[[package]]
-name = "pkcs8"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
-dependencies = [
- "der",
- "spki",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-
-[[package]]
-name = "poly1305"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
-dependencies = [
- "cpufeatures",
- "opaque-debug",
- "universal-hash",
-]
-
-[[package]]
-name = "polyval"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "opaque-debug",
- "universal-hash",
-]
-
-[[package]]
-name = "popol"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93406933502e4446250941cf95d5e62851feb62a25b742acf7ffce96755c53e3"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "pretty_assertions"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
-dependencies = [
- "diff",
- "yansi",
-]
-
-[[package]]
-name = "primeorder"
-version = "0.13.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
-dependencies = [
- "elliptic-curve",
-]
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "prodash"
-version = "28.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79"
-
-[[package]]
-name = "qcheck"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b439bd4242da51d62d18c95e6a6add749346756b0d1a587dfd0cc22fa6b5f3f0"
-dependencies = [
- "rand",
-]
-
-[[package]]
-name = "qcheck-macros"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2742b9af5a690615904b18f11983f4db9ea7ad1c7e6ed3fb4b2402cdaaf5b1b5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "radicle"
-version = "0.13.0"
-dependencies = [
- "amplify",
- "base64 0.21.7",
- "chrono",
- "colored",
- "crossbeam-channel",
- "cyphernet",
- "fastrand",
- "git2",
- "libc",
- "localtime",
- "log",
- "multibase",
- "nonempty 0.9.0",
- "once_cell",
- "pretty_assertions",
- "qcheck",
- "qcheck-macros",
- "radicle-cob",
- "radicle-crypto",
- "radicle-git-ext",
- "radicle-ssh",
- "serde",
- "serde_json",
- "siphasher 1.0.1",
- "sqlite",
- "tempfile",
- "thiserror",
- "unicode-normalization",
-]
-
-[[package]]
-name = "radicle-cli"
-version = "0.11.0"
-dependencies = [
- "anyhow",
- "chrono",
- "git-ref-format",
- "lexopt",
- "localtime",
- "log",
- "nonempty 0.9.0",
- "pretty_assertions",
- "radicle",
- "radicle-cli-test",
- "radicle-cob",
- "radicle-crypto",
- "radicle-git-ext",
- "radicle-node",
- "radicle-surf",
- "radicle-term",
- "serde",
- "serde_json",
- "shlex",
- "tempfile",
- "thiserror",
- "timeago",
- "tree-sitter",
- "tree-sitter-bash",
- "tree-sitter-c",
- "tree-sitter-css",
- "tree-sitter-go",
- "tree-sitter-highlight",
- "tree-sitter-html",
- "tree-sitter-json",
- "tree-sitter-md",
- "tree-sitter-python",
- "tree-sitter-ruby",
- "tree-sitter-rust",
- "tree-sitter-toml",
- "tree-sitter-typescript",
- "zeroize",
-]
-
-[[package]]
-name = "radicle-cli-test"
-version = "0.10.0"
-dependencies = [
- "escargot",
- "log",
- "pretty_assertions",
- "radicle",
- "shlex",
- "snapbox",
- "thiserror",
-]
-
-[[package]]
-name = "radicle-cob"
-version = "0.12.0"
-dependencies = [
- "fastrand",
- "git2",
- "log",
- "nonempty 0.9.0",
- "once_cell",
- "qcheck",
- "qcheck-macros",
- "radicle-crypto",
- "radicle-dag",
- "radicle-git-ext",
- "serde",
- "serde_json",
- "tempfile",
- "thiserror",
-]
-
-[[package]]
-name = "radicle-crdt"
-version = "0.1.0"
-dependencies = [
- "fastrand",
- "num-traits",
- "qcheck",
- "qcheck-macros",
- "radicle-crypto",
- "serde",
- "tempfile",
- "thiserror",
-]
-
-[[package]]
-name = "radicle-crypto"
-version = "0.11.0"
-dependencies = [
- "amplify",
- "cyphernet",
- "ec25519",
- "fastrand",
- "multibase",
- "qcheck",
- "qcheck-macros",
- "radicle-git-ext",
- "radicle-ssh",
- "serde",
- "sqlite",
- "ssh-key",
- "tempfile",
- "thiserror",
- "zeroize",
-]
-
-[[package]]
-name = "radicle-dag"
-version = "0.9.0"
-dependencies = [
- "fastrand",
-]
-
-[[package]]
-name = "radicle-fetch"
-version = "0.10.0"
-dependencies = [
- "bstr",
- "either",
- "gix-actor",
- "gix-features",
- "gix-hash",
- "gix-odb",
- "gix-pack",
- "gix-protocol",
- "gix-transport",
- "log",
- "nonempty 0.9.0",
- "radicle",
- "radicle-git-ext",
- "thiserror",
-]
-
-[[package]]
-name = "radicle-git-ext"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16d2e8a6292811e44388e6068fcaf1040401e1f6a7a58cf48cc121cf7453c19d"
-dependencies = [
- "git-ref-format",
- "git2",
- "percent-encoding",
- "radicle-std-ext",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "radicle-node"
-version = "0.10.0"
-dependencies = [
- "amplify",
- "anyhow",
- "bloomy",
- "byteorder",
- "chrono",
- "colored",
- "crossbeam-channel",
- "cyphernet",
- "fastrand",
- "io-reactor",
- "lexopt",
- "libc",
- "localtime",
- "log",
- "netservices",
- "nonempty 0.9.0",
- "once_cell",
- "qcheck",
- "qcheck-macros",
- "radicle",
- "radicle-crypto",
- "radicle-fetch",
- "radicle-git-ext",
- "radicle-signals",
- "radicle-systemd",
- "scrypt",
- "serde",
- "serde_json",
- "snapbox",
- "socket2",
- "sqlite",
- "tempfile",
- "thiserror",
-]
-
-[[package]]
-name = "radicle-remote-helper"
-version = "0.10.0"
-dependencies = [
- "log",
- "radicle",
- "radicle-cli",
- "radicle-crypto",
- "radicle-git-ext",
- "thiserror",
-]
-
-[[package]]
-name = "radicle-signals"
-version = "0.11.0"
-dependencies = [
- "crossbeam-channel",
- "libc",
- "signals_receipts",
-]
-
-[[package]]
-name = "radicle-ssh"
-version = "0.9.0"
-dependencies = [
- "byteorder",
- "log",
- "thiserror",
- "zeroize",
-]
-
-[[package]]
-name = "radicle-std-ext"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db20136bbc9ae63f3fec8e5a6c369f4902fac2244501b5dfc6d668e43475aaa4"
-
-[[package]]
-name = "radicle-surf"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb308c3989087f71e43d8c7a2737273fdc7fbcd3e6628af81a42f601ae64f314"
-dependencies = [
- "anyhow",
- "base64 0.13.1",
- "flate2",
- "git2",
- "log",
- "nonempty 0.5.0",
- "radicle-git-ext",
- "radicle-std-ext",
- "tar",
- "thiserror",
- "url",
-]
-
-[[package]]
-name = "radicle-systemd"
-version = "0.9.0"
-
-[[package]]
-name = "radicle-term"
-version = "0.11.0"
-dependencies = [
- "anstyle-query",
- "anyhow",
- "crossbeam-channel",
- "git2",
- "inquire",
- "libc",
- "once_cell",
- "pretty_assertions",
- "radicle-signals",
- "shlex",
- "tempfile",
- "termion 3.0.0",
- "thiserror",
- "unicode-display-width",
- "unicode-segmentation",
- "zeroize",
-]
-
-[[package]]
-name = "radicle-tools"
-version = "0.9.0"
-dependencies = [
- "anyhow",
- "radicle",
- "radicle-cli",
- "radicle-git-ext",
- "radicle-term",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_termios"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb"
-
-[[package]]
-name = "regex"
-version = "1.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
-
-[[package]]
-name = "rfc6979"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
-dependencies = [
- "hmac",
- "subtle",
-]
-
-[[package]]
-name = "rsa"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
-dependencies = [
- "const-oid",
- "digest",
- "num-bigint-dig",
- "num-integer",
- "num-traits",
- "pkcs1",
- "pkcs8",
- "rand_core",
- "sha2",
- "signature 2.2.0",
- "spki",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
-dependencies = [
- "bitflags 2.5.0",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
-
-[[package]]
-name = "salsa20"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
-dependencies = [
- "cipher",
-]
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "scrypt"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f"
-dependencies = [
- "pbkdf2",
- "salsa20",
- "sha2",
-]
-
-[[package]]
-name = "sec1"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
-dependencies = [
- "base16ct",
- "der",
- "generic-array",
- "pkcs8",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "sem_safe"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9110d660d39b5f65f10a978ce0dd5e0a08c50e1d5589cadfad9b9a5f221fdb14"
-dependencies = [
- "base64 0.22.1",
- "errno",
- "getrandom",
- "libc",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.198"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.198"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.60",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.116"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
-dependencies = [
- "indexmap",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "sha1_smol"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
-
-[[package]]
-name = "sha2"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sha3"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
-dependencies = [
- "digest",
- "keccak",
-]
-
-[[package]]
-name = "shell-words"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "signals_receipts"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74fa07c27e948f68f2f72241a189850526fbd3b428eee702884ba1883a39610e"
-dependencies = [
- "cfg-if",
- "errno",
- "libc",
- "sem_safe",
-]
-
-[[package]]
-name = "signature"
-version = "1.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
-
-[[package]]
-name = "signature"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
-dependencies = [
- "digest",
- "rand_core",
-]
-
-[[package]]
-name = "similar"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640"
-
-[[package]]
-name = "siphasher"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
-
-[[package]]
-name = "siphasher"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
-
-[[package]]
-name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
-[[package]]
-name = "snapbox"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b831b6e80fbcd2889efa75b185d24005f85981431495f995292b25836519d84"
-dependencies = [
- "anstream",
- "anstyle",
- "normalize-line-endings",
- "similar",
- "snapbox-macros",
-]
-
-[[package]]
-name = "snapbox-macros"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1c4b838b05d15ab22754068cb73500b2f3b07bf09d310e15b27f88160f1de40"
-dependencies = [
- "anstream",
-]
-
-[[package]]
-name = "socket2"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "socks5-client"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc7dcf6fab1d65d82d633006a4cc658d76ce436e01cf1a7c71873c0eeba324c"
-dependencies = [
- "amplify",
- "cypheraddr",
-]
-
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "spki"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
-dependencies = [
- "base64ct",
- "der",
-]
-
-[[package]]
-name = "sqlite"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03801c10193857d6a4a71ec46cee198a15cbc659622aabe1db0d0bdbefbcf8e6"
-dependencies = [
- "libc",
- "sqlite3-sys",
-]
-
-[[package]]
-name = "sqlite3-src"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfc95a51a1ee38839599371685b9d4a926abb51791f0bc3bf8c3bb7867e6e454"
-dependencies = [
- "cc",
- "pkg-config",
-]
-
-[[package]]
-name = "sqlite3-sys"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2752c669433e40ebb08fde824146f50d9628aa0b66a3b7fc6be34db82a8063b"
-dependencies = [
- "libc",
- "sqlite3-src",
-]
-
-[[package]]
-name = "ssh-cipher"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caac132742f0d33c3af65bfcde7f6aa8f62f0e991d80db99149eb9d44708784f"
-dependencies = [
- "aes",
- "aes-gcm",
- "cbc",
- "chacha20",
- "cipher",
- "ctr",
- "poly1305",
- "ssh-encoding",
- "subtle",
-]
-
-[[package]]
-name = "ssh-encoding"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9242b9ef4108a78e8cd1a2c98e193ef372437f8c22be363075233321dd4a15"
-dependencies = [
- "base64ct",
- "pem-rfc7468",
- "sha2",
-]
-
-[[package]]
-name = "ssh-key"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca9b366a80cf18bb6406f4cf4d10aebfb46140a8c0c33f666a144c5c76ecbafc"
-dependencies = [
- "bcrypt-pbkdf",
- "p256",
- "p384",
- "p521",
- "rand_core",
- "rsa",
- "sec1",
- "sha2",
- "signature 2.2.0",
- "ssh-cipher",
- "ssh-encoding",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "subtle"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "tar"
-version = "0.4.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
-dependencies = [
- "filetime",
- "libc",
- "xattr",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
-dependencies = [
- "cfg-if",
- "fastrand",
- "rustix",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "termion"
-version = "2.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4648c7def6f2043b2568617b9f9b75eae88ca185dbc1f1fda30e95a85d49d7d"
-dependencies = [
- "libc",
- "libredox",
- "numtoa",
- "redox_termios",
-]
-
-[[package]]
-name = "termion"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "417813675a504dfbbf21bfde32c03e5bf9f2413999962b479023c02848c1c7a5"
-dependencies = [
- "libc",
- "libredox",
- "numtoa",
- "redox_termios",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.59"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.59"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.60",
-]
-
-[[package]]
-name = "time"
-version = "0.3.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
-dependencies = [
- "deranged",
- "itoa",
- "libc",
- "num-conv",
- "num_threads",
- "powerfmt",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-
-[[package]]
-name = "time-macros"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
-dependencies = [
- "num-conv",
- "time-core",
-]
-
-[[package]]
-name = "timeago"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1710e589de0a76aaf295cd47a6699f6405737dbfd3cf2b75c92d000b548d0e6"
-
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
-[[package]]
-name = "tree-sitter"
-version = "0.20.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d"
-dependencies = [
- "cc",
- "regex",
-]
-
-[[package]]
-name = "tree-sitter-bash"
-version = "0.20.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57da2032c37eb2ce29fd18df7d3b94355fec8d6d854d8f80934955df542b5906"
-dependencies = [
- "cc",
- "tree-sitter",
-]
-
-[[package]]
-name = "tree-sitter-c"
-version = "0.20.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bbd5f3d8658c08581f8f2adac6c391c2e9fa00fe9246bf6c5f52213b9cc6b72"
-dependencies = [
- "cc",
- "tree-sitter",
-]
-
-[[package]]
-name = "tree-sitter-css"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3306ddefa1d2681adda2613d11974ffabfbeb215e23235da6c862f3493a04fd"
-dependencies = [
- "cc",
- "tree-sitter",
-]
-
-[[package]]
-name = "tree-sitter-go"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad6d11f19441b961af2fda7f12f5d0dac325f6d6de83836a1d3750018cc5114"
-dependencies = [
- "cc",
- "tree-sitter",
-]
-
-[[package]]
-name = "tree-sitter-highlight"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "042342584c5a7a0b833d9fc4e2bdab3f9868ddc6c4b339a1e01451c6720868bc"
-dependencies = [
- "regex",
- "thiserror",
- "tree-sitter",
-]
-
-[[package]]
-name = "tree-sitter-html"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "017822b6bd42843c4bd67fabb834f61ce23254e866282dd93871350fd6b7fa1d"
-dependencies = [
- "cc",
- "tree-sitter",
-]
-
-[[package]]
-name = "tree-sitter-json"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9a38a9c679b55cc8d17350381ec08d69fa1a17a53fcf197f344516e485ed4d"
-dependencies = [
- "cc",
- "tree-sitter",
-]
-
-[[package]]
-name = "tree-sitter-md"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c20d3ef8d202430b644a307e6299d84bf8ed87fa1b796e4638f8805a595060c"
-dependencies = [
- "cc",
- "tree-sitter",
-]
-
-[[package]]
-name = "tree-sitter-python"
-version = "0.20.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c93b1b1fbd0d399db3445f51fd3058e43d0b4dcff62ddbdb46e66550978aa5"
-dependencies = [
- "cc",
- "tree-sitter",
-]
-
-[[package]]
-name = "tree-sitter-ruby"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d50ef383469df8485f024c5fb01faced8cb90368192a7ba02605b43b2427fe"
-dependencies = [
- "cc",
- "tree-sitter",
-]
-
-[[package]]
-name = "tree-sitter-rust"
-version = "0.20.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0832309b0b2b6d33760ce5c0e818cb47e1d72b468516bfe4134408926fa7594"
-dependencies = [
- "cc",
- "tree-sitter",
-]
-
-[[package]]
-name = "tree-sitter-toml"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca517f578a98b23d20780247cc2688407fa81effad5b627a5a364ec3339b53e8"
-dependencies = [
- "cc",
- "tree-sitter",
-]
-
-[[package]]
-name = "tree-sitter-typescript"
-version = "0.20.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8bc1d2c24276a48ef097a71b56888ac9db63717e8f8d0b324668a27fd619670"
-dependencies = [
- "cc",
- "tree-sitter",
-]
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
-[[package]]
-name = "unicode-display-width"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a43273b656140aa2bb8e65351fe87c255f0eca706b2538a9bd4a590a3490bf3"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
-
-[[package]]
-name = "universal-hash"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
-dependencies = [
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "url"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
-]
-
-[[package]]
-name = "utf8parse"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "walkdir"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
-dependencies = [
- "same-file",
- "winapi-util",
-]
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.60",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.60",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134306a13c5647ad6453e8deaec55d3a44d6021970129e6188735e74bf546697"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
- "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
-
-[[package]]
-name = "winnow"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "xattr"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
-dependencies = [
- "libc",
- "linux-raw-sys",
- "rustix",
-]
-
-[[package]]
-name = "yansi"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
-
-[[package]]
-name = "zeroize"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
diff --git a/Cargo.toml b/Cargo.toml
deleted file mode 100644
index 72f8c3ef9..000000000
--- a/Cargo.toml
+++ /dev/null
@@ -1,41 +0,0 @@
-[workspace]
-package.version = "0.9.0"
-members = [
-  "radicle",
-  "radicle-cob",
-  "radicle-cli",
-  "radicle-cli-test",
-  "radicle-crdt",
-  "radicle-crypto",
-  "radicle-dag",
-  "radicle-fetch",
-  "radicle-node",
-  "radicle-remote-helper",
-  "radicle-ssh",
-  "radicle-tools",
-  "radicle-signals",
-  "radicle-systemd",
-]
-default-members = [
-  "radicle",
-  "radicle-cli",
-  "radicle-cob",
-  "radicle-crdt",
-  "radicle-crypto",
-  "radicle-node",
-  "radicle-ssh",
-  "radicle-remote-helper",
-  "radicle-term",
-  "radicle-signals",
-  "radicle-systemd",
-]
-resolver = "2"
-
-[profile.container]
-inherits = "release"
-debug = true
-incremental = false
-
-[workspace.lints]
-clippy.type_complexity = "allow"
-clippy.enum_variant_names = "allow"
diff --git a/DCO b/DCO
deleted file mode 100644
index 69175c983..000000000
--- a/DCO
+++ /dev/null
@@ -1,28 +0,0 @@
-Developer's Certificate of Origin 1.1
-Copyright © 2004, 2006 The Linux Foundation and its contributors.
-
----
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the best
-    of my knowledge, is covered under an appropriate open source
-    license and I have the right under that license to submit that
-    work with modifications, whether created in whole or in part
-    by me, under the same open source license (unless I am
-    permitted to submit under a different license), as indicated
-    in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including all
-    personal information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed consistent with
-    this project or the open source license(s) involved.
diff --git a/HACKING.md b/HACKING.md
deleted file mode 100644
index e900fcf94..000000000
--- a/HACKING.md
+++ /dev/null
@@ -1,178 +0,0 @@
-# HACKING
-
-Welcome to the Radicle "Heartwood" hacking guide!
-
-We appreciate your interest in contributing to the Radicle project. If you come across
-a bug or a missing feature, please feel free to submit a patch. This guide is meant as
-an introduction to the codebase, on how to debug issues, write tests and navigate the
-repository.
-
-Please make sure to read [CONTRIBUTING.md](CONTRIBUTING.md) before submitting code,
-and follow the included guidelines. To download a development version of Radicle,
-see the [README.md](README.md).
-
-For an architectural overview of Heartwood, see [ARCHITECTURE.md](ARCHITECTURE.md).
-
----
-
-The repository is structured in *crates*, as follows:
-
-* `radicle`: The Radicle standard library that contains shared libraries used across the project.
-* `radicle-cli`: the Radicle command-line interface (`rad`).
-* `radicle-cli-test`: The Radicle CLI testing framework, for writing documentation tests.
-* `radicle-cob`: Radicle Collaborative Objects (COBs). Provides a way of creating and traversing edit histories.
-* `radicle-crdt`: Conflict-free replicated datatypes (CRDTs) used for things like discussions and patches.
-* `radicle-crypto`: A wrapper around Ed25519 cryptographic signing primitives.
-* `radicle-dag`: A simple directed acyclic graph implementation used by `radicle-cob`.
-* `radicle-node`: The radicle peer-to-peer daemon that enables users to connect to the network and share code.
-* `radicle-remote-helper`: A Git remote helper for `rad://` remotes.
-* `radicle-ssh`: OpenSSH functionality, including a library used to interface with `ssh-agent`.
-* `radicle-term`: A generic terminal library used by the Radicle CLI.
-* `radicle-tools`: Tools used to aid in the development of Radicle.
-
-## Running in debug mode
-
-To run the services or the CLI in debug mode, use `cargo run -p <package>`.
-
-For example, the equivalent of `rad auth` in debug mode would be:
-
-    $ cargo run -p radicle-cli --bin rad -- auth
-
-Arguments after the `--` are passed directly to the `rad` executable.
-
-This is useful if you are running multiple nodes on the same machine. You can also
-specify different listen addresses for the peer-to-peer protocol using `--listen`.
-To view all options, run `cargo run -p radicle-node -- --help`.
-
-You may want to set the appropriate environment variables before running these commands
-to prevent them from interfering with an existing installation of radicle. See the
-following section on environment variables.
-
-## Running in isolation
-
-When testing things, if you want to run one or more nodes in isolation from the
-public Radicle network of nodes:
-
-* In the node `config.json` file:
-  - set `preferredSeeds` to `[]`
-  - set `node.connect` to `[]`
-  - set `node.network` to `test`
-  - set `node.peers.type` to `static`
-
-This allows you to make any changes to the repositories on your nodes without
-having them replicated to outside your nodes. This would be good to do for any
-experiments you make that might be burdensome for other nodes, such as creating
-very large repositories.
-
-## Environment variables
-
-When developing radicle, some environment variables may be used to make the
-development environment more friendly.
-
-**`RAD_HOME`**
-
-Set this to a path on your file system where you'd like radicle to store keys
-and repositories. Typically you'll want to set this to a temporary folder, eg.
-`/tmp/radicle`, that can be safely deleted. If set, all radicle data will be
-stored within this folder.
-
-**`RAD_KEYGEN_SEED`**
-
-Set this to a 32-byte hexadecimal string to generate deterministic Node IDs
-when creating new profiles. For example, integration tests use the following
-setting:
-
-    RAD_KEYGEN_SEED=ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-
-**`RAD_PASSPHRASE`**
-
-Set this to the passphrase chosen during profile initialization (`rad auth`) to
-skip the passphrase prompt. It's recommended to set this while developing to
-avoid storing development keys with `ssh-agent`.
-
-## Logging
-
-Logging for `radicle-node` is turned on by default. Check the respective
-`--help` output to set the log level.
-
-## Writing tests
-
-### Documentation tests
-
-When implementing changes to the CLI, or adding a new sub-command, it's a good
-idea to add a documentation test. You can find examples of these in
-`radicle-cli/examples`.
-
-Each documentation test must be accompanied by a regular unit test. These are
-located in `radicle-cli/tests/commands.rs`. To keep tests deterministic,
-environment variables are used. If your document test output is changing on
-each test run, make sure to account for any variability in the test environment
-(clocks, RNGs, etc.).
-
-### Node service logic tests
-
-When testing the core service logic, eg. the gossip protocol; tests can be
-added to `radicle-node/src/tests.rs`. These service-level tests simply test
-inputs and outputs and do not perform any I/O.
-
-### Node end-to-end tests
-
-If you find the need to test the replication protocol or networking layer, it's
-possible to write an end-to-end test. These tests can be found in
-`radicle-node/src/tests/e2e.rs`.
-
-## Debugging
-
-### Repository storage
-
-Radicle stores git repositories inside `$RAD_HOME/storage`, which defaults to
-`~/.radicle/storage` on UNIX-based operating systems. You can use standard git
-tooling to inspect references and other git objects inside storage. Each radicle
-repository is stored under its own folder under storage as a bare Git repository.
-
-Once inside a repository folder, the following commands may come in handy.
-
-`git show-ref` to show all references:
-
-    $ git show-ref
-    f60b291752bc38be7dfc90c4c4034de13e01a66b refs/heads/master
-    f60b291752bc38be7dfc90c4c4034de13e01a66b refs/namespaces/z6MkqTY5aQepDGNCrkPqzdmzveX3D4oAmyVXUDDVQaDGdyVH/refs/heads/master
-    805b7d0df927dcbc4d3911ab07cd497953eecbd1 refs/namespaces/z6MkqTY5aQepDGNCrkPqzdmzveX3D4oAmyVXUDDVQaDGdyVH/refs/rad/id
-    86136a42a69572015466bac2d974154ee76f0853 refs/namespaces/z6MkqTY5aQepDGNCrkPqzdmzveX3D4oAmyVXUDDVQaDGdyVH/refs/rad/sigrefs
-    5575035d8b4faf1f18c532b08516f18031dd7b28 refs/namespaces/z6MkuGSynjxM8SLhcsiEPWZgDeGLAVNXf5g7WePmc1Tri1FS/refs/heads/master
-    805b7d0df927dcbc4d3911ab07cd497953eecbd1 refs/namespaces/z6MkuGSynjxM8SLhcsiEPWZgDeGLAVNXf5g7WePmc1Tri1FS/refs/rad/id
-    89e4f0baa327595c7b2849189fc8808388a29033 refs/namespaces/z6MkuGSynjxM8SLhcsiEPWZgDeGLAVNXf5g7WePmc1Tri1FS/refs/rad/sigrefs
-
-`git cat-file` to examine refs:
-
-    $ git cat-file -p f60b291752bc38be7dfc90c4c4034de13e01a66b
-
-    tree 1afc38724d2b89264c7b3826d40b0655a95cfab4
-    author cloudhead <cloudhead@anonymous.xyz> 1678097961 +0100
-    committer cloudhead <cloudhead@anonymous.xyz> 1678097961 +0100
-    gpgsig -----BEGIN SSH SIGNATURE-----
-     U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgvjrQogRxxLjzzWns8+mKJAGzEX
-     4fm2ALoN7pyvD2ssQAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5
-     AAAAQHXhUf7QjXNlgCjDbGSG+zoyIlE4S9/d9qjvG7x9jw8J/fXDVIMkh/Lkp743g7EliM
-     X+88wqit9BeQoHXuxj2Ao=
-     -----END SSH SIGNATURE-----
-
-    Init
-
-You can also run `git ls-remote rad` from inside a working copy to examine the
-remote refs in storage.
-
-### Connecting to your local node
-
-The radicle node listens on a UNIX domain socket located at
-`$RAD_HOME/node/control.sock`. Make sure this file is accessible and has the
-required permissions for your user to read and write to it.
-
-### Radicle keys
-
-Radicle uses Ed25519 keys that are located in `$RAD_HOME/keys`. These keys are
-encoded in the standard OpenSSH format. It's therefore possible to use standard
-OpenSSH tools to interact with them, eg. `ssh-add`.
-
-Your radicle secret key is protected with a passphrase (See: `$RAD_PASSPHRASE`).
-
diff --git a/LICENSE-APACHE b/LICENSE-APACHE
deleted file mode 100644
index 1b5ec8b78..000000000
--- a/LICENSE-APACHE
+++ /dev/null
@@ -1,176 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
diff --git a/LICENSE-MIT b/LICENSE-MIT
deleted file mode 100644
index 68fa6d19c..000000000
--- a/LICENSE-MIT
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 The Radicle Foundation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/README.md b/README.md
deleted file mode 100644
index a6c939dba..000000000
--- a/README.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# ❤️🪵
-
-*Radicle Heartwood Protocol & Stack*
-
-Heartwood is the third iteration of the Radicle Protocol, a powerful
-peer-to-peer code collaboration and publishing stack. The repository contains a
-full implementation of Heartwood, complete with a user-friendly command-line
-interface (`rad`) and network daemon (`radicle-node`).
-
-Radicle was designed to be a secure, decentralized and powerful alternative to
-code forges such as GitHub and GitLab that preserves user sovereignty
-and freedom.
-
-See the [Protocol Guide](https://radicle.xyz/guides/protocol) for an
-in-depth description of how Radicle works.
-
-## Installation
-
-**Requirements**
-
-* *Linux* or *Unix* based operating system.
-* Git 2.34 or later
-* OpenSSH 9.1 or later with `ssh-agent`
-
-### 📀 From binaries
-
-> Requires `curl` and `tar`.
-
-Run the following command to install the latest binary release:
-
-    curl -sSf https://radicle.xyz/install | sh
-
-Or visit our [download](https://radicle.xyz/download) page.
-
-### 📦 From source
-
-> Requires the Rust toolchain.
-
-You can install the Radicle stack from source, by running the following
-commands from inside this repository:
-
-    cargo install --path radicle-cli --force --locked --root ~/.radicle
-    cargo install --path radicle-node --force --locked --root ~/.radicle
-    cargo install --path radicle-remote-helper --force --locked --root ~/.radicle
-
-Or directly from our seed node:
-
-    cargo install --force --locked --root ~/.radicle \
-        --git https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git \
-        radicle-cli radicle-node radicle-remote-helper
-
-## Running
-
-*Systemd* unit files are provided for the node under the `/systemd` folder.
-They can be used as a starting point for further customization.
-
-For running in debug mode, see [HACKING.md](HACKING.md).
-
-## Contributing
-
-See [CONTRIBUTING.md](CONTRIBUTING.md) and [HACKING.md](HACKING.md) for an
-introduction to contributing to Radicle.
-
-## License
-
-Radicle is distributed under the terms of both the MIT license and the Apache License (Version 2.0).
-
-See [LICENSE-APACHE](LICENSE-APACHE) and [LICENSE-MIT](LICENSE-MIT) for details.
diff --git a/VERSIONING.md b/VERSIONING.md
deleted file mode 100644
index 3cf115905..000000000
--- a/VERSIONING.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# Versioning
-
-This document describes the versioning scheme used by the Radicle Stack, ie.
-the package that includes the Radicle CLI (`rad`), Radicle Node
-(`radicle-node`) and other binaries. It is not relevant to the Rust *crate*
-versions which follow [Semantic Versioning][semver].
-
-[semver]: https://semver.org/
-
-## Format
-
-Versioning of the Radicle Stack is based on Git tags. During the build phase,
-we search for the most recent tag that starts with a `v` character, eg.
-`v1.0.0`, and use that as the basis for computing the version.
-
-If we're building code that is pointed to by that tag directly, that code will
-inherit that version number, with the `v` character stripped. For example:
-
-    1.0.0
-
-If on the other hand, the commit we are building has no version tag pointing to
-it, the output of `git describe` is used as-is. This indicates a development
-version that is not released and not meant to be packaged or distributed. For
-example:
-
-    1.0.0-6-ga3ffe51d
-
-Tags used for versioning are always annotated and signed, and follow the format:
-
-    "v" <major> "." <minor> "." <patch>
-
-When the tag is parsed, we strip the `v` prefix, which results in a version
-matching:
-
-    <major> "." <minor> "." <patch>
-
-For pre-releases or release candidates, we add the `-rc` suffix, plus a number.
-For example:
-
-    1.0.0-rc.2
-
-These releases are meant to be packaged.
-
-## Semantics
-
-The Radicle version numbers do not follow strict rules, but these are the
-guidelines we use:
-
-1. Increment the `<major>` number when significant changes and/or improvements
-   are made to the Radicle Stack. This should happen rarely.
-2. Increment the `<minor>` number when new features are added or existing
-   features are improved in a noticeable way.
-3. Increment the `<patch>` number when bugs are fixed, docs are updated or
-   features are tweaked.
-
-Unless clearly stated in the documentation, none of the user-facing commands
-should be considered stable APIs, and may therefore break in `<minor>` or
-`<major>` version updates. If command output is considered stable, and an
-effort is made to maintain that stability, this will be stated in the command's
-documentation.
diff --git a/build.rs b/build.rs
deleted file mode 100644
index 34d54253b..000000000
--- a/build.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use std::env;
-use std::process::Command;
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // Set a build-time `GIT_HEAD` env var which includes the commit id;
-    // such that we can tell which code is running.
-    let hash = env::var("GIT_HEAD").unwrap_or_else(|_| {
-        Command::new("git")
-            .arg("rev-parse")
-            .arg("--short")
-            .arg("HEAD")
-            .output()
-            .ok()
-            .and_then(|output| {
-                if output.status.success() {
-                    String::from_utf8(output.stdout).ok()
-                } else {
-                    None
-                }
-            })
-            .unwrap_or("unknown".into())
-    });
-
-    let version = if let Ok(version) = env::var("RADICLE_VERSION") {
-        version
-    } else {
-        "pre-release".to_owned()
-    };
-
-    // Set a build-time `SOURCE_DATE_EPOCH` env var which includes the commit time.
-    let commit_time = env::var("SOURCE_DATE_EPOCH").unwrap_or_else(|_| {
-        Command::new("git")
-            .arg("log")
-            .arg("-1")
-            .arg("--pretty=%ct")
-            .arg("HEAD")
-            .output()
-            .ok()
-            .and_then(|output| {
-                if output.status.success() {
-                    String::from_utf8(output.stdout).ok()
-                } else {
-                    None
-                }
-            })
-            .unwrap_or(0.to_string())
-    });
-
-    println!("cargo::rustc-env=RADICLE_VERSION={version}");
-    println!("cargo::rustc-env=SOURCE_DATE_EPOCH={commit_time}");
-    println!("cargo::rustc-env=GIT_HEAD={hash}");
-
-    Ok(())
-}
diff --git a/build/Dockerfile b/build/Dockerfile
deleted file mode 100644
index 478f10128..000000000
--- a/build/Dockerfile
+++ /dev/null
@@ -1,107 +0,0 @@
-# Builds release binaries for Radicle.
-FROM rust:1.77.2-alpine3.19 as builder
-LABEL maintainer="Radicle Team <team@radicle.xyz>"
-WORKDIR /src
-COPY . .
-
-ARG TZ
-ARG LC_ALL
-ARG SOURCE_DATE_EPOCH
-ARG RADICLE_VERSION
-ARG GIT_HEAD
-
-# Copy cargo configuration we're going to use to specify compiler options.
-RUN mkdir -p .cargo && cp build/config.toml .cargo/config.toml
-# Install dependencies.
-RUN apk update && apk add --no-cache git musl-dev minisign curl xz asciidoctor
-# Build man pages and strip metadata. Removes all comments, since they include
-# non-reproducible information, such as version numbers.
-RUN asciidoctor --doctype manpage --backend manpage --destination-dir . *.1.adoc && \
-    find . -maxdepth 1 -type f -name '*.1' -exec sed -i '/^.\\\"/d' '{}' \;
-# Add cargo targets.
-RUN rustup target add \
-    x86_64-unknown-linux-musl \
-    aarch64-unknown-linux-musl \
-    x86_64-apple-darwin \
-    aarch64-apple-darwin
-
-# Install dependencies for cross-compiling to macOS.
-# We use Zig as the linker to perform the compilation from a Linux host.
-# Zig is not yet available on Debian, so we download the official binary.
-# Compilation is done via `cargo-zigbuild` which is a wrapper around `zig`.
-RUN curl -sSf -o zig.tar.xz         https://ziglang.org/download/0.12.0/zig-linux-x86_64-0.12.0.tar.xz && \
-    curl -sSf -o zig.tar.xz.minisig https://ziglang.org/download/0.12.0/zig-linux-x86_64-0.12.0.tar.xz.minisig && \
-    minisign -Vm zig.tar.xz -P RWSGOq2NVecA2UPNdBUZykf1CCb147pkmdtYxgb3Ti+JO/wCYvhbAb/U && \
-    xz -d -c zig.tar.xz | tar -x && \
-    mv zig-linux-x86_64-0.12.0/zig /usr/bin/zig && \
-    mv zig-linux-x86_64-0.12.0/lib /usr/lib/zig && \
-    cargo install cargo-zigbuild@0.18.3
-
-
-# Parts of the macOS SDK are required to build Radicle, we make these available
-# here. So far only `CoreFoundation` and `Security` frameworks are needed.
-RUN xz -d -c build/macos-sdk-11.3.tar.xz | tar -x
-# This env var is used by `cargo-zigbuild` to find the SDK.
-ENV SDKROOT /src/macos-sdk-11.3
-
-# Build binaries.
-RUN cargo zigbuild --locked --release \
-    --target=x86_64-apple-darwin \
-    --target=aarch64-apple-darwin \
-    --target=aarch64-unknown-linux-musl \
-    --target=x86_64-unknown-linux-musl \
-    -p radicle-node \
-    -p radicle-remote-helper \
-    -p radicle-cli
-
-# Now copy the files to a new image without all the intermediary artifacts to
-# save some space.
-FROM alpine:3.19 as packager
-
-ARG RADICLE_VERSION
-ARG SOURCE_DATE_EPOCH
-
-COPY --from=builder \
-     /src/target/x86_64-unknown-linux-musl/release/rad \
-     /src/target/x86_64-unknown-linux-musl/release/git-remote-rad \
-     /src/target/x86_64-unknown-linux-musl/release/radicle-node \
-     /builds/x86_64-unknown-linux-musl/bin/
-COPY --from=builder \
-     /src/target/aarch64-unknown-linux-musl/release/rad \
-     /src/target/aarch64-unknown-linux-musl/release/git-remote-rad \
-     /src/target/aarch64-unknown-linux-musl/release/radicle-node \
-     /builds/aarch64-unknown-linux-musl/bin/
-COPY --from=builder \
-     /src/target/aarch64-apple-darwin/release/rad \
-     /src/target/aarch64-apple-darwin/release/git-remote-rad \
-     /src/target/aarch64-apple-darwin/release/radicle-node \
-     /builds/aarch64-apple-darwin/bin/
-COPY --from=builder \
-     /src/target/x86_64-apple-darwin/release/rad \
-     /src/target/x86_64-apple-darwin/release/git-remote-rad \
-     /src/target/x86_64-apple-darwin/release/radicle-node \
-     /builds/x86_64-apple-darwin/bin/
-COPY --from=builder /src/*.1 /builds/x86_64-unknown-linux-musl/man/man1/
-COPY --from=builder /src/*.1 /builds/aarch64-unknown-linux-musl/man/man1/
-COPY --from=builder /src/*.1 /builds/aarch64-apple-darwin/man/man1/
-COPY --from=builder /src/*.1 /builds/x86_64-apple-darwin/man/man1/
-
-# Create and compress reproducible archive.
-WORKDIR /builds
-RUN x86_64-unknown-linux-musl/bin/rad version --json > radicle.json
-RUN apk update && apk add --no-cache tar xz
-RUN find * -maxdepth 0 -type d -exec mv '{}' "radicle-$RADICLE_VERSION-{}" \; && \
-    find * -maxdepth 0 -type d -exec tar \
-    --sort=name \
-    --verbose \
-    --mtime="@$SOURCE_DATE_EPOCH" \
-    --owner=0 \
-    --group=0 \
-    --numeric-owner \
-    --format=posix \
-    --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
-    --mode='go+u,go-w' \
-    --remove-files \
-    --create --xz \
-    --file="{}.tar.xz" \
-    '{}' \;
diff --git a/build/README.md b/build/README.md
deleted file mode 100644
index 51ec10768..000000000
--- a/build/README.md
+++ /dev/null
@@ -1,70 +0,0 @@
-# Builds
-
-Radicle uses a [reproducible build][rb] pipeline to make binary verification
-easier and more secure.
-
-[rb]: https://reproducible-builds.org/
-
-This build pipeline is designed to be run on an x86_64 machine running Linux.
-The output is a set of `.tar.xz` archives containing binaries for the supported
-platforms and signed by the user's Radicle key.
-
-These binaries are statically linked to be maximally portable, and designed to
-be reproducible, byte for byte.
-
-To run the build, simply enter the following command from the repository root:
-
-    build/build
-
-This will build all targets and place the output in `build/artifacts` with
-one sub-directory per build target.
-
-Note that it will use `git describe` to get a version number for the build.
-You *must* have a commit tagged with a version in your history or the build
-will fail, eg. `v1.0.0`.
-
-When the build completes, the SHA-256 checksums of the artifacts are output.
-For a given Radicle version and source tree, the same set of checksums should
-always be output, no matter where or when the build is run. If they do not
-match, either the build pipeline has a bug, making it non-reproducible, or one
-of the machines is compromised.
-
-Here's an example output for a development version of Radicle:
-
-    b9aa75bba175e18e05df4f6b39ec097414bbf56ccdeb4a2229b557f8b8e05404  radicle-1.0.0-rc.4-3-gb299f3b5-aarch64-apple-darwin.tar.xz
-    c7070806bf2d17a8a0d3b329e4d57b1e544b7b82cb58e2863074d96348a2ab0d  radicle-1.0.0-rc.4-3-gb299f3b5-aarch64-unknown-linux-musl.tar.xz
-    1a8327854f16ea90491fb90e0c3291a63c4b2ab01742c8435faec7d370cacb79  radicle-1.0.0-rc.4-3-gb299f3b5-x86_64-apple-darwin.tar.xz
-    709ac67541ff0c0c570ac22ab2de9f98320e0cc2cc9b67f1909c014a2bb5bd49  radicle-1.0.0-rc.4-3-gb299f3b5-x86_64-unknown-linux-musl.tar.xz
-
-A script is included in `build/checksums` to output these checksums after
-the artifacts are built.
-
-## Requirements
-
-The following software is required for the build:
-
-  * `podman`
-  * `rad` (The Radicle CLI)
-  * `sha256sum`
-
-## macOS
-
-macOS binaries are not signed or notarized, so they have to be downloaded via
-the CLI to avoid issues. A copy of a small subset of the Apple SDK is included
-here to be able to cross-compile.
-
-## Podman
-
-We use `podman` to make the build reproducible on any machine by controlling
-the build environment. We prefer `podman` to `docker` because it doesn't
-require a background process to run and can be run without root access out of
-the box.
-
-The first time you run `podman`, you may have to give yourself some extra UIDs
-for `podman` to use, with:
-
-    sudo usermod --add-subuids 100000-165535 --add-subgids 100000-165535 $USER
-
-Then update `podman` with:
-
-    podman system migrate
diff --git a/build/TARGETS b/build/TARGETS
deleted file mode 100644
index eec922875..000000000
--- a/build/TARGETS
+++ /dev/null
@@ -1,4 +0,0 @@
-x86_64-unknown-linux-musl
-aarch64-unknown-linux-musl
-x86_64-apple-darwin
-aarch64-apple-darwin
diff --git a/build/build b/build/build
deleted file mode 100755
index 70bcd91a5..000000000
--- a/build/build
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-set -e
-
-main() {
-  # Use UTC time for everything.
-  export TZ=UTC0
-  # Set minimal locale.
-  export LC_ALL=C
-  # Set source date. This is honored by `asciidoctor` and other tools.
-  export SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)
-
-  if ! command -v rad > /dev/null; then
-    echo "fatal: rad is not installed" >&2 ; exit 1
-  fi
-
-  if ! command -v podman > /dev/null; then
-    echo "fatal: podman is not installed" >&2 ; exit 1
-  fi
-
-  if ! command -v sha256sum > /dev/null; then
-    echo "fatal: sha256sum is not installed" >&2 ; exit 1
-  fi
-
-  rev="$(git rev-parse --short HEAD)"
-  tempdir="$(mktemp -d)"
-  gitarchive="$tempdir/heartwood-$rev.tar.gz"
-  keypath="$(rad path)/keys/radicle.pub"
-  version="$(build/version)"
-  image=radicle-build-$version
-
-  if [ ! -f "$keypath" ]; then
-    echo "fatal: no key found at $keypath" >&2 ; exit 1
-  fi
-  # Authenticate user for signing
-  rad auth
-
-  echo "Building Radicle $version.."
-  echo "Creating archive of repository at $rev in $gitarchive.."
-  git archive --format tar.gz -o "$gitarchive" HEAD
-
-  echo "Building image ($image).."
-  podman --cgroup-manager=cgroupfs build \
-    --build-arg SOURCE_DATE_EPOCH \
-    --build-arg TZ \
-    --build-arg LC_ALL \
-    --build-arg RADICLE_VERSION=$version \
-    --build-arg GIT_HEAD=$rev \
-    --arch amd64 --tag $image -f ./build/Dockerfile - < $gitarchive
-
-  echo "Creating container (radicle-build-container).."
-  podman --cgroup-manager=cgroupfs create --ulimit=host --replace --name radicle-build-container $image
-
-  # Copy build artifacts to output folder.
-  outdir=build/artifacts
-  mkdir -p $outdir
-  podman cp --overwrite radicle-build-container:/builds/. $outdir/
-
-  for target in $(cat build/TARGETS); do
-    echo "Signing artifacts for $target.."
-
-    filename="radicle-$version-$target.tar.xz"
-    filepath="$outdir/$filename"
-
-    # Output SHA256 digest of archive.
-    checksum="$(cd $outdir && sha256sum $filename)"
-    echo "Checksum of $filepath is $(echo "$checksum" | cut -d' ' -f1)"
-    echo "$checksum" > $filepath.sha256
-
-    # Sign archive and verify archive.
-    rm -f $filepath.sig # Delete existing signature
-    ssh-keygen -Y sign -n file -f $keypath $filepath
-    ssh-keygen -Y check-novalidate -n file -s $filepath.sig < $filepath
-  done
-
-  # Remove build artifacts that aren't needed anymore.
-  rm -f $gitarchive
-  podman rm radicle-build-container > /dev/null
-  podman rmi --ignore localhost/$image
-}
-
-# Run build.
-echo "Running build.."
-main "$@"
-
-# Show artifact checksums.
-echo
-build/checksums
-echo
-
-echo "Build successful."
diff --git a/build/checksums b/build/checksums
deleted file mode 100755
index a0225cf56..000000000
--- a/build/checksums
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-find build/artifacts -type f -name '*.sha256' -exec cat {} +
diff --git a/build/config.toml b/build/config.toml
deleted file mode 100644
index b50ab6768..000000000
--- a/build/config.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[target.x86_64-unknown-linux-musl]
-rustflags = [
-    "-C", "codegen-units=1",
-    "-C", "incremental=false",
-    "-C", "opt-level=3",
-]
-
-[target.aarch64-unknown-linux-musl]
-rustflags = [
-    "-C", "codegen-units=1",
-    "-C", "incremental=false",
-    "-C", "opt-level=3",
-]
diff --git a/build/macos-sdk-11.3.tar.xz b/build/macos-sdk-11.3.tar.xz
deleted file mode 100644
index 02fad1f94..000000000
Binary files a/build/macos-sdk-11.3.tar.xz and /dev/null differ
diff --git a/build/tag b/build/tag
deleted file mode 100755
index 7c8b3dbf5..000000000
--- a/build/tag
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ $# -ne 1 ]; then
-  echo "Usage: $0 <version-number>"
-  exit 1
-fi
-
-version="$1"
-tag="v$version"
-commit="$(git rev-parse HEAD)"
-signing_key=$(git config user.signingKey)
-
-git show "$commit"
-
-if [ "$signing_key" != "$(rad self --ssh-key)" ]; then
-  echo "The Git signing key does not match the output of 'rad self --ssh-key'."
-  exit 1
-fi
-
-printf "\n"
-printf "Tag the above commit with \033[35m$tag\033[0m, using \033[35m$(rad self --did)\033[0m? [y/N] "
-read confirmation
-rad auth
-
-case "$confirmation" in
-  [Yy]*)
-    if git tag --annotate --sign "$tag" -m "Release $version" "$commit"; then
-      echo "Tag $tag created and signed over $commit."
-    else
-      echo "Failed to create tag."
-      exit 1
-    fi ;;
-  *)
-    echo "Operation aborted."
-    exit 1 ;;
-esac
-
diff --git a/build/upload b/build/upload
deleted file mode 100755
index 8c89dffd7..000000000
--- a/build/upload
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-set -e
-
-SSH_LOGIN=${SSH_LOGIN:-release}
-SSH_ADDRESS=${SSH_ADDRESS:-$SSH_LOGIN@files.radicle.xyz}
-SSH_KEY="$(rad path)/keys/radicle"
-
-main() {
-  version="$(build/version)"
-
-  echo "Uploading Radicle $version..."
-
-  if [ -z "$version" ]; then
-    echo "fatal: empty version number" >&2 ; exit 1
-  fi
-
-  # Create remote folder.
-  ssh -i $SSH_KEY $SSH_ADDRESS mkdir -p /mnt/radicle/files/releases/$version
-  # Copy files over.
-  scp -i $SSH_KEY build/artifacts/radicle-$version* $SSH_ADDRESS:/mnt/radicle/files/releases/$version
-  scp -i $SSH_KEY build/artifacts/radicle.json $SSH_ADDRESS:/mnt/radicle/files/releases/$version
-
-  for target in $(cat build/TARGETS); do
-    archive=/mnt/radicle/files/releases/$version/radicle-$version-$target.tar.xz
-    symlink=/mnt/radicle/files/releases/$version/radicle-$target.tar.xz
-
-    echo "Creating symlinks for $target.."
-
-    ssh -i $SSH_KEY $SSH_ADDRESS ln -snf $archive $symlink
-    ssh -i $SSH_KEY $SSH_ADDRESS ln -snf $archive.sig $symlink.sig
-    ssh -i $SSH_KEY $SSH_ADDRESS ln -snf $archive.sha256 $symlink.sha256
-  done
-
-  if git describe --exact-match --match='v*' 2>/dev/null; then
-    echo "Creating 'latest' symlink.."
-    ssh -i $SSH_KEY $SSH_ADDRESS ln -snf /mnt/radicle/files/releases/$version /mnt/radicle/files/releases/latest
-  else
-    echo "Skipping 'latest' symlink creation for development build."
-  fi
-
-  echo "Pushing tags.."
-  git push rad --tags
-
-  echo "Done."
-}
-
-main "$@"
diff --git a/build/version b/build/version
deleted file mode 100755
index 4383147c1..000000000
--- a/build/version
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if ! version="$(git describe --match='v*' --candidates=1 2>/dev/null)"; then
-  echo "fatal: no version tag found by 'git describe'" >&2 ; exit 1
-fi
-# Remove `v` prefix from version.
-version=${version#v}
-
-echo $version
diff --git a/debian/build-deb b/debian/build-deb
deleted file mode 100755
index 6f9ff8bc3..000000000
--- a/debian/build-deb
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-rm -f ../radicle*_*
-git clean -fdx
-
-# Get name and version of source package.
-name="$(dpkg-parsechangelog -SSource)"
-version="$(dpkg-parsechangelog -SVersion)"
-
-# Get upstream version: everything before the last dash.
-uv="$(echo "$version" | sed 's/-[^-]*$//')"
-orig="${name}_${uv}.orig.tar.xz"
-
-# Create a tar ball without the Debian packaging.
-tmp="$(mktemp -d)"
-trap 'rm -rf "$tmp"' EXIT
-git archive HEAD | tar -C "$tmp" -xf -
-rm -rf "$tmp/debian"
-tar -C "$tmp" -cf - . | xz >"../$orig"
-
-# Actually build the package, without signing the .changes file.
-dpkg-buildpackage -us -uc
-
-# Dump some information to make it easier to visually verify
-# everything looks OK. Also, test the package with the lintian tool.
-arch="$(dpkg --print-architecture)"
-deb="../${name}_${version}_${arch}.deb"
-changes="../${name}_${version}_${arch}.changes"
-
-ls -l "$deb"
-dpkg -c "$deb"
-lintian -i "$changes"
diff --git a/debian/cargo-checksum.json b/debian/cargo-checksum.json
deleted file mode 100644
index 6852d00f5..000000000
--- a/debian/cargo-checksum.json
+++ /dev/null
@@ -1 +0,0 @@
-/* This file needs to exist, but can be empty. */
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index a4efdeb5a..000000000
--- a/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-radicle (0.8.0-1) unstable; urgency=medium
-
-  * New release.
-
- -- Lars Wirzenius <liw@liw.fi>  Mon, 25 Sep 2023 08:34:08 +0300
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 021ea30c0..000000000
--- a/debian/compat
+++ /dev/null
@@ -1,2 +0,0 @@
-10
-
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 971763292..000000000
--- a/debian/control
+++ /dev/null
@@ -1,17 +0,0 @@
-Source: radicle
-Maintainer: The Radicle Team <team@radicle.xyz>
-Uploaders: Lars Wirzenius <liw@liw.fi>
-Section: vcs
-Priority: optional
-Standards-Version: 4.6.2
-Build-Depends: debhelper (>= 10~),
-  asciidoctor
-Homepage: https://radicle.xyz/
-
-Package: radicle
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, git
-Description: peer-to-peer, distributed git hosting
- Radicle is a secure, decentralized and powerful alternative to code
- forges such as GitHub and GitLab that preserves user sovereignty and
- freedom.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 05a9fff69..000000000
--- a/debian/copyright
+++ /dev/null
@@ -1,10 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: heartwood
-Upstream-Contact: https://radicle.xyz/
-Source: https://app.radicle.xyz/seeds/seed.radicle.xyz
-
-Files: *
-Copyright: 2019-2021, The Radicle Foundation
-License: Apache-2 or Expat
-  License texts omitted, see LICENSE-APACHE and LICENSE-MIT in the
-  source tree.
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 7e79e07c7..000000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-*.1 usr/share/man/man1
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
deleted file mode 100644
index ba0f0dfc6..000000000
--- a/debian/lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-radicle binary: initial-upload-closes-no-bugs
-radicle binary: no-manual-page
-radicle binary: unstripped-binary-or-object
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 8472b0f47..000000000
--- a/debian/rules
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/make -f
-
-DEB_BUILD_OPTIONS=nostrip
-
-%:
-	dh $@
-
-override_dh_auto_build:
-	scripts/build-man-pages.sh . *.adoc
-
-override_dh_auto_install:
-	cargo install --locked --path=radicle-cli --root=debian/radicle
-	cargo install --locked --path=radicle-node --root=debian/radicle
-	cargo install --locked --path=radicle-remote-helper --root=debian/radicle
-	rm -f debian/*/.crates*.*
-
-override_dh_auto_test:
-	echo tests are disabled, for now
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
deleted file mode 100644
index 1d1033798..000000000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-radicle source: debian-rules-sets-DEB_BUILD_OPTIONS
diff --git a/deny.toml b/deny.toml
deleted file mode 100644
index f28eccf01..000000000
--- a/deny.toml
+++ /dev/null
@@ -1,126 +0,0 @@
-# Note that all fields that take a lint level have these possible values:
-# * deny - An error will be produced and the check will fail
-# * warn - A warning will be produced, but the check will not fail
-# * allow - No warning or error will be produced
-
-
-# The graph table configures how the dependency graph is constructed and thus
-# which crates the checks are performed against
-[graph]
-targets = []
-# If true, metadata will be collected with `--all-features`. Note that this can't
-# be toggled off if true, if you want to conditionally enable `--all-features` it
-# is recommended to pass `--all-features` on the cmd line instead
-all-features = false
-# If true, metadata will be collected with `--no-default-features`. The same
-# caveat with `all-features` applies
-no-default-features = false
-
-# The output table provides options for how/if diagnostics are outputted
-[output]
-# When outputting inclusion graphs in diagnostics that include features, this
-# option can be used to specify the depth at which feature edges will be added.
-# This option is included since the graphs can be quite large and the addition
-# of features from the crate(s) to all of the graph roots can be far too verbose.
-# This option can be overridden via `--feature-depth` on the cmd line
-feature-depth = 1
-
-# This section is considered when running `cargo deny check advisories`
-[advisories]
-# Opt into new defaults since cargo deny 0.14.12 (2024-02-23)
-version = 2
-# The path where the advisory database is cloned/fetched into
-db-path = "~/.cargo/advisory-db"
-# The url(s) of the advisory databases to use
-db-urls = ["https://github.com/rustsec/advisory-db"]
-# The lint level for crates that have been yanked from their source registry.
-yanked = "warn"
-# A list of advisory IDs to ignore. Note that ignored advisories will still
-# output a note when they are encountered.
-ignore = []
-
-# This section is considered when running `cargo deny check licenses`
-[licenses]
-# Opt into new defaults since cargo deny 0.14.12 (2024-02-23)
-version = 2
-# List of explicitly allowed licenses
-allow = [
-    "MIT",
-    "Apache-2.0",
-    "Unicode-DFS-2016",
-    "BSD-3-Clause",
-    "MPL-2.0"
-]
-# The confidence threshold for detecting a license from license text.
-confidence-threshold = 0.8
-# Allow 1 or more licenses on a per-crate basis, so that particular licenses
-# aren't accepted for every possible crate as with the normal allow list
-exceptions = [
-    { allow = ["GPL-3.0"], name = "radicle-surf", version = "*" },
-    { allow = ["GPL-3.0"], name = "radicle-std-ext", version = "*" },
-    { allow = ["GPL-3.0"], name = "radicle-git-ext", version = "*" },
-    { allow = ["GPL-3.0"], name = "git-ref-format-core", version = "*" },
-    { allow = ["GPL-3.0"], name = "git-ref-format-macro", version = "*" },
-    { allow = ["GPL-3.0"], name = "git-ref-format", version = "*" },
-]
-
-[licenses.private]
-# If true, ignores workspace crates that aren't published, or are only
-# published to private registries.
-ignore = false
-registries = []
-
-# This section is considered when running `cargo deny check bans`.
-[bans]
-# Lint level for when multiple versions of the same crate are detected
-multiple-versions = "warn"
-# Lint level for when a crate version requirement is `*`
-wildcards = "allow"
-# The graph highlighting used when creating dotgraphs for crates
-# with multiple versions
-# * lowest-version - The path to the lowest versioned duplicate is highlighted
-# * simplest-path - The path to the version with the fewest edges is highlighted
-# * all - Both lowest-version and simplest-path are used
-highlight = "all"
-# The default lint level for `default` features for crates that are members of
-# the workspace that is being checked. This can be overridden by allowing/denying
-# `default` on a crate-by-crate basis if desired.
-workspace-default-features = "allow"
-# The default lint level for `default` features for external crates that are not
-# members of the workspace. This can be overridden by allowing/denying `default`
-# on a crate-by-crate basis if desired.
-external-default-features = "allow"
-# List of crates that are allowed. Use with care!
-allow = []
-# List of crates to deny
-deny = []
-
-# Certain crates/versions that will be skipped when doing duplicate detection.
-skip = []
-# Similarly to `skip` allows you to skip certain crates during duplicate
-# detection. Unlike skip, it also includes the entire tree of transitive
-# dependencies starting at the specified crate, up to a certain depth, which is
-# by default infinite.
-skip-tree = []
-
-# This section is considered when running `cargo deny check sources`.
-[sources]
-# Lint level for what to happen when a crate from a crate registry that is not
-# in the allow list is encountered
-unknown-registry = "warn"
-# Lint level for what to happen when a crate from a git repository that is not
-# in the allow list is encountered
-unknown-git = "warn"
-# List of URLs for allowed crate registries. Defaults to the crates.io index
-# if not specified. If it is specified but empty, no registries are allowed.
-allow-registry = ["https://github.com/rust-lang/crates.io-index"]
-# List of URLs for allowed Git repositories
-allow-git = []
-
-[sources.allow-org]
-# 1 or more github.com organizations to allow git sources for
-github = []
-# 1 or more gitlab.com organizations to allow git sources for
-gitlab = []
-# 1 or more bitbucket.org organizations to allow git sources for
-bitbucket = []
diff --git a/flake.lock b/flake.lock
deleted file mode 100644
index 416d4fcdc..000000000
--- a/flake.lock
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "nodes": {
-    "advisory-db": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1722017365,
-        "narHash": "sha256-9wYR5NZIgI+qzMDlJrUzevR31fvFQRgfjlYp50Xp3Ts=",
-        "owner": "rustsec",
-        "repo": "advisory-db",
-        "rev": "9d024c07ee8c18609b43436bc865abf46636e250",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rustsec",
-        "repo": "advisory-db",
-        "type": "github"
-      }
-    },
-    "crane": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1722907532,
-        "narHash": "sha256-i/j/dMZPR7uJoQPFTa6UCahLu8kMtozYuR83lIKMERM=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "d0c8f4ed8571c533b31c1d68e4ebc534b790cc5c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1722940684,
-        "narHash": "sha256-X8JnSq0ruRWsU4PdYuxV+8W4W66F1lnCcxIZZMWzo4E=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a3103d68517c6ad262ea27c96fc4a38ad81be7a0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "advisory-db": "advisory-db",
-        "crane": "crane",
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1722910815,
-        "narHash": "sha256-v6Vk/xlABhw2QzOa6xh3Jx/IvmlbKbOazFM+bDFQlWU=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "7df2ac544c203d21b63aac23bfaec7f9b919a733",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/flake.nix b/flake.nix
deleted file mode 100644
index b36dd91bc..000000000
--- a/flake.nix
+++ /dev/null
@@ -1,242 +0,0 @@
-{
-  description = "Radicle";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
-
-    crane = {
-      url = "github:ipetkov/crane";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    rust-overlay = {
-      url = "github:oxalica/rust-overlay";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-      };
-    };
-
-    flake-utils.url = "github:numtide/flake-utils";
-
-    advisory-db = {
-      url = "github:rustsec/advisory-db";
-      flake = false;
-    };
-  };
-
-  nixConfig = {
-    keepOutputs = true;
-  };
-
-  outputs = {
-    self,
-    nixpkgs,
-    crane,
-    flake-utils,
-    advisory-db,
-    rust-overlay,
-    ...
-  }:
-    flake-utils.lib.eachDefaultSystem (system: let
-      lib = nixpkgs.lib;
-      pkgs = import nixpkgs {
-        inherit system;
-        overlays = [(import rust-overlay)];
-      };
-
-      rustToolChain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
-      craneLib = (crane.mkLib pkgs).overrideToolchain rustToolChain;
-
-      srcFilters = path: type:
-        builtins.any (suffix: lib.hasSuffix suffix path) [
-          ".sql" # schemas
-          ".diff" # testing
-          ".md" # testing
-          ".adoc" # man pages
-        ]
-        ||
-        # Default filter from crane (allow .rs files)
-        (craneLib.filterCargoSources path type);
-
-      src = lib.cleanSourceWith {
-        src = ./.;
-        filter = srcFilters;
-      };
-
-      basicArgs = {
-        inherit src;
-        pname = "Heartwood";
-        strictDeps = true;
-      };
-
-      # Build *just* the cargo dependencies, so we can reuse
-      # all of that work (e.g. via cachix) when running in CI
-      cargoArtifacts = craneLib.buildDepsOnly basicArgs;
-
-      # Common arguments can be set here to avoid repeating them later
-      commonArgs =
-        basicArgs
-        // {
-          inherit cargoArtifacts;
-
-          nativeBuildInputs = with pkgs; [
-            git
-            # Add additional build inputs here
-          ];
-          buildInputs = lib.optionals pkgs.stdenv.buildPlatform.isDarwin (with pkgs; [
-            darwin.apple_sdk.frameworks.Security
-          ]);
-
-          env =
-            {
-              RADICLE_VERSION = "nix-" + (self.shortRev or self.dirtyShortRev or "unknown");
-            }
-            // (
-              if self ? rev || self ? dirtyRev
-              then {
-                GIT_HEAD = self.rev or self.dirtyRev;
-              }
-              else {}
-            );
-        };
-    in {
-      # Formatter
-      formatter = pkgs.alejandra;
-
-      # Set of checks that are run: `nix flake check`
-      checks = {
-        # Build the crate as part of `nix flake check` for convenience
-        inherit (self.packages.${system}) radicle;
-
-        # Run clippy (and deny all warnings) on the crate source,
-        # again, reusing the dependency artifacts from above.
-        #
-        # Note that this is done as a separate derivation so that
-        # we can block the CI if there are issues here, but not
-        # prevent downstream consumers from building our crate by itself.
-        clippy = craneLib.cargoClippy (commonArgs
-          // {
-            cargoClippyExtraArgs = "--all-targets -- --deny warnings";
-          });
-
-        doc = craneLib.cargoDoc commonArgs;
-        deny = craneLib.cargoDeny commonArgs;
-        fmt = craneLib.cargoFmt basicArgs;
-
-        audit = craneLib.cargoAudit {
-          inherit src advisory-db;
-        };
-
-        # Run tests with cargo-nextest
-        nextest = craneLib.cargoNextest (commonArgs
-          // {
-            partitions = 1;
-            partitionType = "count";
-            nativeBuildInputs = [
-              # git is required so the sandbox can access it.
-              pkgs.git
-              # Ensure that `git-remote-rad` is present for testing.
-              self.packages.${system}.radicle-remote-helper
-            ];
-            # Ensure dev is used since we rely on env variables being
-            # set in tests.
-            env.CARGO_PROFILE = "dev";
-          });
-      };
-
-      packages = let
-        crate = {
-          name,
-          pages ? [],
-        }:
-          craneLib.buildPackage (commonArgs
-            // {
-              inherit (craneLib.crateNameFromCargoToml {cargoToml = src + "/" + name + "/Cargo.toml";}) pname version;
-              cargoExtraArgs = "-p ${name}";
-              doCheck = false;
-
-              nativeBuildInputs = with pkgs; [asciidoctor installShellFiles];
-              postInstall = ''
-                for page in ${lib.escapeShellArgs pages}; do
-                  asciidoctor -d manpage -b manpage $page
-                  installManPage ''${page::-5}
-                done
-              '';
-            });
-        crates = builtins.listToAttrs (map
-          ({name, ...} @ package: lib.nameValuePair name (crate package))
-          [
-            {
-              name = "radicle-cli";
-              pages = [
-                "rad.1.adoc"
-                "rad-id.1.adoc"
-                "rad-patch.1.adoc"
-              ];
-            }
-            {
-              name = "radicle-remote-helper";
-              pages = ["git-remote-rad.1.adoc"];
-            }
-            {
-              name = "radicle-node";
-              pages = ["radicle-node.1.adoc"];
-            }
-          ]);
-      in
-        crates
-        // rec {
-          default = radicle;
-          radicle = pkgs.buildEnv {
-            name = "radicle";
-            paths = with crates; [
-              radicle-cli
-              radicle-node
-              radicle-remote-helper
-            ];
-          };
-          radicle-full = pkgs.buildEnv {
-            name = "radicle-full";
-            paths = builtins.attrValues crates;
-          };
-        };
-
-      apps.default = flake-utils.lib.mkApp {
-        drv = self.packages.${system}.radicle;
-      };
-
-      apps.radicle-full = flake-utils.lib.mkApp {
-        name = "rad";
-        drv = self.packages.${system}.radicle-full;
-      };
-
-      apps.rad = flake-utils.lib.mkApp {
-        name = "rad";
-        drv = self.packages.${system}.radicle-cli;
-      };
-
-      apps.git-remote-rad = flake-utils.lib.mkApp {
-        name = "git-remote-rad";
-        drv = self.packages.${system}.radicle-remote-helper;
-      };
-
-      apps.radicle-node = flake-utils.lib.mkApp {
-        name = "radicle-node";
-        drv = self.packages.${system}.radicle-node;
-      };
-
-      devShells.default = craneLib.devShell {
-        # Extra inputs can be added here; cargo and rustc are provided by default.
-        packages = with pkgs; [
-          cargo-watch
-          cargo-nextest
-          ripgrep
-          rust-analyzer
-          sqlite
-        ];
-
-        env.RUST_SRC_PATH = "${rustToolChain}/lib/rustlib/src/rust/library";
-      };
-    });
-}
diff --git a/git-remote-rad.1.adoc b/git-remote-rad.1.adoc
deleted file mode 100644
index ca8c75aed..000000000
--- a/git-remote-rad.1.adoc
+++ /dev/null
@@ -1,26 +0,0 @@
-= git-remote-rad(1)
-The Radicle Team <team@radicle.xyz>
-:doctype: manpage
-:revnumber: 0.8.0
-:revdate: 2023-10-12
-:mansource: rad {revnumber}
-:manmanual: Radicle CLI Manual
-
-== Name
-
-git-remote-rad - Git remote helper for Radicle
-
-== Synopsis
-
-*git-remote-rad* *
-
-== Description
-
-**git-remote-rad** is a **git**(1) remote helper program to allow git
-to interact with the local Radicle storage. git will use this program
-automatically, when using a remote repository with the "rad" protocol.
-It is never invoked directly.
-
-== SEE ALSO ==
-
-*git-remote-helpers*(1), *rad*(1)
diff --git a/manifest b/manifest
new file mode 100644
index 000000000..6188fc176
--- /dev/null
+++ b/manifest
@@ -0,0 +1 @@
+{"typeName":"xyz.radicle.patch","version":1}
\ No newline at end of file
diff --git a/rad-id.1.adoc b/rad-id.1.adoc
deleted file mode 100644
index 124bc26f4..000000000
--- a/rad-id.1.adoc
+++ /dev/null
@@ -1,170 +0,0 @@
-= rad-id(1)
-The Radicle Team <team@radicle.xyz>
-:doctype: manpage
-:revnumber: 1.0.0
-:revdate: 2024-04-22
-:mansource: rad {revnumber}
-:manmanual: Radicle CLI Manual
-
-== Name
-
-rad-id - Manage changes to a Radicle repository's identity.
-
-== Synopsis
-
-*rad id* [<option>...] +
-*rad id* _list_ [<option>...] +
-*rad id* _update_ [--title <string>] [--description <string>] <option>... +
-*rad id* _edit_ <revision-id> [--title <string>] [--description <string>] [<option>...] +
-*rad id* _show_ <revision-id> [<option>...] +
-*rad id* _accept_ | _reject_ <revision-id> [<option>...] +
-*rad id* _redact_ <revision-id> [<option>...]
-
-== Description
-
-The *rad id* command is used to manage and propose changes to the identity of a
-Radicle repository. Each repository has an associated identity document that
-contains metadata such as the repository name, description, and delegates. The
-identity document is versioned and changes to it must be signed by a quorum of
-delegates.
-
-The identity document is stored as a _Canonical JSON_ document.
-
-== Commands
-
-With no arguments, *rad id* defaults to the _list_ command, showing the list of
-revisions to the identity of the current repository.
-
-=== list
-
-Lists all revisions to the identity document.
-
-=== update
-
-Proposes a new revision to the identity document. Revisions have a title and a
-description in addition to the proposed updated identity document, just like
-source code commits.
-
-If a title and description are not provided on the command line, you will be
-prompted to enter one via your text editor.
-
-Note that if you are the repository's only delegate, proposed changes will be
-automatically accepted and included into the identity document.
-
-*--title* _<string>_::
-  Set the title for the new revision.
-
-*--description* _<string>_::
-  Set the description for the new revision.
-
-*--delegate* _<did>_::
-  Update the identity by adding a new delegate, identified by their DID.
-
-*--rescind* _<did>_::
-  Update the identity by removing a delegate identified by their DID.
-
-*--threshold* _<num>_::
-  Update the identity by setting the number of delegates required to accept a
-  revision.
-
-*--visibility* _<private>_ | _<public>_::
-  Update the identity by setting the repository visibility to private or public.
-
-*--allow* _<did>_::
-  Update the identity by giving a specific peer access to a private repository.
-
-*--payload* _<id> <key> <val>_::
-  Update the identity by setting metadata in one of the identity payloads.
-  This can be used to update a repository's project name or description, for
-  example. To delete a field from a payload, simply set it to *null*.
-
-*--no-confirm*::
-  Don't ask for confirmation before creating the revision.
-
-=== edit
-
-Edit an existing revision to the identity document. The revision must still be
-in the "active" state. The same options as for *update* are available. Note
-that this edits a proposed revision to the identity; to edit the identity
-document itself, use *update*.
-
-=== show
-
-Show a specific revision of the identity document.
-
-=== accept
-
-Accept a proposed revision to the identity document. The revision must be in
-the "active" state and the caller must be a delegate.
-
-=== reject
-
-Reject a proposed revision to the identity document. The revision must be in
-the "active" state and the caller must be a delegate.
-
-=== redact
-
-Redact an existing revision to the identity document. The revision must not be
-in the "accepted" state and the caller must be the author of the revision.
-
-== Options
-
-*--repo* _<rid>_::
-  Specify the repository to operate on. Defaults to the current repository.
-
-*--quiet*, *-q*::
-  Suppress output.
-
-*--help*::
-  Print help information.
-
-== Examples
-
-=== Adding a delegate
-
-To add a new delegate to a repository and update the threshold, use the
-*update* command:
-
-    $ rad id update --title "Add Bob" --description "Add Bob as a delegate" \
-        --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk \
-        --threshold 2
-
-This will create a new revision proposing to add the delegate identified by the
-given DID and set the threshold to `2`, meaning two delegates must sign off on
-future identity changes.
-
-=== Changing repository visibility
-
-To change a repository from public to private:
-
-    $ rad id update --visibility private
-
-Note that this will require acceptance from a quorum of delegates to take
-effect.
-
-=== Changing a repository payload
-
-To change a repository's name and description, this is usually done through the
-*xyz.radicle.project* payload:
-
-    $ rad id update --title "Update title and description" \
-        --description "Improve clarity" \
-        --payload xyz.radicle.project name '"radicle-beans"' \
-        --payload xyz.radicle.project description '"Tasty Radicle beans"'
-
-Note that the values passed to *--payload*, eg. `"radicle-beans"` must be valid
-_JSON_ values. This means that strings should be double quoted, as in the
-example above.
-
-=== Removing a delegate
-
-To remove a delegate and update the threshold, use the *--rescind* option:
-
-    $ rad id update --title "Remove Bob" \
-        --description "Bob is no longer a delegate" \
-        --rescind did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk \
-        --threshold 1
-
-As with adding a delegate, this change will require approval from the remaining
-delegates. Make sure you set an appropriate new threshold when removing
-delegates!
diff --git a/rad-patch.1.adoc b/rad-patch.1.adoc
deleted file mode 100644
index baad195ee..000000000
--- a/rad-patch.1.adoc
+++ /dev/null
@@ -1,287 +0,0 @@
-= rad-patch(1)
-The Radicle Team <team@radicle.xyz>
-:doctype: manpage
-:revnumber: 1.0.0
-:revdate: 2024-04-22
-:mansource: rad {revnumber}
-:manmanual: Radicle CLI Manual
-
-== Name
-
-rad-patch - Manage radicle patches.
-
-== Synopsis
-
-*rad patch* [<option>...] +
-*rad patch* _list_ [--all|--merged|--open|--archived|--draft] [<option>...] +
-*rad patch* _show_ <patch-id> [<option>...] +
-*rad patch* _diff_ <patch-id> [--revision <revision-id>] [<option>...] +
-*rad patch* _archive_ <patch-id> [--undo] [<option>...] +
-*rad patch* _update_ <patch-id> [<option>...] +
-*rad patch* _checkout_ <patch-id> [<option>...] +
-*rad patch* _delete_ <patch-id> [<option>...] +
-*rad patch* _redact_ <revision-id> [<option>...] +
-*rad patch* _ready_ <patch-id> [--undo] [<option>...] +
-*rad patch* _review_ <patch-id> [<option>...] +
-*rad patch* _edit_ <patch-id> [<option>...] +
-*rad patch* _set_ <patch-id> [<option>...] +
-*rad patch* _comment_ <revision-id> [<option>...] +
-*rad patch* _label_ <patch-id> [<option>...] +
-
-*git push rad* HEAD:refs/patches +
-
-== Description
-
-The Radicle *patch* command is used for managing changesets inside of Radicle
-repositories.
-
-Though many actions can be performed using *rad patch*, certain patch-related
-actions use *git* directly. For example, opening a patch is typically
-done using *git push*, while merging a patch is done with a combination of
-*git merge* and *git push*.
-
-To make this possible, Radicle ships with a helper program, *git-remote-rad*
-which is invoked by *git* on push and fetch to and from Radicle remotes.
-
-== Commands
-
-With no arguments, *rad patch* defaults to the _list_ command, showing the list of
-open patches for the current repository.
-
-=== show
-
-Shows information on the given patch.
-
-*<patch-id>*::                       The patch to show
-*--patch*, *-p*::                    Show the patch changes in git patch format
-*--verbose*, *-v*::                  Show additional information about the patch
-
-=== diff
-
-Outputs the patch diff, using Radicle's diffing tool.
-
-*<patch-id>*::                       The patch to diff
-*--revision*, *-r <revision-id>*::   The revision to diff (default: latest)
-
-=== edit
-
-Edits a patch revision comment. To edit the patch title or description, pass
-in the *<patch-id>*. To edit a revision comment, pass that revision's
-*<revision-id>*.
-
-*<revision-id>*::
-The revision to edit.
-
-*--message*, *-m [<string>]*::
-Comment message to the patch or revision. If omitted, Radicle will prompt for
-a comment string via *$EDITOR*.
-
-=== list
-
-List patches in the current repository. The default is *--open*.
-
-*--all*::                  List all patches, including merged and archived patches
-*--archived*::             List only archived patches
-*--merged*::               List only merged patches
-*--open*::                 List only open patches
-*--draft*::                List only draft patches
-*--authored*::             Show only patches that you have authored
-*--author <did>*::         Show only patched where the given user is an author
-                           (may be specified multiple times)
-
-=== ready
-
-Mark a patch as ready to review. This changes the state of a patch from *draft*
-to *open*.
-
-*--undo*::                 Change a patch back to *draft*
-
-=== review
-
-Review a patch. Indicate acceptance or rejection of a patch revision along
-with a comment.
-
-*--revision*, *-r <revision-id>*::   The revision to diff (default: latest)
-*--patch*, *--p*::                   Review by patch hunks
-*--hunk <index>*::                   Only review a specific hunk
-*--accept*::                         Accept a patch or set of hunks
-*--reject*::                         Reject a patch or set of hunks
-*--unified*, *-U <n>*::              Generate diffs with *<n>* lines of context instead of the usual three
-*--delete*, *-d*::                   Delete a review draft
-*--message*, *-m [<string>]*::       Provide a comment with the review (default: prompt)
-
-=== archive
-
-Archive a patch.
-
-*--undo*::                 Unarchive a patch
-
-=== set
-
-Set the current branch upstream to a patch reference. This configures your
-branch such that pushing will update the specified patch.
-
-*<patch-id>*::             The patch to set this branch's upstream to
-
-=== update
-
-Updates a patch to the current repository *HEAD*. This is a low-level command
-that should only be used when using *git push rad* is not possible.
-
-*--message*, *-m [<string>]*::   Provide a comment message to the revision
-*--no-message*::                 Leave the revision comment message blank
-
-=== checkout
-
-Switch to a given patch, by creating a branch that points to the patch head.
-This is essentially equivalent to *git checkout -b <name>* followed by
-*rad patch set <patch-id>*. By default, the branch name includes the Patch ID.
-
-*--revision <id>*::        Checkout the given revision of the patch
-*--name <string>*::        Provide a name for the new branch
-*--force*, *-f*::          If the checkout already exists, update its head
-
-=== comment
-
-Comment on a patch revision, optionally replying to an existing comment.
-
-*<revision-id>*::
-The patch revision to comment on. The Patch ID is also a Revision ID,
-and can be used for commenting on the initial revision of the patch.
-Any other Revision ID will comment on the revision specified.
-
-*--message*, *-m <string>*::
-Comment message. If omitted, Radicle will prompt for a comment string via
-*$EDITOR*. Multiple messages will be concatinated with a blank line in between.
-
-*--reply-to <comment-id>*::
-Optional comment to reply to. If ommitted, the comment is a top-level comment
-on the given revision.
-
-== Opening a patch
-
-To open a patch, we start by making changes to our working copy, typically on
-a feature branch. For example:
-
-    $ git checkout -b fix/option-parsing
-      ... edit some files ...
-    $ git commit -a -m "Fix option parsing"
-
-Once our changes are ready to be proposed as a patch, we push them via *git*
-to a special reference on the *rad* remote, that is used for opening patches
-(*refs/patches*):
-
-    $ git push rad HEAD:refs/patches
-    ✓ Patch 90c77f2c33b7e472e058de4a586156f8a7fec7d6 opened
-    ...
-
-Radicle will then open your editor, where you can edit the patch title and
-description. Make sure either *EDITOR* or *VISUAL* is set in your environment
-(See *environ(7)* for more details). Once you're done, simply save and exit your
-editor. If successful, the patch is opened and its identifier is printed out.
-You can then display the patch metadata using the *show* sub-command:
-
-    $ rad patch show 90c77f2
-
-Note that you don't have to use the full patch identifier. An unambiguous
-prefix of it also works.
-
-Radicle can create a patch from any Git commit. Simply substitute *HEAD* with
-the branch name or commit hash you wish to propose a patch for. For example:
-
-    $ git push rad d39fe32387496876fae6446daf3762aacf69d83b:refs/patches
-
-After the patch is opened, you may notice that Radicle has set your branch
-upstream to something like *rad/patches/90c77f2c33b7e472e058de4a586156f8a7fec7d6*.
-This means your branch is now associated with the newly opened patch, and any
-push from this branch will result in the patch being updated. See the next
-section on updating a patch for more information.
-
-=== Options
-
-When opening a patch, various options can be specified using git push options.
-This is done via the *-o* or *--push-option* flag. For example, *-o patch.draft*.
-The full list of options follows:
-
-*sync*, *no-sync*::
-  Whether or not to sync with the network after the patch is opened. Defaults
-  to _sync_.
-
-*sync.debug*::
-  Show debug information about the syncing process.
-
-*patch.draft*::
-  Open the patch as a _draft_. Turned off by default.
-
-*patch.message*=_<message>_::
-  To prevent the editor from opening, you can specify the patch message via this
-  option. Multiple *patch.message* options are concatenated with a blank line
-  in between.
-
-*patch.base*=_<oid>_::
-  The base commit onto which this patch should be merged. By default, this is
-  your "master" branch. When building stacked patches, it may be useful to
-  set this to the head of a previous patch.
-
-For more information on push options, see *git-push(1)*.
-
-== Updating a patch
-
-To update a patch, we simply make our changes locally and push:
-
-    $ git commit --amend
-    $ git push --force
-    ✓ Patch 90c77f2 updated to revision d0018fcc21d87c91a1ff9155aed6b4e57535566b
-    ...
-
-Note that this will only work if the current branch upstream is set correctly.
-This happens automatically when a patch is opened from a branch without an
-upstream set. In the above example, we used the *--force* option, since the
-commit was amended. This is common practice when a patch has been reworked
-after receiving a review.
-
-If the branch upstream is not set to the patch reference, ie. *rad/patches/<id>*,
-you can do so using `rad patch set <id>`.
-
-As with opening a patch, you will be asked to enter a reason for updating the
-patch, via your editor. Simply save and exit when you're done; or leave it
-blank to skip this step.
-
-It's also possible to change the patch _base_ during an update. Simply use the
-*patch.base* push option as described in _Opening a patch_.
-
-== Checking out a patch
-
-When working with patches opened by peers, it's often useful to be able to
-checkout the code in its own branch. With a patch checkout, you can browse the
-code, run tests and even propose your own update to the patch. The *checkout*
-sub-command is used to that effect:
-
-    $ rad patch checkout 90c77f2
-
-Radicle will create a new branch if necessary and checkout the patch head. From
-there, you can *git-push* to publish a patch update, or simply browse the code.
-
-== Merging a patch
-
-Once a patch is ready to merge, the repository maintainer simply has to use the
-*git-merge(1)* command from the "master" branch and push via *git*. For
-example, if some patch *26e3e56* is ready to merge, the steps would be:
-
-    $ rad patch checkout 26e3e56
-    ✓ Switched to branch patch/26e3e56
-    $ git checkout master
-    $ git merge patch/26e3e56
-    $ git push rad
-    ✓ Patch 26e3e563ddc7df8dd0c9f81274c0b3cb1b764568 merged
-    To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-       f2de534..d6399c7  master -> master
-
-In the above, we created a checkout for the patch, and merged that branch into
-our master branch. Then we pushed to our *rad* remote.
-
-== Listing patches
-
-To list patches, run *rad patch*. By default, this will only show open patches.
-To list all patches, including ones that have been merged or archived, add the
-*--all* option.
diff --git a/rad.1.adoc b/rad.1.adoc
deleted file mode 100644
index eaf54b70b..000000000
--- a/rad.1.adoc
+++ /dev/null
@@ -1,218 +0,0 @@
-= rad(1)
-The Radicle Team <team@radicle.xyz>
-:doctype: manpage
-:revnumber: 1.0.0
-:revdate: 2024-04-22
-:mansource: rad {revnumber}
-:manmanual: Radicle CLI Manual
-
-== Name
-
-rad - Radicle command-line tooling.
-
-== Synopsis
-
-*rad* *
-
-== Description
-
-The Radicle CLI is a set of tools designed for users of the Radicle
-peer-to-peer code collaboration stack. The CLI provides the ability to manage
-Radicle profiles and publish repositories to the Radicle network.
-
-== Requirements
-
-There are a few important requirements for running the Radicle CLI: first, a
-recent version of *git* (*2.34.0* or later) must be installed. You can check
-your installation by running *git --version*. Second, *ssh-agent* must be
-installed and running. To bypass ssh-agent, it's possible to set the
-*RAD_PASSPHRASE* environment variable. See the _Environment_ section.
-
-== Getting started
-
-Let's see how we can setup Radicle and clone a repository from the network.
-
-Before we start, make sure that the *rad* binary is available on your system by
-running:
-
-    $ rad
-
-This is the base command and the output will show you all available
-sub-commands.
-
-=== Creating a profile
-
-When using Radicle for the first time, you have to create a new Radicle
-_profile_. A profile is simply a cryptographic key pair associated with some
-storage space on your local device. Radicle stores everything under the Radicle
-_home_ directory, which defaults to *~/.radicle* on most systems.
-To create your profile, run:
-
-    $ rad auth
-
-Follow the instructions by entering an alias and a passphrase to protect your
-key pair. When you've completed the steps, your new Radicle _DID_
-(Decentralized Identifier) will be displayed. This identifies your device, as
-well as all the code you publish. Share it freely with collaborators. Your
-alias is a non-unique name that is shared across the network to identify your
-node. It can always be changed at a later time.
-
-After running *rad auth*, you should have a new profile and key pair under your
-Radicle home. The key pair is used for identifying peers across the network, as
-well as signing code and other artifacts published on the network.
-
-To avoid having to re-enter your passphrase every time a signature is required,
-*rad auth* adds your secret key to *ssh-agent*.
-
-You can always display the full path to your Radicle home directory using:
-
-    $ rad self --home
-
-The *self* sub-command is useful for querying profile information. You can
-run it without any arguments to show all of your profile information, including
-your DID:
-
-    $ rad self
-
-=== Connecting to the network
-
-Radicle is a peer-to-peer system. This means that there are no clients or
-servers; only _nodes_, and every user has to run their own. This ensures
-that there is no single point of failure, and the Radicle network can keep on
-existing as long as there are users to run nodes.
-
-The Radicle node is a lightweight process that runs in the background and
-manages connections with other nodes, as well as data replication. To check your
-node's status, run:
-
-    $ rad node status
-
-If the node is not running, you can start it with:
-
-    $ rad node start
-
-This will start the node in the foreground. Simply add *--daemon* to run the
-node in the background.
-
-When daemonized, the node will log all output to a file under your Radicle home.
-On most systems, this will be *~/.radicle/node/node.log*.
-
-You can also display the latest logs at any time using:
-
-    $ rad node logs
-
-After your node starts, it will attempt to connect to peers on the network.
-
-To connect to a specific peer, the *connect* sub-command can be used:
-For example, to connect to the *radicle.garden* community node, you can run:
-
-    $ rad node connect z6MkrLMMsiPWUcNPHcRajuMi9mDfYckSoJyPwwnknocNYPm7@seed.radicle.garden:8776
-
-The argument given to *connect* is called a node _address_. It is composed of
-a Node ID (NID), followed by an *@* symbol, and the _host_ name and _port_.
-You can display your NID with *rad self --nid*.
-
-To make these connections permanent, such that they are always tried on
-startup, add the addresses to your configuration file at
-*~/.radicle/config.json*, under the *"connect"* field.
-
-Now that you're connected to the network, we can try to clone a repository
-hosted on Radicle.
-
-=== Cloning a repository
-
-To clone a repository from the Radicle network, you need to be connected to a
-seed which is hosting the repository. Eventually, this won't be necessary,
-but for now, a direct connection with the seed you are cloning from is
-required. Once the connection is established, you can run the *rad clone*
-command to clone a repository, by supplying a Repository Identifier (RID).
-RIDs are globally unique URNs that identify a repository on Radicle.
-For example, let's clone the Radicle heartwood repository:
-
-    $ rad clone rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5
-
-If the command succeeds, you will have a checkout of the repository under
-*./heartwood*, with a *rad* remote setup, which you can pull from and push to.
-
-The *rad* remote is special in that it will always return the _authoritative_
-branch of the repo, when fetched from. This is defined as the latest commit
-on the repository's default branch that a threshold of delegates have published.
-
-Under the hood, the *clone* command does a few important things:
-
-* It subscribes to updates from this repository; this is called _tracking_.
-* It creates a copy of the repository under your local storage, which provides
-  a replica to the network.
-* It creates a Git remote for every repository _delegate_. These are usually
-  the repository maintainers.
-* It creates a fork of the repository that is under your public key.
-* It creates a *rad* remote which you can push to, to update your fork.
-
-You can see all replicated and locally-available repositories using:
-
-    $ rad ls --all
-
-By default, your node will subscribe to updates from _all_ peers. This
-behavior can be changed by passing *--scope followed* when cloning. It can
-also be changed later via the *rad seed* command.
-
-=== Publishing a repository on Radicle
-
-To publish an existing Git repository on the Radicle network, navigate to
-a working copy and run the *rad init* command:
-
-    $ cd my-repo
-    $ rad init
-
-You will be prompted to enter a repository name and default branch. Once the
-repository is created, the Repository Identifier (RID) will be printed.
-Share this with collaborators so that they can clone your repository.
-
-Note that your new repository will only be replicated by nodes that you are
-connected to and either have an open tracking policy, or trust your Node ID.
-
-The *rad init* command creates a special remote in your working copy named
-*rad*. Pushing to this remote publishes changes to your local storage and to
-the network.
-
-You can view information about the *rad* remote with:
-
-    $ git remote show rad
-
-You can display the Repository ID (RID) from the root of any Git repository
-by running:
-
-    $ rad .
-
-You can also show the repository's identity payload, which contains its name,
-description and default branch by running:
-
-    $ rad inspect --payload
-
-== Files
-
-*~/.radicle*::
-
-The _Radicle Home_. This is the default location for Radicle configuration
-files, keys, and repository storage. Can be controlled by settting the
-**RAD_HOME** environment variable.
-
-*~/.radicle/config.json*::
-
-The default configuration file for Radicle. To display its exact
-location on your system, you can use the *rad self --config* command.
-
-== Environment
-
-Various environment variables are used by *rad*.
-
-*RAD_HOME*::
-
-This sets the location of your Radicle home. If unset, your Radicle home will
-be located at *~/.radicle*.
-
-*RAD_PASSPHRASE*::
-
-If you would like to bypass *ssh-agent*, you can store your passphrase in this
-environment variable. Note that this is not secure and is equivalent to having
-an unencrypted secret key.
diff --git a/radicle-cli-test/Cargo.toml b/radicle-cli-test/Cargo.toml
deleted file mode 100644
index e9d6874d4..000000000
--- a/radicle-cli-test/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-name = "radicle-cli-test"
-description = "Radicle CLI test library"
-homepage = "https://radicle.xyz"
-license = "MIT OR Apache-2.0"
-version = "0.10.0"
-authors = ["cloudhead <cloudhead@radicle.xyz>"]
-edition = "2021"
-categories = ["development-tools::testing"]
-keywords = ["cli", "test", "command"]
-readme = "README.md"
-
-[dependencies]
-escargot = { version = "0.5.7" }
-log = { version = "0.4", features = ["std"] }
-pretty_assertions = { version = "1.3.0" }
-shlex = { version = "1.1.0" }
-snapbox = { version = "0.4.3" }
-thiserror = { version = "1" }
-
-[dependencies.radicle]
-path = "../radicle"
-version = "0"
-features = ["logger", "test"]
diff --git a/radicle-cli-test/README.md b/radicle-cli-test/README.md
deleted file mode 100644
index f94828b3f..000000000
--- a/radicle-cli-test/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# radicle-cli-test
-
-Test your CLI with the help of markdown descriptions.
-
-## Example
-
-Test flows are described in markdown like this example:
-
-````` markdown
-# Echoing works
-
-When I call echo, it answers:
-
-```
-$ echo "ohai"
-ohai
-```
-`````
-
-Say this is placed in `kind-echo.md`, this is what the corresponding test case
-would look lke:
-
-``` rust
-use std::path::Path;
-use radicle_cli_test::TestFormula;
-
-#[test]
-fn kind_echo() {
-    TestFormula::new()
-        .file(Path::new("./kind-echo.md"))
-        .unwrap()
-        .run()
-        .unwrap();
-}
-```
diff --git a/radicle-cli-test/src/lib.rs b/radicle-cli-test/src/lib.rs
deleted file mode 100644
index 16c8e9a21..000000000
--- a/radicle-cli-test/src/lib.rs
+++ /dev/null
@@ -1,659 +0,0 @@
-#![allow(clippy::collapsible_else_if)]
-use std::borrow::Cow;
-use std::collections::HashMap;
-use std::path::{Path, PathBuf};
-use std::str::FromStr;
-use std::sync;
-use std::{env, ffi, fs, io, mem};
-
-use snapbox::cmd::{Command, OutputAssert};
-use snapbox::{Assert, Substitutions};
-use thiserror::Error;
-
-/// Used to ensure the build task is only run once.
-static BUILD: sync::Once = sync::Once::new();
-
-#[derive(Error, Debug)]
-pub enum Error {
-    #[error("parsing failed")]
-    Parse,
-    #[error("invalid file path: {0:?}")]
-    InvalidFilePath(String),
-    #[error("unknown home {0:?}")]
-    UnknownHome(String),
-    #[error("test file not found: {0:?}")]
-    TestNotFound(PathBuf),
-    #[error("i/o: {0}")]
-    Io(#[from] io::Error),
-    #[error("snapbox: {0}")]
-    Snapbox(#[from] snapbox::Error),
-}
-
-#[derive(Debug, PartialEq, Eq)]
-enum ExitStatus {
-    Success,
-    Failure,
-}
-
-/// A test which may contain multiple assertions.
-#[derive(Debug, Default, PartialEq, Eq)]
-pub struct Test {
-    /// Human-readable context around the test. Functions as documentation.
-    context: Vec<String>,
-    /// Test assertions to run.
-    assertions: Vec<Assertion>,
-    /// Whether to check stderr's output instead of stdout.
-    stderr: bool,
-    /// Whether to expect an error status code.
-    fail: bool,
-    /// Home directory under which to run this test.
-    home: Option<String>,
-    /// Local env vars to use just for this test.
-    env: HashMap<String, String>,
-}
-
-/// An assertion is a command to run with an expected output.
-#[derive(Debug, PartialEq, Eq)]
-pub struct Assertion {
-    /// The test file that contains this assertion.
-    path: PathBuf,
-    /// Name of command to run, eg. `git`.
-    command: String,
-    /// Command arguments, eg. `["push"]`.
-    args: Vec<String>,
-    /// Expected output (stdout or stderr).
-    expected: String,
-    /// Expected exit status.
-    exit: ExitStatus,
-}
-
-#[derive(Debug, Default, PartialEq, Eq, Clone)]
-pub struct Home {
-    name: Option<String>,
-    path: PathBuf,
-    envs: HashMap<String, String>,
-}
-
-#[derive(Debug)]
-pub struct TestRun {
-    home: Home,
-    env: HashMap<String, String>,
-}
-
-impl TestRun {
-    fn cd(&mut self, path: PathBuf) {
-        self.home.path = path;
-    }
-
-    fn envs(&self) -> impl Iterator<Item = (String, String)> + '_ {
-        self.home
-            .envs
-            .iter()
-            .chain(self.env.iter())
-            .map(|(k, v)| (k.to_owned(), v.to_owned()))
-            .chain(Some((
-                "PWD".to_owned(),
-                self.home.path.to_string_lossy().to_string(),
-            )))
-    }
-
-    fn path(&self) -> PathBuf {
-        self.home.path.clone()
-    }
-}
-
-#[derive(Debug)]
-pub struct TestRunner<'a> {
-    cwd: Option<PathBuf>,
-    homes: HashMap<String, Home>,
-    formula: &'a TestFormula,
-}
-
-impl<'a> TestRunner<'a> {
-    fn new(formula: &'a TestFormula) -> Self {
-        Self {
-            cwd: None,
-            homes: formula.homes.clone(),
-            formula,
-        }
-    }
-
-    fn run(&mut self, test: &'a Test) -> TestRun {
-        let mut env = self.formula.env.clone();
-        env.extend(test.env.clone());
-
-        if let Some(ref h) = test.home {
-            if let Some(home) = self.homes.get(h) {
-                return TestRun {
-                    home: home.clone(),
-                    env,
-                };
-            } else {
-                panic!("TestRunner::test: home `~{h}` does not exist");
-            }
-        }
-        TestRun {
-            home: Home {
-                name: None,
-                path: self.cwd.clone().unwrap_or_else(|| self.formula.cwd.clone()),
-                envs: HashMap::new(),
-            },
-            env,
-        }
-    }
-
-    fn finish(&mut self, run: TestRun) {
-        if let Some(name) = &run.home.name {
-            self.homes.insert(name.clone(), run.home);
-        } else {
-            self.cwd = Some(run.home.path);
-        }
-    }
-}
-
-#[derive(Debug, Default, PartialEq, Eq)]
-pub struct TestFormula {
-    /// Current working directory to run the test in.
-    cwd: PathBuf,
-    /// User homes.
-    homes: HashMap<String, Home>,
-    /// Environment to pass to the test.
-    env: HashMap<String, String>,
-    /// Tests to run.
-    tests: Vec<Test>,
-    /// Output substitutions.
-    subs: Substitutions,
-    /// Binaries path.
-    bins: Vec<PathBuf>,
-}
-
-impl TestFormula {
-    pub fn new(cwd: PathBuf) -> Self {
-        Self {
-            cwd,
-            env: HashMap::new(),
-            homes: HashMap::new(),
-            tests: Vec::new(),
-            subs: Substitutions::new(),
-            bins: env::var("PATH")
-                .map(|p| p.split(':').map(PathBuf::from).collect())
-                .unwrap_or_default(),
-        }
-    }
-
-    pub fn build(&mut self, binaries: &[(&str, &str)]) -> &mut Self {
-        let manifest = env::var("CARGO_MANIFEST_DIR").expect(
-            "TestFormula::build: cannot build binaries: variable `CARGO_MANIFEST_DIR` is not set",
-        );
-        let profile = if cfg!(debug_assertions) {
-            "debug"
-        } else {
-            "release"
-        };
-        let target_dir = env::var("CARGO_TARGET_DIR").unwrap_or("target".to_string());
-        let manifest = Path::new(manifest.as_str());
-        let bins = manifest.join(&target_dir).join(profile);
-
-        // Add the target dir to the beginning of the list we will use as `PATH`.
-        self.bins.insert(0, bins);
-
-        // We don't need to re-build everytime the `build` function is called. Once is enough.
-        BUILD.call_once(|| {
-            use escargot::format::Message;
-            use radicle::logger::env_level;
-            use radicle::logger::test as logger;
-
-            logger::init(env_level().unwrap_or(log::Level::Debug));
-
-            for (package, binary) in binaries {
-                log::debug!(target: "test", "Building binaries for package `{package}`..");
-
-                let results = escargot::CargoBuild::new()
-                    .package(package)
-                    .bin(binary)
-                    .manifest_path(manifest.join("Cargo.toml"))
-                    .target_dir(&target_dir)
-                    .exec()
-                    .unwrap();
-
-                for result in results {
-                    match result {
-                        Ok(msg) => {
-                            if let Ok(Message::CompilerArtifact(a)) = msg.decode() {
-                                if let Some(e) = a.executable {
-                                    log::debug!(target: "test", "Built {}", e.display());
-                                }
-                            }
-                        }
-                        Err(e) => {
-                            log::error!(target: "test", "Error building package `{package}`: {e}");
-                        }
-                    }
-                }
-            }
-        });
-        self
-    }
-
-    pub fn env(&mut self, key: impl ToString, val: impl ToString) -> &mut Self {
-        self.env.insert(key.to_string(), val.to_string());
-        self
-    }
-
-    pub fn home(
-        &mut self,
-        user: impl ToString,
-        path: impl AsRef<Path>,
-        envs: impl IntoIterator<Item = (impl ToString, impl ToString)>,
-    ) -> &mut Self {
-        self.homes.insert(
-            user.to_string(),
-            Home {
-                name: Some(user.to_string()),
-                path: path.as_ref().to_path_buf(),
-                envs: envs
-                    .into_iter()
-                    .map(|(k, v)| (k.to_string(), v.to_string()))
-                    .collect(),
-            },
-        );
-        self
-    }
-
-    pub fn envs<K: ToString, V: ToString>(
-        &mut self,
-        envs: impl IntoIterator<Item = (K, V)>,
-    ) -> &mut Self {
-        for (k, v) in envs {
-            self.env.insert(k.to_string(), v.to_string());
-        }
-        self
-    }
-
-    pub fn file(&mut self, path: impl AsRef<Path>) -> Result<&mut Self, Error> {
-        let path = path.as_ref();
-        let contents = match fs::read(path) {
-            Ok(bytes) => bytes,
-            Err(err) if err.kind() == io::ErrorKind::NotFound => {
-                return Err(Error::TestNotFound(path.to_path_buf()));
-            }
-            Err(err) => return Err(err.into()),
-        };
-        self.read(path, io::Cursor::new(contents))
-    }
-
-    pub fn read(&mut self, path: &Path, r: impl io::BufRead) -> Result<&mut Self, Error> {
-        let mut test = Test::default();
-        let mut fenced = false; // Whether we're inside a fenced code block.
-        let mut file: Option<(PathBuf, String)> = None; // Path and content of file created by this test block.
-
-        for line in r.lines() {
-            let line = line?;
-
-            if line.starts_with("```") {
-                if fenced {
-                    if let Some((ref path, ref mut content)) = file.take() {
-                        // Write file.
-                        let path = self.cwd.join(path);
-
-                        if let Some(dir) = path.parent() {
-                            log::debug!(target: "test", "Creating directory {}..", dir.display());
-                            fs::create_dir_all(dir)?;
-                        }
-                        log::debug!(target: "test", "Writing {} bytes to {}..", content.len(), path.display());
-                        fs::write(path, content)?;
-                    } else {
-                        // End existing code block.
-                        self.tests.push(mem::take(&mut test));
-                    }
-                } else {
-                    for token in line.split_whitespace() {
-                        if let Some(home) = token.strip_prefix('~') {
-                            test.home = Some(home.to_owned());
-                        } else if let Some((key, val)) = token.split_once('=') {
-                            test.env.insert(key.to_owned(), val.to_owned());
-                        } else if token.contains("stderr") {
-                            test.stderr = true;
-                        } else if token.contains("fail") {
-                            test.fail = true;
-                        } else if let Some(path) = token.strip_prefix("./") {
-                            file = Some((
-                                PathBuf::from_str(path)
-                                    .map_err(|_| Error::InvalidFilePath(token.to_owned()))?,
-                                String::new(),
-                            ));
-                        }
-                    }
-                }
-                fenced = !fenced;
-
-                continue;
-            }
-
-            if fenced {
-                if let Some((_, ref mut content)) = file {
-                    content.push_str(line.as_str());
-                    content.push('\n');
-                } else if let Some(line) = line.strip_prefix('$') {
-                    let line = line.trim();
-                    let parts = shlex::split(line).ok_or(Error::Parse)?;
-                    let (cmd, args) = parts.split_first().ok_or(Error::Parse)?;
-
-                    test.assertions.push(Assertion {
-                        path: path.to_path_buf(),
-                        command: cmd.to_owned(),
-                        args: args.to_owned(),
-                        expected: String::new(),
-                        exit: if test.fail {
-                            ExitStatus::Failure
-                        } else {
-                            ExitStatus::Success
-                        },
-                    });
-                } else if let Some(a) = test.assertions.last_mut() {
-                    a.expected.push_str(line.as_str());
-                    a.expected.push('\n');
-                } else {
-                    return Err(Error::Parse);
-                }
-            } else {
-                test.context.push(line);
-            }
-        }
-        Ok(self)
-    }
-
-    #[allow(dead_code)]
-    pub fn substitute(
-        &mut self,
-        value: &'static str,
-        other: impl Into<Cow<'static, str>>,
-    ) -> Result<&mut Self, Error> {
-        self.subs.insert(value, other)?;
-        Ok(self)
-    }
-
-    /// Convert instances of '[..   ]' to '[..]' where the number of ' 's are arbitrary.
-    ///
-    /// Supporting these bracket types help support using the '[..]' pattern while preserving
-    /// spaces important for text alignment.
-    fn map_spaced_brackets(s: &str) -> String {
-        let mut ret = String::new();
-        let mut pos = 0;
-
-        for c in s.chars() {
-            match (c, pos) {
-                ('[', 0) => pos += 1,
-                (' ', 1) => continue,
-                ('.', 1) => pos += 1,
-                ('.', 2) => pos += 1,
-                ('.', 3) => continue,
-                (' ', 3) => continue,
-                (']', 3) => pos = 0,
-                (_, _) => pos = 0,
-            }
-            ret.push(c);
-        }
-
-        ret
-    }
-
-    pub fn run(&mut self) -> Result<bool, io::Error> {
-        let assert = Assert::new().substitutions(self.subs.clone());
-        let mut runner = TestRunner::new(self);
-
-        fs::create_dir_all(&self.cwd)?;
-        log::debug!(target: "test", "Using PATH {:?}", self.bins);
-
-        // For each code block.
-        for test in &self.tests {
-            let mut run = runner.run(test);
-
-            // For each command.
-            for assertion in &test.assertions {
-                // Expand environment variables.
-                let mut args = assertion.args.clone();
-                for arg in &mut args {
-                    for (k, v) in run.envs() {
-                        *arg = arg.replace(format!("${k}").as_str(), &v);
-                    }
-                }
-                let path = assertion
-                    .path
-                    .file_name()
-                    .map(|f| f.to_string_lossy().to_string())
-                    .unwrap_or(String::from("<none>"));
-                let cmd = if assertion.command == "rad" {
-                    snapbox::cmd::cargo_bin("rad")
-                } else if assertion.command == "cd" {
-                    let arg = assertion.args.first().unwrap();
-                    let dir: PathBuf = arg.into();
-                    let dir = run.path().join(dir);
-
-                    // TODO: Add support for `..` and `/`
-                    // TODO: Error if more than one args are given.
-
-                    log::debug!(target: "test", "{path}: Running `cd {}`..", dir.display());
-
-                    if !dir.exists() {
-                        return Err(io::Error::new(
-                            io::ErrorKind::NotFound,
-                            format!("cd: '{}' does not exist", dir.display()),
-                        ));
-                    }
-                    run.cd(dir);
-
-                    continue;
-                } else {
-                    PathBuf::from(&assertion.command)
-                };
-                log::debug!(target: "test", "{path}: Running `{}` with {:?} in `{}`..", cmd.display(), assertion.args, run.path().display());
-
-                if !run.path().exists() {
-                    log::warn!(target: "test", "{path}: Directory {} does not exist. Creating..", run.path().display());
-                    fs::create_dir_all(run.path())?;
-                }
-
-                let bins = self
-                    .bins
-                    .iter()
-                    .map(|p| p.as_os_str())
-                    .collect::<Vec<_>>()
-                    .join(ffi::OsStr::new(":"));
-                let result = Command::new(cmd.clone())
-                    .env_clear()
-                    .env("PATH", &bins)
-                    .env("RUST_BACKTRACE", "1")
-                    .envs(run.envs())
-                    .current_dir(run.path())
-                    .args(args)
-                    .with_assert(assert.clone())
-                    .output();
-
-                match result {
-                    Ok(output) => {
-                        let assert = OutputAssert::new(output).with_assert(assert.clone());
-                        let expected = Self::map_spaced_brackets(&assertion.expected);
-
-                        let matches = if test.stderr {
-                            assert.stderr_matches(&expected)
-                        } else {
-                            assert.stdout_matches(&expected)
-                        };
-                        match assertion.exit {
-                            ExitStatus::Success => {
-                                matches.success();
-                            }
-                            ExitStatus::Failure => {
-                                matches.failure();
-                            }
-                        }
-                    }
-                    Err(err) => {
-                        if err.kind() == io::ErrorKind::NotFound {
-                            log::error!(target: "test", "{path}: Command `{}` does not exist..", cmd.display());
-                        }
-                        return Err(io::Error::new(
-                            err.kind(),
-                            format!("{path}: {err}: `{}`", cmd.display()),
-                        ));
-                    }
-                }
-            }
-            runner.finish(run);
-        }
-        Ok(true)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use pretty_assertions::assert_eq;
-
-    #[test]
-    fn test_parse() {
-        let input = r#"
-Let's try to track @dave and @sean:
-``` RAD_HINT=true
-$ rad track @dave
-Tracking relationship established for @dave.
-Nothing to do.
-
-$ rad track @sean
-Tracking relationship established for @sean.
-Nothing to do.
-```
-Super, now let's move on to the next step.
-``` ~alice (stderr)
-$ rad sync
-```
-"#
-        .trim()
-        .as_bytes()
-        .to_owned();
-
-        let mut actual = TestFormula::new(PathBuf::new());
-        let path = Path::new("test.md").to_path_buf();
-        actual
-            .read(path.as_path(), io::BufReader::new(io::Cursor::new(input)))
-            .unwrap();
-
-        let expected = TestFormula {
-            homes: HashMap::new(),
-            cwd: PathBuf::new(),
-            env: HashMap::new(),
-            subs: Substitutions::new(),
-            bins: env::var("PATH")
-                .unwrap()
-                .split(':')
-                .map(PathBuf::from)
-                .collect(),
-            tests: vec![
-                Test {
-                    context: vec![String::from("Let's try to track @dave and @sean:")],
-                    home: None,
-                    assertions: vec![
-                        Assertion {
-                            path: path.clone(),
-                            command: String::from("rad"),
-                            args: vec![String::from("track"), String::from("@dave")],
-                            expected: String::from(
-                                "Tracking relationship established for @dave.\nNothing to do.\n\n",
-                            ),
-                            exit: ExitStatus::Success,
-                        },
-                        Assertion {
-                            path: path.clone(),
-                            command: String::from("rad"),
-                            args: vec![String::from("track"), String::from("@sean")],
-                            expected: String::from(
-                                "Tracking relationship established for @sean.\nNothing to do.\n",
-                            ),
-                            exit: ExitStatus::Success,
-                        },
-                    ],
-                    fail: false,
-                    stderr: false,
-                    env: vec![("RAD_HINT".to_owned(), "true".to_owned())]
-                        .into_iter()
-                        .collect(),
-                },
-                Test {
-                    context: vec![String::from("Super, now let's move on to the next step.")],
-                    home: Some("alice".to_owned()),
-                    assertions: vec![Assertion {
-                        path: path.clone(),
-                        command: String::from("rad"),
-                        args: vec![String::from("sync")],
-                        expected: String::new(),
-                        exit: ExitStatus::Success,
-                    }],
-                    fail: false,
-                    stderr: true,
-                    env: HashMap::default(),
-                },
-            ],
-        };
-
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn test_run() {
-        let input = r#"
-Running a simple command such as `head`:
-```
-$ head -n 2 Cargo.toml
-[package]
-name = "radicle-cli-test"
-```
-"#
-        .trim()
-        .as_bytes()
-        .to_owned();
-
-        let mut formula = TestFormula::new(PathBuf::from_str(env!("CARGO_MANIFEST_DIR")).unwrap());
-        formula
-            .read(
-                Path::new("test.md"),
-                io::BufReader::new(io::Cursor::new(input)),
-            )
-            .unwrap();
-        formula.run().unwrap();
-    }
-
-    #[test]
-    fn test_example_spaced_brackets() {
-        let input = r#"
-Running a simple command such as `head`:
-```
-$ echo "    hello"
-[..]hello
-$ echo "    hello"
-[..  ]hello
-$ echo "    hello"
-[  ..]hello
-$ echo "[bug, good-first-issue]"
-[bug, good-first-issue]
-$ echo "[bug, good-first-issue]"
-[bug, [  ..    ]-issue]
-$ echo "[bug, good-first-issue]"
-[bug, [  ...   ]-issue]
-```
-"#
-        .trim()
-        .as_bytes()
-        .to_owned();
-
-        let mut formula = TestFormula::new(PathBuf::from_str(env!("CARGO_MANIFEST_DIR")).unwrap());
-        formula
-            .read(
-                Path::new("test.md"),
-                io::BufReader::new(io::Cursor::new(input)),
-            )
-            .unwrap();
-        formula.run().unwrap();
-    }
-}
diff --git a/radicle-cli/Cargo.toml b/radicle-cli/Cargo.toml
deleted file mode 100644
index 6df095e80..000000000
--- a/radicle-cli/Cargo.toml
+++ /dev/null
@@ -1,76 +0,0 @@
-[package]
-name = "radicle-cli"
-description = "Radicle CLI"
-homepage = "https://radicle.xyz"
-license = "MIT OR Apache-2.0"
-version = "0.11.0"
-authors = ["cloudhead <cloudhead@radicle.xyz>"]
-edition = "2021"
-build = "build.rs"
-
-[[bin]]
-name = "rad"
-path = "src/main.rs"
-
-[dependencies]
-anyhow = { version = "1" }
-chrono = { version = "0.4.26", default-features = false, features = ["clock", "std"] }
-git-ref-format = { version = "0.3.0", features = ["macro"] }
-lexopt = { version = "0.3.0" }
-localtime = { version = "1.2.0" }
-log = { version = "0.4", features = ["std"] }
-nonempty = { version = "0.9.0" }
-# N.b. this is required to use macros, even though it's re-exported
-# through radicle
-radicle-git-ext = { version = "0.8.0", features = ["serde"] }
-radicle-surf = { version = "0.22.0" }
-serde = { version = "1.0" }
-serde_json = { version = "1" }
-shlex = { version = "1.1.0" }
-tempfile = { version = "3.3.0" }
-thiserror = { version = "1" }
-timeago = { version = "0.4.2", default-features = false }
-tree-sitter = { version = "0.20.0" }
-tree-sitter-highlight = { version = "0.20" }
-tree-sitter-json = { version = "0.20.1" }
-tree-sitter-rust = { version = "0.20" }
-tree-sitter-typescript = { version = "0.20.3" }
-tree-sitter-html = { version = "0.20" }
-tree-sitter-css = { version = "0.20" }
-tree-sitter-toml = { version = "0.20" }
-tree-sitter-c = { version = "0.20" }
-tree-sitter-python = { version = "0.20" }
-tree-sitter-ruby = { version = "0.20" }
-tree-sitter-bash = { version = "0.20" }
-tree-sitter-go = { version = "0.20.0" }
-tree-sitter-md = { version = "0.1.5" }
-zeroize = { version = "1.1" }
-
-[dependencies.radicle]
-version = "0"
-path = "../radicle"
-features = ["logger"]
-
-[dependencies.radicle-cli-test]
-version = "0"
-path = "../radicle-cli-test"
-
-[dependencies.radicle-cob]
-version = "0"
-path = "../radicle-cob"
-
-[dependencies.radicle-crypto]
-version = "0"
-path = "../radicle-crypto"
-
-[dependencies.radicle-term]
-version = "0"
-path = "../radicle-term"
-
-[dev-dependencies]
-pretty_assertions = { version = "1.3.0" }
-radicle = { version = "0", path = "../radicle", features = ["test"] }
-radicle-node = { path = "../radicle-node", features = ["test"] }
-
-[lints]
-workspace = true
diff --git a/radicle-cli/build.rs b/radicle-cli/build.rs
deleted file mode 120000
index 10238032f..000000000
--- a/radicle-cli/build.rs
+++ /dev/null
@@ -1 +0,0 @@
-../build.rs
\ No newline at end of file
diff --git a/radicle-cli/examples/framework/home.md b/radicle-cli/examples/framework/home.md
deleted file mode 100644
index 66795003f..000000000
--- a/radicle-cli/examples/framework/home.md
+++ /dev/null
@@ -1,33 +0,0 @@
-```
-$ mkdir bin
-$ cd bin
-$ touch file.bin
-```
-
-``` ~bob
-$ rad self --did
-did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-$ pwd
-[..]/home/bob/.radicle
-$ mkdir src
-$ cd src
-$ pwd
-[..]/home/bob/.radicle/src
-```
-
-``` ~alice
-$ rad self --did
-did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-$ pwd
-[..]/home/alice/.radicle
-```
-
-``` ~bob
-$ pwd
-[..]/home/bob/.radicle/src
-```
-
-```
-$ ls
-file.bin
-```
diff --git a/radicle-cli/examples/git/git-fetch.md b/radicle-cli/examples/git/git-fetch.md
deleted file mode 100644
index 652254b7f..000000000
--- a/radicle-cli/examples/git/git-fetch.md
+++ /dev/null
@@ -1,30 +0,0 @@
-```
-$ cd heartwood
-$ git branch -r
-  alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master
-  rad/master
-```
-
-```
-$ git ls-remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 'refs/heads/*'
-145e1e69bef3ad93d14946ea212249c2fa9b9828	refs/heads/alice/1
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354	refs/heads/master
-```
-
-``` (stderr)
-$ git fetch alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new branch]      alice/1    -> alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/alice/1
-```
-
-```
-$ git branch -r
-  alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/alice/1
-  alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master
-  rad/master
-```
-
-```
-$ git rev-parse alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/alice/1
-145e1e69bef3ad93d14946ea212249c2fa9b9828
-```
diff --git a/radicle-cli/examples/git/git-push-amend.md b/radicle-cli/examples/git/git-push-amend.md
deleted file mode 100644
index f656d6266..000000000
--- a/radicle-cli/examples/git/git-push-amend.md
+++ /dev/null
@@ -1,27 +0,0 @@
-``` ~alice
-$ rad id update --title "Add Bob" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji -q
-c036c0d89ce26aef3ad7da402157dba16b5163b4
-```
-
-``` ~bob
-$ rad sync --fetch
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Fetched repository from 1 seed(s)
-```
-
-``` ~alice
-$ git commit -m "New changes" --allow-empty -q
-$ git push rad master -o no-sync
-```
-
-``` ~alice
-$ git commit --amend -m "Neue Änderungen" --allow-empty -q
-```
-
-``` ~alice (stderr)
-$ git push rad master -f
-✓ Canonical head updated to 9170c8795d3a78f0381a0ffafb20ea69fb0f5b6b
-✓ Synced with 1 node(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- + fb25886...9170c87 master -> master (forced update)
-```
diff --git a/radicle-cli/examples/git/git-push-converge.md b/radicle-cli/examples/git/git-push-converge.md
deleted file mode 100644
index 3ae8468fd..000000000
--- a/radicle-cli/examples/git/git-push-converge.md
+++ /dev/null
@@ -1,142 +0,0 @@
-In this scenario we check that we can easily reset our canonical head to the
-head of another delegate when there is divergence between the 3 delegates.
-
-First we add our new delegates, Bob & Eve, to our repo, while also setting the
-`threshold` to `3`:
-
-``` ~alice
-$ rad id update --title "Add Bob & Eve" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --delegate did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z --threshold 3 --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji -q
-3143236b2e40338f5574ec04e935a5ab80a6868a
-```
-
-Bob and Eve will fetch the changes to ensure they hear about their delegate
-responsibilities:
-
-``` ~bob
-$ rad sync --fetch
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkux1…nVhib7Z..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Fetched repository from 2 seed(s)
-```
-
-``` ~eve
-$ rad sync --fetch
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Fetched repository from 2 seed(s)
-```
-
-To demonstrate the divergence, Alice, Bob, and Eve will all create a new change,
-pushing to their `rad` remote -- but they won't sync to the network just yet:
-
-``` ~alice
-$ git commit -m "Alice's commit" --allow-empty -q
-$ git push rad -o no-sync
-$ git ls-remote rad
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354	refs/heads/master
-```
-
-``` ~bob
-$ git add README
-$ git commit -m "Bob's commit" -q
-$ git push rad -o no-sync
-$ git ls-remote rad
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354	refs/heads/master
-```
-
-``` ~eve
-$ git add README
-$ git commit -m "Eve's commit" -q
-$ git push rad -o no-sync
-$ git ls-remote rad
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354	refs/heads/master
-```
-
-Alice adds Bob and Eve as remotes and starts to notice that the `no quorum was
-found` error is showing up:
-
-``` ~alice
-$ rad remote add did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --name bob
-✓ Follow policy updated for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkux1…nVhib7Z..
-✗ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk.. error: no quorum was found
-✓ Remote bob added
-✓ Remote-tracking branch bob/master created for z6Mkt67…v4N1tRk
-$ rad remote add did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z --name eve
-✓ Follow policy updated for z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z (eve)
-✗ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkux1…nVhib7Z.. error: no quorum was found
-✗ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk.. error: no quorum was found
-✓ Remote eve added
-✓ Remote-tracking branch eve/master created for z6Mkux1…nVhib7Z
-```
-
-Alice does indeed have Bob and Eve's references, however, a new canonical
-`refs/heads/master` cannot be decided while they're out of quorum. This can be
-remedied by the delegates agreeing upon which way to move forward. In this case,
-Alice resets her `master` to `bob/master`:
-
-``` ~alice
-$ git merge bob/master
-Merge made by the 'ort' strategy.
- README | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-$ git merge eve/master -s ours
-Merge made by the 'ours' strategy.
-```
-
-She can then force push to update the canonical head to the new agreed upon
-commit:
-
-``` ~alice (stderr)
-$ git push rad -f
-warn: no quorum was found for `refs/heads/master`
-warn: it is recommended to find a commit to agree upon
-✓ Synced with 1 node(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-   d09e634..0f9bd80  master -> master
-```
-
-``` ~bob
-$ rad remote add did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --name alice
-✓ Follow policy updated for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (alice)
-✗ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkux1…nVhib7Z.. error: no quorum was found
-✗ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi.. error: no quorum was found
-✓ Remote alice added
-✓ Remote-tracking branch alice/master created for z6MknSL…StBU8Vi
-$ git reset --hard alice/master
-HEAD is now at 0f9bd80 Merge remote-tracking branch 'eve/master'
-```
-
-When we check Bob's `rad` remote, we see that the commit for `refs/heads/master`
-has changed. This is actually Eve's commit as part of Alice merging above. Now
-that Alice, Bob, and Eve all have this commit as part of their history it has
-become the canonical `master`.
-
-``` ~bob (stderr)
-$ git push rad
-✓ Canonical head updated to 3a75f66dd0020c9a0355cc6ec21f15de989e2001
-✓ Synced with 2 node(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-   2a37862..0f9bd80  master -> master
-```
-
-Once Eve also resets to the merge commits, the canonical `master` is set to this tip.
-
-``` ~eve
-$ rad remote add did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --name alice
-✓ Follow policy updated for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (alice)
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Remote alice added
-✓ Remote-tracking branch alice/master created for z6MknSL…StBU8Vi
-$ git reset --hard alice/master
-HEAD is now at 0f9bd80 Merge remote-tracking branch 'eve/master'
-```
-
-``` ~eve (stderr)
-$ git push rad
-✓ Canonical head updated to 0f9bd8035c04b3f73f5408e73e8454879b20800b
-✓ Synced with 2 node(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z
-   3a75f66..0f9bd80  master -> master
-```
diff --git a/radicle-cli/examples/git/git-push-delete.md b/radicle-cli/examples/git/git-push-delete.md
deleted file mode 100644
index 9ca29cdf7..000000000
--- a/radicle-cli/examples/git/git-push-delete.md
+++ /dev/null
@@ -1,20 +0,0 @@
-Finally, we can also delete branches with `git push`:
-
-```
-$ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi refs/heads/*
-145e1e69bef3ad93d14946ea212249c2fa9b9828	refs/heads/alice/1
-ddcc1f164eacfd7dba41da9bff3261da3ee79fd3	refs/heads/alice/2
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354	refs/heads/master
-```
-
-``` (stderr) RAD_SOCKET=/dev/null
-$ git push rad :alice/1
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- - [deleted]         alice/1
-```
-
-```
-$ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi refs/heads/*
-ddcc1f164eacfd7dba41da9bff3261da3ee79fd3	refs/heads/alice/2
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354	refs/heads/master
-```
diff --git a/radicle-cli/examples/git/git-push-diverge.md b/radicle-cli/examples/git/git-push-diverge.md
deleted file mode 100644
index cbf8fb3d4..000000000
--- a/radicle-cli/examples/git/git-push-diverge.md
+++ /dev/null
@@ -1,80 +0,0 @@
-
-Let's see what happens if we try to push a head which diverges from the
-canonical head.
-
-First we add a second delegate, Bob, to our repo:
-
-``` ~alice
-$ rad id update --title "Add Bob" --description "" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji -q
-c036c0d89ce26aef3ad7da402157dba16b5163b4
-```
-
-Then, as Bob, we commit some code on top of the canonical head:
-
-``` ~bob
-$ rad sync --fetch
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Fetched repository from 1 seed(s)
-$ rad inspect --delegates
-did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (alice)
-did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
-$ git commit -m "Third commit" --allow-empty -q
-$ git push rad
-$ git branch -arv
-  alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master f2de534 Second commit
-  rad/master                                                    319a7dc Third commit
-```
-
-As Alice, we fetch that code, but commit on top of our own master, which is no
-longer canonical, since Bob pushed a more recent commit, and the threshold is 1:
-
-``` ~alice
-$ rad remote add did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --fetch --no-sync
-✓ Remote bob@z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk added
-✓ Remote-tracking branch bob@z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/master created for z6Mkt67…v4N1tRk
-$ git branch -arv
-  bob@z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/master 319a7dc Third commit
-  rad/master                                                  f2de534 Second commit
-$ git commit -m "Third commit by Alice" --allow-empty -q
-```
-
-If we try to push now, we get an error with a hint, telling us that we need to
-integrate Bob's changes before pushing ours:
-
-``` ~alice (stderr) (fail) RAD_HINT=1
-$ git push rad
-hint: you are attempting to push a commit that would cause your upstream to diverge from the canonical head
-hint: to integrate the remote changes, run `git pull --rebase` and try again
-error: refusing to update branch to commit that is not a descendant of canonical head
-error: failed to push some refs to 'rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi'
-```
-
-We do that, and notice that we're now able to push our code:
-
-``` ~alice
-$ git pull --rebase
-$ git log --oneline
-f6cff86 Third commit by Alice
-319a7dc Third commit
-f2de534 Second commit
-08c788d Initial commit
-```
-``` ~alice RAD_SOCKET=/dev/null (stderr)
-$ git push rad
-✓ Canonical head updated to f6cff86594495e9beccfeda7c20173e55c1dd9fc
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-   f2de534..f6cff86  master -> master
-```
-
-One thing of note is that we can revert to an older commit as long as we are
-still ahead of the other delegates.
-
-``` ~alice
-$ git reset --hard HEAD^ -q
-```
-``` ~alice RAD_SOCKET=/dev/null (stderr)
-$ git push -f
-✓ Canonical head updated to 319a7dc3b195368ded4b099f8c90bbb80addccd3
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- + f6cff86...319a7dc master -> master (forced update)
-```
diff --git a/radicle-cli/examples/git/git-push-rollback.md b/radicle-cli/examples/git/git-push-rollback.md
deleted file mode 100644
index 1994624b9..000000000
--- a/radicle-cli/examples/git/git-push-rollback.md
+++ /dev/null
@@ -1,60 +0,0 @@
-In this scenario, we will explore being able to rollback to a previous commit.
-
-First we add a second delegate, Bob, to our repo. We also change the threshold
-to 2:
-
-``` ~alice
-$ rad id update --title "Add Bob" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --threshold 2 -q
-069e7d58faa9a7473d27f5510d676af33282796f
-```
-
-Bob then syncs these changes and adds a new commit:
-
-``` ~bob
-$ rad sync --fetch
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Fetched repository from 1 seed(s)
-$ git commit -m "Third commit" --allow-empty -q
-$ git push rad
-$ git branch -arv
-  alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master f2de534 Second commit
-  rad/master                                                    319a7dc Third commit
-```
-
-Alice merges these changes and pushes them, which updates the canonical head:
-
-``` ~alice
-$ rad remote add did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --name bob --fetch --no-sync
-✓ Remote bob added
-✓ Remote-tracking branch bob/master created for z6Mkt67…v4N1tRk
-$ git merge bob/master
-Updating f2de534..319a7dc
-Fast-forward
-```
-
-``` ~alice (stderr)
-$ git push rad
-✓ Canonical head updated to 319a7dc3b195368ded4b099f8c90bbb80addccd3
-✓ Synced with 1 node(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-   f2de534..319a7dc  master -> master
-```
-
-Alice decides that she changes her mind about these changes and rolls back to
-the previous commit:
-
-``` ~alice
-$ git reset --hard f2de534
-HEAD is now at f2de534 Second commit
-```
-
-Since the canonical head is still decidable from this commit she is allowed to
-push and the new canonical head becomes the previous commit again:
-
-``` ~alice (stderr)
-$ git push rad -f
-✓ Canonical head updated to f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
-✓ Synced with 1 node(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- + 319a7dc...f2de534 master -> master (forced update)
-```
diff --git a/radicle-cli/examples/git/git-push.md b/radicle-cli/examples/git/git-push.md
deleted file mode 100644
index 632639825..000000000
--- a/radicle-cli/examples/git/git-push.md
+++ /dev/null
@@ -1,90 +0,0 @@
-```
-$ git checkout -b alice/1
-$ git commit -m "Alice's commit" --allow-empty -s
-[alice/1 87fa120] Alice's commit
-```
-
-``` (stderr) RAD_SOCKET=/dev/null
-$ git push rad HEAD:alice/1
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new branch]      HEAD -> alice/1
-```
-
-Make sure we can't force-push without `+`:
-
-``` (stderr)
-$ git commit --amend -m "Alice's amended commit" --allow-empty -s
-```
-``` (stderr) (fail)
-$ git push rad HEAD:alice/1
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- ! [rejected]        HEAD -> alice/1 (non-fast-forward)
-error: failed to push some refs to 'rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi'
-hint: [..]
-hint: [..]
-hint: [..]
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-```
-
-And that we can with `+`:
-
-``` (stderr)
-$ git push -o no-sync rad +HEAD:alice/1
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- + 87fa120...145e1e6 HEAD -> alice/1 (forced update)
-```
-
-Notice that we used the `-o no-sync` push option to disable syncing after the push.
-
-```
-$ git branch -r -vv
-  rad/alice/1 145e1e6 Alice's amended commit
-  rad/master  f2de534 Second commit
-```
-
-List our namespaced refs:
-
-```
-$ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 'refs/heads/*'
-145e1e69bef3ad93d14946ea212249c2fa9b9828	refs/heads/alice/1
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354	refs/heads/master
-```
-
-List the canonical refs:
-
-```
-$ git ls-remote rad
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354	refs/heads/master
-```
-
-```
-$ rad sync --announce
-✓ Synced with 1 node(s)
-```
-
-Note that it is forbidden to delete the default/canonical branch:
-
-``` (fail) (stderr)
-$ git push rad :master
-error: refusing to delete default branch ref 'refs/heads/master'
-error: failed to push some refs to 'rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi'
-```
-
-If you pass an unsupported push option, you get an error:
-
-``` (stderr) (fail)
-$ git push -o alien rad HEAD:alice/2
-error: unknown push option "alien"
-```
-
-We can also push a SHA-1:
-
-```
-$ git commit -m "Something good" --allow-empty -s
-[alice/1 ddcc1f1] Something good
-```
-``` (stderr)
-$ git push -o no-sync rad ddcc1f164eacfd7dba41da9bff3261da3ee79fd3:refs/heads/alice/2
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new branch]      ddcc1f164eacfd7dba41da9bff3261da3ee79fd3 -> alice/2
-```
diff --git a/radicle-cli/examples/git/git-tag.md b/radicle-cli/examples/git/git-tag.md
deleted file mode 100644
index f9b4dd79d..000000000
--- a/radicle-cli/examples/git/git-tag.md
+++ /dev/null
@@ -1,70 +0,0 @@
-Alice creates an annotated tag and pushed to her `rad` remote:
-
-``` ~alice
-$ touch LICENSE
-$ git add LICENSE
-$ git commit -am "Add LICENSE"
-[master 62d19fd] Add LICENSE
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 LICENSE
-$ git tag v1.0 -a -m "Release v1.0"
-```
-
-``` ~alice (stderr)
-$ git push rad v1.0 --tags
-✓ Synced with 1 node(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new tag]         v1.0 -> v1.0
-```
-
-Bob fetches the tag from Alice, by adding her as a remote:
-
-``` ~bob
-$ cd heartwood
-$ rad remote add z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --name alice
-✓ Follow policy updated for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (alice)
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Remote alice added
-✓ Remote-tracking branch alice/master created for z6MknSL…StBU8Vi
-```
-
-Bob is able to fetch Alice's tag into his working copy by using the
-`--tags` flag:
-
-``` ~bob (stderr)
-$ git fetch alice --tags
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new tag]         v1.0       -> v1.0
-```
-
-Alice forcefully creates a new version of the tag (let's say she made
-a mistake):
-
-``` ~alice
-$ git commit --allow-empty -m "Release: v1.0"
-[master 8260c04] Release: v1.0
-$ git tag v1.0 -f -a -m "Release v1.0"
-Updated tag 'v1.0' (was be18ed6)
-```
-
-``` ~alice (stderr)
-$ git push rad v1.0 -f
-✓ Synced with 1 node(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- + be18ed6...9dbdebc v1.0 -> v1.0 (forced update)
-```
-
-We ensure that Bob is still able to fetch from Alice and get the new
-update of the tag:
-
-``` ~bob
-$ rad sync -f
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Fetched repository from 1 seed(s)
-```
-
-``` ~bob (stderr)
-$ git fetch alice --tags -f
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- t [tag update]      v1.0       -> v1.0
-```
diff --git a/radicle-cli/examples/rad-auth-errors.md b/radicle-cli/examples/rad-auth-errors.md
deleted file mode 100644
index c723dec1a..000000000
--- a/radicle-cli/examples/rad-auth-errors.md
+++ /dev/null
@@ -1,17 +0,0 @@
-Note that aliases must not be longer than 32 bytes, or you will get an error.
-There are other rules as well:
-
-``` (fail)
-$ rad auth --alias "5fad63fe6b339fa92c588d926121bea6240773a7"
-✗ Error: rad auth: alias cannot be greater than 32 bytes
-```
-
-``` (fail)
-$ rad auth --alias "john doe"
-✗ Error: rad auth: alias cannot contain whitespace or control characters
-```
-
-``` (fail)
-$ rad auth --alias ""
-✗ Error: rad auth: alias cannot be empty
-```
diff --git a/radicle-cli/examples/rad-auth.md b/radicle-cli/examples/rad-auth.md
deleted file mode 100644
index 8dc0e588f..000000000
--- a/radicle-cli/examples/rad-auth.md
+++ /dev/null
@@ -1,32 +0,0 @@
-Initializing a new identity with `rad-auth`.
-The example below is run with `RAD_PASSPHRASE` set.
-
-```
-$ rad auth --alias "alice"
-
-Initializing your radicle 👾 identity
-
-✓ Creating your Ed25519 keypair...
-✓ Your Radicle DID is did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi. This identifies your device. Run `rad self` to show it at all times.
-✓ You're all set.
-
-✗ Hint: install ssh-agent to have it fill in your passphrase for you when signing.
-
-To create a Radicle repository, run `rad init` from a Git repository with at least one commit.
-To clone a repository, run `rad clone <rid>`. For example, `rad clone rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5` clones the Radicle 'heartwood' repository.
-To get a list of all commands, run `rad`.
-```
-
-You can get the above information at all times using the `self` command:
-
-```
-$ rad self --did
-did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-```
-
-You can also show your alias:
-
-```
-$ rad self --alias
-alice
-```
diff --git a/radicle-cli/examples/rad-block.md b/radicle-cli/examples/rad-block.md
deleted file mode 100644
index 413350273..000000000
--- a/radicle-cli/examples/rad-block.md
+++ /dev/null
@@ -1,55 +0,0 @@
-When using an open seeding policy, it can be useful to block individual
-repositories from being seeded.
-
-For instance, if our default policy is to seed, any unknown repository will
-have its policy set to allow seeding:
-```
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --policy
-Repository rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji is being seeded with scope `all`
-```
-
-Since there is no policy specific to this repository, there's nothing to be
-removed.
-
-```
-$ rad seed
-No seeding policies to show.
-```
-
-But if we wanted to prevent this repository from being seeded, while
-allowing all other repositories, we could use `rad block`:
-
-```
-$ rad block rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Policy for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji set to 'block'
-```
-
-We can see that it is now no longer seeded:
-
-```
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --policy
-Repository rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji is not being seeded
-```
-
-And a 'block' policy was added:
-
-```
-$ rad seed
-╭───────────────────────────────────────────────────────────╮
-│ Repository                          Name   Policy   Scope │
-├───────────────────────────────────────────────────────────┤
-│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji          block    all   │
-╰───────────────────────────────────────────────────────────╯
-```
-
-If we want to reverse the blocking of the RID we can use `rad unblock`:
-
-```
-$ rad unblock rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ The 'block' policy for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji is removed
-```
-
-```
-$ rad seed
-No seeding policies to show.
-```
diff --git a/radicle-cli/examples/rad-checkout-repo-config-linux.md b/radicle-cli/examples/rad-checkout-repo-config-linux.md
deleted file mode 100644
index 69c6f10e9..000000000
--- a/radicle-cli/examples/rad-checkout-repo-config-linux.md
+++ /dev/null
@@ -1,23 +0,0 @@
-```
-$ cd heartwood
-```
-
-View the repository configuration:
-
-```
-$ cat .git/config
-[core]
-	bare = false
-	repositoryformatversion = 0
-	filemode = true
-	logallrefupdates = true
-[push]
-	default = upstream
-[remote "rad"]
-	url = rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-	fetch = +refs/heads/*:refs/remotes/rad/*
-	pushurl = rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-[branch "master"]
-	remote = rad
-	merge = refs/heads/master
-```
diff --git a/radicle-cli/examples/rad-checkout-repo-config-macos.md b/radicle-cli/examples/rad-checkout-repo-config-macos.md
deleted file mode 100644
index 42acc4365..000000000
--- a/radicle-cli/examples/rad-checkout-repo-config-macos.md
+++ /dev/null
@@ -1,25 +0,0 @@
-```
-$ cd heartwood
-```
-
-View the repository configuration:
-
-```
-$ cat .git/config
-[core]
-	bare = false
-	repositoryformatversion = 0
-	filemode = true
-	ignorecase = true
-	precomposeunicode = true
-	logallrefupdates = true
-[push]
-	default = upstream
-[remote "rad"]
-	url = rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-	fetch = +refs/heads/*:refs/remotes/rad/*
-	pushurl = rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-[branch "master"]
-	remote = rad
-	merge = refs/heads/master
-```
diff --git a/radicle-cli/examples/rad-checkout.md b/radicle-cli/examples/rad-checkout.md
deleted file mode 100644
index e51b4199c..000000000
--- a/radicle-cli/examples/rad-checkout.md
+++ /dev/null
@@ -1,53 +0,0 @@
-With the `rad checkout` command, you can create a new working copy from an
-existing project.
-
-```
-$ rad checkout rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Repository checkout successful under ./heartwood
-```
-
-Let's have a look at what the command did. Navigate to the working copy:
-
-```
-$ cd heartwood
-```
-
-Check the README:
-```
-$ cat README
-Hello World!
-```
-
-Check the repository status:
-
-```
-$ git status
-On branch master
-Your branch is up to date with 'rad/master'.
-
-nothing to commit, working tree clean
-```
-
-Check the remote configuration:
-
-```
-$ git remote --verbose
-rad	rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji (fetch)
-rad	rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (push)
-```
-
-List the branches:
-
-```
-$ git branch --all
-* master
-  remotes/rad/master
-```
-
-List the references:
-
-```
-$ git show-ref
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 refs/heads/master
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 refs/remotes/rad/master
-```
diff --git a/radicle-cli/examples/rad-clean.md b/radicle-cli/examples/rad-clean.md
deleted file mode 100644
index 2d09bffe8..000000000
--- a/radicle-cli/examples/rad-clean.md
+++ /dev/null
@@ -1,67 +0,0 @@
-We cannot delete a repository, since that can cause data integrity
-issues. However, we can clean the storage of remotes that are not the
-local peer or the repository delegates. To do this we can use the `rad
-clean` command.
-
-First let's look at what we have locally:
-
-``` ~alice
-$ rad ls
-╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ Name        RID                                 Visibility   Head      Description                        │
-├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ heartwood   rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji   public       f2de534   Radicle Heartwood Protocol & Stack │
-╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯
-```
-
-Let's also inspect what remotes are in the repository:
-
-``` ~alice
-$ rad inspect --sigrefs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi f209c9f68aa689af24220a20462e13ee9dfb2a95
-z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk 161b775a3509c8098de67f57f750972bba015b31
-```
-
-Now let's clean the `heartwood` project:
-
-``` ~alice
-$ rad clean rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --no-confirm
-Removed z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-✓ Successfully cleaned rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-```
-
-Inspecting the remotes again, we see that Bob is now gone:
-
-``` ~alice
-$ rad inspect --sigrefs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi f209c9f68aa689af24220a20462e13ee9dfb2a95
-```
-
-Note that Bob will be fetched again if we do not untrack his
-node. Currently, there is no per repository tracking so it's not
-possible to stop fetching Bob for this particular repository.
-
-Cleaning a repository again will remove no remotes, since we're
-already at the minimal set of remotes:
-
-``` ~alice
-$ rad clean rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --no-confirm
-✓ Successfully cleaned rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-```
-
-Since Eve did not fork the repository, and has no refs of their own,
-when they run `rad clean` it will remove the project entirely:
-
-``` ~eve
-$ rad clean rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --no-confirm
-Removed z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-✓ Successfully cleaned rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-```
-
-And attempting to clean the repository again, or any non-existent
-repository, has no effect on the storage at all:
-
-``` ~eve (fail)
-$ rad clean rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --no-confirm
-✗ Error: repository rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji was not found
-```
diff --git a/radicle-cli/examples/rad-clone-all.md b/radicle-cli/examples/rad-clone-all.md
deleted file mode 100644
index 8fa5c7381..000000000
--- a/radicle-cli/examples/rad-clone-all.md
+++ /dev/null
@@ -1,91 +0,0 @@
-```
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope all
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'all'
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Creating checkout in ./heartwood..
-✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
-✓ Remote-tracking branch alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master created for z6MknSL…StBU8Vi
-✓ Repository successfully cloned under [..]/heartwood/
-╭────────────────────────────────────╮
-│ heartwood                          │
-│ Radicle Heartwood Protocol & Stack │
-│ 0 issues · 0 patches               │
-╰────────────────────────────────────╯
-Run `cd ./heartwood` to go to the repository directory.
-```
-
-We can now have a look at the new working copy that was created from the cloned
-repository:
-
-```
-$ cd heartwood
-$ cat README
-Hello World!
-```
-
-Let's check that we have Bob and Alice's namespaces in storage:
-
-```
-$ rad inspect --refs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-└── refs
-    ├── cobs
-    │   └── xyz.radicle.id
-    │       └── [...]
-    ├── heads
-    │   └── master
-    └── rad
-        ├── id
-        └── sigrefs
-z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-└── refs
-    ├── heads
-    │   └── master
-    └── rad
-        └── sigrefs
-```
-
-We can then setup a git remote for `bob`:
-
-```
-$ rad remote add z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --name bob --no-sync --fetch
-✓ Remote bob added
-✓ Remote-tracking branch bob/master created for z6Mkt67…v4N1tRk
-$ git branch --remotes
-  alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master
-  bob/master
-  rad/master
-```
-
-We can also create our own fork just by pushing:
-
-``` (stderr)
-$ git push -o no-sync rad master
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z
- * [new branch]      master -> master
-```
-```
-$ rad inspect --refs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-└── refs
-    ├── cobs
-    │   └── xyz.radicle.id
-    │       └── [...]
-    ├── heads
-    │   └── master
-    └── rad
-        ├── id
-        └── sigrefs
-z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-└── refs
-    ├── heads
-    │   └── master
-    └── rad
-        └── sigrefs
-z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z
-└── refs
-    ├── heads
-    │   └── master
-    └── rad
-        └── sigrefs
-```
diff --git a/radicle-cli/examples/rad-clone-connect.md b/radicle-cli/examples/rad-clone-connect.md
deleted file mode 100644
index 4d8247748..000000000
--- a/radicle-cli/examples/rad-clone-connect.md
+++ /dev/null
@@ -1,21 +0,0 @@
-If we're not connecting to seed nodes when cloning, the `clone` command will
-automatically connect to the necessary seeds.
-
-```
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'all'
-✓ Connecting to z6Mkt67…v4N1tRk@[..]
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk..
-✓ Connecting to z6MknSL…StBU8Vi@[..]
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Creating checkout in ./heartwood..
-✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
-✓ Remote-tracking branch alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master created for z6MknSL…StBU8Vi
-✓ Repository successfully cloned under [..]/heartwood/
-╭────────────────────────────────────╮
-│ heartwood                          │
-│ Radicle Heartwood Protocol & Stack │
-│ 0 issues · 0 patches               │
-╰────────────────────────────────────╯
-Run `cd ./heartwood` to go to the repository directory.
-```
diff --git a/radicle-cli/examples/rad-clone-directory.md b/radicle-cli/examples/rad-clone-directory.md
deleted file mode 100644
index 02f48cb24..000000000
--- a/radicle-cli/examples/rad-clone-directory.md
+++ /dev/null
@@ -1,27 +0,0 @@
-We can specify where a repository gets cloned into on our filesystem
-by specifying the directory in the `rad clone` command:
-
-```
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope followed Developer/Radicle
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'followed'
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Creating checkout in ./Developer/Radicle..
-✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
-✓ Remote-tracking branch alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master created for z6MknSL…StBU8Vi
-✓ Repository successfully cloned under [..]/Developer/Radicle/
-╭────────────────────────────────────╮
-│ heartwood                          │
-│ Radicle Heartwood Protocol & Stack │
-│ 0 issues · 0 patches               │
-╰────────────────────────────────────╯
-Run `cd [..]/Developer/Radicle` to go to the repository directory.
-```
-
-Note that attempting to clone into a directory that already exists,
-and is not empty, will fail:
-
-``` (fail)
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope followed Developer/Radicle
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✗ Error: the directory path "Developer/Radicle" already exists
-```
diff --git a/radicle-cli/examples/rad-clone-partial-fail.md b/radicle-cli/examples/rad-clone-partial-fail.md
deleted file mode 100644
index c0270700e..000000000
--- a/radicle-cli/examples/rad-clone-partial-fail.md
+++ /dev/null
@@ -1,32 +0,0 @@
-Eve knows about three seeds.
-
-```
-$ rad node routing
-╭─────────────────────────────────────────────────────╮
-│ RID                                 NID             │
-├─────────────────────────────────────────────────────┤
-│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji   z6MknSL…StBU8Vi │
-│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji   z6MksFq…bS9wzpT │
-│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji   z6Mkt67…v4N1tRk │
-╰─────────────────────────────────────────────────────╯
-```
-When she tries to clone, one of those will fail to fetch. But the clone command
-still returns successfully.
-
-```
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --timeout 3
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'all'
-✗ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk.. error: failed to perform fetch handshake
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✗ Connecting to z6MksFq…bS9wzpT@[..].. error: connection reset
-✓ Creating checkout in ./heartwood..
-✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
-✓ Remote-tracking branch alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master created for z6MknSL…StBU8Vi
-✓ Repository successfully cloned under [..]/heartwood/
-╭────────────────────────────────────╮
-│ heartwood                          │
-│ Radicle Heartwood Protocol & Stack │
-│ 0 issues · 0 patches               │
-╰────────────────────────────────────╯
-Run `cd ./heartwood` to go to the repository directory.
-```
diff --git a/radicle-cli/examples/rad-clone-unknown.md b/radicle-cli/examples/rad-clone-unknown.md
deleted file mode 100644
index 8ce39d88d..000000000
--- a/radicle-cli/examples/rad-clone-unknown.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Trying to clone a repository that is not in our routing table returns an error:
-
-``` (fail)
-$ rad clone rad:zVNuptPuk5XauitpCWSNVCXGGfXW --scope followed
-✓ Seeding policy updated for rad:zVNuptPuk5XauitpCWSNVCXGGfXW with scope 'followed'
-✗ Error: no seeds found for rad:zVNuptPuk5XauitpCWSNVCXGGfXW
-```
diff --git a/radicle-cli/examples/rad-clone.md b/radicle-cli/examples/rad-clone.md
deleted file mode 100644
index df2662ca9..000000000
--- a/radicle-cli/examples/rad-clone.md
+++ /dev/null
@@ -1,74 +0,0 @@
-To create a local copy of a repository on the radicle network, we use the
-`clone` command, followed by the identifier or *RID* of the repository:
-
-```
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope followed
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'followed'
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Creating checkout in ./heartwood..
-✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
-✓ Remote-tracking branch alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master created for z6MknSL…StBU8Vi
-✓ Repository successfully cloned under [..]/heartwood/
-╭────────────────────────────────────╮
-│ heartwood                          │
-│ Radicle Heartwood Protocol & Stack │
-│ 0 issues · 0 patches               │
-╰────────────────────────────────────╯
-Run `cd ./heartwood` to go to the repository directory.
-```
-
-We can now have a look at the new working copy that was created from the cloned
-repository:
-
-```
-$ cd heartwood
-$ ls
-README
-$ cat README
-Hello World!
-$ git status
-On branch master
-Your branch is up to date with 'rad/master'.
-
-nothing to commit, working tree clean
-```
-
-Let's check that the remote tracking branch was setup correctly:
-
-```
-$ git branch --remotes
-  alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master
-  rad/master
-```
-
-The first branch is ours, and the second points to the repository delegate.
-We can also take a look at the remotes:
-
-```
-$ git remote -v
-alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi	rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (fetch)
-alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi	rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (push)
-rad	rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji (fetch)
-rad	rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (push)
-```
-
-Let's check the last commit!
-
-```
-$ git log -n 1
-commit f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
-Author: anonymous <anonymous@radicle.xyz>
-Date:   Mon Jan 1 14:39:16 2018 +0000
-
-    Second commit
-```
-
-Cloned repositories show up in `rad ls`:
-```
-$ rad ls --seeded
-╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ Name        RID                                 Visibility   Head      Description                        │
-├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ heartwood   rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji   public       f2de534   Radicle Heartwood Protocol & Stack │
-╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯
-```
diff --git a/radicle-cli/examples/rad-cob-log.md b/radicle-cli/examples/rad-cob-log.md
deleted file mode 100644
index 2fa0c0562..000000000
--- a/radicle-cli/examples/rad-cob-log.md
+++ /dev/null
@@ -1,141 +0,0 @@
-Handle arbitrary COBs.
-
-First create an issue.
-
-```
-$ rad issue open --title "flux capacitor underpowered" --description "Flux capacitor power requirements exceed current supply" --no-announce
-╭─────────────────────────────────────────────────────────╮
-│ Title   flux capacitor underpowered                     │
-│ Issue   d87dcfe8c2b3200e78b128d9b959cfdf7063fefe        │
-│ Author  alice (you)                                     │
-│ Status  open                                            │
-│                                                         │
-│ Flux capacitor power requirements exceed current supply │
-╰─────────────────────────────────────────────────────────╯
-```
-
-The issue is now listed under our project.
-
-```
-$ rad issue list
-╭──────────────────────────────────────────────────────────────────────────────────────────╮
-│ ●   ID        Title                         Author           Labels   Assignees   Opened │
-├──────────────────────────────────────────────────────────────────────────────────────────┤
-│ ●   d87dcfe   flux capacitor underpowered   alice    (you)                        now    │
-╰──────────────────────────────────────────────────────────────────────────────────────────╯
-```
-
-Let's create a patch, too.
-
-```
-$ git checkout -b flux-capacitor-power
-$ touch REQUIREMENTS
-$ git add REQUIREMENTS
-$ git commit -v -m "Define power requirements"
-[flux-capacitor-power 3e674d1] Define power requirements
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 REQUIREMENTS
-$ git push rad -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches
-```
-
-Patch can be listed.
-
-```
-$ rad patch
-╭─────────────────────────────────────────────────────────────────────────────────────────╮
-│ ●  ID       Title                      Author         Reviews  Head     +   -   Updated │
-├─────────────────────────────────────────────────────────────────────────────────────────┤
-│ ●  aa45913  Define power requirements  alice   (you)  -        3e674d1  +0  -0  now     │
-╰─────────────────────────────────────────────────────────────────────────────────────────╯
-```
-
-Both issue and patch COBs can be listed.
-
-```
-$ rad cob list --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.issue
-d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
-$ rad cob list --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.patch
-aa45913e757cacd46972733bddee5472c78fa32a
-```
-
-We can look at the issue COB.
-
-```
-$ rad cob log --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.issue --object d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
-commit   d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
-author   z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-date     Thu, 15 Dec 2022 17:28:04 +0000
-
-    {
-      "body": "Flux capacitor power requirements exceed current supply",
-      "type": "comment"
-    }
-
-    {
-      "title": "flux capacitor underpowered",
-      "type": "edit"
-    }
-
-```
-
-We can look at the patch COB too.
-
-```
-$ rad cob log --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.patch --object aa45913e757cacd46972733bddee5472c78fa32a
-commit   aa45913e757cacd46972733bddee5472c78fa32a
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
-rel      3e674d1a1df90807e934f9ae5da2591dd6848a33
-rel      f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
-author   z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-date     Thu, 15 Dec 2022 17:28:04 +0000
-
-    {
-      "base": "f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354",
-      "description": "See details.",
-      "oid": "3e674d1a1df90807e934f9ae5da2591dd6848a33",
-      "type": "revision"
-    }
-
-    {
-      "target": "delegates",
-      "title": "Define power requirements",
-      "type": "edit"
-    }
-
-```
-
-Finally let's updated the issue and see the `parent` header:
-
-```
-$ rad issue label d87dcfe --add bug --no-announce
-$ rad cob log --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.issue --object d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
-commit   abec0a9f3c945594c4e78d24d8ec679e56b22b79
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
-parent   d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
-author   z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-date     Thu, 15 Dec 2022 17:28:04 +0000
-
-    {
-      "labels": [
-        "bug"
-      ],
-      "type": "label"
-    }
-
-commit   d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
-author   z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-date     Thu, 15 Dec 2022 17:28:04 +0000
-
-    {
-      "body": "Flux capacitor power requirements exceed current supply",
-      "type": "comment"
-    }
-
-    {
-      "title": "flux capacitor underpowered",
-      "type": "edit"
-    }
-
-```
diff --git a/radicle-cli/examples/rad-cob-show.md b/radicle-cli/examples/rad-cob-show.md
deleted file mode 100644
index f0af93373..000000000
--- a/radicle-cli/examples/rad-cob-show.md
+++ /dev/null
@@ -1,184 +0,0 @@
-Well known COBs, for example issues and patches, can not only be showed via porcelain commands such as
-`rad issue show` and `rad patch show`, but also using the plumbing command `rad cob show`.
-While humans likely prefer to use `rad issue show` and `rad patch show`, this command makes integration
-with other software components easier.
-
-First create an issue.
-
-```
-$ rad issue open --title "spice harvester broken" --description "Fremen have attacked, maybe we went too far?" --no-announce
-╭──────────────────────────────────────────────────╮
-│ Title   spice harvester broken                   │
-│ Issue   9de644864342d7a505eb8d58d1ef20e5bb05de2e │
-│ Author  alice (you)                              │
-│ Status  open                                     │
-│                                                  │
-│ Fremen have attacked, maybe we went too far?     │
-╰──────────────────────────────────────────────────╯
-```
-
-The issue is now listed under our project.
-
-```
-$ rad issue list
-╭─────────────────────────────────────────────────────────────────────────────────────╮
-│ ●   ID        Title                    Author           Labels   Assignees   Opened │
-├─────────────────────────────────────────────────────────────────────────────────────┤
-│ ●   9de6448   spice harvester broken   alice    (you)                        now    │
-╰─────────────────────────────────────────────────────────────────────────────────────╯
-```
-
-Let's create a patch, too.
-
-```
-$ git checkout -b spice-harvester-broken
-$ touch TREATY.md
-$ git add TREATY.md
-$ git commit -v -m "Start drafting peace treaty"
-[spice-harvester-broken 575ed68] Start drafting peace treaty
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 TREATY.md
-$ git push rad -o patch.message="Start drafting peace treaty" -o patch.message="See details." HEAD:refs/patches
-```
-
-Patch can be listed.
-
-```
-$ rad patch
-╭───────────────────────────────────────────────────────────────────────────────────────────╮
-│ ●  ID       Title                        Author         Reviews  Head     +   -   Updated │
-├───────────────────────────────────────────────────────────────────────────────────────────┤
-│ ●  d1f7f86  Start drafting peace treaty  alice   (you)  -        575ed68  +0  -0  now     │
-╰───────────────────────────────────────────────────────────────────────────────────────────╯
-```
-
-Both issue and patch COBs can be listed.
-
-```
-$ rad cob list --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.issue
-9de644864342d7a505eb8d58d1ef20e5bb05de2e
-$ rad cob list --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.patch
-d1f7f869fde9fac19c1779c4c2e77e8361333f91
-```
-
-We can show the issue COB.
-
-```
-$ rad cob show --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.issue --object 9de644864342d7a505eb8d58d1ef20e5bb05de2e
-{
-  "assignees": [],
-  "title": "spice harvester broken",
-  "state": {
-    "status": "open"
-  },
-  "labels": [],
-  "thread": {
-    "comments": {
-      "9de644864342d7a505eb8d58d1ef20e5bb05de2e": {
-        "author": "z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
-        "reactions": [],
-        "resolved": false,
-        "body": "Fremen have attacked, maybe we went too far?",
-        "edits": [
-          {
-            "author": "z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
-            "timestamp": 1671125284000,
-            "body": "Fremen have attacked, maybe we went too far?",
-            "embeds": []
-          }
-        ]
-      }
-    },
-    "timeline": [
-      "9de644864342d7a505eb8d58d1ef20e5bb05de2e"
-    ]
-  }
-}
-```
-
-We can show the patch COB too.
-
-```
-$ rad cob show --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.patch --object d1f7f869fde9fac19c1779c4c2e77e8361333f91
-{
-  "title": "Start drafting peace treaty",
-  "author": {
-    "id": "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
-  },
-  "state": {
-    "status": "open"
-  },
-  "target": "delegates",
-  "labels": [],
-  "merges": {},
-  "revisions": {
-    "d1f7f869fde9fac19c1779c4c2e77e8361333f91": {
-      "id": "d1f7f869fde9fac19c1779c4c2e77e8361333f91",
-      "author": {
-        "id": "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
-      },
-      "description": [
-        {
-          "author": "z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
-          "timestamp": 1671125284000,
-          "body": "See details.",
-          "embeds": []
-        }
-      ],
-      "base": "f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354",
-      "oid": "575ed68c716d6aae81ea6b718fd9ac66a8eae532",
-      "discussion": {
-        "comments": {},
-        "timeline": []
-      },
-      "reviews": {},
-      "timestamp": 1671125284000,
-      "resolves": [],
-      "reactions": []
-    }
-  },
-  "assignees": [],
-  "timeline": [
-    "d1f7f869fde9fac19c1779c4c2e77e8361333f91"
-  ],
-  "reviews": {}
-}
-```
-
-Finally let's update the issue and see the output of `rad cob show` also changes.
-
-```
-$ rad issue label 9de6448 --add bug --no-announce
-$ rad cob show --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.issue --object 9de644864342d7a505eb8d58d1ef20e5bb05de2e
-{
-  "assignees": [],
-  "title": "spice harvester broken",
-  "state": {
-    "status": "open"
-  },
-  "labels": [
-    "bug"
-  ],
-  "thread": {
-    "comments": {
-      "9de644864342d7a505eb8d58d1ef20e5bb05de2e": {
-        "author": "z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
-        "reactions": [],
-        "resolved": false,
-        "body": "Fremen have attacked, maybe we went too far?",
-        "edits": [
-          {
-            "author": "z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
-            "timestamp": 1671125284000,
-            "body": "Fremen have attacked, maybe we went too far?",
-            "embeds": []
-          }
-        ]
-      }
-    },
-    "timeline": [
-      "9de644864342d7a505eb8d58d1ef20e5bb05de2e"
-    ]
-  }
-}
-```
diff --git a/radicle-cli/examples/rad-config.md b/radicle-cli/examples/rad-config.md
deleted file mode 100644
index e47467da6..000000000
--- a/radicle-cli/examples/rad-config.md
+++ /dev/null
@@ -1,70 +0,0 @@
-The `rad config` command is used to manage the local user configuration.
-In its simplest form, `rad config` prints the current configuration.
-
-```
-$ rad config
-{
-  "publicExplorer": "https://app.radicle.xyz/nodes/$host/$rid$path",
-  "preferredSeeds": [
-    "z6MkrLMMsiPWUcNPHcRajuMi9mDfYckSoJyPwwnknocNYPm7@seed.radicle.garden:8776",
-    "z6MksmpU5b1dS7oaqF2bHXhQi1DWy2hB7Mh9CuN7y1DN6QSz@seed.radicle.xyz:8776"
-  ],
-  "web": {
-    "pinned": {
-      "repositories": []
-    }
-  },
-  "cli": {
-    "hints": true
-  },
-  "node": {
-    "alias": "alice",
-    "listen": [],
-    "peers": {
-      "type": "dynamic"
-    },
-    "connect": [],
-    "externalAddresses": [],
-    "network": "main",
-    "log": "INFO",
-    "relay": "auto",
-    "limits": {
-      "routingMaxSize": 1000,
-      "routingMaxAge": 604800,
-      "gossipMaxAge": 1209600,
-      "fetchConcurrency": 1,
-      "maxOpenFiles": 4096,
-      "rate": {
-        "inbound": {
-          "fillRate": 5.0,
-          "capacity": 1024
-        },
-        "outbound": {
-          "fillRate": 10.0,
-          "capacity": 2048
-        }
-      },
-      "connection": {
-        "inbound": 128,
-        "outbound": 16
-      }
-    },
-    "workers": 8,
-    "seedingPolicy": {
-      "default": "block"
-    }
-  }
-}
-```
-
-You can also get any value in the configuration by path, eg.
-
-```
-$ rad config get node.alias
-alice
-$ rad config get preferredSeeds
-z6MkrLMMsiPWUcNPHcRajuMi9mDfYckSoJyPwwnknocNYPm7@seed.radicle.garden:8776
-z6MksmpU5b1dS7oaqF2bHXhQi1DWy2hB7Mh9CuN7y1DN6QSz@seed.radicle.xyz:8776
-$ rad config get node.limits.routingMaxSize
-1000
-```
diff --git a/radicle-cli/examples/rad-diff.md b/radicle-cli/examples/rad-diff.md
deleted file mode 100644
index 64ce618a0..000000000
--- a/radicle-cli/examples/rad-diff.md
+++ /dev/null
@@ -1,159 +0,0 @@
-Exploring `rad diff`.
-
-``` ./main.c
-#include <stdio.h>
-
-int main(void) {
-    printf("Hello World!\n");
-    return 0;
-}
-```
-
-```
-$ ls
-README
-main.c
-```
-
-```
-$ git mv README README.md
-$ git add main.c
-$ git commit -m "Make changes"
-[master 5f771e0] Make changes
- 2 files changed, 6 insertions(+)
- rename README => README.md (100%)
- create mode 100644 main.c
-```
-
-```
-$ rad diff HEAD^ HEAD
-╭────────────────────────────────────────────╮
-│ README -> README.md ❲moved❳                │
-╰────────────────────────────────────────────╯
-
-╭────────────────────────────────────────────╮
-│ main.c +6 ❲created❳                        │
-├────────────────────────────────────────────┤
-│ @@ -0,0 +1,6 @@                            │
-│      1     + #include <stdio.h>            │
-│      2     +                               │
-│      3     + int main(void) {              │
-│      4     +     printf("Hello World!/n"); │
-│      5     +     return 0;                 │
-│      6     + }                             │
-╰────────────────────────────────────────────╯
-
-```
-
-```
-$ sed -i 's/Hello World/Hello Radicle/' main.c
-$ rad diff
-╭──────────────────────────────────────────────╮
-│ main.c -1 +1                                 │
-├──────────────────────────────────────────────┤
-│ @@ -1,6 +1,6 @@                              │
-│ 1    1       #include <stdio.h>              │
-│ 2    2                                       │
-│ 3    3       int main(void) {                │
-│ 4          -     printf("Hello World!/n");   │
-│      4     +     printf("Hello Radicle!/n"); │
-│ 5    5           return 0;                   │
-│ 6    6       }                               │
-╰──────────────────────────────────────────────╯
-
-```
-
-```
-$ git add main.c
-$ rad diff
-$ rad diff --staged
-╭──────────────────────────────────────────────╮
-│ main.c -1 +1                                 │
-├──────────────────────────────────────────────┤
-│ @@ -1,6 +1,6 @@                              │
-│ 1    1       #include <stdio.h>              │
-│ 2    2                                       │
-│ 3    3       int main(void) {                │
-│ 4          -     printf("Hello World!/n");   │
-│      4     +     printf("Hello Radicle!/n"); │
-│ 5    5           return 0;                   │
-│ 6    6       }                               │
-╰──────────────────────────────────────────────╯
-
-```
-
-```
-$ git rm -f -q main.c
-$ rad diff --staged
-╭────────────────────────────────────────────╮
-│ main.c -6 ❲deleted❳                        │
-├────────────────────────────────────────────┤
-│ @@ -1,6 +0,0 @@                            │
-│ 1          - #include <stdio.h>            │
-│ 2          -                               │
-│ 3          - int main(void) {              │
-│ 4          -     printf("Hello World!/n"); │
-│ 5          -     return 0;                 │
-│ 6          - }                             │
-╰────────────────────────────────────────────╯
-
-```
-
-For now, copies are not detected.
-
-```
-$ git reset --hard master -q
-$ mkdir docs
-$ cp README.md docs/README.md
-$ git add docs
-$ rad diff --staged
-╭─────────────────────────────╮
-│ docs/README.md +1 ❲created❳ │
-├─────────────────────────────┤
-│ @@ -0,0 +1,1 @@             │
-│      1     + Hello World!   │
-╰─────────────────────────────╯
-
-$ git reset
-$ git checkout .
-```
-
-Empty file.
-
-```
-$ touch EMPTY
-$ git add EMPTY
-$ rad diff --staged
-╭─────────────────╮
-│ EMPTY ❲created❳ │
-╰─────────────────╯
-
-$ git reset
-$ git checkout .
-```
-
-File mode change.
-
-```
-$ chmod +x README.md
-$ rad diff
-╭───────────────────────────────────────────╮
-│ README.md 100644 -> 100755 ❲mode changed❳ │
-╰───────────────────────────────────────────╯
-
-$ git reset -q
-$ git checkout .
-```
-
-Binary file.
-
-```
-$ touch file.bin
-$ truncate -s 8 file.bin
-$ git add file.bin
-$ rad diff --staged
-╭─────────────────────────────╮
-│ file.bin ❲binary❳ ❲created❳ │
-╰─────────────────────────────╯
-
-```
diff --git a/radicle-cli/examples/rad-fetch.md b/radicle-cli/examples/rad-fetch.md
deleted file mode 100644
index c4b32464f..000000000
--- a/radicle-cli/examples/rad-fetch.md
+++ /dev/null
@@ -1,27 +0,0 @@
-Using `rad clone` is useful if we want to create and fetch a project
-that exists on Radicle, but perhaps we're in a scenario where we may
-already have an existing Git repository and so a full clone is not
-necessary.
-
-Instead, we want to fetch the project from the network into our local
-storage. In this scenario, we know that the project is
-`rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji`. In order to fetch it, we first
-have to update our seeding policy for the project.
-
-```
-$ rad seed rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --no-fetch
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'all'
-```
-
-Now that the project is seeding we can fetch it and we will have it in
-our local storage. Note that the `seed` command can also be told to fetch
-by passing the `--fetch` option.
-
-```
-$ rad sync --fetch rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Fetched repository from 1 seed(s)
-```
-
-However, we don't have a local fork of the project. We can follow this
-up with [rad-fork](rad-fork.md).
diff --git a/radicle-cli/examples/rad-fork.md b/radicle-cli/examples/rad-fork.md
deleted file mode 100644
index bfedf69fc..000000000
--- a/radicle-cli/examples/rad-fork.md
+++ /dev/null
@@ -1,52 +0,0 @@
-If we have fetched a project, then we do not have a fork of the
-repository in the storage, i.e. there is no ref hierarchy for our
-NID. This is demonstrated below where our NID is
-`z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk`:
-
-```
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --refs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-└── refs
-    ├── cobs
-    │   └── xyz.radicle.id
-    │       └── [...]
-    ├── heads
-    │   └── master
-    └── rad
-        ├── id
-        └── sigrefs
-```
-
-To remedy this, we can use the `rad fork` command for the project we
-wish to fork:
-
-```
-$ rad fork rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Forked repository rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-```
-
-Now, if we `rad inspect` the project's refs again we will see that we
-have a copy of the main set of refs:
-
-```
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --refs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-└── refs
-    ├── cobs
-    │   └── xyz.radicle.id
-    │       └── [...]
-    ├── heads
-    │   └── master
-    └── rad
-        ├── id
-        └── sigrefs
-z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-└── refs
-    ├── heads
-    │   └── master
-    └── rad
-        └── sigrefs
-```
-
-We are now able to setup a remote in our own working copy of the
-project and push to our own fork.
diff --git a/radicle-cli/examples/rad-id-collaboration.md b/radicle-cli/examples/rad-id-collaboration.md
deleted file mode 100644
index 5b21d7bbe..000000000
--- a/radicle-cli/examples/rad-id-collaboration.md
+++ /dev/null
@@ -1,189 +0,0 @@
-It's common that in projects where there are already multiple
-delegates that one of those delegates meets someone that they want to
-bring into the project. So let's see how Alice and Bob end up inviting
-Eve to the project.
-
-First, we'll start off with Alice adding Bob. It's necessary for Bob
-to have a fork of the project and Alice must be aware of the fork:
-
-``` ~bob
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope followed
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'followed'
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkuPZ…xEuaPUp..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkvVv…Z1Ct4tD..
-✓ Creating checkout in ./heartwood..
-✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
-✓ Remote-tracking branch alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master created for z6MknSL…StBU8Vi
-✓ Repository successfully cloned under [..]/heartwood/
-╭────────────────────────────────────╮
-│ heartwood                          │
-│ Radicle Heartwood Protocol & Stack │
-│ 0 issues · 0 patches               │
-╰────────────────────────────────────╯
-Run `cd ./heartwood` to go to the repository directory.
-$ cd ./heartwood
-$ git push rad master
-```
-
-If Alice wants to ensure that both her and Bob need to agree on merges
-to the default branch, she must set the `threshold` to `2` when adding
-Bob as a delegate:
-
-``` ~alice (fails)
-$ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Add Bob" --description "" --threshold 2 --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-confirm -q
-✗ Error: failed to verify delegates for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✗ Error: a threshold of 2 delegates cannot be met, found 1 delegate(s) and the following delegates are missing [did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk]
-✗ Hint: run `rad follow did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk` to follow this missing peer
-✗ Hint: run `rad sync -f` to attempt to fetch the newly followed peers
-✗ Error: fatal: refusing to update identity document
-```
-
-We can see that `a threshold of 2 delegates cannot be met` when Alice
-attempts to do this. This is because she requires Bob's default branch
-to ensure that the threshold can be met and the canonical version of
-the default branch (`refs/heads/<default branch>` at the top-level of
-the storage) can be updated.
-
-So, instead Alice needs to first follow Bob and fetch his references:
-
-``` ~alice
-$ rad follow did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --alias bob
-✓ Follow policy updated for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
-$ rad sync
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkuPZ…xEuaPUp..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkvVv…Z1Ct4tD..
-✓ Fetched repository from 2 seed(s)
-✓ Synced with 1 node(s)
-$ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Add Bob" --description "" --threshold 2 --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-confirm -q
-069e7d58faa9a7473d27f5510d676af33282796f
-$ rad sync
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkuPZ…xEuaPUp..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkvVv…Z1Ct4tD..
-✓ Fetched repository from 2 seed(s)
-✓ Synced with 3 node(s)
-```
-
-Bob can confirm that he was made a delegate by fetching the update:
-
-``` ~bob
-$ rad sync
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkuPZ…xEuaPUp..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkvVv…Z1Ct4tD..
-✓ Fetched repository from 2 seed(s)
-✓ Synced with 1 node(s)
-$ rad inspect --delegates
-did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (alice)
-did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
-```
-
-Later, Bob meets Eve at a conference and she wants to take part in the
-project. For Bob to propose Eve, similar steps need to happen as
-between Alice and Bob. Eve first needs to setup a fork:
-
-``` ~eve
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope followed
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'followed'
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkuPZ…xEuaPUp..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkvVv…Z1Ct4tD..
-✓ Creating checkout in ./heartwood..
-✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
-✓ Remote-tracking branch alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master created for z6MknSL…StBU8Vi
-✓ Remote bob@z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk added
-✓ Remote-tracking branch bob@z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/master created for z6Mkt67…v4N1tRk
-✓ Repository successfully cloned under [..]/heartwood/
-╭────────────────────────────────────╮
-│ heartwood                          │
-│ Radicle Heartwood Protocol & Stack │
-│ 0 issues · 0 patches               │
-╰────────────────────────────────────╯
-Run `cd ./heartwood` to go to the repository directory.
-$ cd ./heartwood
-$ git push rad master
-```
-
-Bob then adds Eve as a delegate:
-
-``` ~bob
-$ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Add Eve" --description "" --delegate did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z --no-confirm -q
-3cd3c7f9900de0fcb19705856a7cc339a38fb0b3
-$ rad sync
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkvVv…Z1Ct4tD..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkuPZ…xEuaPUp..
-✓ Fetched repository from 2 seed(s)
-✓ Synced with 3 node(s)
-```
-
-Notice how there was no need to follow Eve right away in this case?
-This is because Bob can meet the threshold of 2 without Eve, he
-has Alice and his default reference.
-
-Since there are two delegates when Bob adds Eve, Alice needs to accept
-the change to meet a quorum of votes (`votes >= (delegates / 2) + 1`):
-
-``` ~alice
-$ rad sync
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkvVv…Z1Ct4tD..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkuPZ…xEuaPUp..
-✓ Fetched repository from 2 seed(s)
-✓ Nothing to announce, already in sync with 3 node(s) (see `rad sync status`)
-$ rad id list
-╭────────────────────────────────────────────────────────────────────────────────╮
-│ ●   ID        Title              Author                     Status     Created │
-├────────────────────────────────────────────────────────────────────────────────┤
-│ ●   3cd3c7f   Add Eve            bob      z6Mkt67…v4N1tRk   active     now     │
-│ ●   069e7d5   Add Bob            alice    (you)             accepted   now     │
-│ ●   0656c21   Initial revision   alice    (you)             accepted   now     │
-╰────────────────────────────────────────────────────────────────────────────────╯
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --sigrefs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 6acd3b370839318d96dbfff43948bab2bcdd3681
-z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk c40018821dc1b41cad75e91e0c9d00827e815324
-$ rad id accept 3cd3c7f
-✓ Revision 3cd3c7f9900de0fcb19705856a7cc339a38fb0b3 accepted
-╭────────────────────────────────────────────────────────────────────────╮
-│ Title    Add Eve                                                       │
-│ Revision 3cd3c7f9900de0fcb19705856a7cc339a38fb0b3                      │
-│ Blob     74581605d1f75396c331487a10ca61c4815ed685                      │
-│ Author   did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk      │
-│ State    accepted                                                      │
-│ Quorum   yes                                                           │
-├────────────────────────────────────────────────────────────────────────┤
-│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
-│ ✓ did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk bob         │
-╰────────────────────────────────────────────────────────────────────────╯
-```
-
-At this point, when Alice runs `rad sync`, she will fetch Eve's fork
-since she has become a delegate:
-
-``` ~alice
-$ rad sync --timeout 3
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkvVv…Z1Ct4tD..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkuPZ…xEuaPUp..
-✓ Fetched repository from 2 seed(s)
-✓ Synced with 3 node(s)
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --sigrefs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 1f716870f890be0c13fdd0af9f527af849fec792
-z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk c40018821dc1b41cad75e91e0c9d00827e815324
-z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z 95cd447c57de8d232c6154f5dba0451aa593520e
-```
-
-Since the network is eventually consistent, if Eve decides to `sync`
-(this could also happen through a transient announcement), then we can
-see that both seeds are `synced`:
-
-``` ~eve
-$ rad sync
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkvVv…Z1Ct4tD..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkuPZ…xEuaPUp..
-✓ Fetched repository from 2 seed(s)
-✓ Synced with 3 node(s)
-$ rad sync status
-╭─────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ ●   Node                            Address                        Status   Tip       Timestamp │
-├─────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ●   eve           (you)                                                     95cd447   now       │
-│ ●   bob           z6Mkt67…v4N1tRk                                  synced   95cd447   now       │
-│ ●   distrustful   z6MkvVv…Z1Ct4tD   distrustful.radicle.xyz:8776   synced   95cd447   now       │
-│ ●   seed          z6MkuPZ…xEuaPUp   seed.radicle.xyz:8776          synced   95cd447   now       │
-╰─────────────────────────────────────────────────────────────────────────────────────────────────╯
-```
diff --git a/radicle-cli/examples/rad-id-conflict.md b/radicle-cli/examples/rad-id-conflict.md
deleted file mode 100644
index 11f7e1771..000000000
--- a/radicle-cli/examples/rad-id-conflict.md
+++ /dev/null
@@ -1,104 +0,0 @@
-First let's add Bob as a delegate, and sync the changes to Bob:
-
-``` ~alice
-$ rad id update --title "Add Bob" --description "Add Bob as a delegate" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --threshold 2 -q
-0ca42d376bd566631083c8913cf86bec722da392
-```
-``` ~bob
-$ cd heartwood
-$ rad sync --fetch rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Fetched repository from 1 seed(s)
-```
-
-One thing that can happen is that two delegates propose a revision at the same
-time:
-
-``` ~alice
-$ rad id update --title "Edit project name" --description "" --payload "xyz.radicle.project" "name" '"heart"' -q
-12d7300d1bbba84e4e5760c8c61999bf5fefb81a
-```
-``` ~bob
-$ rad id update --title "Edit project name" --description "" --payload "xyz.radicle.project" "name" '"wood"' -q
-89b2623e7f2ddf5748661b15b9975ab0b4ee17ab
-```
-
-When Alice syncs with Bob, she notices the problem: there are two active
-revisions.
-
-``` ~alice
-$ rad sync --fetch rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk..
-✓ Fetched repository from 1 seed(s)
-$ rad id list
-╭─────────────────────────────────────────────────────────────────────────────────╮
-│ ●   ID        Title               Author                     Status     Created │
-├─────────────────────────────────────────────────────────────────────────────────┤
-│ ●   89b2623   Edit project name   bob      z6Mkt67…v4N1tRk   active     now     │
-│ ●   12d7300   Edit project name   alice    (you)             active     now     │
-│ ●   0ca42d3   Add Bob             alice    (you)             accepted   now     │
-│ ●   0656c21   Initial revision    alice    (you)             accepted   now     │
-╰─────────────────────────────────────────────────────────────────────────────────╯
-```
-
-This isn't a problem as long as we don't try to accept both. So let's accept
-Bob's:
-
-``` ~alice
-$ rad id accept 89b2623 -q
-$ rad id list
-╭─────────────────────────────────────────────────────────────────────────────────╮
-│ ●   ID        Title               Author                     Status     Created │
-├─────────────────────────────────────────────────────────────────────────────────┤
-│ ●   89b2623   Edit project name   bob      z6Mkt67…v4N1tRk   accepted   now     │
-│ ●   12d7300   Edit project name   alice    (you)             stale      now     │
-│ ●   0ca42d3   Add Bob             alice    (you)             accepted   now     │
-│ ●   0656c21   Initial revision    alice    (you)             accepted   now     │
-╰─────────────────────────────────────────────────────────────────────────────────╯
-```
-
-Doing so voided the other conflicting revision, and it can no longer be
-accepted now.
-
-``` ~bob
-$ rad sync --fetch rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Fetched repository from 1 seed(s)
-```
-``` ~bob (fail)
-$ rad id accept 12d7300 -q
-✗ Error: cannot vote on revision that is stale
-$ rad id reject 12d7300 -q
-✗ Error: cannot vote on revision that is stale
-```
-``` ~bob
-$ rad id show 12d7300
-╭────────────────────────────────────────────────────────────────────────╮
-│ Title    Edit project name                                             │
-│ Revision 12d7300d1bbba84e4e5760c8c61999bf5fefb81a                      │
-│ Blob     e93aa3e3c5c448bacd3537a81daf1437eccd046a                      │
-│ Author   did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi      │
-│ State    stale                                                         │
-│ Quorum   no                                                            │
-├────────────────────────────────────────────────────────────────────────┤
-│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice       │
-│ ? did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk bob   (you) │
-╰────────────────────────────────────────────────────────────────────────╯
-
-@@ -1,14 +1,14 @@
- {
-   "payload": {
-     "xyz.radicle.project": {
-       "defaultBranch": "master",
-       "description": "Radicle Heartwood Protocol & Stack",
--      "name": "heartwood"
-+      "name": "heart"
-     }
-   },
-   "delegates": [
-     "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
-     "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
-   ],
-   "threshold": 2
- }
-```
diff --git a/radicle-cli/examples/rad-id-multi-delegate.md b/radicle-cli/examples/rad-id-multi-delegate.md
deleted file mode 100644
index 1b97ceb15..000000000
--- a/radicle-cli/examples/rad-id-multi-delegate.md
+++ /dev/null
@@ -1,202 +0,0 @@
-``` ~alice
-$ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Add Bob" --description "" --threshold 2 --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-confirm -q
-069e7d58faa9a7473d27f5510d676af33282796f
-```
-
-``` ~bob
-$ rad watch --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --node z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z -r 'refs/rad/sigrefs' -t 95cd447c57de8d232c6154f5dba0451aa593520e -i 500 --timeout 5000
-$ rad sync --fetch rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Fetched repository from 1 seed(s)
-$ rad id --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-╭────────────────────────────────────────────────────────────────────────────────╮
-│ ●   ID        Title              Author                     Status     Created │
-├────────────────────────────────────────────────────────────────────────────────┤
-│ ●   069e7d5   Add Bob            alice    z6MknSL…StBU8Vi   accepted   now     │
-│ ●   0656c21   Initial revision   alice    z6MknSL…StBU8Vi   accepted   now     │
-╰────────────────────────────────────────────────────────────────────────────────╯
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --sigrefs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi [..]
-z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk [..]
-z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z [..]
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --delegates
-did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (alice)
-did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
-$ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Add Eve" --description "" --delegate did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z --no-confirm
-✓ Identity revision 3cd3c7f9900de0fcb19705856a7cc339a38fb0b3 created
-╭────────────────────────────────────────────────────────────────────────╮
-│ Title    Add Eve                                                       │
-│ Revision 3cd3c7f9900de0fcb19705856a7cc339a38fb0b3                      │
-│ Blob     74581605d1f75396c331487a10ca61c4815ed685                      │
-│ Author   did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk      │
-│ State    active                                                        │
-│ Quorum   no                                                            │
-├────────────────────────────────────────────────────────────────────────┤
-│ ✓ did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk bob   (you) │
-│ ? did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice       │
-╰────────────────────────────────────────────────────────────────────────╯
-
-@@ -1,14 +1,15 @@
- {
-   "payload": {
-     "xyz.radicle.project": {
-       "defaultBranch": "master",
-       "description": "Radicle Heartwood Protocol & Stack",
-       "name": "heartwood"
-     }
-   },
-   "delegates": [
-     "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
--    "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
-+    "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk",
-+    "did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z"
-   ],
-   "threshold": 2
- }
-```
-
-``` ~alice
-$ rad sync --fetch rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkux1…nVhib7Z..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk..
-✓ Fetched repository from 2 seed(s)
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --delegates
-did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (alice)
-did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
-$ rad id accept 3cd3c7f9900de0fcb19705856a7cc339a38fb0b3 --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --no-confirm
-✓ Revision 3cd3c7f9900de0fcb19705856a7cc339a38fb0b3 accepted
-╭────────────────────────────────────────────────────────────────────────╮
-│ Title    Add Eve                                                       │
-│ Revision 3cd3c7f9900de0fcb19705856a7cc339a38fb0b3                      │
-│ Blob     74581605d1f75396c331487a10ca61c4815ed685                      │
-│ Author   did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk      │
-│ State    accepted                                                      │
-│ Quorum   yes                                                           │
-├────────────────────────────────────────────────────────────────────────┤
-│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
-│ ✓ did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk bob         │
-╰────────────────────────────────────────────────────────────────────────╯
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --delegates
-did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (alice)
-did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
-did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z (eve)
-```
-
-``` ~alice
-$ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Make private" --description "" --visibility private --no-confirm -q
-e6bf10593b78384eb2b281cbb18a605668a6d1f7
-```
-
-We can list all revisions:
-
-``` ~alice
-$ rad id list
-╭────────────────────────────────────────────────────────────────────────────────╮
-│ ●   ID        Title              Author                     Status     Created │
-├────────────────────────────────────────────────────────────────────────────────┤
-│ ●   e6bf105   Make private       alice    (you)             active     now     │
-│ ●   3cd3c7f   Add Eve            bob      z6Mkt67…v4N1tRk   accepted   now     │
-│ ●   069e7d5   Add Bob            alice    (you)             accepted   now     │
-│ ●   0656c21   Initial revision   alice    (you)             accepted   now     │
-╰────────────────────────────────────────────────────────────────────────────────╯
-```
-
-Despite being a delegate, Bob can't edit or redact Alice's revision:
-
-``` ~bob (fail)
-$ rad id redact e6bf10593b78384eb2b281cbb18a605668a6d1f7
-[..]
-```
-``` ~bob (fail)
-$ rad id edit --title "Boo!" --description "Boo!" e6bf10593b78384eb2b281cbb18a605668a6d1f7
-[..]
-```
-
-Alice can edit:
-
-``` ~alice
-$ rad id edit --title "Make private" --description "Privacy is cool." e6bf10593b78384eb2b281cbb18a605668a6d1f7
-✓ Revision e6bf10593b78384eb2b281cbb18a605668a6d1f7 edited
-$ rad id show e6bf10593b78384eb2b281cbb18a605668a6d1f7
-╭────────────────────────────────────────────────────────────────────────╮
-│ Title    Make private                                                  │
-│ Revision e6bf10593b78384eb2b281cbb18a605668a6d1f7                      │
-│ Blob     c533865b2846ca6c5b4436ec6872257293380c3b                      │
-│ Author   did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi      │
-│ State    active                                                        │
-│ Quorum   no                                                            │
-│                                                                        │
-│ Privacy is cool.                                                       │
-├────────────────────────────────────────────────────────────────────────┤
-│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
-│ ? did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk bob         │
-│ ? did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z eve         │
-╰────────────────────────────────────────────────────────────────────────╯
-
-@@ -1,15 +1,18 @@
- {
-   "payload": {
-     "xyz.radicle.project": {
-       "defaultBranch": "master",
-       "description": "Radicle Heartwood Protocol & Stack",
-       "name": "heartwood"
-     }
-   },
-   "delegates": [
-     "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
-     "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk",
-     "did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z"
-   ],
--  "threshold": 2
-+  "threshold": 2,
-+  "visibility": {
-+    "type": "private"
-+  }
- }
-```
-
-And she can redact her revision:
-
-``` ~alice
-$ rad id redact e6bf10593b78384eb2b281cbb18a605668a6d1f7
-✓ Revision e6bf10593b78384eb2b281cbb18a605668a6d1f7 redacted
-```
-``` ~alice (fail)
-$ rad id show e6bf10593b78384eb2b281cbb18a605668a6d1f7
-✗ Error: revision `e6bf10593b78384eb2b281cbb18a605668a6d1f7` not found
-```
-
-Finally, Alice can also propose to remove Bob:
-``` ~alice
-$ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Remove Bob" --description "" --rescind did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-confirm
-✓ Identity revision 8ba242a80bc1181f41f9ea7a19286038c7948994 created
-╭────────────────────────────────────────────────────────────────────────╮
-│ Title    Remove Bob                                                    │
-│ Revision 8ba242a80bc1181f41f9ea7a19286038c7948994                      │
-│ Blob     254d62de237117e7d7b9ceff85c47f5e3b610c1e                      │
-│ Author   did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi      │
-│ State    active                                                        │
-│ Quorum   no                                                            │
-├────────────────────────────────────────────────────────────────────────┤
-│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
-│ ? did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk bob         │
-│ ? did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z eve         │
-╰────────────────────────────────────────────────────────────────────────╯
-
-@@ -1,15 +1,14 @@
- {
-   "payload": {
-     "xyz.radicle.project": {
-       "defaultBranch": "master",
-       "description": "Radicle Heartwood Protocol & Stack",
-       "name": "heartwood"
-     }
-   },
-   "delegates": [
-     "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
--    "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk",
-     "did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z"
-   ],
-   "threshold": 2
- }
-```
diff --git a/radicle-cli/examples/rad-id-private.md b/radicle-cli/examples/rad-id-private.md
deleted file mode 100644
index 63998838b..000000000
--- a/radicle-cli/examples/rad-id-private.md
+++ /dev/null
@@ -1,100 +0,0 @@
-When we are working with a private repository, we can modify the list of peers
-we allow by using the `rad id` command with its `--allow` and `--disallow`
-options. Both options can be specified multiple times in the same command line call:
-
-Here we will add Bob and Eve's DIDs to the `allow`list:
-
-```
-$ rad id update --title "Allow Bob & Eve" --allow did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --allow did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z -q
-...
-$ rad inspect --identity
-{
-  "payload": {
-    "xyz.radicle.project": {
-      "defaultBranch": "master",
-      "description": "radicle heartwood protocol & stack",
-      "name": "heartwood"
-    }
-  },
-  "delegates": [
-    "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
-  ],
-  "threshold": 1,
-  "visibility": {
-    "type": "private",
-    "allow": [
-      "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk",
-      "did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z"
-    ]
-  }
-}
-```
-
-To remove a peer's DID, we can use the `--disallow` option. Let's remove both of them again:
-
-```
-$ rad id update --title "Remove allow list" --disallow did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --disallow did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z
-...
-$ rad inspect --identity
-{
-  "payload": {
-    "xyz.radicle.project": {
-      "defaultBranch": "master",
-      "description": "radicle heartwood protocol & stack",
-      "name": "heartwood"
-    }
-  },
-  "delegates": [
-    "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
-  ],
-  "threshold": 1,
-  "visibility": {
-    "type": "private"
-  }
-}
-```
-
-Note that using both `--disallow` and `--allow` with the same DID will result in
-an error:
-
-``` (fails)
-$ rad id update --title "Remove allow list" --allow did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --disallow did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-✗ Error: `--allow` and `--disallow` must not overlap: ["did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"]
-```
-
-Allowing or disallowing the same peer twice will result in a message saying that
-the document is already up to date:
-
-```
-$ rad id update --title "Allow Bob" --allow did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk -q
-...
-```
-```
-$ rad id update --title "Allow Bob" --allow did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-Nothing to do. The document is up to date. See `rad inspect --identity`.
-```
-
-If we attempt to change the list while also changing the repository to `public`,
-then the command will fail since there is no longer an allow list to work with:
-
-``` (fails)
-$ rad id update --visibility public --allow did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-✗ Error: `--allow` and `--disallow` cannot be used with `--visibility public`
-```
-
-Let's change the repository to `public`:
-
-```
-$ rad id update --title "IPO" --visibility public -q
-...
-```
-
-Now, if we attempt to change the `allow` list we also get an error with a
-helpful hint:
-
-``` (fails)
-$ rad id update --allow did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-✗ Error: `--allow` and `--disallow` should only be used for private repositories
-✗ Hint: use `--visibility private` to make the repository private, or perhaps you meant to use `--delegate`/`--rescind`
-```
-
diff --git a/radicle-cli/examples/rad-id-threshold-soft-fork.md b/radicle-cli/examples/rad-id-threshold-soft-fork.md
deleted file mode 100644
index 7de2e9fbe..000000000
--- a/radicle-cli/examples/rad-id-threshold-soft-fork.md
+++ /dev/null
@@ -1,48 +0,0 @@
-In some cases, a peer can create references, which includes `rad/sigrefs`,
-without having pushed the canonical default branch. For example, Bob can create
-an issue in the repository:
-
-``` ~bob
-$ rad issue open --title "Add Bob as a delegate" --description "We agreed to add me as a delegate, so I am creating an issue to track that work" --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-╭──────────────────────────────────────────────────────────────╮
-│ Title   Add Bob as a delegate                                │
-│ Issue   f12d512c51d30429f7916db038ae0360e2e938c2             │
-│ Author  bob (you)                                            │
-│ Status  open                                                 │
-│                                                              │
-│ We agreed to add me as a delegate, so I am creating an issue │
-│ to track that work                                           │
-╰──────────────────────────────────────────────────────────────╯
-✓ Synced with 1 node(s)
-```
-
-and if we inspect Alice's references, then we will see the following:
-
-``` ~alice
-$ rad inspect --refs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-└── refs
-    ├── cobs
-    │   └── xyz.radicle.id
-    │       └── 0656c217f917c3e06234771e9ecae53aba5e173e
-    ├── heads
-    │   └── master
-    └── rad
-        ├── id
-        └── sigrefs
-z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-└── refs
-    ├── cobs
-    │   └── xyz.radicle.issue
-    │       └── f12d512c51d30429f7916db038ae0360e2e938c2
-    └── rad
-        └── sigrefs
-```
-
-Despite not having the canonical branch, Alice should still be able to add Bob
-as a delegate, since a threshold of 1 can still be reached:
-
-``` ~alice
-$ rad id update --title "Add Bob" --description "Add Bob as a delegate" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk -q
-7be665f9fccba97abb21b2fa85a6fd3181c72858
-```
diff --git a/radicle-cli/examples/rad-id-threshold.md b/radicle-cli/examples/rad-id-threshold.md
deleted file mode 100644
index 54bafaceb..000000000
--- a/radicle-cli/examples/rad-id-threshold.md
+++ /dev/null
@@ -1,200 +0,0 @@
-In the attempt below, to update the identity, we can see that `a
-threshold of 2 delegates cannot be met` when Alice attempts to do
-this. This is because she requires Bob's default branch to ensure that
-the threshold can be met and the canonical version of the default
-branch (`refs/heads/<default branch>` at the top-level of the storage)
-can be updated.
-
-``` ~alice (fail)
-$ rad id update --title "Add Bob" --description "Add Bob as a delegate" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --threshold 2
-✗ Error: failed to verify delegates for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✗ Error: the threshold of 2 delegates cannot be met..
-✗ Error: the delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk is missing
-✗ Hint: run `rad follow did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk` to follow this missing peer
-✗ Error: fatal: refusing to update identity document
-```
-
-Instead, Alice can simply keep the `threshold` as `1` and still add Bob as a delegate:
-
-``` ~alice
-$ rad id update --title "Add Bob" --description "Add Bob as a delegate" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-✓ Identity revision 7be665f9fccba97abb21b2fa85a6fd3181c72858 created
-╭────────────────────────────────────────────────────────────────────────╮
-│ Title    Add Bob                                                       │
-│ Revision 7be665f9fccba97abb21b2fa85a6fd3181c72858                      │
-│ Blob     93d3009787e5d8a481dffc4dd248ea46af592466                      │
-│ Author   did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi      │
-│ State    accepted                                                      │
-│ Quorum   yes                                                           │
-│                                                                        │
-│ Add Bob as a delegate                                                  │
-├────────────────────────────────────────────────────────────────────────┤
-│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
-╰────────────────────────────────────────────────────────────────────────╯
-
-@@ -1,13 +1,14 @@
- {
-   "payload": {
-     "xyz.radicle.project": {
-       "defaultBranch": "master",
-       "description": "Radicle Heartwood Protocol & Stack",
-       "name": "heartwood"
-     }
-   },
-   "delegates": [
--    "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
-+    "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
-+    "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
-   ],
-   "threshold": 1
- }
-```
-
-Alice can still make changes to her working copy, change the canonical
-head, and make patches -- as we can see below:
-
-``` ~alice
-$ touch REQUIREMENTS
-$ git add REQUIREMENTS
-$ git commit -v -m "Define power requirements"
-[master 3e674d1] Define power requirements
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 REQUIREMENTS
-```
-
-``` ~alice (stderr) RAD_SOCKET=/dev/null
-$ git push rad master
-✓ Canonical head updated to 3e674d1a1df90807e934f9ae5da2591dd6848a33
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-   f2de534..3e674d1  master -> master
-```
-
-``` ~alice
-$ rad sync -a
-✓ Synced with 1 node(s)
-```
-
-``` ~alice
-$ git checkout -b add-readme
-$ touch README.md
-$ git add README.md
-$ git commit -v -m "Add README file"
-[add-readme 964513c] Add README file
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 README.md
-```
-
-``` ~alice (stderr) RAD_SOCKET=/dev/null
-$ git push rad HEAD:refs/patches
-✓ Patch b09b2aa0ee055671c811e9ad4ba73eed211ebaa3 opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-
-Any other seeds can also still fetch changes from Alice without any
-errors:
-
-``` ~seed
-$ rad sync rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji -f
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Fetched repository from 1 seed(s)
-```
-
-We can also inspect the repository to ensure all the data is
-consistent with the change made to the identity.
-
-The identity has the new delegate, while the `threshold` is still `1`
-
-``` ~alice
-$ rad inspect --identity
-{
-  "payload": {
-    "xyz.radicle.project": {
-      "defaultBranch": "master",
-      "description": "Radicle Heartwood Protocol & Stack",
-      "name": "heartwood"
-    }
-  },
-  "delegates": [
-    "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
-    "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
-  ],
-  "threshold": 1
-}
-```
-
-Alice only sees her refs, since she has not synced with Bob's
-references yet:
-
-``` ~alice
-$ rad inspect --refs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-└── refs
-    ├── cobs
-    │   ├── xyz.radicle.id
-    │   │   └── 0656c217f917c3e06234771e9ecae53aba5e173e
-    │   └── xyz.radicle.patch
-    │       └── b09b2aa0ee055671c811e9ad4ba73eed211ebaa3
-    ├── heads
-    │   ├── master
-    │   └── patches
-    │       └── b09b2aa0ee055671c811e9ad4ba73eed211ebaa3
-    └── rad
-        ├── id
-        └── sigrefs
-```
-
-Similarly, she still does not have Bob's `rad/sigrefs`:
-
-``` ~alice
-$ rad inspect --sigrefs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 7ffed605e4871bb0640ee1538181640e239b182c
-```
-
-And she can still list the project, without any worries:
-
-``` ~alice
-$ rad ls
-╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ Name        RID                                 Visibility   Head      Description                        │
-├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ heartwood   rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji   public       3e674d1   Radicle Heartwood Protocol & Stack │
-╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯
-```
-
-Once Bob clones the repository and creates a fork, i.e. creates a
-branch to `refs/heads/master` for this project, she can then use `rad
-sync` and fetch his references:
-
-``` ~bob
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'all'
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkux1…nVhib7Z..
-✓ Creating checkout in ./heartwood..
-✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
-✓ Remote-tracking branch alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master created for z6MknSL…StBU8Vi
-✓ Repository successfully cloned under [..]/bob/heartwood/
-╭────────────────────────────────────╮
-│ heartwood                          │
-│ Radicle Heartwood Protocol & Stack │
-│ 0 issues · 1 patches               │
-╰────────────────────────────────────╯
-Run `cd ./heartwood` to go to the repository directory.
-```
-
-``` ~bob
-$ cd heartwood
-$ rad fork
-✓ Forked repository rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-```
-
-``` ~alice
-$ rad sync -f
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkux1…nVhib7Z..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk..
-✓ Fetched repository from 2 seed(s)
-$ rad inspect --sigrefs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 7ffed605e4871bb0640ee1538181640e239b182c
-z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk cc068d93ee77dc134518d7d0fbe55b39804baf53
-```
diff --git a/radicle-cli/examples/rad-id-unknown-field.md b/radicle-cli/examples/rad-id-unknown-field.md
deleted file mode 100644
index 68657dedb..000000000
--- a/radicle-cli/examples/rad-id-unknown-field.md
+++ /dev/null
@@ -1,47 +0,0 @@
-The payloads in the identity document are extensible and arbitrary fields can be
-added. Here we will add an emoji alias for the heartwood project:
-
-```
-$ rad id update --title "Add emoji alias" --description "Adding alias field" --payload xyz.radicle.project alias '"❤️🪵"'
-✓ Identity revision 05100d3f0a73b9373681677158615a53ba51940e created
-╭────────────────────────────────────────────────────────────────────────╮
-│ Title    Add emoji alias                                               │
-│ Revision 05100d3f0a73b9373681677158615a53ba51940e                      │
-│ Blob     a0f421c928dcfc6eca129fc2ea1f50877de7dc20                      │
-│ Author   did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi      │
-│ State    accepted                                                      │
-│ Quorum   yes                                                           │
-│                                                                        │
-│ Adding alias field                                                     │
-├────────────────────────────────────────────────────────────────────────┤
-│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
-╰────────────────────────────────────────────────────────────────────────╯
-
-@@ -1,13 +1,14 @@
- {
-   "payload": {
-     "xyz.radicle.project": {
-+      "alias": "❤️🪵",
-       "defaultBranch": "master",
-       "description": "Radicle Heartwood Protocol & Stack",
-       "name": "heartwood"
-     }
-   },
-   "delegates": [
-     "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
-   ],
-   "threshold": 1
- }
-```
-
-We can see that the project payload still loads by using `rad ls` which will
-attempt to deserialize the payload:
-
-```
-$ rad ls
-╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ Name        RID                                 Visibility   Head      Description                        │
-├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ heartwood   rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji   public       f2de534   Radicle Heartwood Protocol & Stack │
-╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯
-```
diff --git a/radicle-cli/examples/rad-id-update-delete-field.md b/radicle-cli/examples/rad-id-update-delete-field.md
deleted file mode 100644
index 7f80573cb..000000000
--- a/radicle-cli/examples/rad-id-update-delete-field.md
+++ /dev/null
@@ -1,78 +0,0 @@
-Let's add a payload field and then delete it.
-
-```
-$ rad id update --title "Add field" --description "Add a new 'web' field" --payload xyz.radicle.project web '"https://acme.example"'
-✓ Identity revision a8a9fee6c4f83578ab132d375f1da0c81282bef3 created
-╭────────────────────────────────────────────────────────────────────────╮
-│ Title    Add field                                                     │
-│ Revision a8a9fee6c4f83578ab132d375f1da0c81282bef3                      │
-│ Blob     fbe268d13e60f1f3a1972e0ccd592f3cdecf08b5                      │
-│ Author   did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi      │
-│ State    accepted                                                      │
-│ Quorum   yes                                                           │
-│                                                                        │
-│ Add a new 'web' field                                                  │
-├────────────────────────────────────────────────────────────────────────┤
-│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
-╰────────────────────────────────────────────────────────────────────────╯
-
-@@ -1,13 +1,14 @@
- {
-   "payload": {
-     "xyz.radicle.project": {
-       "defaultBranch": "master",
-       "description": "Radicle Heartwood Protocol & Stack",
--      "name": "heartwood"
-+      "name": "heartwood",
-+      "web": "https://acme.example"
-     }
-   },
-   "delegates": [
-     "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
-   ],
-   "threshold": 1
- }
-```
-
-Now let's delete it by setting it to `null`.
-
-```
-$ rad id update --title "Delete field" --description "Delete 'web'" --payload xyz.radicle.project web null
-✓ Identity revision d373c35876833105f8aafed8b610660b5737cd67 created
-╭────────────────────────────────────────────────────────────────────────╮
-│ Title    Delete field                                                  │
-│ Revision d373c35876833105f8aafed8b610660b5737cd67                      │
-│ Blob     d96f425412c9f8ad5d9a9a05c9831d0728e2338d                      │
-│ Author   did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi      │
-│ State    accepted                                                      │
-│ Quorum   yes                                                           │
-│                                                                        │
-│ Delete 'web'                                                           │
-├────────────────────────────────────────────────────────────────────────┤
-│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
-╰────────────────────────────────────────────────────────────────────────╯
-
-@@ -1,14 +1,13 @@
- {
-   "payload": {
-     "xyz.radicle.project": {
-       "defaultBranch": "master",
-       "description": "Radicle Heartwood Protocol & Stack",
--      "name": "heartwood",
--      "web": "https://acme.example"
-+      "name": "heartwood"
-     }
-   },
-   "delegates": [
-     "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
-   ],
-   "threshold": 1
- }
-```
-
-Note that we cannot delete mandatory fields:
-
-``` (fails)
-$ rad id update --title "Delete default branch" --payload xyz.radicle.project defaultBranch null
-✗ Error: failed to verify `xyz.radicle.project`, json: missing field `defaultBranch`
-```
diff --git a/radicle-cli/examples/rad-id.md b/radicle-cli/examples/rad-id.md
deleted file mode 100644
index 2bc93ed89..000000000
--- a/radicle-cli/examples/rad-id.md
+++ /dev/null
@@ -1,182 +0,0 @@
-At some point in the lifetime of a Radicle project you may want to
-collaborate with someone else allowing them to become a project
-maintainer. This requires adding them as a `delegate` and possibly
-editing the `threshold` for passing new changes to the identity of the
-project.
-
-For cases where `threshold > 1`, it is necessary to gather a quorum of
-signatures to update the Radicle identity. To do this, we use the `rad id`
-command. For now, since we are the only delegate, and `treshold` is `1`, we
-can update the identity ourselves.
-
-Let's add Bob as a delegate using their DID,
-`did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk`, and update the
-threshold to `2`.
-
-```
-$ rad id update --title "Add Bob" --description "Add Bob as a delegate" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --threshold 2
-✓ Identity revision 0ca42d376bd566631083c8913cf86bec722da392 created
-╭────────────────────────────────────────────────────────────────────────╮
-│ Title    Add Bob                                                       │
-│ Revision 0ca42d376bd566631083c8913cf86bec722da392                      │
-│ Blob     053541ba7b90534b35dd8718e0ceaa408979b02b                      │
-│ Author   did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi      │
-│ State    accepted                                                      │
-│ Quorum   yes                                                           │
-│                                                                        │
-│ Add Bob as a delegate                                                  │
-├────────────────────────────────────────────────────────────────────────┤
-│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
-╰────────────────────────────────────────────────────────────────────────╯
-
-@@ -1,13 +1,14 @@
- {
-   "payload": {
-     "xyz.radicle.project": {
-       "defaultBranch": "master",
-       "description": "Radicle Heartwood Protocol & Stack",
-       "name": "heartwood"
-     }
-   },
-   "delegates": [
--    "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
-+    "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
-+    "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
-   ],
--  "threshold": 1
-+  "threshold": 2
- }
-```
-
-Before moving on, let's take a few notes on this output. The first
-thing we'll notice is that the difference between the current identity
-document and the proposed changes are shown. Specifically, we changed
-the delegates and threshold:
-
-      "delegates": [
-    -   "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
-    +   "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
-    +   "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
-      ],
-    ...
-    -  "threshold": 1
-    +  "threshold": 2
-
-Next we have the number of signatures from delegates, which includes our own:
-
-    ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-
-Finally, we can see whether the `Quorum` was reached:
-
-    Quorum   yes
-
-Since the threshold was previously `1`, this change is now in effect. We
-can verify that by listing the current identity document:
-
-```
-$ rad inspect --identity
-{
-  "payload": {
-    "xyz.radicle.project": {
-      "defaultBranch": "master",
-      "description": "Radicle Heartwood Protocol & Stack",
-      "name": "heartwood"
-    }
-  },
-  "delegates": [
-    "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
-    "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
-  ],
-  "threshold": 2
-}
-```
-
-We can also look at the document's COB directly:
-```
-$ rad cob log --object 0656c217f917c3e06234771e9ecae53aba5e173e --type xyz.radicle.id --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-commit   0ca42d376bd566631083c8913cf86bec722da392
-parent   0656c217f917c3e06234771e9ecae53aba5e173e
-author   z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-date     Thu, 15 Dec 2022 17:28:04 +0000
-
-    {
-      "blob": "053541ba7b90534b35dd8718e0ceaa408979b02b",
-      "description": "Add Bob as a delegate",
-      "parent": "0656c217f917c3e06234771e9ecae53aba5e173e",
-      "signature": "z3AyzixN2eWLtRfQWowtBXwWyRH3iJ8oJ25W6KFYFw5ANLntbzfavge15muNU6AVAUkxSxQvgg9yh2gupbUecavQY",
-      "title": "Add Bob",
-      "type": "revision"
-    }
-
-commit   0656c217f917c3e06234771e9ecae53aba5e173e
-author   z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-date     Thu, 15 Dec 2022 17:28:04 +0000
-
-    {
-      "blob": "d96f425412c9f8ad5d9a9a05c9831d0728e2338d",
-      "parent": null,
-      "signature": "z5nGqUvrmfiSyLjNCHWTWYvVMcPUZcvo9TxPKzEKXYBdSgUzbrqf1cYsmpGgbQvYunnsrLSsubEmxZaRdKM4quqQR",
-      "title": "Initial revision",
-      "type": "revision"
-    }
-
-```
-
-We can use `rad id show` to show the changes of an accepted update:
-
-```
-$ rad id show 0ca42d376bd566631083c8913cf86bec722da392
-╭────────────────────────────────────────────────────────────────────────╮
-│ Title    Add Bob                                                       │
-│ Revision 0ca42d376bd566631083c8913cf86bec722da392                      │
-│ Blob     053541ba7b90534b35dd8718e0ceaa408979b02b                      │
-│ Author   did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi      │
-│ State    accepted                                                      │
-│ Quorum   yes                                                           │
-│                                                                        │
-│ Add Bob as a delegate                                                  │
-├────────────────────────────────────────────────────────────────────────┤
-│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
-╰────────────────────────────────────────────────────────────────────────╯
-
-@@ -1,13 +1,14 @@
- {
-   "payload": {
-     "xyz.radicle.project": {
-       "defaultBranch": "master",
-       "description": "Radicle Heartwood Protocol & Stack",
-       "name": "heartwood"
-     }
-   },
-   "delegates": [
--    "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
-+    "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
-+    "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
-   ],
--  "threshold": 1
-+  "threshold": 2
- }
-```
-
-Note that once a revision is accepted, it can't be edited, redacted or otherwise
-acted upon:
-
-``` (fail)
-$ rad id redact 0ca42d376bd566631083c8913cf86bec722da392
-✗ Error: [..]
-```
-``` (fail)
-$ rad id reject 0ca42d376bd566631083c8913cf86bec722da392
-✗ Error: [..]
-```
-``` (fail)
-$ rad id accept 0ca42d376bd566631083c8913cf86bec722da392
-✗ Error: [..]
-```
-
-If no updates are specified then we are told that our command had no effect:
-
-```
-$ rad id update --title "Update canonical branch" --description "Update the canonical branch to `main`"
-Nothing to do. The document is up to date. See `rad inspect --identity`.
-```
diff --git a/radicle-cli/examples/rad-inbox.md b/radicle-cli/examples/rad-inbox.md
deleted file mode 100644
index 13a714a8c..000000000
--- a/radicle-cli/examples/rad-inbox.md
+++ /dev/null
@@ -1,140 +0,0 @@
-``` ~alice
-$ cd heartwood
-$ rad inbox
-Your inbox is empty.
-```
-
-``` ~bob
-$ cd heartwood
-$ rad issue open --title "No license file" --description "..." -q
-✓ Synced with 1 node(s)
-$ git commit -m "Change copyright" --allow-empty -q
-$ git push rad HEAD:bob/copy
-$ cd ..
-$ cd radicle-git
-$ git commit -m "Change copyright" --allow-empty -q
-$ git push rad -o patch.message="Copyright fixes" HEAD:refs/patches
-```
-
-``` ~alice
-$ rad inbox --sort-by id
-╭──────────────────────────────────────────────────────────────────────╮
-│ heartwood                                                            │
-├──────────────────────────────────────────────────────────────────────┤
-│ 001   ●   [ ... ]    No license file    issue    open      bob   now │
-│ 002   ●   bob/copy   Change copyright   branch   created   bob   now │
-╰──────────────────────────────────────────────────────────────────────╯
-```
-
-``` ~alice
-$ rad inbox --all --sort-by id
-╭────────────────────────────────────────────────────────────────╮
-│ radicle-git                                                    │
-├────────────────────────────────────────────────────────────────┤
-│ 003   ●   [ ... ]   Copyright fixes   patch   open   bob   now │
-╰────────────────────────────────────────────────────────────────╯
-╭──────────────────────────────────────────────────────────────────────╮
-│ heartwood                                                            │
-├──────────────────────────────────────────────────────────────────────┤
-│ 001   ●   [ ... ]    No license file    issue    open      bob   now │
-│ 002   ●   bob/copy   Change copyright   branch   created   bob   now │
-╰──────────────────────────────────────────────────────────────────────╯
-```
-
-``` ~alice
-$ rad inbox show 2
-commit 141c9073066e3910f1dfe356904a0120542e1cc9
-Author: radicle <radicle@localhost>
-Date:   Thu Dec 15 17:28:04 2022 +0000
-
-    Change copyright
-
-commit f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
-Author: anonymous <anonymous@radicle.xyz>
-Date:   Mon Jan 1 14:39:16 2018 +0000
-
-    Second commit
-
-commit 08c788dd1be6315de09e3fe09b5b1b7a2b8711d9
-Author: anonymous <anonymous@radicle.xyz>
-Date:   Mon Jan 1 14:39:16 2018 +0000
-
-    Initial commit
-```
-
-``` ~alice
-$ rad inbox list --sort-by id
-╭──────────────────────────────────────────────────────────────────────╮
-│ heartwood                                                            │
-├──────────────────────────────────────────────────────────────────────┤
-│ 001   ●   [ ... ]    No license file    issue    open      bob   now │
-│ 002       bob/copy   Change copyright   branch   created   bob   now │
-╰──────────────────────────────────────────────────────────────────────╯
-```
-
-``` ~alice
-$ rad inbox show 1
-╭──────────────────────────────────────────────────╮
-│ Title   No license file                          │
-│ Issue   [ ...                                  ] │
-│ Author  bob z6Mkt67…v4N1tRk                      │
-│ Status  open                                     │
-│                                                  │
-│ ...                                              │
-╰──────────────────────────────────────────────────╯
-```
-
-``` ~alice
-$ rad inbox clear 1 2
-✓ Cleared 2 item(s) from your inbox
-$ rad inbox
-Your inbox is empty.
-$ rad inbox --all
-╭────────────────────────────────────────────────────────────────╮
-│ radicle-git                                                    │
-├────────────────────────────────────────────────────────────────┤
-│ 003   ●   [ ... ]   Copyright fixes   patch   open   bob   now │
-╰────────────────────────────────────────────────────────────────╯
-```
-
-``` ~alice
-$ rad inbox clear --all
-✓ Cleared 1 item(s) from your inbox
-```
-
-``` ~alice
-$ rad inbox clear --all
-Your inbox is empty.
-```
-
-Now let's do an identity update.
-
-``` ~alice
-$ rad id update --title "Modify description" --description "Use website" --payload xyz.radicle.project description '"https://radicle.xyz"' -q
-[..]
-$ rad sync -a
-✓ Synced with 1 node(s)
-```
-
-``` ~bob
-$ rad inbox --all
-╭──────────────────────────────────────────────────────────────────────╮
-│ heartwood                                                            │
-├──────────────────────────────────────────────────────────────────────┤
-│ 001   ●   [ ... ]   Modify description   id   accepted   alice   now │
-╰──────────────────────────────────────────────────────────────────────╯
-$ rad inbox show 1
-{
-  "payload": {
-    "xyz.radicle.project": {
-      "defaultBranch": "master",
-      "description": "https://radicle.xyz",
-      "name": "heartwood"
-    }
-  },
-  "delegates": [
-    "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
-  ],
-  "threshold": 1
-}
-```
diff --git a/radicle-cli/examples/rad-init-existing.md b/radicle-cli/examples/rad-init-existing.md
deleted file mode 100644
index a9bf5879b..000000000
--- a/radicle-cli/examples/rad-init-existing.md
+++ /dev/null
@@ -1,40 +0,0 @@
-Let's clone a regular repository via plain Git:
-```
-$ git clone $URL heartwood
-$ cd heartwood
-$ git rev-parse HEAD
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
-```
-
-We can see it's not a Radicle working copy:
-``` (fail)
-$ rad .
-✗ Error: Current directory is not a Radicle repository
-```
-
-Let's pick an existing repository:
-```
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-```
-
-And initialize this working copy as that existing repository:
-```
-$ rad init --existing rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Initialized existing repository rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji in [..]/heartwood/..
-```
-
-We can confirm that the working copy is initialized:
-```
-$ rad .
-rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-$ git remote show rad
-* remote rad
-  Fetch URL: rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-  Push  URL: rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-  HEAD branch: (unknown)
-  Remote branch:
-    master new (next fetch will store in remotes/rad)
-  Local ref configured for 'git push':
-    master pushes to master (up to date)
-```
diff --git a/radicle-cli/examples/rad-init-no-git.md b/radicle-cli/examples/rad-init-no-git.md
deleted file mode 100644
index 505c426a8..000000000
--- a/radicle-cli/examples/rad-init-no-git.md
+++ /dev/null
@@ -1,22 +0,0 @@
-If you try to `init` from a directory that doesn't contain a Git repository,
-it will fail:
-
-``` (fail)
-$ rad init
-✗ Error: a Git repository was not found at the given path
-```
-
-Ok so let's initialize one.
-
-```
-$ git init -q
-```
-
-Now we try again.
-
-``` (fail)
-$ rad init
-✗ Error: repository head must point to a commit
-```
-
-Looks like we need a commit.
diff --git a/radicle-cli/examples/rad-init-no-seed.md b/radicle-cli/examples/rad-init-no-seed.md
deleted file mode 100644
index 0597b3ccc..000000000
--- a/radicle-cli/examples/rad-init-no-seed.md
+++ /dev/null
@@ -1,29 +0,0 @@
-If we initialize a public repository without seeding it, it won't be advertized:
-```
-$ rad init --name heartwood --description "radicle heartwood protocol & stack" --no-confirm --public --no-seed
-
-Initializing public radicle 👾 repository in [..]
-
-✓ Repository heartwood created.
-
-Your Repository ID (RID) is rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK.
-You can show it any time by running `rad .` from this directory.
-
-Your repository will be announced to the network when you start your node.
-You can start your node with `rad node start`.
-To push changes, run `git push`.
-```
-```
-$ rad node inventory
-```
-
-If we then seed it, it becomes advertized in our inventory:
-```
-$ rad seed rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK
-✓ Inventory updated with rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK
-✓ Seeding policy updated for rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK with scope 'all'
-```
-```
-$ rad node inventory
-rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK
-```
diff --git a/radicle-cli/examples/rad-init-private-clone-seed.md b/radicle-cli/examples/rad-init-private-clone-seed.md
deleted file mode 100644
index 1094892a2..000000000
--- a/radicle-cli/examples/rad-init-private-clone-seed.md
+++ /dev/null
@@ -1,53 +0,0 @@
-Given a private repo `rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu` belonging to Alice,
-Alice allows Bob to fetch it, and Bob, without the updated identity document
-is able to fetch it by specifiying Alice as a seed.
-
-``` ~alice
-$ rad id update --title "Allow Bob" --description "" --allow did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk -q
-...
-$ rad inspect --identity
-{
-  "payload": {
-    "xyz.radicle.project": {
-      "defaultBranch": "master",
-      "description": "radicle heartwood protocol & stack",
-      "name": "heartwood"
-    }
-  },
-  "delegates": [
-    "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
-  ],
-  "threshold": 1,
-  "visibility": {
-    "type": "private",
-    "allow": [
-      "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
-    ]
-  }
-}
-```
-
-``` ~bob
-$ rad ls --all --private
-$ rad clone rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu --seed z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --timeout 1
-✓ Seeding policy updated for rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu with scope 'all'
-✓ Fetching rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu from z6MknSL…StBU8Vi..
-✓ Creating checkout in ./heartwood..
-✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
-✓ Remote-tracking branch alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master created for z6MknSL…StBU8Vi
-✓ Repository successfully cloned under [...]/.radicle/heartwood/
-╭────────────────────────────────────╮
-│ heartwood                          │
-│ radicle heartwood protocol & stack │
-│ 0 issues · 0 patches               │
-╰────────────────────────────────────╯
-Run `cd ./heartwood` to go to the repository directory.
-```
-
-We can also use `rad seed` to seed and fetch without creating a checkout.
-
-``` ~bob
-$ rad seed rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu --from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --timeout 1
-✓ Seeding policy exists for rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu with scope 'all'
-✓ Fetching rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu from z6MknSL…StBU8Vi..
-```
diff --git a/radicle-cli/examples/rad-init-private-clone.md b/radicle-cli/examples/rad-init-private-clone.md
deleted file mode 100644
index fe57bcfc6..000000000
--- a/radicle-cli/examples/rad-init-private-clone.md
+++ /dev/null
@@ -1,44 +0,0 @@
-Given a private repo `rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu` belonging to Alice,
-Bob tries to fetch it, and even though he's connected to Alice, it fails.
-
-``` ~bob
-$ rad ls
-```
-``` ~bob (fail)
-$ rad clone rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu --seed z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --timeout 1
-✓ Seeding policy updated for rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu with scope 'all'
-✗ Fetching rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu from z6MknSL…StBU8Vi.. error: failed to perform fetch handshake
-✗ Error: repository rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu not found
-```
-
-She allows Bob to view the repository. And when she syncs, one node (Bob) gets
-the refs.
-
-``` ~alice
-$ rad id update --title "Allow Bob" --description "" --allow did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk -q
-...
-$ rad sync --announce --timeout 3
-✓ Synced with 1 node(s)
-```
-
-Bob can now fetch the private repo without specifying a seed, because he knows
-that Alice has the repo after she announced her refs:
-
-``` ~bob
-$ rad sync rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu --fetch
-✓ Fetching rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu from z6MknSL…StBU8Vi..
-✓ Fetched repository from 1 seed(s)
-$ rad ls --private --all
-╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ Name        RID                                 Visibility   Head      Description                        │
-├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ heartwood   rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu   private      f2de534   radicle heartwood protocol & stack │
-╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯
-```
-
-Note that since we don't have our own fork of this repo, omitting the `--all` flag shows nothing:
-
-``` ~bob
-$ rad ls --private
-Nothing to show.
-```
diff --git a/radicle-cli/examples/rad-init-private-no-seed.md b/radicle-cli/examples/rad-init-private-no-seed.md
deleted file mode 100644
index 9b3bd246b..000000000
--- a/radicle-cli/examples/rad-init-private-no-seed.md
+++ /dev/null
@@ -1,37 +0,0 @@
-Let's say we initialize a private repository and specify that we don't want it
-to be seeded. This means that the repo will be available locally, to us,
-and even if other peers know about it, they won't be able to fetch it
-from us.
-```
-$ rad init --name heartwood --description "radicle heartwood protocol & stack" --no-confirm --private --no-seed
-
-Initializing private radicle 👾 repository in [..]
-
-✓ Repository heartwood created.
-
-Your Repository ID (RID) is rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu.
-You can show it any time by running `rad .` from this directory.
-
-You have created a private repository.
-This repository will only be visible to you, and to peers you explicitly allow.
-
-To make it public, run `rad publish`.
-To push changes, run `git push`.
-```
-
-```
-$ rad seed
-No seeding policies to show.
-```
-
-We can decide to seed it later, so that others can fetch it from us, given
-that they are part of the allow list:
-```
-$ rad seed rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu
-✓ Seeding policy updated for rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu with scope 'all'
-```
-
-But it still won't show up in our inventory, since it's private:
-```
-$ rad node inventory
-```
diff --git a/radicle-cli/examples/rad-init-private-seed.md b/radicle-cli/examples/rad-init-private-seed.md
deleted file mode 100644
index 0300facaf..000000000
--- a/radicle-cli/examples/rad-init-private-seed.md
+++ /dev/null
@@ -1,48 +0,0 @@
-Alice allows Bob to fetch this repo, but doesn't announce it, which means
-that Bob needs to know to fetch it from Alice.
-
-``` ~alice
-$ rad id update --title "Allow Bob" --description "" --allow did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk -q
-[..]
-```
-
-First, Bob seeds the repo.
-
-``` ~bob
-$ rad seed rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu --no-fetch
-[..]
-```
-
-If Bob just tries to fetch it without specifying seeds, he gets an error:
-
-``` ~bob
-$ rad sync rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu --fetch
-✗ Error: no seeds found for rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu
-```
-
-He has to specify a seed that isn't in his routing table:
-
-``` ~bob
-$ rad sync rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu --fetch --seed z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-✓ Fetching rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu from z6MknSL…StBU8Vi..
-✓ Fetched repository from 1 seed(s)
-```
-
-``` ~bob
-$ rad ls --private --all
-╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ Name        RID                                 Visibility   Head      Description                        │
-├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ heartwood   rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu   private      f2de534   radicle heartwood protocol & stack │
-╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯
-```
-
-Note that if multiple seeds are specified, the command succeeds as long as one
-seed succeeds.
-
-``` ~bob
-$ rad sync rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu --fetch --seed z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --seed z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx
-✓ Fetching rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu from z6MknSL…StBU8Vi..
-✗ Fetching rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu from z6MkwPU…Ug2mVvx.. error: peer is not connected; cannot initiate fetch
-✓ Fetched repository from 1 seed(s)
-```
diff --git a/radicle-cli/examples/rad-init-private.md b/radicle-cli/examples/rad-init-private.md
deleted file mode 100644
index 02654415b..000000000
--- a/radicle-cli/examples/rad-init-private.md
+++ /dev/null
@@ -1,30 +0,0 @@
-Alice can initialize a *private* repo using the `--private` flag.
-
-```
-$ rad init --name heartwood --description "radicle heartwood protocol & stack" --no-confirm --private
-
-Initializing private radicle 👾 repository in [..]
-
-✓ Repository heartwood created.
-
-Your Repository ID (RID) is rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu.
-You can show it any time by running `rad .` from this directory.
-
-You have created a private repository.
-This repository will only be visible to you, and to peers you explicitly allow.
-
-To make it public, run `rad publish`.
-To push changes, run `git push`.
-```
-
-The repository does not show up in our inventory, since it is not advertized,
-despite being seeded:
-```
-$ rad node inventory
-$ rad seed
-╭────────────────────────────────────────────────────────────────╮
-│ Repository                          Name        Policy   Scope │
-├────────────────────────────────────────────────────────────────┤
-│ rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu   heartwood   allow    all   │
-╰────────────────────────────────────────────────────────────────╯
-```
diff --git a/radicle-cli/examples/rad-init-sync-not-connected.md b/radicle-cli/examples/rad-init-sync-not-connected.md
deleted file mode 100644
index a2a7d830f..000000000
--- a/radicle-cli/examples/rad-init-sync-not-connected.md
+++ /dev/null
@@ -1,19 +0,0 @@
-When initializing a repository without any peer connections, we get this output:
-
-```
-$ rad init --name heartwood --description "Radicle Heartwood Protocol & Stack" --no-confirm --public --scope followed
-
-Initializing public radicle 👾 repository in [..]
-
-✓ Repository heartwood created.
-
-Your Repository ID (RID) is rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji.
-You can show it any time by running `rad .` from this directory.
-
-✗ Announcing.. <canceled>
-
-You are not connected to any peers. Your repository will be announced as soon as your node establishes a connection with the network.
-Check for peer connections with `rad node status`.
-
-To push changes, run `git push`.
-```
diff --git a/radicle-cli/examples/rad-init-sync-preferred.md b/radicle-cli/examples/rad-init-sync-preferred.md
deleted file mode 100644
index 7698ccc54..000000000
--- a/radicle-cli/examples/rad-init-sync-preferred.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Let's try initializing a new repository with a preferred seed configured.
-
-```
-$ rad init --name heartwood --description "Radicle Heartwood Protocol & Stack" --no-confirm --public --scope followed
-
-Initializing public radicle 👾 repository in [..]
-
-✓ Repository heartwood created.
-
-Your Repository ID (RID) is rad:z3Rry7rpdWuGpfjPYGzdJKQADsoNW.
-You can show it any time by running `rad .` from this directory.
-
-✓ Repository successfully synced to z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-✓ Repository successfully synced to 1 node(s).
-
-Your repository has been synced to the network and is now discoverable by peers.
-View it in your browser at:
-
-    https://app.radicle.xyz/nodes/[...]/rad:z3Rry7rpdWuGpfjPYGzdJKQADsoNW
-
-To push changes, run `git push`.
-```
diff --git a/radicle-cli/examples/rad-init-sync-timeout.md b/radicle-cli/examples/rad-init-sync-timeout.md
deleted file mode 100644
index 911dc2627..000000000
--- a/radicle-cli/examples/rad-init-sync-timeout.md
+++ /dev/null
@@ -1,20 +0,0 @@
-Sometimes, `init` will fail to sync with the network. This is not a big deal,
-as the node will keep attempting to sync in the background.
-
-```
-$ rad init --name heartwood --description "Radicle Heartwood Protocol & Stack" --no-confirm --public --scope followed
-
-Initializing public radicle 👾 repository in [..]
-
-✓ Repository heartwood created.
-
-Your Repository ID (RID) is rad:z3Rry7rpdWuGpfjPYGzdJKQADsoNW.
-You can show it any time by running `rad .` from this directory.
-
-✓ Repository successfully announced to the network.
-
-Your repository has been announced to the network and is now discoverable by peers.
-You can check for any nodes that have replicated your repository by running `rad sync status`.
-
-To push changes, run `git push`.
-```
diff --git a/radicle-cli/examples/rad-init-sync.md b/radicle-cli/examples/rad-init-sync.md
deleted file mode 100644
index 0a9aa4134..000000000
--- a/radicle-cli/examples/rad-init-sync.md
+++ /dev/null
@@ -1,21 +0,0 @@
-
-To create your first radicle repository, navigate to a git repository, and run
-the `init` command:
-
-```
-$ rad init --name heartwood --description "Radicle Heartwood Protocol & Stack" --no-confirm --public --scope followed
-
-Initializing public radicle 👾 repository in [..]
-
-✓ Repository heartwood created.
-
-Your Repository ID (RID) is rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji.
-You can show it any time by running `rad .` from this directory.
-
-✓ Repository successfully announced to the network.
-
-Your repository has been announced to the network and is now discoverable by peers.
-You can check for any nodes that have replicated your repository by running `rad sync status`.
-
-To push changes, run `git push`.
-```
diff --git a/radicle-cli/examples/rad-init-with-existing-remote.md b/radicle-cli/examples/rad-init-with-existing-remote.md
deleted file mode 100644
index 323860367..000000000
--- a/radicle-cli/examples/rad-init-with-existing-remote.md
+++ /dev/null
@@ -1,42 +0,0 @@
-Let's try to `rad init` a repo which already has a remote tracking branch for `master`.
-
-First we have to create a valid remote repository.
-
-```
-$ git init --bare remote
-Initialized empty Git repository in [..]
-```
-
-Then we add it as a remote.
-
-```
-$ git remote add origin file://$PWD/remote
-$ git push -u origin master:master
-...
-$ git branch -vv
-* master f2de534 [origin/master] Second commit
-```
-
-Then we initialize.
-
-```
-$ rad init --name heartwood --description "Heartwood Protocol & Stack" --no-confirm --public
-
-Initializing public radicle 👾 repository in [..]
-
-✓ Repository heartwood created.
-
-Your Repository ID (RID) is rad:z2D6wQnKapY7dn5meBnbH2rUKNZbT.
-You can show it any time by running `rad .` from this directory.
-
-Your repository will be announced to the network when you start your node.
-You can start your node with `rad node start`.
-To push changes, run `git push rad master`.
-```
-
-Finally we run the suggested command.
-
-``` (stderr)
-$ git push rad master
-Everything up-to-date
-```
diff --git a/radicle-cli/examples/rad-init.md b/radicle-cli/examples/rad-init.md
deleted file mode 100644
index f2eef99b1..000000000
--- a/radicle-cli/examples/rad-init.md
+++ /dev/null
@@ -1,48 +0,0 @@
-
-To create your first radicle repository, navigate to a git repository, and run the
-`init` command.  Make sure you have [authenticated](../rad-auth.md) beforehand.
-
-```
-$ rad init --name heartwood --description "Radicle Heartwood Protocol & Stack" --no-confirm --public -v
-
-Initializing public radicle 👾 repository in [..]
-
-✓ Repository heartwood created.
-{
-  "name": "heartwood",
-  "description": "Radicle Heartwood Protocol & Stack",
-  "defaultBranch": "master"
-}
-
-Your Repository ID (RID) is rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji.
-You can show it any time by running `rad .` from this directory.
-
-Your repository will be announced to the network when you start your node.
-You can start your node with `rad node start`.
-To push changes, run `git push`.
-```
-
-If we try to initialize it again, we get an error:
-
-``` (fail)
-$ rad init
-✗ Error: repository is already initialized with remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-```
-
-Repositories can be listed with the `ls` command:
-
-```
-$ rad ls
-╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ Name        RID                                 Visibility   Head      Description                        │
-├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ heartwood   rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji   public       f2de534   Radicle Heartwood Protocol & Stack │
-╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯
-```
-
-Public repositories are added to our inventory:
-
-```
-$ rad node inventory
-rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-```
diff --git a/radicle-cli/examples/rad-inspect-noauth.md b/radicle-cli/examples/rad-inspect-noauth.md
deleted file mode 100644
index 212784906..000000000
--- a/radicle-cli/examples/rad-inspect-noauth.md
+++ /dev/null
@@ -1,12 +0,0 @@
-The `rad inspect` command can be run without being authenticated with radicle:
-
-``` (fail)
-$ rad self
-✗ Error: Radicle profile not found in '[..]'.
-✗ Hint: To setup your radicle profile, run `rad auth`.
-```
-
-```
-$ rad inspect
-rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-```
diff --git a/radicle-cli/examples/rad-inspect.md b/radicle-cli/examples/rad-inspect.md
deleted file mode 100644
index 548e5711d..000000000
--- a/radicle-cli/examples/rad-inspect.md
+++ /dev/null
@@ -1,82 +0,0 @@
-To display a repository's identifier, or *RID*, you may use the `rad inspect`
-command from inside a working copy:
-
-```
-$ rad inspect
-rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-```
-
-As a shorthand, you can also simply use `rad .`:
-
-```
-$ rad .
-rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-```
-
-It's also possible to display all of the repository's git references:
-
-```
-$ rad inspect --refs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-└── refs
-    ├── cobs
-    │   └── xyz.radicle.id
-    │       └── 0656c217f917c3e06234771e9ecae53aba5e173e
-    ├── heads
-    │   └── master
-    └── rad
-        ├── id
-        └── sigrefs
-```
-
-And sigrefs:
-
-```
-$ rad inspect --sigrefs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi f209c9f68aa689af24220a20462e13ee9dfb2a95
-```
-
-Or display the repository identity's payload and delegates:
-
-```
-$ rad inspect --payload
-{
-  "xyz.radicle.project": {
-    "defaultBranch": "master",
-    "description": "Radicle Heartwood Protocol & Stack",
-    "name": "heartwood"
-  }
-}
-$ rad inspect --delegates
-did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (alice)
-```
-
-Finally, the `--history` flag allows you to examine the identity document's
-history:
-
-```
-$ rad inspect --history
-commit 0656c217f917c3e06234771e9ecae53aba5e173e
-blob   d96f425412c9f8ad5d9a9a05c9831d0728e2338d
-date   Thu, 15 Dec 2022 17:28:04 +0000
-
-    Initialize identity
-
- {
-   "payload": {
-     "xyz.radicle.project": {
-       "defaultBranch": "master",
-       "description": "Radicle Heartwood Protocol & Stack",
-       "name": "heartwood"
-     }
-   },
-   "delegates": [
-     "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
-   ],
-   "threshold": 1
- }
-
-```
-
-The identity document is the metadata associated with a repository, that is
-only changeable by delegates.
diff --git a/radicle-cli/examples/rad-issue.md b/radicle-cli/examples/rad-issue.md
deleted file mode 100644
index 21e237230..000000000
--- a/radicle-cli/examples/rad-issue.md
+++ /dev/null
@@ -1,106 +0,0 @@
-Project 'todo' items are called 'issue's.  They can be inspected and modified
-using the 'issue' subcommand.
-
-Let's say the new car you are designing with your peers has a problem with its flux capacitor.
-
-```
-$ rad issue open --title "flux capacitor underpowered" --description "Flux capacitor power requirements exceed current supply" --no-announce
-╭─────────────────────────────────────────────────────────╮
-│ Title   flux capacitor underpowered                     │
-│ Issue   d87dcfe8c2b3200e78b128d9b959cfdf7063fefe        │
-│ Author  alice (you)                                     │
-│ Status  open                                            │
-│                                                         │
-│ Flux capacitor power requirements exceed current supply │
-╰─────────────────────────────────────────────────────────╯
-```
-
-The issue is now listed under our project.
-
-```
-$ rad issue list
-╭──────────────────────────────────────────────────────────────────────────────────────────╮
-│ ●   ID        Title                         Author           Labels   Assignees   Opened │
-├──────────────────────────────────────────────────────────────────────────────────────────┤
-│ ●   d87dcfe   flux capacitor underpowered   alice    (you)                        now    │
-╰──────────────────────────────────────────────────────────────────────────────────────────╯
-```
-
-Show the issue information issue.
-
-```
-$ rad issue show d87dcfe
-╭─────────────────────────────────────────────────────────╮
-│ Title   flux capacitor underpowered                     │
-│ Issue   d87dcfe8c2b3200e78b128d9b959cfdf7063fefe        │
-│ Author  alice (you)                                     │
-│ Status  open                                            │
-│                                                         │
-│ Flux capacitor power requirements exceed current supply │
-╰─────────────────────────────────────────────────────────╯
-```
-
-
-Great! Now we've documented the issue for ourselves and others.
-
-Just like with other project management systems, the issue can be
-labeled and assigned to others to work on. This is to ensure work is
-not duplicated.
-
-Let's assign ourselves to this one, this is to ensure work is not
-duplicated. While we're at it, let's add a label.
-
-```
-$ rad issue assign d87dcfe --add did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --no-announce
-$ rad issue label d87dcfe --add good-first-issue --no-announce
-```
-
-It will now show in the list of issues assigned to us, along with the new label.
-
-```
-$ rad issue list --assigned
-╭────────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ ●   ID        Title                         Author           Labels             Assignees   Opened │
-├────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ●   d87dcfe   flux capacitor underpowered   alice    (you)   good-first-issue   alice       now    │
-╰────────────────────────────────────────────────────────────────────────────────────────────────────╯
-```
-
-Note: this can always be undone with the `unassign` subcommand.
-
-```
-$ rad issue assign d87dcfe --delete did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --no-announce
-```
-
-Great, now we have communicated to the world about our car's defect.
-
-But wait! We've found an important detail about the car's power requirements.
-It will help whoever works on a fix.
-
-```
-$ rad issue comment d87dcfe8c2b3200e78b128d9b959cfdf7063fefe --message 'The flux capacitor needs 1.21 Gigawatts' -q --no-announce
-2193e871916d18ddd0416b5198cb08c5dc7416b7
-$ rad issue comment d87dcfe8c2b3200e78b128d9b959cfdf7063fefe --reply-to 2193e871916d18ddd0416b5198cb08c5dc7416b7 --message 'More power!' -q --no-announce
-880fdcd94b36e412fc906b510f41008700d65424
-```
-
-We can see our comments by showing the issue:
-
-```
-$ rad issue show d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
-╭─────────────────────────────────────────────────────────╮
-│ Title   flux capacitor underpowered                     │
-│ Issue   d87dcfe8c2b3200e78b128d9b959cfdf7063fefe        │
-│ Author  alice (you)                                     │
-│ Labels  good-first-issue                                │
-│ Status  open                                            │
-│                                                         │
-│ Flux capacitor power requirements exceed current supply │
-├─────────────────────────────────────────────────────────┤
-│ alice (you) now 2193e87                                 │
-│ The flux capacitor needs 1.21 Gigawatts                 │
-├─────────────────────────────────────────────────────────┤
-│ alice (you) now 880fdcd                                 │
-│ More power!                                             │
-╰─────────────────────────────────────────────────────────╯
-```
diff --git a/radicle-cli/examples/rad-merge-after-update.md b/radicle-cli/examples/rad-merge-after-update.md
deleted file mode 100644
index 0fe08a2a3..000000000
--- a/radicle-cli/examples/rad-merge-after-update.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Let's start by creating a patch.
-
-``` (stderr) RAD_SOCKET=/dev/null
-$ git checkout -b feature/1 -q
-$ git commit --allow-empty -q -m "First change"
-$ git push rad HEAD:refs/patches
-✓ Patch 696ec5508494692899337afe6713fe1796d0315c opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-
-Then let's update the code and merge the updated code without updating the patch:
-
-``` (stderr) RAD_SOCKET=/dev/null
-$ git commit --amend --allow-empty -q -m "Amended change"
-$ git checkout master -q
-$ git merge feature/1 -q
-$ git push rad master
-✓ Canonical head updated to 954bcdb5008447ce294a61a21d7eb87afbe7f4a6
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-   f2de534..954bcdb  master -> master
-```
-
-As we can see, no patch is merged. Now if we go back to our patch and try to
-update it, we expect it to be updated and merged:
-
-``` (stderr) RAD_SOCKET=/dev/null
-$ git checkout feature/1 -q
-$ git push -f
-✓ Patch 696ec55 updated to revision [...]
-✓ Patch 696ec5508494692899337afe6713fe1796d0315c merged
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- + 20aa5dd...954bcdb feature/1 -> patches/696ec5508494692899337afe6713fe1796d0315c (forced update)
-```
diff --git a/radicle-cli/examples/rad-merge-no-ff.md b/radicle-cli/examples/rad-merge-no-ff.md
deleted file mode 100644
index f6de66bcb..000000000
--- a/radicle-cli/examples/rad-merge-no-ff.md
+++ /dev/null
@@ -1,43 +0,0 @@
-Let's test that merge commits are handled properly in the context of patches.
-First, let's create a patch.
-``` (stderr) RAD_SOCKET=/dev/null
-$ git checkout -b feature/1 -q
-$ git commit --allow-empty -q -m "First change"
-$ git push rad HEAD:refs/patches
-✓ Patch 696ec5508494692899337afe6713fe1796d0315c opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-
-Then let's update the master branch so that merging the patch would create a merge commit.
-```
-$ git checkout master -q
-$ git commit --amend --allow-empty -q -m "Concurrent change"
-$ git rev-parse HEAD
-f65977beef04fcc5cd5395feed7ff4c37cd90a2f
-```
-
-Now let's merge the patch, creating a merge commit. We can see that one of the
-parents is the patch head.
-```
-$ git merge feature/1 -q --no-ff
-$ git show --format=raw HEAD
-commit 737a10cfa29111afeb0d43cf3545cee386b939ec
-tree b4eecafa9be2f2006ce1b709d6857b07069b4608
-parent f65977beef04fcc5cd5395feed7ff4c37cd90a2f
-parent 20aa5dde6210796c3a2f04079b42316a31d02689
-author radicle <radicle@localhost> 1671125284 +0000
-committer radicle <radicle@localhost> 1671125284 +0000
-
-    Merge branch 'feature/1'
-
-```
-
-Finally, we push master and expect the patch to be merged.
-``` (stderr) RAD_SOCKET=/dev/null
-$ git push rad master
-✓ Patch 696ec5508494692899337afe6713fe1796d0315c merged
-✓ Canonical head updated to 737a10cfa29111afeb0d43cf3545cee386b939ec
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-   f2de534..737a10c  master -> master
-```
diff --git a/radicle-cli/examples/rad-merge-via-push.md b/radicle-cli/examples/rad-merge-via-push.md
deleted file mode 100644
index c79272296..000000000
--- a/radicle-cli/examples/rad-merge-via-push.md
+++ /dev/null
@@ -1,119 +0,0 @@
-Let's start by creating two patches.
-
-``` (stderr) RAD_SOCKET=/dev/null
-$ git checkout -b feature/1 -q
-$ git commit --allow-empty -q -m "First change"
-$ git push rad HEAD:refs/patches
-✓ Patch 696ec5508494692899337afe6713fe1796d0315c opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-``` (stderr) RAD_SOCKET=/dev/null
-$ git checkout -b feature/2 -q master
-$ git commit --allow-empty -q -m "Second change"
-$ git push rad HEAD:refs/patches
-✓ Patch 356f73863a8920455ff6e77cd9c805d68910551b opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-
-This creates some remote tracking branches for us:
-
-```
-$ git branch -r
-  rad/master
-  rad/patches/356f73863a8920455ff6e77cd9c805d68910551b
-  rad/patches/696ec5508494692899337afe6713fe1796d0315c
-```
-
-And some remote refs:
-
-```
-$ rad inspect --refs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-└── refs
-    ├── cobs
-    │   ├── xyz.radicle.id
-    │   │   └── 0656c217f917c3e06234771e9ecae53aba5e173e
-    │   └── xyz.radicle.patch
-    │       ├── 356f73863a8920455ff6e77cd9c805d68910551b
-    │       └── 696ec5508494692899337afe6713fe1796d0315c
-    ├── heads
-    │   ├── master
-    │   └── patches
-    │       ├── 356f73863a8920455ff6e77cd9c805d68910551b
-    │       └── 696ec5508494692899337afe6713fe1796d0315c
-    └── rad
-        ├── id
-        └── sigrefs
-```
-
-Then let's merge the changes into `master`.
-
-``` (stderr) RAD_SOCKET=/dev/null
-$ git checkout master
-Switched to branch 'master'
-$ git merge feature/1
-$ git merge feature/2
-```
-
-When we push to `rad/master`, we automatically merge the patches:
-
-``` (stderr) RAD_SOCKET=/dev/null
-$ git push rad master
-✓ Patch 356f73863a8920455ff6e77cd9c805d68910551b merged
-✓ Patch 696ec5508494692899337afe6713fe1796d0315c merged
-✓ Canonical head updated to d6399c71702b40bae00825b3c444478d06b4e91c
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-   f2de534..d6399c7  master -> master
-```
-```
-$ rad patch --merged
-╭─────────────────────────────────────────────────────────────────────────────╮
-│ ●  ID       Title          Author         Reviews  Head     +   -   Updated │
-├─────────────────────────────────────────────────────────────────────────────┤
-│ ✔  [ ... ]  Second change  alice   (you)  -        daf349f  +0  -0  now     │
-│ ✔  [ ... ]  First change   alice   (you)  -        20aa5dd  +0  -0  now     │
-╰─────────────────────────────────────────────────────────────────────────────╯
-$ rad patch show 356f73863a8920455ff6e77cd9c805d68910551b
-╭────────────────────────────────────────────────────────────────╮
-│ Title     Second change                                        │
-│ Patch     356f73863a8920455ff6e77cd9c805d68910551b             │
-│ Author    alice (you)                                          │
-│ Head      daf349ff76bedf48c5f292290b682ee7be0683cf             │
-│ Branches  feature/2                                            │
-│ Commits   ahead 0, behind 2                                    │
-│ Status    merged                                               │
-├────────────────────────────────────────────────────────────────┤
-│ daf349f Second change                                          │
-├────────────────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (daf349f) now                          │
-│   └─ ✓ merged by alice (you) at revision 356f738 (d6399c7) now │
-╰────────────────────────────────────────────────────────────────╯
-```
-
-We can verify that the remote tracking branches were also deleted:
-
-```
-$ git branch -r
-  rad/master
-```
-
-And so were the remote branches:
-
-```
-$ rad inspect --refs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-└── refs
-    ├── cobs
-    │   ├── xyz.radicle.id
-    │   │   └── 0656c217f917c3e06234771e9ecae53aba5e173e
-    │   └── xyz.radicle.patch
-    │       ├── 356f73863a8920455ff6e77cd9c805d68910551b
-    │       └── 696ec5508494692899337afe6713fe1796d0315c
-    ├── heads
-    │   └── master
-    └── rad
-        ├── id
-        └── sigrefs
-```
diff --git a/radicle-cli/examples/rad-node.md b/radicle-cli/examples/rad-node.md
deleted file mode 100644
index 8a0ec5f2d..000000000
--- a/radicle-cli/examples/rad-node.md
+++ /dev/null
@@ -1,132 +0,0 @@
-The radicle node is our daemon friend that is running as a background
-process. It allows us to interact with the network as well as storing
-some key data that we may be interested in.
-
-If the node is not running we can start it by using the `rad node
-start` command:
-
-```
-$ rad node start
-✓ Node is already running.
-```
-
-We can confirm the status of the node at any time by using the `rad
-node status` command (or just `rad node` for short):
-
-```
-$ rad node status
-✓ Node is running and listening on [..].
-```
-
-```
-$ rad node config --addresses
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi@41.12.98.112:8776
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi@seed.cloudhead.io:8776
-```
-
-The node also allows us to query data that it has access to such as
-the follow policies and the routing table. Before we explore
-those commands we'll first follow a peer so that we have something to
-see.
-
-```
-$ rad follow did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --alias Bob
-✓ Follow policy updated for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (Bob)
-```
-
-Now, when we use the `rad seed` command we will see information for
-repositories that we seed -- in this case a repository that was already
-created:
-
-```
-$ rad seed
-╭───────────────────────────────────────────────────────────────────╮
-│ Repository                          Name        Policy   Scope    │
-├───────────────────────────────────────────────────────────────────┤
-│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji   heartwood   allow    followed │
-╰───────────────────────────────────────────────────────────────────╯
-```
-
-If we wish to see which nodes we are following:
-
-```
-$ rad follow
-╭───────────────────────────────────────────────────────────────────────────╮
-│ DID                                                        Alias   Policy │
-├───────────────────────────────────────────────────────────────────────────┤
-│ did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk   Bob     allow  │
-╰───────────────────────────────────────────────────────────────────────────╯
-```
-
-To see the routing table we can use the `rad node routing` command and
-see what Repository IDs match up with the interests of which Node
-IDs. In this case, it is just our own Node ID for the project we
-created.
-
-```
-$ rad node routing
-╭─────────────────────────────────────────────────────╮
-│ RID                                 NID             │
-├─────────────────────────────────────────────────────┤
-│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji   z6MknSL…StBU8Vi │
-╰─────────────────────────────────────────────────────╯
-```
-
-Finally, if we want to stop the daemon process from running we can
-issue the `rad node stop` command:
-
-```
-$ rad node stop
-✓ Node stopped
-```
-
-Running the command again gives us an error:
-
-```
-$ rad node stop
-✗ Stopping node... error: node is not running
-```
-
-Note that if we unseed a repository, it is no longer part of our inventory:
-
-```
-$ rad unseed rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Seeding policy for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji removed
-$ rad node inventory
-```
-
-Likewise, if we seed a repository we don't have locally, it won't show up as
-part of our inventory:
-```
-$ rad seed rad:z3trNYnLWS11cJWC6BbxDs5niGo82
-[...]
-$ rad node inventory
-```
-
-But if we start seeding the repository we have locally again, it'll show
-up in our inventory:
-```
-$ rad seed rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Inventory updated with rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'all'
-$ rad node inventory
-rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-```
-
-Some commands also give us a hint if the node isn't running:
-
-``` (fail)
-$ rad node events
-✗ Error: failed to open node control socket "[..]/.radicle/node/control.sock" (entity not found)
-✗ Hint: to start your node, run `rad node start`.
-```
-``` (fail)
-$ rad sync status
-✗ Error: to sync a repository, your node must be running. To start it, run `rad node start`
-```
-``` (fail)
-$ rad node connect z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk@radicle.xyz:8776
-✗ Connecting to z6Mkt67…v4N1tRk@radicle.xyz:8776... <canceled>
-✗ Error: failed to open node control socket "[..]/.radicle/node/control.sock" (entity not found)
-✗ Hint: to start your node, run `rad node start`.
-```
diff --git a/radicle-cli/examples/rad-patch-ahead-behind.md b/radicle-cli/examples/rad-patch-ahead-behind.md
deleted file mode 100644
index b01547885..000000000
--- a/radicle-cli/examples/rad-patch-ahead-behind.md
+++ /dev/null
@@ -1,154 +0,0 @@
-In this example, we explore how the `ahead/behind` indicator works, and what is
-shown as diffs in the case of divergent branches.
-
-First we add the `CONTRIBUTORS` file to `master`, which contains one entry:
-```
-$ git checkout -q master
-$ git add CONTRIBUTORS
-$ git commit -a -q -m "Add contributors"
-$ git push rad master
-$ cat CONTRIBUTORS
-Alice Jones
-```
-
-Then we create a feature branch which adds another entry:
-```
-$ git checkout -q -b feature/1
-$ sed -i '$a Alan K' CONTRIBUTORS
-$ git commit -a -q -m "Add Alan"
-```
-
-We go back to master, and add a different second entry, essentially forking
-the history:
-```
-$ git checkout -q master
-$ sed -i '$a Jason Bourne' CONTRIBUTORS
-$ git commit -a -q -m "Add Jason"
-$ git push rad master
-$ git log --graph --decorate --abbrev-commit --pretty=oneline --all
-* 5c88a79 (feature/1) Add Alan
-| * e101a99 (HEAD -> master, rad/master) Add Jason
-|/ [..]
-* f64fb2c Add contributors
-* f2de534 Second commit
-* 08c788d Initial commit
-```
-
-Then we create a patch from `feature/1`:
-``` (stderr)
-$ git push rad feature/1:refs/patches
-✓ Patch 217f050f8891def8fb863f7c0b4f85c89f97299d opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   feature/1 -> refs/patches
-```
-
-When listing, we see that it has one addition:
-```
-$ rad patch list
-╭────────────────────────────────────────────────────────────────────────╮
-│ ●  ID       Title     Author         Reviews  Head     +   -   Updated │
-├────────────────────────────────────────────────────────────────────────┤
-│ ●  217f050  Add Alan  alice   (you)  -        5c88a79  +1  -0  now     │
-╰────────────────────────────────────────────────────────────────────────╯
-```
-
-When showing the patch, we see that it is `ahead 1, behind 1`, since master has
-diverged by one commit:
-```
-$ rad patch show -v -p 217f050
-╭────────────────────────────────────────────────────╮
-│ Title     Add Alan                                 │
-│ Patch     217f050f8891def8fb863f7c0b4f85c89f97299d │
-│ Author    alice (you)                              │
-│ Head      5c88a79d75f5c2b4cc51ee6f163d2db91ee198d7 │
-│ Base      f64fb2c8fe28f7c458c72ec8d700373924794943 │
-│ Branches  feature/1                                │
-│ Commits   ahead 1, behind 1                        │
-│ Status    open                                     │
-├────────────────────────────────────────────────────┤
-│ 5c88a79 Add Alan                                   │
-├────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (5c88a79) now              │
-╰────────────────────────────────────────────────────╯
-
-commit 5c88a79d75f5c2b4cc51ee6f163d2db91ee198d7
-Author: radicle <radicle@localhost>
-Date:   Thu Dec 15 17:28:04 2022 +0000
-
-    Add Alan
-
-diff --git a/CONTRIBUTORS b/CONTRIBUTORS
-index 3f60d25..6829c43 100644
---- a/CONTRIBUTORS
-+++ b/CONTRIBUTORS
-@@ -1 +1,2 @@
- Alice Jones
-+Alan K
-
-```
-
-Then, we stack another change onto `feature/1`, adding another contributor:
-``` (stderr)
-$ git checkout -q -b feature/2 feature/1
-$ sed -i '$a Mel Farna' CONTRIBUTORS
-$ git commit -a -q -m "Add Mel"
-$ git push -o patch.message="Add Mel" rad HEAD:refs/patches
-✓ Patch e22ff008e2a0ed47262890d13263031d7555b555 opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-
-When we look at the patch, we see that it has both commits, because this new
-patch uses the same base as the previous patch:
-```
-$ rad patch show -v e22ff008e2a0ed47262890d13263031d7555b555
-╭────────────────────────────────────────────────────╮
-│ Title     Add Mel                                  │
-│ Patch     e22ff008e2a0ed47262890d13263031d7555b555 │
-│ Author    alice (you)                              │
-│ Head      7f63fcbcf23fc39eea784c091ad3d20d7e4bd005 │
-│ Base      f64fb2c8fe28f7c458c72ec8d700373924794943 │
-│ Branches  feature/2                                │
-│ Commits   ahead 2, behind 1                        │
-│ Status    open                                     │
-├────────────────────────────────────────────────────┤
-│ 7f63fcb Add Mel                                    │
-│ 5c88a79 Add Alan                                   │
-├────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (7f63fcb) now              │
-╰────────────────────────────────────────────────────╯
-```
-
-If we want to instead create a "stacked" patch, we can do so with the
-`patch.base` push option:
-
-``` (stderr)
-$ git push -o patch.message="Add Mel #2" -o patch.base=HEAD^ rad HEAD:refs/patches
-✓ Patch a467ffa260c4fbe355b6fb550ba0c4956078717e opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-
-As you'll notice, using the previous patch as the base, we only see commit
-`7f63fcb` listed for this new patch.
-
-However, since the patch is still intended to be merged into `master`, we see
-that it is still two commits ahead and one behind from `master`.
-
-```
-$ rad patch show -v a467ffa260c4fbe355b6fb550ba0c4956078717e
-╭────────────────────────────────────────────────────╮
-│ Title     Add Mel #2                               │
-│ Patch     a467ffa260c4fbe355b6fb550ba0c4956078717e │
-│ Author    alice (you)                              │
-│ Head      7f63fcbcf23fc39eea784c091ad3d20d7e4bd005 │
-│ Base      5c88a79d75f5c2b4cc51ee6f163d2db91ee198d7 │
-│ Branches  feature/2                                │
-│ Commits   ahead 2, behind 1                        │
-│ Status    open                                     │
-├────────────────────────────────────────────────────┤
-│ 7f63fcb Add Mel                                    │
-├────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (7f63fcb) now              │
-╰────────────────────────────────────────────────────╯
-```
diff --git a/radicle-cli/examples/rad-patch-change-base.md b/radicle-cli/examples/rad-patch-change-base.md
deleted file mode 100644
index 12b295a92..000000000
--- a/radicle-cli/examples/rad-patch-change-base.md
+++ /dev/null
@@ -1,93 +0,0 @@
-Sometimes we are a bit forgetful and miss a detail when creating a
-patch. In this case we'll stack two patches by creating one after the
-other.
-
-First we add a `REQUIREMENTS` file:
-
-```
-$ git checkout -b flux-capacitor-power
-$ touch REQUIREMENTS
-$ git add REQUIREMENTS
-$ git commit -v -m "Define power requirements"
-[flux-capacitor-power 3e674d1] Define power requirements
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 REQUIREMENTS
-```
-``` (stderr)
-$ git push rad flux-capacitor-power
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new branch]      flux-capacitor-power -> flux-capacitor-power
-$ git push rad -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches
-✓ Patch aa45913e757cacd46972733bddee5472c78fa32a opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-
-And then a `README` file:
-```
-$ git checkout -b add-readme
-$ touch README.md
-$ git add README.md
-$ git commit --message "Add README, just for the fun"
-[add-readme 27857ec] Add README, just for the fun
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 README.md
-```
-``` (stderr)
-$ git push rad -o patch.message="Add README, just for the fun" HEAD:refs/patches
-✓ Patch 183d343ab47d7fe18baf1b24b7209ad033d7fe5c opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-
-Our second patch looks like the following:
-
-```
-$ rad patch show 183d343ab47d7fe18baf1b24b7209ad033d7fe5c -v
-╭────────────────────────────────────────────────────╮
-│ Title     Add README, just for the fun             │
-│ Patch     183d343ab47d7fe18baf1b24b7209ad033d7fe5c │
-│ Author    alice (you)                              │
-│ Head      27857ec9eb04c69cacab516e8bf4b5fd36090f66 │
-│ Base      f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 │
-│ Branches  add-readme                               │
-│ Commits   ahead 2, behind 0                        │
-│ Status    open                                     │
-├────────────────────────────────────────────────────┤
-│ 27857ec Add README, just for the fun               │
-│ 3e674d1 Define power requirements                  │
-├────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (27857ec) now              │
-╰────────────────────────────────────────────────────╯
-```
-
-But wait, we meant to stack them and so we don't want to see the
-commit `3e674d1` as part of this patch, so we create a new revision
-with a new `base`:
-
-```
-$ rad patch update 183d343 -b 3e674d1 -m "Whoops, forgot to set the base" --no-announce
-ebe76f9c2148eb595d7a745f82275786bf3458c3
-```
-
-Now, if we show the patch we can see the patch's base has changed and
-we have a single commit:
-
-```
-$ rad patch show 183d343 -v
-╭─────────────────────────────────────────────────────────────────────╮
-│ Title     Add README, just for the fun                              │
-│ Patch     183d343ab47d7fe18baf1b24b7209ad033d7fe5c                  │
-│ Author    alice (you)                                               │
-│ Head      27857ec9eb04c69cacab516e8bf4b5fd36090f66                  │
-│ Base      3e674d1a1df90807e934f9ae5da2591dd6848a33                  │
-│ Branches  add-readme                                                │
-│ Commits   ahead 2, behind 0                                         │
-│ Status    open                                                      │
-├─────────────────────────────────────────────────────────────────────┤
-│ 27857ec Add README, just for the fun                                │
-├─────────────────────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (27857ec) now                               │
-│ ↑ updated to ebe76f9c2148eb595d7a745f82275786bf3458c3 (27857ec) now │
-╰─────────────────────────────────────────────────────────────────────╯
-```
diff --git a/radicle-cli/examples/rad-patch-checkout-force.md b/radicle-cli/examples/rad-patch-checkout-force.md
deleted file mode 100644
index c08c03738..000000000
--- a/radicle-cli/examples/rad-patch-checkout-force.md
+++ /dev/null
@@ -1,90 +0,0 @@
-A common workflow is to use `rad patch checkout` to view a
-collaborator's changes. So, first off, we create a patch:
-
-``` ~alice
-$ git checkout -b flux-capacitor-power
-$ touch REQUIREMENTS
-$ git add REQUIREMENTS
-$ git commit -v -m "Define power requirements"
-[flux-capacitor-power 3e674d1] Define power requirements
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 REQUIREMENTS
-```
-
-``` ~alice (stderr)
-$ git push rad -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches
-✓ Patch aa45913e757cacd46972733bddee5472c78fa32a opened
-✓ Synced with 1 node(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-
-On the other end, Bob uses `rad patch checkout` to view the patch:
-
-``` ~bob
-$ cd heartwood
-$ rad sync -f
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Fetched repository from 1 seed(s)
-$ rad patch checkout aa45913 --name alice-init
-✓ Switched to branch alice-init at revision aa45913
-✓ Branch alice-init setup to track rad/patches/aa45913e757cacd46972733bddee5472c78fa32a
-```
-
-Meanwhile, we may see some more changes that we need to make, so we
-add a `README.md`:
-
-``` ~alice
-$ touch README.md
-$ git add README.md
-$ git commit --message "Add README, just for the fun"
-[flux-capacitor-power 27857ec] Add README, just for the fun
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 README.md
-```
-
-``` ~alice (stderr)
-$ git push rad -o patch.message="Add README, just for the fun"
-✓ Patch aa45913 updated to revision 3156bed9d64d4675d6cf56612d217fc5f4e8a53a
-✓ Synced with 1 node(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-   3e674d1..27857ec  flux-capacitor-power -> patches/aa45913e757cacd46972733bddee5472c78fa32a
-```
-
-Bob fetches these new changes and can see their branch is now behind:
-
-``` ~bob (stderr)
-$ git fetch rad
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-   3e674d1..27857ec  patches/aa45913e757cacd46972733bddee5472c78fa32a -> rad/patches/aa45913e757cacd46972733bddee5472c78fa32a
-```
-
-``` ~bob
-$ git status
-On branch alice-init
-Your branch is behind 'rad/patches/aa45913e757cacd46972733bddee5472c78fa32a' by 1 commit, and can be fast-forwarded.
-  (use "git pull" to update your local branch)
-
-nothing to commit, working tree clean
-```
-
-If Bob was to run `rad patch checkout` again, it would error.
-This is because the branch already exists and `rad` does not want to
-overwrite any changes. Bob can choose to use the `--force` (`-f`) flag to
-ensure that they are looking at the latest changes:
-
-``` ~bob (fail)
-$ rad patch checkout aa45913 --name alice-init
-✗ Performing checkout... <canceled>
-✗ Error: branch 'alice-init' already exists (use `--force` to overwrite)
-```
-
-``` ~bob
-$ rad patch checkout aa45913 -f --name alice-init
-✓ Switched to branch alice-init at revision 3156bed
-$ git status
-On branch alice-init
-Your branch is up to date with 'rad/patches/aa45913e757cacd46972733bddee5472c78fa32a'.
-
-nothing to commit, working tree clean
-```
diff --git a/radicle-cli/examples/rad-patch-checkout-revision.md b/radicle-cli/examples/rad-patch-checkout-revision.md
deleted file mode 100644
index f135130f9..000000000
--- a/radicle-cli/examples/rad-patch-checkout-revision.md
+++ /dev/null
@@ -1,51 +0,0 @@
-We may want to checkout a particular revision of a patch.
-So first, let's add another change to the patch and a `LICENSE` file.
-
-```
-$ touch LICENSE
-$ git add LICENSE
-$ git commit --message "Add LICENSE, just for the business"
-[patch/aa45913 639f44a] Add LICENSE, just for the business
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 LICENSE
-$ git push rad -o patch.message="Add LICENSE, just for the business"
-```
-
-We can see the list of revisions of the patch by `show`ing it:
-
-```
-$ rad patch show aa45913
-╭─────────────────────────────────────────────────────────────────────╮
-│ Title     Define power requirements                                 │
-│ Patch     aa45913e757cacd46972733bddee5472c78fa32a                  │
-│ Author    alice (you)                                               │
-│ Head      639f44a25145a37f747f3c84265037a9461e44c5                  │
-│ Branches  patch/aa45913                                             │
-│ Commits   ahead 3, behind 0                                         │
-│ Status    open                                                      │
-│                                                                     │
-│ See details.                                                        │
-├─────────────────────────────────────────────────────────────────────┤
-│ 639f44a Add LICENSE, just for the business                          │
-│ 27857ec Add README, just for the fun                                │
-│ 3e674d1 Define power requirements                                   │
-├─────────────────────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (3e674d1) now                               │
-│ ↑ updated to 3156bed9d64d4675d6cf56612d217fc5f4e8a53a (27857ec) now │
-│ ↑ updated to 2f5324f61e05cda65b667eeea02570d077a8e724 (639f44a) now │
-╰─────────────────────────────────────────────────────────────────────╯
-```
-
-So, let's checkout the previous revision, `0c0942e2`:
-
-```
-$ rad patch checkout aa45913 --revision 3156bed9d64d4675d6cf56612d217fc5f4e8a53a -f
-✓ Switched to branch patch/aa45913 at revision 3156bed
-```
-
-And we can confirm that the current commit corresponds to `27857ec`:
-
-```
-$ git rev-parse HEAD
-27857ec9eb04c69cacab516e8bf4b5fd36090f66
-```
diff --git a/radicle-cli/examples/rad-patch-checkout.md b/radicle-cli/examples/rad-patch-checkout.md
deleted file mode 100644
index eadb67fc8..000000000
--- a/radicle-cli/examples/rad-patch-checkout.md
+++ /dev/null
@@ -1,65 +0,0 @@
-We may want to work on top of an existing patch and this where `rad
-patch checkout` comes into play. So, first we will create a patch to
-set up the workflow.
-
-```
-$ git checkout -b flux-capacitor-power
-$ touch REQUIREMENTS
-```
-
-Here the instructions are added to the project's README for 1.21 gigawatts and
-commit the changes to git.
-
-```
-$ git add REQUIREMENTS
-$ git commit -v -m "Define power requirements"
-[flux-capacitor-power 3e674d1] Define power requirements
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 REQUIREMENTS
-```
-
-Once the code is ready, we open (or create) a patch with our changes for the project.
-
-``` (stderr)
-$ git push rad -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches
-✓ Patch aa45913e757cacd46972733bddee5472c78fa32a opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-
-Now, let's checkout the patch that we just created:
-
-```
-$ rad patch checkout aa45913e757cacd46972733bddee5472c78fa32a
-✓ Switched to branch patch/aa45913 at revision aa45913
-✓ Branch patch/aa45913 setup to track rad/patches/aa45913e757cacd46972733bddee5472c78fa32a
-```
-
-Note that `rad patch checkout` can be used to switch to the patch branch
-as long as we haven't made changes to it.
-
-```
-$ git checkout master -q
-$ rad patch checkout aa45913
-✓ Switched to branch patch/aa45913 at revision aa45913
-```
-
-Now, let's add a README too!
-
-```
-$ touch README.md
-$ git add README.md
-$ git commit --message "Add README, just for the fun"
-[patch/aa45913 27857ec] Add README, just for the fun
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 README.md
-```
-
-We can now finish off the update:
-
-``` (stderr)
-$ git push rad -o patch.message="Add README, just for the fun"
-✓ Patch aa45913 updated to revision 3156bed9d64d4675d6cf56612d217fc5f4e8a53a
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-   3e674d1..27857ec  patch/aa45913 -> patches/aa45913e757cacd46972733bddee5472c78fa32a
-```
diff --git a/radicle-cli/examples/rad-patch-delete.md b/radicle-cli/examples/rad-patch-delete.md
deleted file mode 100644
index 200124cb4..000000000
--- a/radicle-cli/examples/rad-patch-delete.md
+++ /dev/null
@@ -1,136 +0,0 @@
-``` ~alice
-$ git checkout -b prepare-license
-$ touch LICENSE
-$ git add LICENSE
-$ git commit -m "Introduce license"
-[prepare-license 717c900] Introduce license
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 LICENSE
-```
-
-``` ~alice (stderr)
-$ git push rad -o patch.draft -o patch.message="Define LICENSE for project" HEAD:refs/patches
-✓ Patch 6c61ef1716ad8a5c11e04dd7a3fec51e01fba70b drafted
-✓ Synced with 2 node(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-
-``` ~bob
-$ cd heartwood
-$ rad sync -f
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Fetched repository from 1 seed(s)
-$ rad patch comment 6c61ef1 -m "I think we should use MIT"
-╭───────────────────────────╮
-│ bob (you) now 833db19     │
-│ I think we should use MIT │
-╰───────────────────────────╯
-✓ Synced with 2 node(s)
-```
-
-``` ~alice
-$ rad patch show 6c61ef1 -v
-╭────────────────────────────────────────────────────╮
-│ Title     Define LICENSE for project               │
-│ Patch     6c61ef1716ad8a5c11e04dd7a3fec51e01fba70b │
-│ Author    alice (you)                              │
-│ Head      717c900ec17735639587325e0fd9fe09991c9edd │
-│ Base      f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 │
-│ Branches  prepare-license                          │
-│ Commits   ahead 1, behind 0                        │
-│ Status    draft                                    │
-├────────────────────────────────────────────────────┤
-│ 717c900 Introduce license                          │
-├────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (717c900) now              │
-├────────────────────────────────────────────────────┤
-│ bob z6Mkt67…v4N1tRk now 833db19                    │
-│ I think we should use MIT                          │
-╰────────────────────────────────────────────────────╯
-$ rad patch comment 6c61ef1 --reply-to 833db19 -m "Thanks, I'll add it!"
-╭─────────────────────────╮
-│ alice (you) now 1803a38 │
-│ Thanks, I'll add it!    │
-╰─────────────────────────╯
-✓ Synced with 2 node(s)
-```
-
-``` ~alice
-$ touch MIT
-$ ln MIT LICENSE -f
-$ git add MIT
-$ git commit -am "Add MIT License"
-[prepare-license 1cc8cd9] Add MIT License
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 MIT
-```
-
-``` ~alice (stderr)
-$ git push -f
-✓ Patch 6c61ef1 updated to revision 93915b9afa94a9dc4f52f12cdf077d4613ea3eb3
-✓ Synced with 2 node(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-   717c900..1cc8cd9  prepare-license -> patches/6c61ef1716ad8a5c11e04dd7a3fec51e01fba70b
-```
-
-``` ~bob
-$ rad patch review 6c61ef1 --accept -m "LGTM!"
-✓ Patch 6c61ef1 accepted
-✓ Synced with 2 node(s)
-$ rad patch show 6c61ef1 -v
-╭─────────────────────────────────────────────────────────────────────╮
-│ Title    Define LICENSE for project                                 │
-│ Patch    6c61ef1716ad8a5c11e04dd7a3fec51e01fba70b                   │
-│ Author   alice z6MknSL…StBU8Vi                                      │
-│ Head     1cc8cd9de8ccc44b4fe3876f2dbd2cd1cf9ddc0e                   │
-│ Base     f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354                   │
-│ Commits  ahead 2, behind 0                                          │
-│ Status   draft                                                      │
-├─────────────────────────────────────────────────────────────────────┤
-│ 1cc8cd9 Add MIT License                                             │
-│ 717c900 Introduce license                                           │
-├─────────────────────────────────────────────────────────────────────┤
-│ ● opened by alice z6MknSL…StBU8Vi (717c900) now                     │
-│ ↑ updated to 93915b9afa94a9dc4f52f12cdf077d4613ea3eb3 (1cc8cd9) now │
-│   └─ ✓ accepted by bob (you) now                                    │
-╰─────────────────────────────────────────────────────────────────────╯
-```
-
-``` ~bob
-$ rad patch delete 6c61ef1
-✓ Synced with 2 node(s)
-```
-
-``` ~alice
-$ rad patch show 6c61ef1 -v
-╭─────────────────────────────────────────────────────────────────────╮
-│ Title     Define LICENSE for project                                │
-│ Patch     6c61ef1716ad8a5c11e04dd7a3fec51e01fba70b                  │
-│ Author    alice (you)                                               │
-│ Head      1cc8cd9de8ccc44b4fe3876f2dbd2cd1cf9ddc0e                  │
-│ Base      f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354                  │
-│ Branches  prepare-license                                           │
-│ Commits   ahead 2, behind 0                                         │
-│ Status    draft                                                     │
-├─────────────────────────────────────────────────────────────────────┤
-│ 1cc8cd9 Add MIT License                                             │
-│ 717c900 Introduce license                                           │
-├─────────────────────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (717c900) now                               │
-│ ↑ updated to 93915b9afa94a9dc4f52f12cdf077d4613ea3eb3 (1cc8cd9) now │
-╰─────────────────────────────────────────────────────────────────────╯
-```
-
-If Alice also decides to delete the patch, then any seeds that have synced with
-Alice should no longer have the patch:
-
-``` ~alice
-$ rad patch delete 6c61ef1
-✓ Synced with 2 node(s)
-```
-
-``` ~seed (fails)
-$ rad patch show --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji 6c61ef1 -v
-✗ Error: Patch `6c61ef1716ad8a5c11e04dd7a3fec51e01fba70b` not found
-```
diff --git a/radicle-cli/examples/rad-patch-detached-head.md b/radicle-cli/examples/rad-patch-detached-head.md
deleted file mode 100644
index ab0c3f8e1..000000000
--- a/radicle-cli/examples/rad-patch-detached-head.md
+++ /dev/null
@@ -1,41 +0,0 @@
-To ensure that we can handle diverse workflows, we also allow patches to be
-opened when we're in the infamous 'detached HEAD' state.
-
-First, we will enter this state by using `git checkout` on a commit object:
-
-``` (stderr) RAD_HINT=1
-$ git checkout f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
-Note: switching to 'f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at f2de534 Second commit
-```
-
-Now, we can create a commit on top of this and create a patch, as usual:
-
-``` (stderr) RAD_HINT=1
-$ git commit -a -m "Add things" -q --allow-empty
-$ git push -o patch.message="Add things #1" -o patch.message="See commits for details." rad HEAD:refs/patches
-✓ Patch 6035d2f582afbe01ff23ea87528ae523d76875b6 opened
-hint: offline push, your node is not running
-hint: to sync with the network, run `rad node start`
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-
-Note that there will be no upstream branch, since we did not have a branch to
-set an upstream for in the first place!
diff --git a/radicle-cli/examples/rad-patch-diff.md b/radicle-cli/examples/rad-patch-diff.md
deleted file mode 100644
index bb00955f5..000000000
--- a/radicle-cli/examples/rad-patch-diff.md
+++ /dev/null
@@ -1,63 +0,0 @@
-Using `rad patch diff`, we can output the patch diff:
-
-``` ./README.md
-Hello World!
-```
-```
-$ git checkout -b feature/1
-$ git add README.md
-$ git commit -m "Add README" -q
-$ git push rad HEAD:refs/patches
-```
-```
-$ rad patch diff 147309e
-╭───────────────────────────╮
-│ README.md +1 ❲created❳    │
-├───────────────────────────┤
-│ @@ -0,0 +1,1 @@           │
-│      1     + Hello World! │
-╰───────────────────────────╯
-
-```
-
-If we add another file and update the patch, we can see it in the diff.
-
-``` ./RADICLE.md
-Hello Radicle!
-```
-```
-$ git add RADICLE.md
-$ git commit --amend -q
-$ git push -f
-```
-```
-$ rad patch diff 147309e
-╭─────────────────────────────╮
-│ RADICLE.md +1 ❲created❳     │
-├─────────────────────────────┤
-│ @@ -0,0 +1,1 @@             │
-│      1     + Hello Radicle! │
-╰─────────────────────────────╯
-
-╭─────────────────────────────╮
-│ README.md +1 ❲created❳      │
-├─────────────────────────────┤
-│ @@ -0,0 +1,1 @@             │
-│      1     + Hello World!   │
-╰─────────────────────────────╯
-
-```
-
-Buf if we only want to see the changes from the first revision, we can do that
-too.
-
-```
-$ rad patch diff 147309e --revision 147309e
-╭───────────────────────────╮
-│ README.md +1 ❲created❳    │
-├───────────────────────────┤
-│ @@ -0,0 +1,1 @@           │
-│      1     + Hello World! │
-╰───────────────────────────╯
-
-```
diff --git a/radicle-cli/examples/rad-patch-draft.md b/radicle-cli/examples/rad-patch-draft.md
deleted file mode 100644
index b5167217f..000000000
--- a/radicle-cli/examples/rad-patch-draft.md
+++ /dev/null
@@ -1,78 +0,0 @@
-Let's say we have some changes in a branch:
-
-```
-$ git checkout -b cloudhead/draft
-$ git commit -a -m "Nothing to see here.." -q --allow-empty
-```
-
-To open a patch in draft mode, we use the `--draft` option:
-
-``` (stderr)
-$ git push -o patch.draft -o patch.message="Nothing yet" rad HEAD:refs/patches
-✓ Patch 97e18f8598237a396a1c0ac1509c89028e666c97 drafted
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-
-We can confirm it's a draft by running `show`:
-
-```
-$ rad patch show 97e18f8598237a396a1c0ac1509c89028e666c97
-╭────────────────────────────────────────────────────╮
-│ Title     Nothing yet                              │
-│ Patch     97e18f8598237a396a1c0ac1509c89028e666c97 │
-│ Author    alice (you)                              │
-│ Head      2a465832b5a76abe25be44a3a5d224bbd7741ba7 │
-│ Branches  cloudhead/draft                          │
-│ Commits   ahead 1, behind 0                        │
-│ Status    draft                                    │
-├────────────────────────────────────────────────────┤
-│ 2a46583 Nothing to see here..                      │
-├────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (2a46583) [ .. ]           │
-╰────────────────────────────────────────────────────╯
-```
-
-Once the patch is ready for review, we can use the `ready` command:
-
-```
-$ rad patch ready 97e18f8598237a396a1c0ac1509c89028e666c97 --no-announce
-```
-
-```
-$ rad patch show 97e18f8598237a396a1c0ac1509c89028e666c97
-╭────────────────────────────────────────────────────╮
-│ Title     Nothing yet                              │
-│ Patch     97e18f8598237a396a1c0ac1509c89028e666c97 │
-│ Author    alice (you)                              │
-│ Head      2a465832b5a76abe25be44a3a5d224bbd7741ba7 │
-│ Branches  cloudhead/draft                          │
-│ Commits   ahead 1, behind 0                        │
-│ Status    open                                     │
-├────────────────────────────────────────────────────┤
-│ 2a46583 Nothing to see here..                      │
-├────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (2a46583) [ .. ]           │
-╰────────────────────────────────────────────────────╯
-```
-
-If for whatever reason, it needed to go back into draft mode, we could use
-the `--undo` flag:
-
-```
-$ rad patch ready --undo 97e18f8598237a396a1c0ac1509c89028e666c97 --no-announce
-$ rad patch show 97e18f8598237a396a1c0ac1509c89028e666c97
-╭────────────────────────────────────────────────────╮
-│ Title     Nothing yet                              │
-│ Patch     97e18f8598237a396a1c0ac1509c89028e666c97 │
-│ Author    alice (you)                              │
-│ Head      2a465832b5a76abe25be44a3a5d224bbd7741ba7 │
-│ Branches  cloudhead/draft                          │
-│ Commits   ahead 1, behind 0                        │
-│ Status    draft                                    │
-├────────────────────────────────────────────────────┤
-│ 2a46583 Nothing to see here..                      │
-├────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (2a46583) [ .. ]           │
-╰────────────────────────────────────────────────────╯
-```
diff --git a/radicle-cli/examples/rad-patch-edit.md b/radicle-cli/examples/rad-patch-edit.md
deleted file mode 100644
index 0a6afe30d..000000000
--- a/radicle-cli/examples/rad-patch-edit.md
+++ /dev/null
@@ -1,116 +0,0 @@
-If you ever want to change the title and descriptions associated with
-a patch and its revisions, we can always use the `rad patch edit`
-command.
-
-First off, we'll have to set up a patch and an updated revision:
-
-```
-$ git checkout -b changes
-$ touch README.md
-$ git add README.md
-$ git commit --message "Add README, just for the fun"
-[changes 03c02af] Add README, just for the fun
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 README.md
-```
-
-``` (stderr)
-$ git push rad -o patch.message="Add README, just for the fun" HEAD:refs/patches
-✓ Patch 89f7afb1511b976482b21f6b2f39aef7f4fb88a2 opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-
-```
-$ touch LICENSE
-$ git add LICENSE
-$ git commit -v -m "Define the LICENSE"
-[changes 8945f61] Define the LICENSE
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 LICENSE
-```
-
-``` (stderr)
-$ git push -f -o patch.message="Add License"
-✓ Patch 89f7afb updated to revision 5d78dd5376453e25df5988ec86951c99cb73742c
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-   03c02af..8945f61  changes -> patches/89f7afb1511b976482b21f6b2f39aef7f4fb88a2
-```
-
-Let's look at the patch, to see what it looks like before editing it:
-
-```
-$ rad patch show 89f7afb
-╭─────────────────────────────────────────────────────────────────────╮
-│ Title     Add README, just for the fun                              │
-│ Patch     89f7afb1511b976482b21f6b2f39aef7f4fb88a2                  │
-│ Author    alice (you)                                               │
-│ Head      8945f6189adf027892c85ac57f7e9341049c2537                  │
-│ Branches  changes                                                   │
-│ Commits   ahead 2, behind 0                                         │
-│ Status    open                                                      │
-├─────────────────────────────────────────────────────────────────────┤
-│ 8945f61 Define the LICENSE                                          │
-│ 03c02af Add README, just for the fun                                │
-├─────────────────────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (03c02af) now                               │
-│ ↑ updated to 5d78dd5376453e25df5988ec86951c99cb73742c (8945f61) now │
-╰─────────────────────────────────────────────────────────────────────╯
-```
-
-We can change the title and description of the patch itself by using a
-multi-line message (using two `--message` options here):
-
-```
-$ rad patch edit 89f7afb --message "Add Metadata" --message "Add README & LICENSE" --no-announce
-$ rad patch show 89f7afb
-╭─────────────────────────────────────────────────────────────────────╮
-│ Title     Add Metadata                                              │
-│ Patch     89f7afb1511b976482b21f6b2f39aef7f4fb88a2                  │
-│ Author    alice (you)                                               │
-│ Head      8945f6189adf027892c85ac57f7e9341049c2537                  │
-│ Branches  changes                                                   │
-│ Commits   ahead 2, behind 0                                         │
-│ Status    open                                                      │
-│                                                                     │
-│ Add README & LICENSE                                                │
-├─────────────────────────────────────────────────────────────────────┤
-│ 8945f61 Define the LICENSE                                          │
-│ 03c02af Add README, just for the fun                                │
-├─────────────────────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (03c02af) now                               │
-│ ↑ updated to 5d78dd5376453e25df5988ec86951c99cb73742c (8945f61) now │
-╰─────────────────────────────────────────────────────────────────────╯
-```
-
-Notice that the `Title` is now `Add Metadata`, and the patch now has a
-description `Add README & LICENSE`.
-
-If we want to change a specific revision's description, we can use the
-`--revision` option:
-
-```
-$ rad patch edit 89f7afb --revision 5d78dd5 --message "Changes: Adds LICENSE file" --no-announce
-$ rad patch show 89f7afb
-╭─────────────────────────────────────────────────────────────────────╮
-│ Title     Add Metadata                                              │
-│ Patch     89f7afb1511b976482b21f6b2f39aef7f4fb88a2                  │
-│ Author    alice (you)                                               │
-│ Head      8945f6189adf027892c85ac57f7e9341049c2537                  │
-│ Branches  changes                                                   │
-│ Commits   ahead 2, behind 0                                         │
-│ Status    open                                                      │
-│                                                                     │
-│ Add README & LICENSE                                                │
-├─────────────────────────────────────────────────────────────────────┤
-│ 8945f61 Define the LICENSE                                          │
-│ 03c02af Add README, just for the fun                                │
-├─────────────────────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (03c02af) now                               │
-│ ↑ updated to 5d78dd5376453e25df5988ec86951c99cb73742c (8945f61) now │
-╰─────────────────────────────────────────────────────────────────────╯
-```
-
-We can see that this didn't affect the patch's description, but
-currently there's no way of seeing a revision's description in the
-CLI.
diff --git a/radicle-cli/examples/rad-patch-fetch-1.md b/radicle-cli/examples/rad-patch-fetch-1.md
deleted file mode 100644
index 28fdc9fc8..000000000
--- a/radicle-cli/examples/rad-patch-fetch-1.md
+++ /dev/null
@@ -1,32 +0,0 @@
-This is a simple test to ensure the behavior of our remote helper is correct.
-
-``` ~alice
-$ git rev-parse master
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
-$ git checkout -b alice/1 -q
-$ git commit --allow-empty -m "Change #1" -q
-$ git rev-parse HEAD
-7461703ce0fda972df450d071d1d3702057a6352
-$ git push rad HEAD:alice/1
-```
-
-``` ~bob
-$ git status
-On branch master
-Your branch is up to date with 'rad/master'.
-
-nothing to commit, working tree clean
-$ git fetch --all
-Fetching rad
-Fetching alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-$ cat .git/FETCH_HEAD
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354		branch 'master' of rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-7461703ce0fda972df450d071d1d3702057a6352	not-for-merge	branch 'alice/1' of rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354	not-for-merge	branch 'master' of rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-$ git merge FETCH_HEAD
-Already up to date.
-$ git rev-parse master
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
-$ git rev-parse HEAD
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
-```
diff --git a/radicle-cli/examples/rad-patch-fetch-2.md b/radicle-cli/examples/rad-patch-fetch-2.md
deleted file mode 100644
index a9392665c..000000000
--- a/radicle-cli/examples/rad-patch-fetch-2.md
+++ /dev/null
@@ -1,27 +0,0 @@
-Ensure that we're able to pull our own branches if they happened to be deleted
-in our working copy. This also applies to a situation with multiple working
-copies.
-
-```
-$ git checkout -b alice/1 -q
-$ git commit --allow-empty -m "Changes #1" -q
-$ git push rad -o patch.message="Changes" HEAD:refs/patches
-```
-
-```
-$ git checkout master -q
-$ git branch -D alice/1 -q
-$ git update-ref -d refs/remotes/rad/alice/1
-$ git update-ref -d refs/remotes/rad/patches/5e2dedcc5d515fcbc1cca483d3376609fe889bfb
-$ git gc --prune=now
-$ git branch -r
-  rad/master
-```
-
-```
-$ git pull
-Already up to date.
-$ git branch -r
-  rad/master
-  rad/patches/5e2dedcc5d515fcbc1cca483d3376609fe889bfb
-```
diff --git a/radicle-cli/examples/rad-patch-merge-draft.md b/radicle-cli/examples/rad-patch-merge-draft.md
deleted file mode 100644
index f13f6e830..000000000
--- a/radicle-cli/examples/rad-patch-merge-draft.md
+++ /dev/null
@@ -1,20 +0,0 @@
-Let's start by creating a draft patch.
-
-``` (stderr) RAD_SOCKET=/dev/null
-$ git checkout -b feature/1 -q
-$ git commit --allow-empty -q -m "First change"
-$ git push -o patch.draft rad HEAD:refs/patches
-✓ Patch 8dfb4dcafc4346158c8160410dd3f2b0616ad4fe drafted
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-
-``` (stderr) RAD_SOCKET=/dev/null
-$ git checkout master -q
-$ git merge feature/1
-$ git push rad master
-✓ Patch 8dfb4dcafc4346158c8160410dd3f2b0616ad4fe merged
-✓ Canonical head updated to 20aa5dde6210796c3a2f04079b42316a31d02689
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-   f2de534..20aa5dd  master -> master
-```
diff --git a/radicle-cli/examples/rad-patch-open-explore.md b/radicle-cli/examples/rad-patch-open-explore.md
deleted file mode 100644
index 9073f7f35..000000000
--- a/radicle-cli/examples/rad-patch-open-explore.md
+++ /dev/null
@@ -1,44 +0,0 @@
-When preferred seeds are configured, opening a patch outputs the patch URL.
-
-``` (stderr)
-$ git checkout -b changes -q
-$ git commit --allow-empty -q -m "Changes"
-$ git push rad HEAD:refs/patches
-✓ Patch acab0ec777a97d013f30be5d5d1aec32562ecb02 opened
-✓ Synced with 1 node(s)
-
-  https://app.radicle.xyz/nodes/[..]/rad:z3yXbb1sR6UG6ixxV2YF9jUP7ABra/patches/acab0ec777a97d013f30be5d5d1aec32562ecb02
-
-To rad://z3yXbb1sR6UG6ixxV2YF9jUP7ABra/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
- * [new reference]   HEAD -> refs/patches
-```
-
-If we update the patch, the URL is also output.
-
-``` (stderr)
-$ git commit --amend --allow-empty -q -m "Other changes"
-$ git push -f
-✓ Patch acab0ec updated to revision f7a830d829d0cdf398f63a32b0d5ee31f08e21ab
-✓ Synced with 1 node(s)
-
-  https://app.radicle.xyz/nodes/[..]/rad:z3yXbb1sR6UG6ixxV2YF9jUP7ABra/patches/acab0ec777a97d013f30be5d5d1aec32562ecb02
-
-To rad://z3yXbb1sR6UG6ixxV2YF9jUP7ABra/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
- + e12525d...b2b6432 changes -> patches/acab0ec777a97d013f30be5d5d1aec32562ecb02 (forced update)
-```
-
-While simply pushing a commit outputs a URL to the new source tree.
-
-``` (stderr)
-$ git checkout master -q
-$ git merge changes -q
-$ git push rad master
-✓ Patch acab0ec777a97d013f30be5d5d1aec32562ecb02 merged
-✓ Canonical head updated to b2b6432af93f8fe188e32d400263021b602cfec8
-✓ Synced with 1 node(s)
-
-  https://app.radicle.xyz/nodes/[..]/rad:z3yXbb1sR6UG6ixxV2YF9jUP7ABra/tree/b2b6432af93f8fe188e32d400263021b602cfec8
-
-To rad://z3yXbb1sR6UG6ixxV2YF9jUP7ABra/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-   f2de534..b2b6432  master -> master
-```
diff --git a/radicle-cli/examples/rad-patch-pull-update.md b/radicle-cli/examples/rad-patch-pull-update.md
deleted file mode 100644
index 9f93cfa8c..000000000
--- a/radicle-cli/examples/rad-patch-pull-update.md
+++ /dev/null
@@ -1,130 +0,0 @@
-Let's look at how patch updates work.
-
-Alice creates a repository and Bob clones it.
-
-``` ~alice
-$ rad init --name heartwood --description "radicle heartwood protocol & stack" --no-confirm --public
-
-Initializing public radicle 👾 repository in [..]
-
-✓ Repository heartwood created.
-
-Your Repository ID (RID) is rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK.
-You can show it any time by running `rad .` from this directory.
-
-✓ Repository successfully announced to the network.
-
-Your repository has been announced to the network and is now discoverable by peers.
-You can check for any nodes that have replicated your repository by running `rad sync status`.
-
-To push changes, run `git push`.
-```
-
-``` ~bob
-$ rad clone rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK
-✓ Seeding policy updated for rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK with scope 'all'
-✓ Fetching rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK from z6MknSL…StBU8Vi..
-✓ Creating checkout in ./heartwood..
-✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
-✓ Remote-tracking branch alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master created for z6MknSL…StBU8Vi
-✓ Repository successfully cloned under [..]/heartwood/
-╭────────────────────────────────────╮
-│ heartwood                          │
-│ radicle heartwood protocol & stack │
-│ 0 issues · 0 patches               │
-╰────────────────────────────────────╯
-Run `cd ./heartwood` to go to the repository directory.
-```
-
-We fork the repository by pushing to `master`, and wait for Alice to sync
-our fork:
-
-``` ~bob (stderr)
-$ cd heartwood
-$ git push rad master
-✓ Synced with 1 node(s)
-To rad://zhbMU4DUXrzB8xT6qAJh6yZ7bFMK/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
- * [new branch]      master -> master
-```
-
-Bob then opens a patch.
-
-``` ~bob (stderr)
-$ git checkout -b bob/feature -q
-$ git commit --allow-empty -m "Bob's commit #1" -q
-$ git push rad -o sync -o patch.message="Bob's patch" HEAD:refs/patches
-✓ Patch 55b9721ed7f6bfec38f43729e9b6631c5dc812fb opened
-✓ Synced with 1 node(s)
-To rad://zhbMU4DUXrzB8xT6qAJh6yZ7bFMK/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
- * [new reference]   HEAD -> refs/patches
-```
-``` ~bob
-$ git status --short --branch
-## bob/feature...rad/patches/55b9721ed7f6bfec38f43729e9b6631c5dc812fb
-```
-
-Alice checks it out.
-
-``` ~alice
-$ rad patch checkout 55b9721ed7f6bfec38f43729e9b6631c5dc812fb
-✓ Switched to branch patch/55b9721 at revision 55b9721
-✓ Branch patch/55b9721 setup to track rad/patches/55b9721ed7f6bfec38f43729e9b6631c5dc812fb
-$ git show
-commit bdcdb30b3c0f513620dd0f1c24ff8f4f71de956b
-Author: radicle <radicle@localhost>
-Date:   Thu Dec 15 17:28:04 2022 +0000
-
-    Bob's commit #1
-```
-
-Bob then updates the patch.
-
-``` ~bob (stderr)
-$ git commit --allow-empty -m "Bob's commit #2" -q
-$ git push rad -o sync -o patch.message="Updated."
-✓ Patch 55b9721 updated to revision f91e056da05b2d9a58af1160c76245bc3debf7a8
-✓ Synced with 1 node(s)
-To rad://zhbMU4DUXrzB8xT6qAJh6yZ7bFMK/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-   bdcdb30..cad2666  bob/feature -> patches/55b9721ed7f6bfec38f43729e9b6631c5dc812fb
-```
-
-Alice pulls the update.
-
-``` ~alice
-$ rad patch show 55b9721
-╭─────────────────────────────────────────────────────────────────────╮
-│ Title    Bob's patch                                                │
-│ Patch    55b9721ed7f6bfec38f43729e9b6631c5dc812fb                   │
-│ Author   bob z6Mkt67…v4N1tRk                                        │
-│ Head     cad2666a8a2250e4dee175ed5044be2c251ff08b                   │
-│ Commits  ahead 2, behind 0                                          │
-│ Status   open                                                       │
-├─────────────────────────────────────────────────────────────────────┤
-│ cad2666 Bob's commit #2                                             │
-│ bdcdb30 Bob's commit #1                                             │
-├─────────────────────────────────────────────────────────────────────┤
-│ ● opened by bob z6Mkt67…v4N1tRk (bdcdb30) now                       │
-│ ↑ updated to f91e056da05b2d9a58af1160c76245bc3debf7a8 (cad2666) now │
-╰─────────────────────────────────────────────────────────────────────╯
-$ git ls-remote rad
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354	refs/heads/master
-cad2666a8a2250e4dee175ed5044be2c251ff08b	refs/heads/patches/55b9721ed7f6bfec38f43729e9b6631c5dc812fb
-```
-``` ~alice
-$ git fetch rad
-$ git status --short --branch
-## patch/55b9721...rad/patches/55b9721ed7f6bfec38f43729e9b6631c5dc812fb [behind 1]
-```
-``` ~alice
-$ git pull
-Updating bdcdb30..cad2666
-Fast-forward
-```
-``` ~alice
-$ git show
-commit cad2666a8a2250e4dee175ed5044be2c251ff08b
-Author: radicle <radicle@localhost>
-Date:   Thu Dec 15 17:28:04 2022 +0000
-
-    Bob's commit #2
-```
diff --git a/radicle-cli/examples/rad-patch-revert-merge.md b/radicle-cli/examples/rad-patch-revert-merge.md
deleted file mode 100644
index efb33561b..000000000
--- a/radicle-cli/examples/rad-patch-revert-merge.md
+++ /dev/null
@@ -1,75 +0,0 @@
-Let's create a patch, merge it and then revert it.
-
-``` (stderr) RAD_SOCKET=/dev/null
-$ git checkout -b feature/1 -q
-$ git commit --allow-empty -q -m "First change"
-$ git push rad HEAD:refs/patches
-✓ Patch 696ec5508494692899337afe6713fe1796d0315c opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-$ git checkout master
-Switched to branch 'master'
-$ git merge feature/1
-$ git push rad master
-✓ Patch 696ec5508494692899337afe6713fe1796d0315c merged
-✓ Canonical head updated to 20aa5dde6210796c3a2f04079b42316a31d02689
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-   f2de534..20aa5dd  master -> master
-```
-
-First we see the patch as merged.
-
-```
-$ rad patch show 696ec5508494692899337afe6713fe1796d0315c
-╭────────────────────────────────────────────────────────────────╮
-│ Title     First change                                         │
-│ Patch     696ec5508494692899337afe6713fe1796d0315c             │
-│ Author    alice (you)                                          │
-│ Head      20aa5dde6210796c3a2f04079b42316a31d02689             │
-│ Branches  feature/1, master                                    │
-│ Commits   up to date                                           │
-│ Status    merged                                               │
-├────────────────────────────────────────────────────────────────┤
-│ 20aa5dd First change                                           │
-├────────────────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (20aa5dd) now                          │
-│   └─ ✓ merged by alice (you) at revision 696ec55 (20aa5dd) now │
-╰────────────────────────────────────────────────────────────────╯
-```
-
-Now let's revert the patch by pushing a new `master` that doesn't include
-the commit.
-
-```
-$ git reset --hard HEAD^
-HEAD is now at f2de534 Second commit
-```
-
-When pushing, notice that we're told our patch is reverted.
-
-``` (stderr) RAD_SOCKET=/dev/null
-$ git push rad master --force
-! Patch 696ec5508494692899337afe6713fe1796d0315c reverted at revision 696ec55
-✓ Canonical head updated to f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- + 20aa5dd...f2de534 master -> master (forced update)
-```
-
-The patch shows up as open again.
-
-```
-$ rad patch show 696ec5508494692899337afe6713fe1796d0315c
-╭────────────────────────────────────────────────────╮
-│ Title     First change                             │
-│ Patch     696ec5508494692899337afe6713fe1796d0315c │
-│ Author    alice (you)                              │
-│ Head      20aa5dde6210796c3a2f04079b42316a31d02689 │
-│ Branches  feature/1                                │
-│ Commits   ahead 1, behind 0                        │
-│ Status    open                                     │
-├────────────────────────────────────────────────────┤
-│ 20aa5dd First change                               │
-├────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (20aa5dd) now              │
-╰────────────────────────────────────────────────────╯
-```
diff --git a/radicle-cli/examples/rad-patch-update.md b/radicle-cli/examples/rad-patch-update.md
deleted file mode 100644
index 1b897efc0..000000000
--- a/radicle-cli/examples/rad-patch-update.md
+++ /dev/null
@@ -1,72 +0,0 @@
-Let's explore the `rad patch update` plumbing command. First we create a patch:
-
-``` (stderr)
-$ git checkout -q -b feature/1
-$ git commit -q -m "Not a real change" --allow-empty
-```
-``` (stderr)
-$ git push rad HEAD:refs/patches
-✓ Patch b6a23eb08656de0ef1fcc0b5fe8820841e5cb2e5 opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-
-```
-$ rad patch show b6a23eb08656de0ef1fcc0b5fe8820841e5cb2e5
-╭────────────────────────────────────────────────────╮
-│ Title     Not a real change                        │
-│ Patch     b6a23eb08656de0ef1fcc0b5fe8820841e5cb2e5 │
-│ Author    alice (you)                              │
-│ Head      51b2f0f77b9849bfaa3e9d3ff68ee2f57771d20c │
-│ Branches  feature/1                                │
-│ Commits   ahead 1, behind 0                        │
-│ Status    open                                     │
-├────────────────────────────────────────────────────┤
-│ 51b2f0f Not a real change                          │
-├────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (51b2f0f) now              │
-╰────────────────────────────────────────────────────╯
-```
-
-We can make some changes to the repository:
-
-```
-$ git mv README README.md
-$ git commit -q -m "Rename readme file"
-```
-
-Let's push the changes, but not to the magic ref, that way the push doesn't
-update our patch:
-
-```
-$ git push rad HEAD:refs/heads/feature/1
-```
-
-Now, instead of using `git push` to update the patch, as we normally would,
-we run:
-
-```
-$ rad patch update b6a23eb08656de0ef1fcc0b5fe8820841e5cb2e5 -m "Updated patch" --no-announce
-ea7def3857f62f404606d7cd6490cd0de4eaebd1
-```
-
-The command outputs the new Revision ID, which we can now see here:
-
-```
-$ rad patch show b6a23eb08656de0ef1fcc0b5fe8820841e5cb2e5
-╭─────────────────────────────────────────────────────────────────────╮
-│ Title     Not a real change                                         │
-│ Patch     b6a23eb08656de0ef1fcc0b5fe8820841e5cb2e5                  │
-│ Author    alice (you)                                               │
-│ Head      4d272148458a17620541555b1f0905c01658aa9f                  │
-│ Branches  feature/1                                                 │
-│ Commits   ahead 2, behind 0                                         │
-│ Status    open                                                      │
-├─────────────────────────────────────────────────────────────────────┤
-│ 4d27214 Rename readme file                                          │
-│ 51b2f0f Not a real change                                           │
-├─────────────────────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (51b2f0f) now                               │
-│ ↑ updated to ea7def3857f62f404606d7cd6490cd0de4eaebd1 (4d27214) now │
-╰─────────────────────────────────────────────────────────────────────╯
-```
diff --git a/radicle-cli/examples/rad-patch-via-push.md b/radicle-cli/examples/rad-patch-via-push.md
deleted file mode 100644
index 5aba56af9..000000000
--- a/radicle-cli/examples/rad-patch-via-push.md
+++ /dev/null
@@ -1,240 +0,0 @@
-# Using `git push` to open patches
-
-Let's checkout a branch, make a commit and push to the magic ref `refs/patches`.
-When we push to this ref, a patch is created from our commits.
-
-``` (stderr) RAD_HINT=1
-$ git checkout -b feature/1
-Switched to a new branch 'feature/1'
-$ git commit -a -m "Add things" -q --allow-empty
-$ git push -o patch.message="Add things #1" -o patch.message="See commits for details." rad HEAD:refs/patches
-✓ Patch 6035d2f582afbe01ff23ea87528ae523d76875b6 opened
-hint: to update, run `git push` or `git push rad -f HEAD:patches/6035d2f582afbe01ff23ea87528ae523d76875b6`
-hint: offline push, your node is not running
-hint: to sync with the network, run `rad node start`
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-
-We can see a patch was created:
-
-```
-$ rad patch show 6035d2f582afbe01ff23ea87528ae523d76875b6
-╭────────────────────────────────────────────────────╮
-│ Title     Add things #1                            │
-│ Patch     6035d2f582afbe01ff23ea87528ae523d76875b6 │
-│ Author    alice (you)                              │
-│ Head      42d894a83c9c356552a57af09ccdbd5587a99045 │
-│ Branches  feature/1                                │
-│ Commits   ahead 1, behind 0                        │
-│ Status    open                                     │
-│                                                    │
-│ See commits for details.                           │
-├────────────────────────────────────────────────────┤
-│ 42d894a Add things                                 │
-├────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (42d894a) now              │
-╰────────────────────────────────────────────────────╯
-```
-
-If we check our local branch, we can see its upstream is set to track a remote
-branch associated with this patch:
-
-```
-$ git branch -vv
-* feature/1 42d894a [rad/patches/6035d2f582afbe01ff23ea87528ae523d76875b6] Add things
-  master    f2de534 [rad/master] Second commit
-```
-
-Let's check that it's up to date with our local head:
-
-```
-$ git status --short --branch
-## feature/1...rad/patches/6035d2f582afbe01ff23ea87528ae523d76875b6
-$ git fetch
-$ git push
-```
-
-And let's look at our local and remote refs:
-
-```
-$ git show-ref
-42d894a83c9c356552a57af09ccdbd5587a99045 refs/heads/feature/1
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 refs/heads/master
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 refs/remotes/rad/master
-42d894a83c9c356552a57af09ccdbd5587a99045 refs/remotes/rad/patches/6035d2f582afbe01ff23ea87528ae523d76875b6
-```
-```
-$ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji 'refs/heads/patches/*'
-42d894a83c9c356552a57af09ccdbd5587a99045	refs/heads/patches/6035d2f582afbe01ff23ea87528ae523d76875b6
-$ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 'refs/cobs/*'
-0656c217f917c3e06234771e9ecae53aba5e173e	refs/cobs/xyz.radicle.id/0656c217f917c3e06234771e9ecae53aba5e173e
-6035d2f582afbe01ff23ea87528ae523d76875b6	refs/cobs/xyz.radicle.patch/6035d2f582afbe01ff23ea87528ae523d76875b6
-```
-
-We can create another patch:
-
-``` (stderr)
-$ git checkout -b feature/2 -q master
-$ git commit -a -m "Add more things" -q --allow-empty
-$ git push rad HEAD:refs/patches
-✓ Patch 95808913573cead52ad7b42c7b475260ec45c4b2 opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-
-We see both branches with upstreams now:
-
-```
-$ git branch -vv
-  feature/1 42d894a [rad/patches/6035d2f582afbe01ff23ea87528ae523d76875b6] Add things
-* feature/2 8b0ea80 [rad/patches/95808913573cead52ad7b42c7b475260ec45c4b2] Add more things
-  master    f2de534 [rad/master] Second commit
-```
-
-And both patches:
-
-```
-$ rad patch
-╭───────────────────────────────────────────────────────────────────────────────╮
-│ ●  ID       Title            Author         Reviews  Head     +   -   Updated │
-├───────────────────────────────────────────────────────────────────────────────┤
-│ ●  6035d2f  Add things #1    alice   (you)  -        42d894a  +0  -0  now     │
-│ ●  9580891  Add more things  alice   (you)  -        8b0ea80  +0  -0  now     │
-╰───────────────────────────────────────────────────────────────────────────────╯
-```
-
-To update our patch, we simply push commits to the upstream branch:
-
-```
-$ git commit -a -m "Improve code" -q --allow-empty
-```
-
-``` (stderr)
-$ git push rad
-✓ Patch 9580891 updated to revision d7040c6c97629c2b94f86fb639bebbff5de39697
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-   8b0ea80..02bef3f  feature/2 -> patches/95808913573cead52ad7b42c7b475260ec45c4b2
-```
-
-This last `git push` worked without specifying an upstream branch despite the
-local branch having a different name than the remote. This is because Radicle
-configures repositories upon `rad init` with `push.default = upstream`:
-
-```
-$ git config --local --get push.default
-upstream
-```
-
-This allows for pushing to the remote patch branch without using the full
-`<src>:<dst>` syntax.
-
-We can then see that the patch head has moved:
-
-```
-$ rad patch show 9580891
-╭─────────────────────────────────────────────────────────────────────╮
-│ Title     Add more things                                           │
-│ Patch     95808913573cead52ad7b42c7b475260ec45c4b2                  │
-│ Author    alice (you)                                               │
-│ Head      02bef3fac41b2f98bb3c02b868a53ddfecb55b5f                  │
-│ Branches  feature/2                                                 │
-│ Commits   ahead 2, behind 0                                         │
-│ Status    open                                                      │
-├─────────────────────────────────────────────────────────────────────┤
-│ 02bef3f Improve code                                                │
-│ 8b0ea80 Add more things                                             │
-├─────────────────────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (8b0ea80) now                               │
-│ ↑ updated to d7040c6c97629c2b94f86fb639bebbff5de39697 (02bef3f) now │
-╰─────────────────────────────────────────────────────────────────────╯
-```
-
-And we can check that all the refs are properly updated in our repository:
-
-```
-$ git rev-parse HEAD
-02bef3fac41b2f98bb3c02b868a53ddfecb55b5f
-```
-
-```
-$ git status --short --branch
-## feature/2...rad/patches/95808913573cead52ad7b42c7b475260ec45c4b2
-```
-
-```
-$ git rev-parse refs/remotes/rad/patches/95808913573cead52ad7b42c7b475260ec45c4b2
-02bef3fac41b2f98bb3c02b868a53ddfecb55b5f
-$ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi refs/heads/patches/95808913573cead52ad7b42c7b475260ec45c4b2
-02bef3fac41b2f98bb3c02b868a53ddfecb55b5f	refs/heads/patches/95808913573cead52ad7b42c7b475260ec45c4b2
-```
-
-## Force push
-
-Sometimes, it's necessary to force-push a patch update. For example, if we amended
-the commit and want the updated patch to reflect that.
-
-Let's try.
-
-```
-$ git commit --amend -m "Amended commit" --allow-empty
-[feature/2 9304dbc] Amended commit
- Date: [..]
-```
-
-Now let's push to the patch head.
-
-``` (stderr) (fail)
-$ git push
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- ! [rejected]        feature/2 -> patches/95808913573cead52ad7b42c7b475260ec45c4b2 (non-fast-forward)
-error: failed to push some refs to 'rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi'
-hint: [..]
-hint: [..]
-hint: [..]
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-```
-
-The push fails because it's not a fast-forward update. To remedy this, we can
-use `--force` to force the update.
-
-``` (stderr)
-$ git push --force
-✓ Patch 9580891 updated to revision 670d02794aa05afd6e0851f4aa848bc87c4712c7
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- + 02bef3f...9304dbc feature/2 -> patches/95808913573cead52ad7b42c7b475260ec45c4b2 (forced update)
-```
-
-That worked. We can see the new revision if we call `rad patch show`:
-
-```
-$ rad patch show 9580891
-╭─────────────────────────────────────────────────────────────────────╮
-│ Title     Add more things                                           │
-│ Patch     95808913573cead52ad7b42c7b475260ec45c4b2                  │
-│ Author    alice (you)                                               │
-│ Head      9304dbc445925187994a7a93222a3f8bde73b785                  │
-│ Branches  feature/2                                                 │
-│ Commits   ahead 2, behind 0                                         │
-│ Status    open                                                      │
-├─────────────────────────────────────────────────────────────────────┤
-│ 9304dbc Amended commit                                              │
-│ 8b0ea80 Add more things                                             │
-├─────────────────────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (8b0ea80) now                               │
-│ ↑ updated to d7040c6c97629c2b94f86fb639bebbff5de39697 (02bef3f) now │
-│ ↑ updated to 670d02794aa05afd6e0851f4aa848bc87c4712c7 (9304dbc) now │
-╰─────────────────────────────────────────────────────────────────────╯
-```
-
-## Empty patch
-
-If we try to open a patch without making any changes to our base branch (`master`),
-we should get an error:
-
-``` (stderr) (fail)
-$ git push rad master:refs/patches
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- ! [remote rejected] master -> refs/patches (patch commits are already included in the base branch)
-error: failed to push some refs to 'rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi'
-```
diff --git a/radicle-cli/examples/rad-patch.md b/radicle-cli/examples/rad-patch.md
deleted file mode 100644
index 54b77ce94..000000000
--- a/radicle-cli/examples/rad-patch.md
+++ /dev/null
@@ -1,216 +0,0 @@
-When contributing to another's project, it is common for the contribution to be
-of many commits and involve a discussion with the project's maintainer.  This is supported
-via Radicle's patches.
-
-Here we give a brief overview for using patches in our hypothetical car
-scenario.  It turns out instructions containing the power requirements were
-missing from the project.
-
-```
-$ git checkout -b flux-capacitor-power
-$ touch REQUIREMENTS
-```
-
-Here the instructions are added to the project's README for 1.21 gigawatts and
-commit the changes to git.
-
-```
-$ git add REQUIREMENTS
-$ git commit -v -m "Define power requirements"
-[flux-capacitor-power 3e674d1] Define power requirements
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 REQUIREMENTS
-```
-
-Once the code is ready, we open (or create) a patch with our changes for the project.
-
-``` (stderr)
-$ git push rad -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches
-✓ Patch aa45913e757cacd46972733bddee5472c78fa32a opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-
-It will now be listed as one of the project's open patches.
-
-```
-$ rad patch
-╭─────────────────────────────────────────────────────────────────────────────────────────╮
-│ ●  ID       Title                      Author         Reviews  Head     +   -   Updated │
-├─────────────────────────────────────────────────────────────────────────────────────────┤
-│ ●  aa45913  Define power requirements  alice   (you)  -        3e674d1  +0  -0  now     │
-╰─────────────────────────────────────────────────────────────────────────────────────────╯
-```
-```
-$ rad patch show aa45913e757cacd46972733bddee5472c78fa32a -p
-╭────────────────────────────────────────────────────╮
-│ Title     Define power requirements                │
-│ Patch     aa45913e757cacd46972733bddee5472c78fa32a │
-│ Author    alice (you)                              │
-│ Head      3e674d1a1df90807e934f9ae5da2591dd6848a33 │
-│ Branches  flux-capacitor-power                     │
-│ Commits   ahead 1, behind 0                        │
-│ Status    open                                     │
-│                                                    │
-│ See details.                                       │
-├────────────────────────────────────────────────────┤
-│ 3e674d1 Define power requirements                  │
-├────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (3e674d1) now              │
-╰────────────────────────────────────────────────────╯
-
-commit 3e674d1a1df90807e934f9ae5da2591dd6848a33
-Author: radicle <radicle@localhost>
-Date:   Thu Dec 15 17:28:04 2022 +0000
-
-    Define power requirements
-
-diff --git a/REQUIREMENTS b/REQUIREMENTS
-new file mode 100644
-index 0000000..e69de29
-
-```
-
-We can also list only patches that we've authored.
-
-```
-$ rad patch list --authored
-╭─────────────────────────────────────────────────────────────────────────────────────────╮
-│ ●  ID       Title                      Author         Reviews  Head     +   -   Updated │
-├─────────────────────────────────────────────────────────────────────────────────────────┤
-│ ●  aa45913  Define power requirements  alice   (you)  -        3e674d1  +0  -0  now     │
-╰─────────────────────────────────────────────────────────────────────────────────────────╯
-```
-
-We can also see that it set an upstream for our patch branch:
-```
-$ git branch -vv
-* flux-capacitor-power 3e674d1 [rad/patches/aa45913e757cacd46972733bddee5472c78fa32a] Define power requirements
-  master               f2de534 [rad/master] Second commit
-```
-
-We can also label patches as well as assign DIDs to the patch to help
-organise your workflow:
-
-```
-$ rad patch label aa45913 --add fun --no-announce
-$ rad patch assign aa45913 --add did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --no-announce
-$ rad patch show aa45913
-╭────────────────────────────────────────────────────╮
-│ Title     Define power requirements                │
-│ Patch     aa45913e757cacd46972733bddee5472c78fa32a │
-│ Author    alice (you)                              │
-│ Labels    fun                                      │
-│ Head      3e674d1a1df90807e934f9ae5da2591dd6848a33 │
-│ Branches  flux-capacitor-power                     │
-│ Commits   ahead 1, behind 0                        │
-│ Status    open                                     │
-│                                                    │
-│ See details.                                       │
-├────────────────────────────────────────────────────┤
-│ 3e674d1 Define power requirements                  │
-├────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (3e674d1) now              │
-╰────────────────────────────────────────────────────╯
-```
-
-Wait, let's add a README too! Just for fun.
-
-```
-$ touch README.md
-$ git add README.md
-$ git commit --message "Add README, just for the fun"
-[flux-capacitor-power 27857ec] Add README, just for the fun
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 README.md
-```
-``` (stderr)
-$ git push rad -o patch.message="Add README, just for the fun"
-✓ Patch aa45913 updated to revision 6e5a3b7b2ce27b32e7ccc2f0b3f4594897dde638
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-   3e674d1..27857ec  flux-capacitor-power -> patches/aa45913e757cacd46972733bddee5472c78fa32a
-```
-
-And let's leave a quick comment for our team:
-
-```
-$ rad patch comment aa45913 --message 'I cannot wait to get back to the 90s!' --no-announce
-╭───────────────────────────────────────╮
-│ alice (you) now 686ec1c               │
-│ I cannot wait to get back to the 90s! │
-╰───────────────────────────────────────╯
-$ rad patch comment aa45913 --message 'My favorite decade!' --reply-to 686ec1c -q --no-announce
-f4336e42daf76342f787d574b5ee779d89d05c7a
-```
-
-Now, let's checkout the patch that we just created:
-
-```
-$ rad patch checkout aa45913
-✓ Switched to branch patch/aa45913 at revision 6e5a3b7
-✓ Branch patch/aa45913 setup to track rad/patches/aa45913e757cacd46972733bddee5472c78fa32a
-```
-
-We can also add a review verdict as such:
-
-```
-$ rad patch review aa45913 --accept --no-message --no-announce
-✓ Patch aa45913 accepted
-```
-
-Showing the patch list now will reveal the favorable verdict:
-
-```
-$ rad patch show aa45913
-╭─────────────────────────────────────────────────────────────────────╮
-│ Title     Define power requirements                                 │
-│ Patch     aa45913e757cacd46972733bddee5472c78fa32a                  │
-│ Author    alice (you)                                               │
-│ Labels    fun                                                       │
-│ Head      27857ec9eb04c69cacab516e8bf4b5fd36090f66                  │
-│ Branches  flux-capacitor-power, patch/aa45913                       │
-│ Commits   ahead 2, behind 0                                         │
-│ Status    open                                                      │
-│                                                                     │
-│ See details.                                                        │
-├─────────────────────────────────────────────────────────────────────┤
-│ 27857ec Add README, just for the fun                                │
-│ 3e674d1 Define power requirements                                   │
-├─────────────────────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (3e674d1) now                               │
-│ ↑ updated to 6e5a3b7b2ce27b32e7ccc2f0b3f4594897dde638 (27857ec) now │
-│   └─ ✓ accepted by alice (you) now                                  │
-╰─────────────────────────────────────────────────────────────────────╯
-$ rad patch list
-╭─────────────────────────────────────────────────────────────────────────────────────────╮
-│ ●  ID       Title                      Author         Reviews  Head     +   -   Updated │
-├─────────────────────────────────────────────────────────────────────────────────────────┤
-│ ●  aa45913  Define power requirements  alice   (you)  ✔        27857ec  +0  -0  now     │
-╰─────────────────────────────────────────────────────────────────────────────────────────╯
-```
-
-If you make a mistake on the patch description, you can always change it!
-
-```
-$ rad patch edit aa45913 --message "Define power requirements" --message "Add requirements file" --no-announce
-$ rad patch show aa45913
-╭─────────────────────────────────────────────────────────────────────╮
-│ Title     Define power requirements                                 │
-│ Patch     aa45913e757cacd46972733bddee5472c78fa32a                  │
-│ Author    alice (you)                                               │
-│ Labels    fun                                                       │
-│ Head      27857ec9eb04c69cacab516e8bf4b5fd36090f66                  │
-│ Branches  flux-capacitor-power, patch/aa45913                       │
-│ Commits   ahead 2, behind 0                                         │
-│ Status    open                                                      │
-│                                                                     │
-│ Add requirements file                                               │
-├─────────────────────────────────────────────────────────────────────┤
-│ 27857ec Add README, just for the fun                                │
-│ 3e674d1 Define power requirements                                   │
-├─────────────────────────────────────────────────────────────────────┤
-│ ● opened by alice (you) (3e674d1) now                               │
-│ ↑ updated to 6e5a3b7b2ce27b32e7ccc2f0b3f4594897dde638 (27857ec) now │
-│   └─ ✓ accepted by alice (you) now                                  │
-╰─────────────────────────────────────────────────────────────────────╯
-```
diff --git a/radicle-cli/examples/rad-publish.md b/radicle-cli/examples/rad-publish.md
deleted file mode 100644
index e1145a007..000000000
--- a/radicle-cli/examples/rad-publish.md
+++ /dev/null
@@ -1,69 +0,0 @@
-Let's say we have a private repo. To make it public, we use the `publish` command:
-
-```
-$ rad inspect --visibility
-private
-$ rad node inventory
-$ rad publish
-✓ Updating inventory..
-✓ Repository is now public
-! Warning: Your node is not running. Start your node with `rad node start` to announce your repository to the network
-$ rad inspect --visibility
-public
-```
-
-The repository is now in our inventory:
-```
-$ rad node inventory
-rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu
-```
-
-If we try to publish again, we get an error:
-
-``` (fail)
-$ rad publish
-✗ Error: repository is already public
-✗ Hint: to announce the repository to the network, run `rad sync --inventory`
-```
-
-We can also make the repository private again by using `rad id
-update`. However, it's important to note that once the repository is
-published to the network, that set of data will be public until all
-node operators delete it. Any new changes made after making the
-repository private again __will not_ be replicated.
-
-```
-$ rad id update --visibility private --title "Privatise" --description "Reverting the rad publish event"
-✓ Identity revision 774cc1e72641d97d7dc9377745b7f454a9171747 created
-╭────────────────────────────────────────────────────────────────────────╮
-│ Title    Privatise                                                     │
-│ Revision 774cc1e72641d97d7dc9377745b7f454a9171747                      │
-│ Blob     88f759a4d46e9535766fccec0cbfe1fed6160b1a                      │
-│ Author   did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi      │
-│ State    accepted                                                      │
-│ Quorum   yes                                                           │
-│                                                                        │
-│ Reverting the rad publish event                                        │
-├────────────────────────────────────────────────────────────────────────┤
-│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
-╰────────────────────────────────────────────────────────────────────────╯
-
-@@ -1,13 +1,16 @@
- {
-   "payload": {
-     "xyz.radicle.project": {
-       "defaultBranch": "master",
-       "description": "radicle heartwood protocol & stack",
-       "name": "heartwood"
-     }
-   },
-   "delegates": [
-     "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
-   ],
--  "threshold": 1
-+  "threshold": 1,
-+  "visibility": {
-+    "type": "private"
-+  }
- }
-```
diff --git a/radicle-cli/examples/rad-push-and-pull-patches.md b/radicle-cli/examples/rad-push-and-pull-patches.md
deleted file mode 100644
index 8c5f2e1e5..000000000
--- a/radicle-cli/examples/rad-push-and-pull-patches.md
+++ /dev/null
@@ -1,76 +0,0 @@
-Testing pulling, fetching and the `FETCH_HEAD`.
-
-``` ~bob
-$ git push rad
-$ git checkout -b bob/1 -q
-$ git commit --allow-empty -m "Changes #1" -q
-$ git push -o patch.message="Changes" rad HEAD:refs/patches
-```
-
-``` ~alice
-$ git checkout -b alice/1 -q
-$ git rev-parse HEAD
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
-$ git checkout master -q
-$ rad patch checkout d004b67
-✓ Switched to branch patch/d004b67 at revision d004b67
-✓ Branch patch/d004b67 setup to track rad/patches/d004b67355456c46de10c0d287e4a791ad1a6945
-$ rad remote add z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-✓ Follow policy updated for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk..
-✓ Remote bob@z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk added
-✓ Remote-tracking branch bob@z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/master created for z6Mkt67…v4N1tRk
-$ git checkout master -q
-$ cat .git/FETCH_HEAD
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354	not-for-merge	branch 'master' of rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-8d5f1bae4b69d8e3f6cbfc6f4bd675ed19990afc	not-for-merge	branch 'patches/d004b67355456c46de10c0d287e4a791ad1a6945' of rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-$ git rev-parse master
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
-```
-
-``` ~alice (stderr)
-$ git checkout patch/d004b67 -q
-$ git commit --allow-empty -m "Changes #2" -q
-$ git push
-✓ Patch d004b67 updated to revision 2eb705c3da98e05c083df15be5b1bd6856a0bd77
-✓ Synced with 1 node(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new branch]      patch/d004b67 -> patches/d004b67355456c46de10c0d287e4a791ad1a6945
-```
-
-``` ~bob
-$ git commit --allow-empty -m "Changes #2" -q
-$ git push
-```
-
-``` ~alice (stderr)
-$ git checkout master -q
-$ git pull
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
- + c2aaf1c...8d5f1ba patches/d004b67355456c46de10c0d287e4a791ad1a6945 -> rad/patches/d004b67355456c46de10c0d287e4a791ad1a6945  (forced update)
-$ git checkout - -q
-$ git commit --allow-empty -m "Changes #3" -q
-$ git push
-✓ Patch d004b67 updated to revision 7b5015a8dac188bb0d44a334aa68a51298750b07
-✓ Synced with 1 node(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-   c2aaf1c..d9f8caf  patch/d004b67 -> patches/d004b67355456c46de10c0d287e4a791ad1a6945
-```
-
-``` ~alice
-$ cat .git/FETCH_HEAD
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354		branch 'master' of rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-8d5f1bae4b69d8e3f6cbfc6f4bd675ed19990afc	not-for-merge	branch 'patches/d004b67355456c46de10c0d287e4a791ad1a6945' of rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-```
-
-``` ~bob (stderr)
-$ git checkout master -q
-$ git pull
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
- + c2aaf1c...8d5f1ba patches/d004b67355456c46de10c0d287e4a791ad1a6945 -> rad/patches/d004b67355456c46de10c0d287e4a791ad1a6945  (forced update)
-```
-
-``` ~bob
-$ git rev-parse master
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
-```
diff --git a/radicle-cli/examples/rad-remote.md b/radicle-cli/examples/rad-remote.md
deleted file mode 100644
index f9c1acfdb..000000000
--- a/radicle-cli/examples/rad-remote.md
+++ /dev/null
@@ -1,86 +0,0 @@
-Now, let's add a bob as a new remote:
-
-```
-$ rad remote add did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --name bob --no-sync
-✓ Remote bob added
-✓ Remote-tracking branch bob/master created for z6Mkt67…v4N1tRk
-```
-
-Now, we can see that there is a new remote in the list of remotes:
-
-```
-$ rad remote list
-bob z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (fetch)
-rad (canonical upstream)                             (fetch)
-rad z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (push)
-```
-
-You can see both `bob` and `rad` as remotes.  The `rad` remote is our personal
-remote of the project.
-
-We can now see the remote-tracking branch that was setup:
-
-```
-$ git branch -r -v
-  bob/master f2de534 Second commit
-  rad/master f2de534 Second commit
-```
-
-When we're finished with the `bob` remote, we can remove it:
-
-```
-$ rad remote rm bob
-✓ Remote `bob` removed
-$ git branch -r -v
-  rad/master f2de534 Second commit
-```
-
-Now, add another time `bob` but without specify the `name`, so we should be
-able to fetch the node alias from our db!
-
-```
-$ rad remote add did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-sync
-✓ Remote bob@z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk added
-✓ Remote-tracking branch bob@z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/master created for z6Mkt67…v4N1tRk
-```
-
-We can also use `rad remote` to list all the remotes that are
-available in the repository by using the `--untracked` flag:
-
-```
-$ rad remote --untracked
-eve did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z
-```
-
-If we use `--all`, then we can see all the remotes that we have
-created in the working copy, followed by all the available remotes:
-
-```
-$ rad remote --all
-bob@z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (fetch)
-rad                                                  (canonical upstream)                             (fetch)
-rad                                                  z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (push)
-
-eve did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z
-```
-
-As we can see, we have also have another remote namespace `eve`, so
-let's add them to our set of working copy remotes:
-
-```
-$ rad remote add did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z --name eve --no-sync
-✓ Remote eve added
-✓ Remote-tracking branch eve/master created for z6Mkux1…nVhib7Z
-```
-
-After adding `eve`'s remote, we no longer see any entries that are
-untracked:
-
-```
-$ rad remote --all
-bob@z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (fetch)
-eve                                                  z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z (fetch)
-rad                                                  (canonical upstream)                             (fetch)
-rad                                                  z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (push)
-```
-
diff --git a/radicle-cli/examples/rad-review-by-hunk.md b/radicle-cli/examples/rad-review-by-hunk.md
deleted file mode 100644
index d21b15e1d..000000000
--- a/radicle-cli/examples/rad-review-by-hunk.md
+++ /dev/null
@@ -1,187 +0,0 @@
-Let's start by creating some files we will patch:
-
-``` ./MENU.txt
-Classics
---------
-Salmon Tartare
-Mac & Cheese
-
-Comfort Food
-------------
-Reuben Sandwich
-Club Sandwich
-Fried Shrimp Basket
-
-Sides
------
-French Fries
-```
-
-``` ./INSTRUCTIONS.txt
-Notes on how to prepare food go here.
-```
-
-``` ./.gitignore
-*.draft
-```
-
-Now let's commit and push them:
-
-```
-$ git add MENU.txt INSTRUCTIONS.txt .gitignore
-$ git commit -q -a -m "Add files"
-$ git push rad master
-```
-
-We can now make some changes and create a patch:
-
-```
-$ sed -i '$a Garlic Green Beans' MENU.txt
-$ sed -i '3i\Baked Brie' MENU.txt
-$ sed -i 's/French Fries/French Fries!/' MENU.txt
-$ rm .gitignore
-$ mkdir notes
-$ mv INSTRUCTIONS.txt notes/
-```
-
-``` ./DISCLAIMER.txt
-All food is served as-is, with no warranty!
-```
-
-```
-$ git checkout -q -b patch/1
-$ git add .
-$ git status --short
-D  .gitignore
-A  DISCLAIMER.txt
-M  MENU.txt
-R  INSTRUCTIONS.txt -> notes/INSTRUCTIONS.txt
-$ git commit -q -m "Update files"
-```
-
-``` (stderr)
-$ git push rad HEAD:refs/patches
-✓ Patch 7a2ac7e2841cc1e7394f99f107555a499b1d3f23 opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference]   HEAD -> refs/patches
-```
-
-Finally, we do a review of the patch by hunk. The output of this command should
-match `git diff master -W100% -U5 --patience`:
-
-```
-$ rad patch review --patch -U5 7a2ac7e2841cc1e7394f99f107555a499b1d3f23 --no-announce
-╭──────────────────────╮
-│ .gitignore ❲deleted❳ │
-├──────────────────────┤
-│ @@ -1,1 +0,0 @@      │
-│ 1          - *.draft │
-╰──────────────────────╯
-╭──────────────────────────────────────────────────────────╮
-│ DISCLAIMER.txt ❲created❳                                 │
-├──────────────────────────────────────────────────────────┤
-│ @@ -0,0 +1,1 @@                                          │
-│      1     + All food is served as-is, with no warranty! │
-╰──────────────────────────────────────────────────────────╯
-╭─────────────────────────────╮
-│ MENU.txt                    │
-├─────────────────────────────┤
-│ @@ -1,7 +1,8 @@             │
-│ 1    1       Classics       │
-│ 2    2       --------       │
-│      3     + Baked Brie     │
-│ 3    4       Salmon Tartare │
-│ 4    5       Mac & Cheese   │
-│ 5    6                      │
-│ 6    7       Comfort Food   │
-│ 7    8       ------------   │
-╰─────────────────────────────╯
-╭──────────────────────────────────╮
-│ MENU.txt                         │
-├──────────────────────────────────┤
-│ @@ -9,6 +10,7 @@ Reuben Sandwich │
-│ 9    10      Club Sandwich       │
-│ 10   11      Fried Shrimp Basket │
-│ 11   12                          │
-│ 12   13      Sides               │
-│ 13   14      -----               │
-│ 14         - French Fries        │
-│      15    + French Fries!       │
-│      16    + Garlic Green Beans  │
-╰──────────────────────────────────╯
-╭────────────────────────────────────────────────────╮
-│ INSTRUCTIONS.txt -> notes/INSTRUCTIONS.txt ❲moved❳ │
-╰────────────────────────────────────────────────────╯
-```
-
-Now let's accept these hunks one by one..
-
-```
-$ rad patch review --patch --accept --hunk 1 7a2ac7e2841cc1e7394f99f107555a499b1d3f23 --no-announce
-✓ Loaded existing review ([..]) for patch 7a2ac7e2841cc1e7394f99f107555a499b1d3f23
-╭──────────────────────╮
-│ .gitignore ❲deleted❳ │
-├──────────────────────┤
-│ @@ -1,1 +0,0 @@      │
-│ 1          - *.draft │
-╰──────────────────────╯
-✓ Updated brain to a5fccf0e977225ff13c3f74c43faf4cb679bf835
-```
-```
-$ rad patch review --patch --accept --hunk 1 7a2ac7e2841cc1e7394f99f107555a499b1d3f23 --no-announce
-✓ Loaded existing review ([..]) for patch 7a2ac7e2841cc1e7394f99f107555a499b1d3f23
-╭──────────────────────────────────────────────────────────╮
-│ DISCLAIMER.txt ❲created❳                                 │
-├──────────────────────────────────────────────────────────┤
-│ @@ -0,0 +1,1 @@                                          │
-│      1     + All food is served as-is, with no warranty! │
-╰──────────────────────────────────────────────────────────╯
-✓ Updated brain to 2cdb82ea726e64d3b52847c7699d0d4759198f5c
-```
-```
-$ rad patch review --patch --accept -U3 --hunk 1 7a2ac7e2841cc1e7394f99f107555a499b1d3f23 --no-announce
-✓ Loaded existing review ([..]) for patch 7a2ac7e2841cc1e7394f99f107555a499b1d3f23
-╭─────────────────────────────╮
-│ MENU.txt                    │
-├─────────────────────────────┤
-│ @@ -1,5 +1,6 @@             │
-│ 1    1       Classics       │
-│ 2    2       --------       │
-│      3     + Baked Brie     │
-│ 3    4       Salmon Tartare │
-│ 4    5       Mac & Cheese   │
-│ 5    6                      │
-╰─────────────────────────────╯
-✓ Updated brain to d4aecbb859a802a3215def0b538358bf63593953
-```
-```
-$ rad patch review --patch --accept -U3 --hunk 1 7a2ac7e2841cc1e7394f99f107555a499b1d3f23 --no-announce
-✓ Loaded existing review ([..]) for patch 7a2ac7e2841cc1e7394f99f107555a499b1d3f23
-╭───────────────────────────────────────╮
-│ MENU.txt                              │
-├───────────────────────────────────────┤
-│ @@ -12,4 +12,5 @@ Fried Shrimp Basket │
-│ 12   12                               │
-│ 13   13      Sides                    │
-│ 14   14      -----                    │
-│ 15         - French Fries             │
-│      15    + French Fries!            │
-│      16    + Garlic Green Beans       │
-╰───────────────────────────────────────╯
-✓ Updated brain to 59cee720b0642b1491b241400912b35926a76c3f
-```
-
-```
-$ rad patch review --patch --accept --hunk 1 7a2ac7e2841cc1e7394f99f107555a499b1d3f23 --no-announce
-✓ Loaded existing review ([..]) for patch 7a2ac7e2841cc1e7394f99f107555a499b1d3f23
-╭────────────────────────────────────────────────────╮
-│ INSTRUCTIONS.txt -> notes/INSTRUCTIONS.txt ❲moved❳ │
-╰────────────────────────────────────────────────────╯
-✓ Updated brain to 3effc8f6462fa2573697072245e57708c4dcbe62
-```
-
-```
-$ rad patch review --patch --accept --hunk 1 7a2ac7e2841cc1e7394f99f107555a499b1d3f23 --no-announce
-✓ Loaded existing review ([..]) for patch 7a2ac7e2841cc1e7394f99f107555a499b1d3f23
-✓ All hunks have been reviewed
-```
diff --git a/radicle-cli/examples/rad-seed-and-follow.md b/radicle-cli/examples/rad-seed-and-follow.md
deleted file mode 100644
index ae6d4ff8d..000000000
--- a/radicle-cli/examples/rad-seed-and-follow.md
+++ /dev/null
@@ -1,37 +0,0 @@
-To configure our node's seeding and follow policy, we can use the `rad seed`
-and `rad follow` commands.
-For example, let's follow a remote node we know about, and alias it to "eve":
-
-```
-$ rad follow did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --alias eve
-✓ Follow policy updated for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (eve)
-```
-
-We can list the followed peers by omitting the DID:
-
-```
-$ rad follow
-╭───────────────────────────────────────────────────────────────────────────╮
-│ DID                                                        Alias   Policy │
-├───────────────────────────────────────────────────────────────────────────┤
-│ did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk   eve     allow  │
-╰───────────────────────────────────────────────────────────────────────────╯
-```
-
-Now let's seed one of Eve's repositories:
-
-```
-$ rad seed rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope followed --no-fetch
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'followed'
-```
-
-We can list the repositories we are seeding by omitting the RID:
-
-```
-$ rad seed
-╭──────────────────────────────────────────────────────────────╮
-│ Repository                          Name   Policy   Scope    │
-├──────────────────────────────────────────────────────────────┤
-│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji          allow    followed │
-╰──────────────────────────────────────────────────────────────╯
-```
diff --git a/radicle-cli/examples/rad-self.md b/radicle-cli/examples/rad-self.md
deleted file mode 100644
index a486efc8c..000000000
--- a/radicle-cli/examples/rad-self.md
+++ /dev/null
@@ -1,40 +0,0 @@
-The `rad self` command is used to display information about your local
-device and node.
-
-```
-$ rad self
-Alias           alice
-DID             did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-└╴Node ID (NID) z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-SSH             not running
-├╴Key (hash)    SHA256:UIedaL6Cxm6OUErh9GQUzzglSk7VpQlVTI1TAFB/HWA
-└╴Key (full)    ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHahWSBEpuT1ESZbynOmBNkLBSnR32Ar4woZqSV2YNH1
-Home            [..]/home/alice/.radicle
-├╴Config        [..]/home/alice/.radicle/config.json
-├╴Storage       [..]/home/alice/.radicle/storage
-├╴Keys          [..]/home/alice/.radicle/keys
-└╴Node          [..]/home/alice/.radicle/node
-```
-
-If you need to display only your DID, Node ID, or SSH Public Key, you can use
-the various options available:
-
-```
-$ rad self --did
-did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-```
-
-```
-$ rad self --nid
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-```
-
-```
-$ rad self --ssh-key
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHahWSBEpuT1ESZbynOmBNkLBSnR32Ar4woZqSV2YNH1
-```
-
-```
-$ rad self --home
-[..]/home/alice/.radicle
-```
diff --git a/radicle-cli/examples/rad-sync-without-node.md b/radicle-cli/examples/rad-sync-without-node.md
deleted file mode 100644
index e7ed81801..000000000
--- a/radicle-cli/examples/rad-sync-without-node.md
+++ /dev/null
@@ -1,18 +0,0 @@
-When you try to clone or sync without your node running, it gives you an error:
-
-``` ~bob (fail)
-$ rad clone rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5
-✗ Error: to clone a repository, your node must be running. To start it, run `rad node start`
-```
-
-``` ~eve (fail)
-$ rad sync --fetch rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5 --seed z6MksmpU5b1dS7oaqF2bHXhQi1DWy2hB7Mh9CuN7y1DN6QSz
-✗ Error: to sync a repository, your node must be running. To start it, run `rad node start`
-```
-
-Note that seeding works fine without a running node:
-
-``` ~alice
-$ rad seed rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5
-✓ Seeding policy updated for rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5 with scope 'all'
-```
diff --git a/radicle-cli/examples/rad-sync.md b/radicle-cli/examples/rad-sync.md
deleted file mode 100644
index 1b9585885..000000000
--- a/radicle-cli/examples/rad-sync.md
+++ /dev/null
@@ -1,129 +0,0 @@
-The `rad sync` command announces changes to the network and waits for other
-nodes to be synchronized with those changes.
-
-For instance let's create an issue and sync it with the network:
-
-```
-$ rad issue open --title "Test `rad sync`" --description "Check that the command works" -q --no-announce
-```
-
-If we check the sync status, we see that our peers are out of sync, and our
-change has not yet been announced.
-
-```
-$ rad sync status --sort-by alias
-╭──────────────────────────────────────────────────────────────────────────────────────────────╮
-│ ●   Node                      Address                      Status        Tip       Timestamp │
-├──────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ●   alice   (you)             alice.radicle.example:8776   unannounced   a9ce0d1   [  ...  ] │
-│ ●   bob     z6Mkt67…v4N1tRk   bob.radicle.example:8776     out-of-sync   f209c9f   [  ...  ] │
-│ ●   eve     z6Mkux1…nVhib7Z   eve.radicle.example:8776     out-of-sync   f209c9f   [  ...  ] │
-╰──────────────────────────────────────────────────────────────────────────────────────────────╯
-```
-
-Now let's run `rad sync`. This will announce the issue refs to the network and
-wait for nodes to announce that they have fetched those refs.
-
-```
-$ rad sync --announce
-✓ Synced with 2 node(s)
-```
-
-Now, when we run `rad sync status` again, we can see that `bob` and
-`eve` are up-to-date:
-
-```
-$ rad sync status --sort-by alias
-╭─────────────────────────────────────────────────────────────────────────────────────────╮
-│ ●   Node                      Address                      Status   Tip       Timestamp │
-├─────────────────────────────────────────────────────────────────────────────────────────┤
-│ ●   alice   (you)             alice.radicle.example:8776            a9ce0d1   [  ...  ] │
-│ ●   bob     z6Mkt67…v4N1tRk   bob.radicle.example:8776     synced   a9ce0d1   [  ...  ] │
-│ ●   eve     z6Mkux1…nVhib7Z   eve.radicle.example:8776     synced   a9ce0d1   [  ...  ] │
-╰─────────────────────────────────────────────────────────────────────────────────────────╯
-```
-
-If we try to sync again after the nodes have synced, we will already
-be up to date.
-
-```
-$ rad sync --announce
-✓ Nothing to announce, already in sync with 2 node(s) (see `rad sync status`)
-```
-
-We can also use the `--fetch` option to only fetch objects:
-
-```
-$ rad sync --fetch
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkux1…nVhib7Z..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk..
-✓ Fetched repository from 2 seed(s)
-```
-
-Specifying both `--fetch` and `--announce` is equivalent to specifying none:
-
-```
-$ rad sync --fetch --announce
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkux1…nVhib7Z..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk..
-✓ Fetched repository from 2 seed(s)
-✓ Nothing to announce, already in sync with 2 node(s) (see `rad sync status`)
-```
-
-It's also possible to use the `--seed` flag to only sync with a specific node:
-
-```
-$ rad sync --fetch --seed z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk..
-✓ Fetched repository from 1 seed(s)
-```
-
-And the `--replicas` flag to sync with a number of nodes. First we'll
-create a new issue so that we have something to announce:
-
-```
-$ rad issue open --title "Test `rad sync --replicas`" --description "Check that the replicas works" -q --no-announce
-```
-
-```
-$ rad sync --replicas 1
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkux1…nVhib7Z..
-✓ Fetched repository from 1 seed(s)
-✓ Synced with 1 node(s)
-```
-
-Note that we see `✓ Fetched repository from 1 seed(s)` and `✓ Synced
-with 1 node(s)`. This does not necessarily mean that only `bob` or
-`eve` were synchronized with, since they both could have received the
-announcement of the new changes. However, it does mean that we only
-wait for at least 1 of the nodes to have fetched the changes from us.
-
-
-It's also possible to receive an error if a repository is not found anywhere.
-
-```
-$ rad seed rad:z39mP9rQAaGmERfUMPULfPUi473tY
-✓ Seeding policy updated for rad:z39mP9rQAaGmERfUMPULfPUi473tY with scope 'all'
-```
-``` (fail)
-$ rad sync rad:z39mP9rQAaGmERfUMPULfPUi473tY
-✗ Error: no seeds found for rad:z39mP9rQAaGmERfUMPULfPUi473tY
-✗ Error: nothing to announce, repository rad:z39mP9rQAaGmERfUMPULfPUi473tY is not available locally
-```
-
-Or when trying to fetch from a seed you aren't connected to, using `--seed`:
-```
-$ rad sync --fetch rad:z39mP9rQAaGmERfUMPULfPUi473tY --seed z6MkjM3HpqNVV4ZsL5s3RAd8ThVG3VG98YsDCjHBNnGMq5o7
-✗ Fetching rad:z39mP9rQAaGmERfUMPULfPUi473tY from z6MkjM3…nGMq5o7.. error: peer is not connected; cannot initiate fetch
-✗ Error: repository fetch from 1 seed(s) failed
-```
-
-Also note that you cannot sync an unseeded repo:
-```
-$ rad unseed rad:z39mP9rQAaGmERfUMPULfPUi473tY
-[...]
-```
-``` (fail)
-$ rad sync rad:z39mP9rQAaGmERfUMPULfPUi473tY
-✗ Error: repository rad:z39mP9rQAaGmERfUMPULfPUi473tY is not seeded
-```
diff --git a/radicle-cli/examples/rad-unseed.md b/radicle-cli/examples/rad-unseed.md
deleted file mode 100644
index f258e51e2..000000000
--- a/radicle-cli/examples/rad-unseed.md
+++ /dev/null
@@ -1,45 +0,0 @@
-Let's say we have a local repository we've initialized:
-
-```
-$ rad ls
-╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ Name        RID                                 Visibility   Head      Description                        │
-├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ heartwood   rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji   public       f2de534   Radicle Heartwood Protocol & Stack │
-╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯
-```
-
-We could stop seeding it if we didn't want other nodes to fetch it from us:
-
-```
-$ rad unseed rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Seeding policy for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji removed
-```
-
-Now, if we run `rad ls`, we see it's gone:
-
-```
-$ rad ls
-Nothing to show.
-$ rad ls --seeded
-Nothing to show.
-```
-
-However, with the `--all` flag, we can see it still, but as local-only:
-
-```
-$ rad ls --all
-╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ Name        RID                                 Visibility   Head      Description                        │
-├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ heartwood   rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji   local        f2de534   Radicle Heartwood Protocol & Stack │
-╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯
-```
-
-Hence, we also see that it isn't in our inventory and isn't seeded:
-
-```
-$ rad node inventory
-$ rad seed
-No seeding policies to show.
-```
diff --git a/radicle-cli/examples/rad-watch.md b/radicle-cli/examples/rad-watch.md
deleted file mode 100644
index 39e3fc841..000000000
--- a/radicle-cli/examples/rad-watch.md
+++ /dev/null
@@ -1,20 +0,0 @@
-The `rad watch` command allows you to watch a reference and return when it
-reaches a target commit.
-
-``` ~bob
-$ git rev-parse refs/remotes/alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
-```
-
-``` ~alice
-$ git rev-parse master
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
-$ git commit --allow-empty -m "Minor update" -q
-$ git rev-parse master
-e09c4dc1b54443ceea715ea648afecdcfd1dd7d0
-$ git push rad master
-```
-
-``` ~bob
-$ rad watch --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --node z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --ref 'refs/heads/master' --target e09c4dc1b54443ceea715ea648afecdcfd1dd7d0 --interval 500
-```
diff --git a/radicle-cli/examples/workflow/1-new-project.md b/radicle-cli/examples/workflow/1-new-project.md
deleted file mode 120000
index e2094cdd0..000000000
--- a/radicle-cli/examples/workflow/1-new-project.md
+++ /dev/null
@@ -1 +0,0 @@
-../rad-init.md
\ No newline at end of file
diff --git a/radicle-cli/examples/workflow/2-cloning.md b/radicle-cli/examples/workflow/2-cloning.md
deleted file mode 120000
index 8e7337ecb..000000000
--- a/radicle-cli/examples/workflow/2-cloning.md
+++ /dev/null
@@ -1 +0,0 @@
-../rad-clone.md
\ No newline at end of file
diff --git a/radicle-cli/examples/workflow/3-issues.md b/radicle-cli/examples/workflow/3-issues.md
deleted file mode 100644
index 895246c1d..000000000
--- a/radicle-cli/examples/workflow/3-issues.md
+++ /dev/null
@@ -1,36 +0,0 @@
-Project "todos" are called *issues*.  They can be inspected and
-modified using the `issue` subcommand.
-
-Let's say the new car you are designing with your peers has a problem with its flux capacitor.
-
-```
-$ rad issue open --title "flux capacitor underpowered" --description "Flux capacitor power requirements exceed current supply" --no-announce
-╭─────────────────────────────────────────────────────────╮
-│ Title   flux capacitor underpowered                     │
-│ Issue   9037b7a42323d4b79e6a48b7d05d3bbaae11d69b        │
-│ Author  bob (you)                                       │
-│ Status  open                                            │
-│                                                         │
-│ Flux capacitor power requirements exceed current supply │
-╰─────────────────────────────────────────────────────────╯
-```
-
-The issue is now listed under our project.
-
-```
-$ rad issue list
-╭──────────────────────────────────────────────────────────────────────────────────────────╮
-│ ●   ID        Title                         Author           Labels   Assignees   Opened │
-├──────────────────────────────────────────────────────────────────────────────────────────┤
-│ ●   9037b7a   flux capacitor underpowered   bob      (you)                        now    │
-╰──────────────────────────────────────────────────────────────────────────────────────────╯
-```
-
-Great! Now we've documented the issue for ourselves and others. But wait, we've
-found an important detail about the car's power requirements. It will help
-whoever works on a fix.
-
-```
-$ rad issue comment 9037b7a42323d4b79e6a48b7d05d3bbaae11d69b --message 'The flux capacitor needs 1.21 Gigawatts' -q --no-announce
-400cb155f512b4880858bb05f935104c34167b28
-```
diff --git a/radicle-cli/examples/workflow/4-patching-contributor.md b/radicle-cli/examples/workflow/4-patching-contributor.md
deleted file mode 100644
index 626081cde..000000000
--- a/radicle-cli/examples/workflow/4-patching-contributor.md
+++ /dev/null
@@ -1,91 +0,0 @@
-When contributing to another's project, it is common for the contribution to be
-of many commits and involve a discussion with the project's maintainer.  This is supported
-via Radicle *patches*.
-
-Here we give a brief overview for using patches in our hypothetical car
-scenario.  It turns out instructions containing the power requirements were
-missing from the project.
-
-```
-$ git checkout -b flux-capacitor-power
-$ touch REQUIREMENTS
-```
-
-Here the instructions are added to the project's `REQUIREMENTS` for 1.21
-gigawatts and committed with git.
-
-```
-$ git add REQUIREMENTS
-$ git commit -v -m "Define power requirements"
-[flux-capacitor-power 3e674d1] Define power requirements
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 REQUIREMENTS
-```
-
-Once the code is ready, we open a patch with our changes.
-
-``` (stderr)
-$ git push rad -o no-sync -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches
-✓ Patch e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
- * [new reference]   HEAD -> refs/patches
-```
-
-It will now be listed as one of the project's open patches.
-
-```
-$ rad patch
-╭─────────────────────────────────────────────────────────────────────────────────────────╮
-│ ●  ID       Title                      Author         Reviews  Head     +   -   Updated │
-├─────────────────────────────────────────────────────────────────────────────────────────┤
-│ ●  e4934b6  Define power requirements  bob     (you)  -        3e674d1  +0  -0  now     │
-╰─────────────────────────────────────────────────────────────────────────────────────────╯
-$ rad patch show e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46
-╭────────────────────────────────────────────────────╮
-│ Title     Define power requirements                │
-│ Patch     e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 │
-│ Author    bob (you)                                │
-│ Head      3e674d1a1df90807e934f9ae5da2591dd6848a33 │
-│ Branches  flux-capacitor-power                     │
-│ Commits   ahead 1, behind 0                        │
-│ Status    open                                     │
-│                                                    │
-│ See details.                                       │
-├────────────────────────────────────────────────────┤
-│ 3e674d1 Define power requirements                  │
-├────────────────────────────────────────────────────┤
-│ ● opened by bob (you) (3e674d1) now                │
-╰────────────────────────────────────────────────────╯
-```
-
-We can also confirm that the patch branch is in storage:
-
-```
-$ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk refs/heads/patches/*
-3e674d1a1df90807e934f9ae5da2591dd6848a33	refs/heads/patches/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46
-```
-
-Wait, let's add a README too! Just for fun.
-
-```
-$ touch README.md
-$ git add README.md
-$ git commit --message "Add README, just for the fun"
-[flux-capacitor-power 27857ec] Add README, just for the fun
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 README.md
-```
-``` (stderr) RAD_SOCKET=/dev/null
-$ git push -o patch.message="Add README, just for the fun"
-✓ Patch e4934b6 updated to revision 773b9aab58b11e9fa83d0ed0baca2bea6ff889c9
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-   3e674d1..27857ec  flux-capacitor-power -> patches/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46
-```
-
-And let's leave a quick comment for our team:
-
-```
-$ rad patch comment e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 --message 'I cannot wait to get back to the 90s!' -q
-8c66f87afadc7c7c857f8bb92973c25f64e75776
-✓ Synced with 1 node(s)
-```
diff --git a/radicle-cli/examples/workflow/5-patching-maintainer.md b/radicle-cli/examples/workflow/5-patching-maintainer.md
deleted file mode 100644
index 90c9bc79a..000000000
--- a/radicle-cli/examples/workflow/5-patching-maintainer.md
+++ /dev/null
@@ -1,125 +0,0 @@
-Back to being the project maintainer.
-
-Changes have been proposed by another peer via a radicle patch. To track
-changes from another peer, we must first follow them, and then create
-a tracking branch in our working copy. The `rad remote add` command does all
-of this.
-
-```
-$ rad remote add z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --name bob --sync --fetch
-✓ Follow policy updated for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk..
-✓ Remote bob added
-✓ Remote-tracking branch bob/master created for z6Mkt67…v4N1tRk
-```
-
-The contributor's changes are now visible to us.
-
-```
-$ rad inbox --sort-by id
-╭────────────────────────────────────────────────────────────────────────────╮
-│ heartwood                                                                  │
-├────────────────────────────────────────────────────────────────────────────┤
-│ 001   ●   9037b7a   flux capacitor underpowered   issue   open   bob   now │
-│ 002   ●   e4934b6   Define power requirements     patch   open   bob   now │
-╰────────────────────────────────────────────────────────────────────────────╯
-$ git branch -r
-  bob/patches/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46
-  rad/master
-$ rad patch show e4934b6
-╭─────────────────────────────────────────────────────────────────────╮
-│ Title    Define power requirements                                  │
-│ Patch    e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46                   │
-│ Author   bob z6Mkt67…v4N1tRk                                        │
-│ Head     27857ec9eb04c69cacab516e8bf4b5fd36090f66                   │
-│ Commits  ahead 2, behind 0                                          │
-│ Status   open                                                       │
-│                                                                     │
-│ See details.                                                        │
-├─────────────────────────────────────────────────────────────────────┤
-│ 27857ec Add README, just for the fun                                │
-│ 3e674d1 Define power requirements                                   │
-├─────────────────────────────────────────────────────────────────────┤
-│ ● opened by bob z6Mkt67…v4N1tRk (3e674d1) now                       │
-│ ↑ updated to 773b9aab58b11e9fa83d0ed0baca2bea6ff889c9 (27857ec) now │
-╰─────────────────────────────────────────────────────────────────────╯
-```
-
-Wait! There's a mistake.  The REQUIREMENTS should be a markdown file.  Let's
-quickly update the patch before incorporating the changes.  Updating it this
-way will tell others about the corrections we needed before merging the
-changes.
-
-```
-$ rad patch checkout e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46
-✓ Switched to branch patch/e4934b6 at revision 773b9aa
-✓ Branch patch/e4934b6 setup to track rad/patches/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46
-$ git mv REQUIREMENTS REQUIREMENTS.md
-$ git commit -m "Use markdown for requirements"
-[patch/e4934b6 f567f69] Use markdown for requirements
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename REQUIREMENTS => REQUIREMENTS.md (100%)
-```
-``` (stderr)
-$ git push rad -o no-sync -o patch.message="Use markdown for requirements"
-✓ Patch e4934b6 updated to revision 9d62420e779e5cfe1dc02c51eddec9a0907aa844
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new branch]      patch/e4934b6 -> patches/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46
-```
-
-Great, all fixed up, lets accept and merge the code.
-
-```
-$ rad patch review e4934b6 --revision 9d62420 --accept
-✓ Patch e4934b6 accepted
-✓ Synced with 1 node(s)
-$ git checkout master
-Your branch is up to date with 'rad/master'.
-$ git merge patch/e4934b6
-Updating f2de534..f567f69
-Fast-forward
- README.md       | 0
- REQUIREMENTS.md | 0
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 README.md
- create mode 100644 REQUIREMENTS.md
-```
-``` (stderr)
-$ git push rad master
-✓ Patch e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 merged at revision 9d62420
-✓ Canonical head updated to f567f695d25b4e8fb63b5f5ad2a584529826e908
-✓ Synced with 1 node(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-   f2de534..f567f69  master -> master
-```
-
-The patch is now merged and closed :).
-
-```
-$ rad patch show e4934b6
-╭─────────────────────────────────────────────────────────────────────╮
-│ Title    Define power requirements                                  │
-│ Patch    e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46                   │
-│ Author   bob z6Mkt67…v4N1tRk                                        │
-│ Head     27857ec9eb04c69cacab516e8bf4b5fd36090f66                   │
-│ Commits  ahead 0, behind 1                                          │
-│ Status   merged                                                     │
-│                                                                     │
-│ See details.                                                        │
-├─────────────────────────────────────────────────────────────────────┤
-│ 27857ec Add README, just for the fun                                │
-│ 3e674d1 Define power requirements                                   │
-├─────────────────────────────────────────────────────────────────────┤
-│ ● opened by bob z6Mkt67…v4N1tRk (3e674d1) now                       │
-│ ↑ updated to 773b9aab58b11e9fa83d0ed0baca2bea6ff889c9 (27857ec) now │
-│ * revised by alice (you) in 9d62420 (f567f69) now                   │
-│   └─ ✓ accepted by alice (you) now                                  │
-│   └─ ✓ merged by alice (you) at revision 9d62420 (f567f69) now      │
-╰─────────────────────────────────────────────────────────────────────╯
-```
-
-To publish our new state to the network, we simply push:
-
-```
-$ git push
-```
diff --git a/radicle-cli/examples/workflow/6-pulling-contributor.md b/radicle-cli/examples/workflow/6-pulling-contributor.md
deleted file mode 100644
index 2e57b5c70..000000000
--- a/radicle-cli/examples/workflow/6-pulling-contributor.md
+++ /dev/null
@@ -1,36 +0,0 @@
-Now that the patch is merged, we can update our master branch to the canonical
-master, which includes our patch.
-
-First, we confirm that our master is behind:
-```
-$ git rev-parse master
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
-```
-
-Then, we call `rad sync --fetch` to fetch from the maintainer:
-```
-$ rad sync --fetch
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
-✓ Fetched repository from 1 seed(s)
-```
-
-Now let's checkout `master` and pull the maintainer's changes:
-```
-$ git checkout master
-Your branch is up to date with 'rad/master'.
-```
-``` (stderr) RAD_SOCKET=/dev/null
-$ git pull --all --ff
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-   f2de534..f567f69  master     -> rad/master
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-   f2de534..f567f69  master     -> alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master
-```
-
-Now our master branch is up to date with the maintainer's master:
-
-```
-$ git rev-parse master
-f567f695d25b4e8fb63b5f5ad2a584529826e908
-$ git diff master..alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master
-```
diff --git a/radicle-cli/src/commands.rs b/radicle-cli/src/commands.rs
deleted file mode 100644
index e4df12c10..000000000
--- a/radicle-cli/src/commands.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-#[path = "commands/auth.rs"]
-pub mod rad_auth;
-#[path = "commands/block.rs"]
-pub mod rad_block;
-#[path = "commands/checkout.rs"]
-pub mod rad_checkout;
-#[path = "commands/clean.rs"]
-pub mod rad_clean;
-#[path = "commands/clone.rs"]
-pub mod rad_clone;
-#[path = "commands/cob.rs"]
-pub mod rad_cob;
-#[path = "commands/config.rs"]
-pub mod rad_config;
-#[path = "commands/debug.rs"]
-pub mod rad_debug;
-#[path = "commands/diff.rs"]
-pub mod rad_diff;
-#[path = "commands/follow.rs"]
-pub mod rad_follow;
-#[path = "commands/fork.rs"]
-pub mod rad_fork;
-#[path = "commands/help.rs"]
-pub mod rad_help;
-#[path = "commands/id.rs"]
-pub mod rad_id;
-#[path = "commands/inbox.rs"]
-pub mod rad_inbox;
-#[path = "commands/init.rs"]
-pub mod rad_init;
-#[path = "commands/inspect.rs"]
-pub mod rad_inspect;
-#[path = "commands/issue.rs"]
-pub mod rad_issue;
-#[path = "commands/ls.rs"]
-pub mod rad_ls;
-#[path = "commands/node.rs"]
-pub mod rad_node;
-#[path = "commands/patch.rs"]
-pub mod rad_patch;
-#[path = "commands/path.rs"]
-pub mod rad_path;
-#[path = "commands/publish.rs"]
-pub mod rad_publish;
-#[path = "commands/remote.rs"]
-pub mod rad_remote;
-#[path = "commands/seed.rs"]
-pub mod rad_seed;
-#[path = "commands/self.rs"]
-pub mod rad_self;
-#[path = "commands/stats.rs"]
-pub mod rad_stats;
-#[path = "commands/sync.rs"]
-pub mod rad_sync;
-#[path = "commands/unblock.rs"]
-pub mod rad_unblock;
-#[path = "commands/unfollow.rs"]
-pub mod rad_unfollow;
-#[path = "commands/unseed.rs"]
-pub mod rad_unseed;
-#[path = "commands/watch.rs"]
-pub mod rad_watch;
diff --git a/radicle-cli/src/commands/auth.rs b/radicle-cli/src/commands/auth.rs
deleted file mode 100644
index fe13ac884..000000000
--- a/radicle-cli/src/commands/auth.rs
+++ /dev/null
@@ -1,242 +0,0 @@
-#![allow(clippy::or_fun_call)]
-use std::ffi::OsString;
-use std::ops::Not as _;
-use std::str::FromStr;
-
-use anyhow::anyhow;
-
-use radicle::crypto::ssh;
-use radicle::crypto::ssh::Passphrase;
-use radicle::node::Alias;
-use radicle::profile::env;
-use radicle::{profile, Profile};
-
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-
-pub const HELP: Help = Help {
-    name: "auth",
-    description: "Manage identities and profiles",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad auth [<option>...]
-
-    A passphrase may be given via the environment variable `RAD_PASSPHRASE` or
-    via the standard input stream if `--stdin` is used. Using either of these
-    methods disables the passphrase prompt.
-
-Options
-
-    --alias                 When initializing an identity, sets the node alias
-    --stdin                 Read passphrase from stdin (default: false)
-    --help                  Print help
-"#,
-};
-
-#[derive(Debug)]
-pub struct Options {
-    pub stdin: bool,
-    pub alias: Option<Alias>,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut stdin = false;
-        let mut alias = None;
-        let mut parser = lexopt::Parser::from_args(args);
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("alias") => {
-                    let val = parser.value()?;
-                    let val = term::args::alias(&val)?;
-
-                    alias = Some(val);
-                }
-                Long("stdin") => {
-                    stdin = true;
-                }
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                _ => return Err(anyhow::anyhow!(arg.unexpected())),
-            }
-        }
-
-        Ok((Options { alias, stdin }, vec![]))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    match ctx.profile() {
-        Ok(profile) => authenticate(options, &profile),
-        Err(_) => init(options),
-    }
-}
-
-pub fn init(options: Options) -> anyhow::Result<()> {
-    term::headline("Initializing your radicle 👾 identity");
-
-    if let Ok(version) = radicle::git::version() {
-        if version < radicle::git::VERSION_REQUIRED {
-            term::warning(format!(
-                "Your Git version is unsupported, please upgrade to {} or later",
-                radicle::git::VERSION_REQUIRED,
-            ));
-            term::blank();
-        }
-    } else {
-        anyhow::bail!("a Git installation is required for Radicle to run");
-    }
-
-    let alias: Alias = if let Some(alias) = options.alias {
-        alias
-    } else {
-        let user = env::var("USER").ok().and_then(|u| Alias::from_str(&u).ok());
-        term::input(
-            "Enter your alias:",
-            user,
-            Some("This is your node alias. You can always change it later"),
-        )?
-    };
-    let home = profile::home()?;
-    let passphrase = if options.stdin {
-        term::passphrase_stdin()
-    } else {
-        term::passphrase_confirm("Enter a passphrase:", env::RAD_PASSPHRASE)
-    }?;
-    let passphrase = passphrase.trim().is_empty().not().then_some(passphrase);
-    let spinner = term::spinner("Creating your Ed25519 keypair...");
-    let profile = Profile::init(home, alias, passphrase.clone(), env::seed())?;
-    let mut agent = true;
-    spinner.finish();
-
-    if let Some(passphrase) = passphrase {
-        match ssh::agent::Agent::connect() {
-            Ok(mut agent) => {
-                let mut spinner = term::spinner("Adding your radicle key to ssh-agent...");
-                if register(&mut agent, &profile, passphrase).is_ok() {
-                    spinner.finish();
-                } else {
-                    spinner.message("Could not register radicle key in ssh-agent.");
-                    spinner.warn();
-                }
-            }
-            Err(e) if e.is_not_running() => {
-                agent = false;
-            }
-            Err(e) => Err(e)?,
-        }
-    }
-
-    term::success!(
-        "Your Radicle DID is {}. This identifies your device. Run {} to show it at all times.",
-        term::format::highlight(profile.did()),
-        term::format::command("rad self")
-    );
-    term::success!("You're all set.");
-    term::blank();
-
-    if profile.config.cli.hints && !agent {
-        term::hint("install ssh-agent to have it fill in your passphrase for you when signing.");
-        term::blank();
-    }
-    term::info!(
-        "To create a Radicle repository, run {} from a Git repository with at least one commit.",
-        term::format::command("rad init")
-    );
-    term::info!(
-        "To clone a repository, run {}. For example, {} clones the Radicle 'heartwood' repository.",
-        term::format::command("rad clone <rid>"),
-        term::format::command("rad clone rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5")
-    );
-    term::info!(
-        "To get a list of all commands, run {}.",
-        term::format::command("rad"),
-    );
-
-    Ok(())
-}
-
-/// Try loading the identity's key into SSH Agent, falling back to verifying `RAD_PASSPHRASE` for
-/// use.
-pub fn authenticate(options: Options, profile: &Profile) -> anyhow::Result<()> {
-    if !profile.keystore.is_encrypted()? {
-        term::success!("Authenticated as {}", term::format::tertiary(profile.id()));
-        return Ok(());
-    }
-    for (key, _) in &profile.config.node.extra {
-        term::warning(format!(
-            "unused or deprecated configuration attribute {:?}",
-            key
-        ));
-    }
-
-    // If our key is encrypted, we try to authenticate with SSH Agent and
-    // register it; only if it is running.
-    match ssh::agent::Agent::connect() {
-        Ok(mut agent) => {
-            if agent.request_identities()?.contains(&profile.public_key) {
-                term::success!("Radicle key already in ssh-agent");
-                return Ok(());
-            }
-            let passphrase = if let Some(phrase) = profile::env::passphrase() {
-                phrase
-            } else if options.stdin {
-                term::passphrase_stdin()?
-            } else {
-                term::io::passphrase(term::io::PassphraseValidator::new(profile.keystore.clone()))?
-            };
-            register(&mut agent, profile, passphrase)?;
-
-            term::success!("Radicle key added to {}", term::format::dim("ssh-agent"));
-
-            return Ok(());
-        }
-        Err(e) if e.is_not_running() => {}
-        Err(e) => Err(e)?,
-    };
-
-    // Try RAD_PASSPHRASE fallback.
-    if let Some(passphrase) = profile::env::passphrase() {
-        ssh::keystore::MemorySigner::load(&profile.keystore, Some(passphrase))
-            .map_err(|_| anyhow!("`{}` is invalid", env::RAD_PASSPHRASE))?;
-        return Ok(());
-    }
-
-    term::print(term::format::dim(
-        "Nothing to do, ssh-agent is not running.",
-    ));
-    term::print(term::format::dim(
-        "You will be prompted for a passphrase when necessary.",
-    ));
-
-    Ok(())
-}
-
-/// Register key with ssh-agent.
-pub fn register(
-    agent: &mut ssh::agent::Agent,
-    profile: &Profile,
-    passphrase: Passphrase,
-) -> anyhow::Result<()> {
-    let secret = profile
-        .keystore
-        .secret_key(Some(passphrase))
-        .map_err(|e| {
-            if e.is_crypto_err() {
-                anyhow!("could not decrypt secret key: invalid passphrase")
-            } else {
-                e.into()
-            }
-        })?
-        .ok_or_else(|| anyhow!("Key not found in {:?}", profile.keystore.path()))?;
-
-    agent.register(&secret)?;
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/block.rs b/radicle-cli/src/commands/block.rs
deleted file mode 100644
index fe482f647..000000000
--- a/radicle-cli/src/commands/block.rs
+++ /dev/null
@@ -1,96 +0,0 @@
-use std::ffi::OsString;
-
-use radicle::node::policy::Policy;
-use radicle::prelude::{NodeId, RepoId};
-
-use crate::terminal as term;
-use crate::terminal::args;
-use crate::terminal::args::{Args, Error, Help};
-
-pub const HELP: Help = Help {
-    name: "block",
-    description: "Block repositories or nodes from being seeded or followed",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad block <rid> [<option>...]
-    rad block <nid> [<option>...]
-
-    Blocks a repository from being seeded or a node from being followed.
-
-Options
-
-    --help          Print help
-"#,
-};
-
-enum Target {
-    Node(NodeId),
-    Repo(RepoId),
-}
-
-impl std::fmt::Display for Target {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Node(nid) => nid.fmt(f),
-            Self::Repo(rid) => rid.fmt(f),
-        }
-    }
-}
-
-pub struct Options {
-    target: Target,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut target = None;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                Value(val) if target.is_none() => {
-                    if let Ok(rid) = args::rid(&val) {
-                        target = Some(Target::Repo(rid));
-                    } else if let Ok(nid) = args::nid(&val) {
-                        target = Some(Target::Node(nid));
-                    } else {
-                        return Err(anyhow::anyhow!(
-                            "invalid repository or node specified, see `rad block --help`"
-                        ));
-                    }
-                }
-                _ => return Err(anyhow::anyhow!(arg.unexpected())),
-            }
-        }
-
-        Ok((
-            Options {
-                target: target.ok_or(anyhow::anyhow!(
-                    "a repository or node to block must be specified, see `rad block --help`"
-                ))?,
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    let mut policies = profile.policies_mut()?;
-
-    let updated = match options.target {
-        Target::Node(nid) => policies.set_follow_policy(&nid, Policy::Block)?,
-        Target::Repo(rid) => policies.set_seed_policy(&rid, Policy::Block)?,
-    };
-    if updated {
-        term::success!("Policy for {} set to 'block'", options.target);
-    }
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/checkout.rs b/radicle-cli/src/commands/checkout.rs
deleted file mode 100644
index 0554279f8..000000000
--- a/radicle-cli/src/commands/checkout.rs
+++ /dev/null
@@ -1,185 +0,0 @@
-#![allow(clippy::box_default)]
-use std::ffi::OsString;
-use std::path::PathBuf;
-
-use anyhow::anyhow;
-use anyhow::Context as _;
-
-use radicle::git;
-use radicle::node::AliasStore;
-use radicle::prelude::*;
-use radicle::storage::git::transport;
-
-use crate::project;
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-
-pub const HELP: Help = Help {
-    name: "checkout",
-    description: "Checkout a repository into the local directory",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad checkout <rid> [--remote <did>] [<option>...]
-
-    Creates a working copy from a repository in local storage.
-
-Options
-
-    --remote <did>  Remote peer to checkout
-    --no-confirm    Don't ask for confirmation during checkout
-    --help          Print help
-"#,
-};
-
-pub struct Options {
-    pub id: RepoId,
-    pub remote: Option<Did>,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut id = None;
-        let mut remote = None;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("no-confirm") => {
-                    // Ignored for now.
-                }
-                Long("help") | Short('h') => return Err(Error::Help.into()),
-                Long("remote") => {
-                    let val = parser.value().unwrap();
-                    remote = Some(term::args::did(&val)?);
-                }
-                Value(val) if id.is_none() => {
-                    id = Some(term::args::rid(&val)?);
-                }
-                _ => return Err(anyhow::anyhow!(arg.unexpected())),
-            }
-        }
-
-        Ok((
-            Options {
-                id: id.ok_or_else(|| anyhow!("a repository to checkout must be provided"))?,
-                remote,
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    execute(options, &profile)?;
-
-    Ok(())
-}
-
-fn execute(options: Options, profile: &Profile) -> anyhow::Result<PathBuf> {
-    let id = options.id;
-    let storage = &profile.storage;
-    let remote = options.remote.unwrap_or(profile.did());
-    let doc: Doc<_> = storage
-        .repository(id)?
-        .identity_doc()
-        .context("repository could not be found in local storage")?
-        .into();
-    let payload = doc.project()?;
-    let path = PathBuf::from(payload.name());
-
-    transport::local::register(storage.clone());
-
-    if path.exists() {
-        anyhow::bail!("the local path {:?} already exists", path.as_path());
-    }
-
-    let mut spinner = term::spinner("Performing checkout...");
-    let repo = match radicle::rad::checkout(options.id, &remote, path.clone(), &storage) {
-        Ok(repo) => repo,
-        Err(err) => {
-            spinner.failed();
-            term::blank();
-
-            return Err(err.into());
-        }
-    };
-    spinner.message(format!(
-        "Repository checkout successful under ./{}",
-        term::format::highlight(path.file_name().unwrap_or_default().to_string_lossy())
-    ));
-    spinner.finish();
-
-    let remotes = doc
-        .delegates
-        .into_iter()
-        .map(|did| *did)
-        .filter(|id| id != profile.id())
-        .collect::<Vec<_>>();
-
-    // Setup remote tracking branches for project delegates.
-    setup_remotes(
-        project::SetupRemote {
-            rid: id,
-            tracking: Some(payload.default_branch().clone()),
-            repo: &repo,
-            fetch: true,
-        },
-        &remotes,
-        profile,
-    )?;
-
-    Ok(path)
-}
-
-/// Setup a remote and tracking branch for each given remote.
-pub fn setup_remotes(
-    setup: project::SetupRemote,
-    remotes: &[NodeId],
-    profile: &Profile,
-) -> anyhow::Result<()> {
-    let aliases = profile.aliases();
-
-    for remote_id in remotes {
-        if let Err(e) = setup_remote(&setup, remote_id, None, &aliases) {
-            term::warning(format!("Failed to setup remote for {remote_id}: {e}").as_str());
-        }
-    }
-    Ok(())
-}
-
-/// Setup a remote and tracking branch for the given remote.
-pub fn setup_remote(
-    setup: &project::SetupRemote,
-    remote_id: &NodeId,
-    remote_name: Option<git::RefString>,
-    aliases: &impl AliasStore,
-) -> anyhow::Result<git::RefString> {
-    let remote_name = if let Some(name) = remote_name {
-        name
-    } else {
-        let name = if let Some(alias) = aliases.alias(remote_id) {
-            format!("{alias}@{remote_id}")
-        } else {
-            remote_id.to_human()
-        };
-        git::RefString::try_from(name.as_str())
-            .map_err(|_| anyhow!("invalid remote name: '{name}'"))?
-    };
-    let (remote, branch) = setup.run(&remote_name, *remote_id)?;
-
-    term::success!("Remote {} added", term::format::tertiary(remote.name));
-
-    if let Some(branch) = branch {
-        term::success!(
-            "Remote-tracking branch {} created for {}",
-            term::format::tertiary(branch),
-            term::format::tertiary(term::format::node(remote_id))
-        );
-    }
-    Ok(remote_name)
-}
diff --git a/radicle-cli/src/commands/clean.rs b/radicle-cli/src/commands/clean.rs
deleted file mode 100644
index 130607081..000000000
--- a/radicle-cli/src/commands/clean.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-use std::ffi::OsString;
-
-use anyhow::anyhow;
-
-use radicle::identity::RepoId;
-use radicle::storage;
-use radicle::storage::WriteStorage;
-
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-
-pub const HELP: Help = Help {
-    name: "clean",
-    description: "Remove all remotes from a repository",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad clean <rid> [<option>...]
-
-    Removes all remotes from a repository, as long as they are not the
-    local operator or a delegate of the repository.
-
-    Note that remotes will still be fetched as long as they are
-    followed and/or the follow scope is "all".
-
-Options
-
-    --no-confirm        Do not ask for confirmation before removal (default: false)
-    --help              Print help
-"#,
-};
-
-pub struct Options {
-    rid: RepoId,
-    confirm: bool,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut id: Option<RepoId> = None;
-        let mut confirm = true;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("no-confirm") => {
-                    confirm = false;
-                }
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                Value(val) if id.is_none() => {
-                    id = Some(term::args::rid(&val)?);
-                }
-                _ => return Err(anyhow::anyhow!(arg.unexpected())),
-            }
-        }
-
-        Ok((
-            Options {
-                rid: id
-                    .ok_or_else(|| anyhow!("an RID must be provided; see `rad clean --help`"))?,
-                confirm,
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    let storage = &profile.storage;
-    let rid = options.rid;
-    let path = storage::git::paths::repository(storage, &rid);
-
-    if !path.exists() {
-        anyhow::bail!("repository {rid} was not found");
-    }
-
-    if !options.confirm || term::confirm(format!("Clean {rid}?")) {
-        let cleaned = storage.clean(rid)?;
-        for remote in cleaned {
-            term::info!("Removed {remote}");
-        }
-        term::success!("Successfully cleaned {rid}");
-    }
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/clone.rs b/radicle-cli/src/commands/clone.rs
deleted file mode 100644
index 7c2b9215c..000000000
--- a/radicle-cli/src/commands/clone.rs
+++ /dev/null
@@ -1,298 +0,0 @@
-#![allow(clippy::or_fun_call)]
-use std::ffi::OsString;
-use std::path::{Path, PathBuf};
-use std::str::FromStr;
-use std::time;
-
-use anyhow::anyhow;
-use radicle::issue::cache::Issues as _;
-use radicle::patch::cache::Patches as _;
-use thiserror::Error;
-
-use radicle::git::raw;
-use radicle::identity::doc;
-use radicle::identity::doc::{DocError, RepoId};
-use radicle::node;
-use radicle::node::policy::Scope;
-use radicle::node::{Handle as _, Node};
-use radicle::prelude::*;
-use radicle::rad;
-use radicle::storage;
-use radicle::storage::git::Storage;
-use radicle::storage::RepositoryError;
-
-use crate::commands::rad_checkout as checkout;
-use crate::commands::rad_sync as sync;
-use crate::node::SyncSettings;
-use crate::project;
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-use crate::terminal::Element as _;
-
-pub const HELP: Help = Help {
-    name: "clone",
-    description: "Clone a Radicle repository",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad clone <rid> [<directory>] [--scope <scope>] [<option>...]
-
-    The `clone` command will use your local node's routing table to find seeds from
-    which it can clone the repository.
-
-    For private repositories, use the `--seed` options, to clone directly
-    from known seeds in the privacy set.
-
-Options
-
-        --scope <scope>     Follow scope: `followed` or `all` (default: all)
-    -s, --seed <nid>        Clone from this seed (may be specified multiple times)
-        --timeout <secs>    Timeout for fetching repository (default: 9)
-        --help              Print help
-
-"#,
-};
-
-#[derive(Debug)]
-pub struct Options {
-    /// The RID of the repository.
-    id: RepoId,
-    /// The target directory for the repository to be cloned into.
-    directory: Option<PathBuf>,
-    /// The seeding scope of the repository.
-    scope: Scope,
-    /// Sync settings.
-    sync: SyncSettings,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut id: Option<RepoId> = None;
-        let mut scope = Scope::All;
-        let mut sync = SyncSettings::default();
-        let mut directory = None;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("seed") | Short('s') => {
-                    let value = parser.value()?;
-                    let value = term::args::nid(&value)?;
-
-                    sync.seeds.insert(value);
-                    sync.replicas = sync.seeds.len();
-                }
-                Long("scope") => {
-                    let value = parser.value()?;
-
-                    scope = term::args::parse_value("scope", value)?;
-                }
-                Long("timeout") => {
-                    let value = parser.value()?;
-                    let secs = term::args::number(&value)?;
-
-                    sync.timeout = time::Duration::from_secs(secs as u64);
-                }
-                Long("no-confirm") => {
-                    // We keep this flag here for consistency though it doesn't have any effect,
-                    // since the command is fully non-interactive.
-                }
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                Value(val) if id.is_none() => {
-                    let val = val.to_string_lossy();
-                    let val = val.strip_prefix("rad://").unwrap_or(&val);
-                    let val = RepoId::from_str(val)?;
-
-                    id = Some(val);
-                }
-                // Parse <directory> once <rid> has been parsed
-                Value(val) if id.is_some() && directory.is_none() => {
-                    directory = Some(Path::new(&val).to_path_buf());
-                }
-                _ => return Err(anyhow!(arg.unexpected())),
-            }
-        }
-        let id =
-            id.ok_or_else(|| anyhow!("to clone, an RID must be provided; see `rad clone --help`"))?;
-
-        Ok((
-            Options {
-                id,
-                directory,
-                scope,
-                sync,
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    let signer = term::signer(&profile)?;
-    let mut node = radicle::Node::new(profile.socket());
-
-    if !node.is_running() {
-        anyhow::bail!(
-            "to clone a repository, your node must be running. To start it, run `rad node start`"
-        );
-    }
-
-    let (working, repo, doc, proj) = clone(
-        options.id,
-        options.directory.clone(),
-        options.scope,
-        options.sync.with_profile(&profile),
-        &mut node,
-        &signer,
-        &profile.storage,
-    )?;
-    let delegates = doc
-        .delegates
-        .iter()
-        .map(|d| **d)
-        .filter(|id| id != profile.id())
-        .collect::<Vec<_>>();
-    let default_branch = proj.default_branch().clone();
-    let path = working.workdir().unwrap(); // SAFETY: The working copy is not bare.
-
-    // Configure repository and setup tracking for repository delegates.
-    radicle::git::configure_repository(&working)?;
-    checkout::setup_remotes(
-        project::SetupRemote {
-            rid: options.id,
-            tracking: Some(default_branch),
-            repo: &working,
-            fetch: true,
-        },
-        &delegates,
-        &profile,
-    )?;
-
-    term::success!(
-        "Repository successfully cloned under {}",
-        term::format::dim(Path::new(".").join(path).display())
-    );
-
-    let mut info: term::Table<1, term::Line> = term::Table::new(term::TableOptions::bordered());
-    info.push([term::format::bold(proj.name()).into()]);
-    info.push([term::format::italic(proj.description()).into()]);
-
-    let issues = profile.issues(&repo)?.counts()?;
-    let patches = profile.patches(&repo)?.counts()?;
-
-    info.push([term::Line::spaced([
-        term::format::tertiary(issues.open).into(),
-        term::format::default("issues").into(),
-        term::format::dim("·").into(),
-        term::format::tertiary(patches.open).into(),
-        term::format::default("patches").into(),
-    ])]);
-    info.print();
-
-    let location = options
-        .directory
-        .map_or(proj.name().to_string(), |loc| loc.display().to_string());
-    term::info!(
-        "Run {} to go to the repository directory.",
-        term::format::command(format!("cd ./{location}")),
-    );
-
-    Ok(())
-}
-
-#[derive(Error, Debug)]
-pub enum CloneError {
-    #[error("the directory path {path:?} already exists")]
-    Exists { path: PathBuf },
-    #[error("node: {0}")]
-    Node(#[from] node::Error),
-    #[error("storage: {0}")]
-    Storage(#[from] storage::Error),
-    #[error("checkout: {0}")]
-    Checkout(#[from] rad::CheckoutError),
-    #[error("identity document error: {0}")]
-    Doc(#[from] DocError),
-    #[error("payload: {0}")]
-    Payload(#[from] doc::PayloadError),
-    #[error(transparent)]
-    Repository(#[from] RepositoryError),
-    #[error("repository {0} not found")]
-    NotFound(RepoId),
-    #[error("no seeds found for {0}")]
-    NoSeeds(RepoId),
-}
-
-pub fn clone<G: Signer>(
-    id: RepoId,
-    directory: Option<PathBuf>,
-    scope: Scope,
-    settings: SyncSettings,
-    node: &mut Node,
-    signer: &G,
-    storage: &Storage,
-) -> Result<
-    (
-        raw::Repository,
-        storage::git::Repository,
-        Doc<Verified>,
-        Project,
-    ),
-    CloneError,
-> {
-    let me = *signer.public_key();
-
-    // Seed repository.
-    if node.seed(id, scope)? {
-        term::success!(
-            "Seeding policy updated for {} with scope '{scope}'",
-            term::format::tertiary(id)
-        );
-    }
-
-    let results = sync::fetch(id, settings, node)?;
-    let Ok(repository) = storage.repository(id) else {
-        // If we don't have the repository locally, even after attempting to fetch,
-        // there's nothing we can do.
-        if results.is_empty() {
-            return Err(CloneError::NoSeeds(id));
-        } else {
-            return Err(CloneError::NotFound(id));
-        }
-    };
-
-    let doc = repository.identity_doc()?;
-    let proj = doc.project()?;
-    let path = directory.unwrap_or(Path::new(proj.name()).to_path_buf());
-
-    // N.b. fail if the path exists and is not empty
-    if path.exists() {
-        if path.read_dir().map_or(true, |mut dir| dir.next().is_some()) {
-            return Err(CloneError::Exists { path });
-        }
-    }
-
-    if results.success().next().is_none() {
-        if results.failed().next().is_some() {
-            term::warning("Fetching failed, local copy is potentially stale");
-        } else {
-            term::warning("No seeds found, local copy is potentially stale");
-        }
-    }
-
-    // Checkout.
-    let spinner = term::spinner(format!(
-        "Creating checkout in ./{}..",
-        term::format::tertiary(path.display())
-    ));
-    let working = rad::checkout(id, &me, path, &storage)?;
-
-    spinner.finish();
-
-    Ok((working, repository, doc.into(), proj))
-}
diff --git a/radicle-cli/src/commands/cob.rs b/radicle-cli/src/commands/cob.rs
deleted file mode 100644
index 07b17266a..000000000
--- a/radicle-cli/src/commands/cob.rs
+++ /dev/null
@@ -1,252 +0,0 @@
-use std::ffi::OsString;
-use std::str::FromStr;
-
-use anyhow::anyhow;
-use chrono::prelude::*;
-use nonempty::NonEmpty;
-use radicle::cob;
-use radicle::cob::Op;
-use radicle::identity::Identity;
-use radicle::issue::cache::Issues;
-use radicle::patch::cache::Patches;
-use radicle::prelude::RepoId;
-use radicle::storage::ReadStorage;
-use radicle_cob::object::collaboration::list;
-use serde_json::json;
-
-use crate::git::Rev;
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-
-pub const HELP: Help = Help {
-    name: "cob",
-    description: "Manage collaborative objects",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad cob <command> [<option>...]
-    rad cob list  --repo <rid> --type <typename>
-    rad cob log   --repo <rid> --type <typename> --object <oid> [<option>...]
-    rad cob show  --repo <rid> --type <typename> --object <oid> [<option>...]
-
-Commands
-
-    list                       List all COBs of a given type (--object is not needed)
-    log                        Print a log of all raw operations on a COB
-
-Log options
-
-    --format (pretty | json)   Desired output format (default: pretty)
-
-Show options
-
-    --format json              Desired output format (default: json)
-
-Other options
-
-    --help                     Print help
-"#,
-};
-
-#[derive(PartialEq)]
-enum OperationName {
-    List,
-    Log,
-    Show,
-}
-
-enum Operation {
-    List,
-    Log(Rev),
-    Show(Rev),
-}
-
-enum Format {
-    Json,
-    Pretty,
-}
-
-pub struct Options {
-    rid: RepoId,
-    op: Operation,
-    type_name: cob::TypeName,
-    format: Format,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut op: Option<OperationName> = None;
-        let mut type_name: Option<cob::TypeName> = None;
-        let mut oid: Option<Rev> = None;
-        let mut rid: Option<RepoId> = None;
-        let mut format: Option<Format> = None;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Value(val) if op.is_none() => match val.to_string_lossy().as_ref() {
-                    "list" => op = Some(OperationName::List),
-                    "log" => op = Some(OperationName::Log),
-                    "show" => op = Some(OperationName::Show),
-                    unknown => anyhow::bail!("unknown operation '{unknown}'"),
-                },
-                Long("type") | Short('t') => {
-                    let v = parser.value()?;
-                    let v = term::args::string(&v);
-                    let v = cob::TypeName::from_str(&v)?;
-
-                    type_name = Some(v);
-                }
-                Long("object") => {
-                    let v = parser.value()?;
-                    let v = term::args::string(&v);
-
-                    oid = Some(Rev::from(v));
-                }
-                Long("repo") => {
-                    let v = parser.value()?;
-                    let v = term::args::rid(&v)?;
-
-                    rid = Some(v);
-                }
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                Long("format")
-                    if op == Some(OperationName::Log) || op == Some(OperationName::Show) =>
-                {
-                    let v: String = term::args::string(&parser.value()?);
-                    match v.as_ref() {
-                        "pretty" if op == Some(OperationName::Log) => format = Some(Format::Pretty),
-                        "json" => format = Some(Format::Json),
-                        unknown => anyhow::bail!("unknown format '{unknown}'"),
-                    }
-                }
-                _ => return Err(anyhow::anyhow!(arg.unexpected())),
-            }
-        }
-
-        Ok((
-            Options {
-                op: {
-                    match op.ok_or_else(|| anyhow!("a command must be specified"))? {
-                        OperationName::List => Operation::List,
-                        OperationName::Log => Operation::Log(oid.ok_or_else(|| {
-                            anyhow!("an object id must be specified with `--object`")
-                        })?),
-                        OperationName::Show => Operation::Show(oid.ok_or_else(|| {
-                            anyhow!("an object id must be specified with `--object`")
-                        })?),
-                    }
-                },
-                rid: rid
-                    .ok_or_else(|| anyhow!("a repository id must be specified with `--repo`"))?,
-                type_name: type_name
-                    .ok_or_else(|| anyhow!("an object type must be specified with `--type`"))?,
-                format: format.unwrap_or(Format::Pretty),
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    let storage = &profile.storage;
-    let repo = storage.repository(options.rid)?;
-
-    match options.op {
-        Operation::List => {
-            let cobs = list::<NonEmpty<cob::Entry>, _>(&repo, &options.type_name)?;
-            for cob in cobs {
-                println!("{}", cob.id);
-            }
-        }
-        Operation::Log(oid) => {
-            let oid = oid.resolve(&repo.backend)?;
-            let ops = cob::store::ops(&oid, &options.type_name, &repo)?;
-
-            for op in ops.into_iter().rev() {
-                match options.format {
-                    Format::Json => print_op_json(op)?,
-                    Format::Pretty => print_op_pretty(op)?,
-                }
-            }
-        }
-        Operation::Show(oid) => {
-            let oid = &oid.resolve(&repo.backend)?;
-
-            if options.type_name == cob::patch::TYPENAME.clone() {
-                let patches = profile.patches(&repo)?;
-                let Some(patch) = patches.get(oid)? else {
-                    anyhow::bail!(cob::store::Error::NotFound(options.type_name, *oid))
-                };
-                serde_json::to_writer_pretty(std::io::stdout(), &patch)?
-            } else if options.type_name == cob::issue::TYPENAME.clone() {
-                let issues = profile.issues(&repo)?;
-                let Some(issue) = issues.get(oid)? else {
-                    anyhow::bail!(cob::store::Error::NotFound(options.type_name, *oid))
-                };
-                serde_json::to_writer_pretty(std::io::stdout(), &issue)?
-            } else if options.type_name == cob::identity::TYPENAME.clone() {
-                let Some(cob) = cob::get::<Identity, _>(&repo, &options.type_name, oid)? else {
-                    anyhow::bail!(cob::store::Error::NotFound(options.type_name, *oid))
-                };
-                serde_json::to_writer_pretty(std::io::stdout(), &cob.object)?
-            } else {
-                anyhow::bail!("the type name '{}' is unknown", options.type_name);
-            }
-            println!();
-        }
-    }
-
-    Ok(())
-}
-
-fn print_op_pretty(op: Op<Vec<u8>>) -> anyhow::Result<()> {
-    let time = DateTime::<Utc>::from(
-        std::time::UNIX_EPOCH + std::time::Duration::from_secs(op.timestamp.as_secs()),
-    )
-    .to_rfc2822();
-    term::print(term::format::yellow(format!("commit   {}", op.id)));
-    if let Some(oid) = op.identity {
-        term::print(term::format::tertiary(format!("resource {oid}")));
-    }
-    for parent in op.parents {
-        term::print(format!("parent   {}", parent));
-    }
-    for parent in op.related {
-        term::print(format!("rel      {}", parent));
-    }
-    term::print(format!("author   {}", op.author));
-    term::print(format!("date     {}", time));
-    term::blank();
-    for action in op.actions {
-        let obj: serde_json::Value = serde_json::from_slice(&action)?;
-        let val = serde_json::to_string_pretty(&obj)?;
-        for line in val.lines() {
-            term::indented(term::format::dim(line));
-        }
-        term::blank();
-    }
-    Ok(())
-}
-
-fn print_op_json(op: Op<Vec<u8>>) -> anyhow::Result<()> {
-    let mut ser = json!(op);
-    ser.as_object_mut().unwrap().insert(
-        "actions".to_string(),
-        json!(op
-            .actions
-            .iter()
-            .map(|action: &Vec<u8>| -> Result<serde_json::Value, _> {
-                serde_json::from_slice(action)
-            })
-            .collect::<Result<Vec<serde_json::Value>, _>>()?),
-    );
-    term::print(ser);
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/config.rs b/radicle-cli/src/commands/config.rs
deleted file mode 100644
index 568a70891..000000000
--- a/radicle-cli/src/commands/config.rs
+++ /dev/null
@@ -1,171 +0,0 @@
-#![allow(clippy::or_fun_call)]
-use std::ffi::OsString;
-use std::path::Path;
-use std::process;
-use std::str::FromStr;
-
-use anyhow::anyhow;
-use radicle::node::Alias;
-use radicle::profile::Config;
-
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-use crate::terminal::Element as _;
-
-pub const HELP: Help = Help {
-    name: "config",
-    description: "Manage your local Radicle configuration",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad config [<option>...]
-    rad config show [<option>...]
-    rad config init --alias <alias> [<option>...]
-    rad config edit [<option>...]
-    rad config get <key> [<option>...]
-
-    If no argument is specified, prints the current radicle configuration as JSON.
-    To initialize a new configuration file, use `rad config init`.
-
-Options
-
-    --help    Print help
-
-"#,
-};
-
-#[derive(Default)]
-enum Operation {
-    #[default]
-    Show,
-    Get(String),
-    Init,
-    Edit,
-}
-
-pub struct Options {
-    op: Operation,
-    alias: Option<Alias>,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut op: Option<Operation> = None;
-        let mut alias = None;
-
-        #[allow(clippy::never_loop)]
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                Long("alias") => {
-                    let value = parser.value()?;
-                    let input = value.to_string_lossy();
-                    let input = Alias::from_str(&input)?;
-
-                    alias = Some(input);
-                }
-                Value(val) if op.is_none() => match val.to_string_lossy().as_ref() {
-                    "show" => op = Some(Operation::Show),
-                    "edit" => op = Some(Operation::Edit),
-                    "init" => op = Some(Operation::Init),
-                    "get" => {
-                        let value = parser.value()?;
-                        let key = value.to_string_lossy();
-
-                        op = Some(Operation::Get(key.to_string()));
-                    }
-                    unknown => anyhow::bail!("unknown operation '{unknown}'"),
-                },
-                _ => return Err(anyhow!(arg.unexpected())),
-            }
-        }
-
-        Ok((
-            Options {
-                op: op.unwrap_or_default(),
-                alias,
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let home = ctx.home()?;
-    let path = home.config();
-
-    match options.op {
-        Operation::Show => {
-            let profile = ctx.profile()?;
-            term::json::to_pretty(&profile.config, path.as_path())?.print();
-        }
-        Operation::Get(key) => {
-            let profile = ctx.profile()?;
-            let data = serde_json::to_value(profile.config)?;
-            if let Some(value) = get_value(&data, &key) {
-                print_value(value)?;
-            }
-        }
-        Operation::Init => {
-            if path.try_exists()? {
-                anyhow::bail!("configuration file already exists at `{}`", path.display());
-            }
-            Config::init(
-                options.alias.ok_or(anyhow!(
-                    "an alias must be provided to initialize a new configuration"
-                ))?,
-                &path,
-            )?;
-            term::success!(
-                "Initialized new Radicle configuration at {}",
-                path.display()
-            );
-        }
-        Operation::Edit => {
-            let Some(cmd) = term::editor::default_editor() else {
-                anyhow::bail!("no editor configured; please set the `EDITOR` environment variable");
-            };
-            process::Command::new(cmd)
-                .stdout(process::Stdio::inherit())
-                .stderr(process::Stdio::inherit())
-                .stdin(process::Stdio::inherit())
-                .arg(&path)
-                .spawn()?
-                .wait()?;
-        }
-    }
-
-    Ok(())
-}
-
-/// Get JSON value under a path.
-fn get_value<'a>(data: &'a serde_json::Value, path: &'a str) -> Option<&'a serde_json::Value> {
-    path.split('.').try_fold(data, |acc, key| {
-        if let serde_json::Value::Object(obj) = acc {
-            obj.get(key)
-        } else {
-            None
-        }
-    })
-}
-
-/// Print a JSON Value.
-fn print_value(value: &serde_json::Value) -> anyhow::Result<()> {
-    match value {
-        serde_json::Value::Null => {}
-        serde_json::Value::Bool(b) => term::print(b),
-        serde_json::Value::Array(a) => a.iter().try_for_each(print_value)?,
-        serde_json::Value::Number(n) => term::print(n),
-        serde_json::Value::String(s) => term::print(s),
-        serde_json::Value::Object(o) => {
-            term::json::to_pretty(&o, Path::new("config.json"))?.print()
-        }
-    }
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/debug.rs b/radicle-cli/src/commands/debug.rs
deleted file mode 100644
index 01f1526aa..000000000
--- a/radicle-cli/src/commands/debug.rs
+++ /dev/null
@@ -1,155 +0,0 @@
-#![allow(clippy::or_fun_call)]
-use std::collections::HashMap;
-use std::env;
-use std::ffi::OsString;
-use std::path::PathBuf;
-use std::process::Command;
-
-use anyhow::anyhow;
-use serde::Serialize;
-
-use radicle::Profile;
-
-use crate::terminal as term;
-use crate::terminal::args::{Args, Help};
-
-pub const NAME: &str = "rad";
-pub const VERSION: &str = env!("RADICLE_VERSION");
-pub const DESCRIPTION: &str = "Radicle command line interface";
-pub const GIT_HEAD: &str = env!("GIT_HEAD");
-
-pub const HELP: Help = Help {
-    name: "debug",
-    description: "Write out information to help debug your Radicle node remotely",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad debug
-
-    Run this if you are reporting a problem in Radicle. The output is
-    helpful for Radicle developers to debug your problem remotely. The
-    output is meant to not include any sensitive information, but
-    please check it, and then forward to the Radicle developers.
-
-"#,
-};
-
-#[derive(Debug)]
-pub struct Options {}
-
-impl Args for Options {
-    fn from_args(_args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        Ok((Options {}, vec![]))
-    }
-}
-
-pub fn run(_options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    match ctx.profile() {
-        Ok(profile) => debug(Some(&profile)),
-        Err(e) => {
-            eprintln!("ERROR: Could not load Radicle profile: {e}");
-            debug(None)
-        }
-    }
-}
-
-// Collect information about the local Radicle installation and write
-// it out.
-fn debug(profile: Option<&Profile>) -> anyhow::Result<()> {
-    let env = HashMap::from_iter(env::vars().filter_map(|(k, v)| {
-        if k == "RAD_PASSPHRASE" {
-            Some((k, "<REDACTED>".into()))
-        } else if k.starts_with("RAD_") || k.starts_with("SSH_") || k == "PATH" || k == "SHELL" {
-            Some((k, v))
-        } else {
-            None
-        }
-    }));
-
-    let debug = DebugInfo {
-        rad_exe: if let Ok(filename) = std::env::current_exe() {
-            Some(filename)
-        } else {
-            None
-        },
-        rad_version: VERSION,
-        radicle_node_version: stdout_of("radicle-node", &["--version"])
-            .unwrap_or("<unknown>".into()),
-        git_remote_rad_version: stdout_of("git-remote-rad", &["--version"])
-            .unwrap_or("<unknown>".into()),
-        git_version: stdout_of("git", &["--version"]).unwrap_or("<unknown>".into()),
-        ssh_version: stderr_of("ssh", &["-V"]).unwrap_or("<unknown>".into()),
-        git_head: GIT_HEAD,
-        log: profile.map(|p| LogFile::new(p.node().join("node.log"))),
-        old_log: profile.map(|p| LogFile::new(p.node().join("node.log.old"))),
-        operating_system: std::env::consts::OS,
-        arch: std::env::consts::ARCH,
-        env,
-    };
-
-    println!("{}", serde_json::to_string_pretty(&debug).unwrap());
-
-    Ok(())
-}
-
-#[derive(Debug, Serialize)]
-#[allow(dead_code)]
-#[serde(rename_all = "camelCase")]
-struct DebugInfo {
-    rad_exe: Option<PathBuf>,
-    rad_version: &'static str,
-    radicle_node_version: String,
-    git_remote_rad_version: String,
-    git_version: String,
-    ssh_version: String,
-    git_head: &'static str,
-    log: Option<LogFile>,
-    old_log: Option<LogFile>,
-    operating_system: &'static str,
-    arch: &'static str,
-    env: HashMap<String, String>,
-}
-
-#[derive(Debug, Serialize)]
-#[allow(dead_code)]
-#[serde(rename_all = "camelCase")]
-struct LogFile {
-    filename: PathBuf,
-    exists: bool,
-    len: Option<u64>,
-}
-
-impl LogFile {
-    fn new(filename: PathBuf) -> Self {
-        Self {
-            filename: filename.clone(),
-            exists: filename.exists(),
-            len: if let Ok(meta) = filename.metadata() {
-                Some(meta.len())
-            } else {
-                None
-            },
-        }
-    }
-}
-
-fn output_of(bin: &str, args: &[&str]) -> anyhow::Result<(String, String)> {
-    let output = Command::new(bin).args(args).output()?;
-    if !output.status.success() {
-        return Err(anyhow!("command failed: {bin:?} {args:?}"));
-    }
-    let stdout = String::from_utf8_lossy(&output.stdout).trim().to_string();
-    let stderr = String::from_utf8_lossy(&output.stderr).trim().to_string();
-    Ok((stdout, stderr))
-}
-
-fn stdout_of(bin: &str, args: &[&str]) -> anyhow::Result<String> {
-    let (stdout, _) = output_of(bin, args)?;
-    Ok(stdout)
-}
-
-fn stderr_of(bin: &str, args: &[&str]) -> anyhow::Result<String> {
-    let (_, stderr) = output_of(bin, args)?;
-    Ok(stderr)
-}
diff --git a/radicle-cli/src/commands/diff.rs b/radicle-cli/src/commands/diff.rs
deleted file mode 100644
index 78f2ee583..000000000
--- a/radicle-cli/src/commands/diff.rs
+++ /dev/null
@@ -1,151 +0,0 @@
-use std::ffi::OsString;
-
-use anyhow::anyhow;
-
-use radicle::git;
-use radicle::rad;
-use radicle_surf as surf;
-
-use crate::git::pretty_diff::ToPretty as _;
-use crate::git::Rev;
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-use crate::terminal::highlight::Highlighter;
-
-pub const HELP: Help = Help {
-    name: "diff",
-    description: "Show changes between commits",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad diff [<commit>] [--staged] [<option>...]
-    rad diff <commit> [<commit>] [<option>...]
-
-    This command is meant to operate as closely as possible to `git diff`,
-    except its output is optimized for human-readability.
-
-Options
-
-    --unified, -U   Context lines to show (default: 5)
-    --staged        View staged changes
-    --color         Force color output
-    --help          Print help
-"#,
-};
-
-pub struct Options {
-    pub commits: Vec<Rev>,
-    pub staged: bool,
-    pub unified: usize,
-    pub color: bool,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut commits = Vec::new();
-        let mut staged = false;
-        let mut unified = 5;
-        let mut color = false;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("unified") | Short('U') => {
-                    let val = parser.value()?;
-                    unified = term::args::number(&val)?;
-                }
-                Long("staged") | Long("cached") => staged = true,
-                Long("color") => color = true,
-                Long("help") | Short('h') => return Err(Error::Help.into()),
-                Value(val) => {
-                    let rev = term::args::rev(&val)?;
-
-                    commits.push(rev);
-                }
-                _ => return Err(anyhow::anyhow!(arg.unexpected())),
-            }
-        }
-
-        Ok((
-            Options {
-                commits,
-                staged,
-                unified,
-                color,
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, _ctx: impl term::Context) -> anyhow::Result<()> {
-    let repo = rad::repo()?;
-    let oids = options
-        .commits
-        .into_iter()
-        .map(|rev| {
-            repo.revparse_single(rev.as_str())
-                .map_err(|e| anyhow!("unknown object {rev}: {e}"))
-                .and_then(|o| {
-                    o.into_commit()
-                        .map_err(|_| anyhow!("object {rev} is not a commit"))
-                })
-        })
-        .collect::<Result<Vec<_>, _>>()?;
-
-    let mut opts = git::raw::DiffOptions::new();
-    opts.patience(true)
-        .minimal(true)
-        .context_lines(options.unified as u32);
-
-    let mut find_opts = git::raw::DiffFindOptions::new();
-    find_opts.exact_match_only(true);
-    find_opts.all(true);
-
-    let mut diff = match oids.as_slice() {
-        [] => {
-            if options.staged {
-                let head = repo.head()?.peel_to_tree()?;
-                // HEAD vs. index.
-                repo.diff_tree_to_index(Some(&head), None, Some(&mut opts))
-            } else {
-                // Working tree vs. index.
-                repo.diff_index_to_workdir(None, None)
-            }
-        }
-        [commit] => {
-            let commit = commit.tree()?;
-            if options.staged {
-                // Commit vs. index.
-                repo.diff_tree_to_index(Some(&commit), None, Some(&mut opts))
-            } else {
-                // Commit vs. working tree.
-                repo.diff_tree_to_workdir(Some(&commit), Some(&mut opts))
-            }
-        }
-        [left, right] => {
-            // Commit vs. commit.
-            let left = left.tree()?;
-            let right = right.tree()?;
-
-            repo.diff_tree_to_tree(Some(&left), Some(&right), Some(&mut opts))
-        }
-        _ => {
-            anyhow::bail!("Too many commits given. See `rad diff --help` for usage.");
-        }
-    }?;
-    diff.find_similar(Some(&mut find_opts))?;
-
-    term::Paint::force(options.color);
-
-    let diff = surf::diff::Diff::try_from(diff)?;
-    let mut hi = Highlighter::default();
-    let pretty = diff.pretty(&mut hi, &(), &repo);
-
-    term::pager::page(pretty)?;
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/follow.rs b/radicle-cli/src/commands/follow.rs
deleted file mode 100644
index 4713cb553..000000000
--- a/radicle-cli/src/commands/follow.rs
+++ /dev/null
@@ -1,192 +0,0 @@
-use std::ffi::OsString;
-
-use anyhow::anyhow;
-
-use radicle::node::{policy, Alias, AliasStore, Handle, NodeId};
-use radicle::{prelude::*, Node};
-use radicle_term::{Element as _, Paint, Table};
-
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-
-pub const HELP: Help = Help {
-    name: "follow",
-    description: "Manage node follow policies",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad follow [<nid>] [--alias <name>] [<option>...]
-
-    The `follow` command will print all nodes being followed, optionally filtered by alias, if no
-    Node ID is provided.
-    Otherwise, it takes a Node ID, optionally in DID format, and updates the follow policy
-    for that peer, optionally giving the peer the alias provided.
-
-Options
-
-    --alias <name>         Associate an alias to a followed peer
-    --verbose, -v          Verbose output
-    --help                 Print help
-"#,
-};
-
-#[derive(Debug)]
-pub enum Operation {
-    Follow { nid: NodeId, alias: Option<Alias> },
-    List { alias: Option<Alias> },
-}
-
-#[derive(Debug, Default)]
-pub enum OperationName {
-    Follow,
-    #[default]
-    List,
-}
-
-#[derive(Debug)]
-pub struct Options {
-    pub op: Operation,
-    pub verbose: bool,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut verbose = false;
-        let mut nid: Option<NodeId> = None;
-        let mut alias: Option<Alias> = None;
-
-        while let Some(arg) = parser.next()? {
-            match &arg {
-                Value(val) if nid.is_none() => {
-                    if let Ok(did) = term::args::did(val) {
-                        nid = Some(did.into());
-                    } else if let Ok(val) = term::args::nid(val) {
-                        nid = Some(val);
-                    } else {
-                        anyhow::bail!("invalid Node ID `{}` specified", val.to_string_lossy());
-                    }
-                }
-                Long("alias") if alias.is_none() => {
-                    let name = parser.value()?;
-                    let name = term::args::alias(&name)?;
-
-                    alias = Some(name.to_owned());
-                }
-                Long("verbose") | Short('v') => verbose = true,
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                _ => {
-                    return Err(anyhow!(arg.unexpected()));
-                }
-            }
-        }
-
-        let op = match nid {
-            Some(nid) => Operation::Follow { nid, alias },
-            None => Operation::List { alias },
-        };
-        Ok((Options { op, verbose }, vec![]))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    let mut node = radicle::Node::new(profile.socket());
-
-    match options.op {
-        Operation::Follow { nid, alias } => follow(nid, alias, &mut node, &profile)?,
-        Operation::List { alias } => following(&profile, alias)?,
-    }
-
-    Ok(())
-}
-
-pub fn follow(
-    nid: NodeId,
-    alias: Option<Alias>,
-    node: &mut Node,
-    profile: &Profile,
-) -> Result<(), anyhow::Error> {
-    let followed = match node.follow(nid, alias.clone()) {
-        Ok(updated) => updated,
-        Err(e) if e.is_connection_err() => {
-            let mut config = profile.policies_mut()?;
-            config.follow(&nid, alias.as_deref())?
-        }
-        Err(e) => return Err(e.into()),
-    };
-    let outcome = if followed { "updated" } else { "exists" };
-
-    if let Some(alias) = alias {
-        term::success!(
-            "Follow policy {outcome} for {} ({alias})",
-            term::format::tertiary(nid),
-        );
-    } else {
-        term::success!(
-            "Follow policy {outcome} for {}",
-            term::format::tertiary(nid),
-        );
-    }
-
-    Ok(())
-}
-
-pub fn following(profile: &Profile, alias: Option<Alias>) -> anyhow::Result<()> {
-    let store = profile.policies()?;
-    let aliases = profile.aliases();
-    let mut t = term::Table::new(term::table::TableOptions::bordered());
-    t.push([
-        term::format::default(String::from("DID")),
-        term::format::default(String::from("Alias")),
-        term::format::default(String::from("Policy")),
-    ]);
-    t.divider();
-
-    match alias {
-        None => push_policies(&mut t, &aliases, store.follow_policies()?),
-        Some(alias) => push_policies(
-            &mut t,
-            &aliases,
-            store
-                .follow_policies()?
-                .filter(|p| p.alias.as_ref().is_some_and(|alias_| *alias_ == alias)),
-        ),
-    };
-    t.print();
-
-    Ok(())
-}
-
-fn push_policies(
-    t: &mut Table<3, Paint<String>>,
-    aliases: &impl AliasStore,
-    policies: impl Iterator<Item = policy::FollowPolicy>,
-) {
-    for policy::FollowPolicy {
-        nid: id,
-        alias,
-        policy,
-    } in policies
-    {
-        t.push([
-            term::format::highlight(Did::from(id).to_string()),
-            match alias {
-                None => term::format::secondary(fallback_alias(&id, aliases)),
-                Some(alias) => term::format::secondary(alias.to_string()),
-            },
-            term::format::secondary(policy.to_string()),
-        ]);
-    }
-}
-
-fn fallback_alias(nid: &PublicKey, aliases: &impl AliasStore) -> String {
-    aliases
-        .alias(nid)
-        .map_or("n/a".to_string(), |alias| alias.to_string())
-}
diff --git a/radicle-cli/src/commands/fork.rs b/radicle-cli/src/commands/fork.rs
deleted file mode 100644
index 59ace89ce..000000000
--- a/radicle-cli/src/commands/fork.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-use std::ffi::OsString;
-
-use anyhow::Context as _;
-
-use radicle::prelude::RepoId;
-use radicle::rad;
-
-use crate::terminal as term;
-use crate::terminal::args;
-use crate::terminal::args::{Args, Error, Help};
-
-pub const HELP: Help = Help {
-    name: "fork",
-    description: "Create a fork of a repository",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad fork [<rid>] [<option>...]
-
-Options
-
-    --help          Print help
-"#,
-};
-
-pub struct Options {
-    rid: Option<RepoId>,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut rid = None;
-
-        if let Some(arg) = parser.next()? {
-            match arg {
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                Value(val) if rid.is_none() => {
-                    rid = Some(args::rid(&val)?);
-                }
-                _ => return Err(anyhow::anyhow!(arg.unexpected())),
-            }
-        }
-
-        Ok((Options { rid }, vec![]))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    let signer = profile.signer()?;
-    let storage = &profile.storage;
-
-    let rid = match options.rid {
-        Some(rid) => rid,
-        None => {
-            let (_, rid) =
-                radicle::rad::cwd().context("Current directory is not a Radicle repository")?;
-
-            rid
-        }
-    };
-
-    rad::fork(rid, &signer, &storage)?;
-    term::success!("Forked repository {rid} for {}", profile.id());
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/help.rs b/radicle-cli/src/commands/help.rs
deleted file mode 100644
index 79ba11bf5..000000000
--- a/radicle-cli/src/commands/help.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-use std::ffi::OsString;
-
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-
-use super::*;
-
-pub const HELP: Help = Help {
-    name: "help",
-    description: "CLI help",
-    version: env!("RADICLE_VERSION"),
-    usage: "Usage: rad help [--help]",
-};
-
-const COMMANDS: &[Help] = &[
-    rad_auth::HELP,
-    rad_block::HELP,
-    rad_checkout::HELP,
-    rad_clone::HELP,
-    rad_config::HELP,
-    rad_fork::HELP,
-    rad_help::HELP,
-    rad_id::HELP,
-    rad_init::HELP,
-    rad_inbox::HELP,
-    rad_inspect::HELP,
-    rad_issue::HELP,
-    rad_ls::HELP,
-    rad_node::HELP,
-    rad_patch::HELP,
-    rad_path::HELP,
-    rad_clean::HELP,
-    rad_self::HELP,
-    rad_seed::HELP,
-    rad_follow::HELP,
-    rad_unblock::HELP,
-    rad_unfollow::HELP,
-    rad_unseed::HELP,
-    rad_remote::HELP,
-    rad_stats::HELP,
-    rad_sync::HELP,
-];
-
-#[derive(Default)]
-pub struct Options {}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        let mut parser = lexopt::Parser::from_args(args);
-
-        if let Some(arg) = parser.next()? {
-            return Err(anyhow::anyhow!(arg.unexpected()));
-        }
-        Err(Error::HelpManual { name: "rad" }.into())
-    }
-}
-
-pub fn run(_options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    term::print("Usage: rad <command> [--help]");
-
-    if let Err(e) = ctx.profile() {
-        term::blank();
-        match e.downcast_ref() {
-            Some(term::args::Error::WithHint { err, hint }) => {
-                term::print(term::format::yellow(err));
-                term::print(term::format::yellow(hint));
-            }
-            Some(e) => {
-                term::error(e);
-            }
-            None => {
-                term::error(e);
-            }
-        }
-        term::blank();
-    }
-
-    term::print("Common `rad` commands used in various situations:");
-    term::blank();
-
-    for help in COMMANDS {
-        term::info!(
-            "\t{} {}",
-            term::format::bold(format!("{:-12}", help.name)),
-            term::format::dim(help.description)
-        );
-    }
-    term::blank();
-    term::print("See `rad <command> --help` to learn about a specific command.");
-    term::blank();
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/id.rs b/radicle-cli/src/commands/id.rs
deleted file mode 100644
index ba8dcbd1d..000000000
--- a/radicle-cli/src/commands/id.rs
+++ /dev/null
@@ -1,830 +0,0 @@
-use std::collections::BTreeSet;
-use std::str::FromStr;
-use std::{ffi::OsString, io};
-
-use anyhow::{anyhow, Context};
-
-use nonempty::NonEmpty;
-use radicle::cob::identity::{self, IdentityMut, Revision, RevisionId};
-use radicle::identity::{doc, Identity, Visibility};
-use radicle::prelude::{Did, Doc, RepoId, Signer};
-use radicle::storage::refs;
-use radicle::storage::{ReadRepository, ReadStorage as _, WriteRepository};
-use radicle::{cob, Profile};
-use radicle_crypto::Verified;
-use radicle_surf::diff::Diff;
-use radicle_term::Element;
-use serde_json as json;
-
-use crate::git::unified_diff::Encode as _;
-use crate::git::Rev;
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-use crate::terminal::patch::Message;
-use crate::terminal::Interactive;
-
-pub const HELP: Help = Help {
-    name: "id",
-    description: "Manage repository identities",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad id list [<option>...]
-    rad id update [--title <string>] [--description <string>]
-                  [--delegate <did>] [--rescind <did>]
-                  [--threshold <num>] [--visibility <private | public>]
-                  [--allow <did>] [--disallow <did>]
-                  [--no-confirm] [--payload <id> <key> <val>...]
-                  [<option>...]
-    rad id edit <revision-id> [--title <string>] [--description <string>] [<option>...]
-    rad id show <revision-id> [<option>...]
-    rad id <accept | reject | redact> <revision-id> [<option>...]
-
-    The *rad id* command is used to manage and propose changes to the
-    identity of a Radicle repository.
-
-    See the rad-id(1) man page for more information.
-
-Options
-
-    --repo <rid>           Repository (defaults to the current repository)
-    --quiet, -q            Don't print anything
-    --help                 Print help
-"#,
-};
-
-#[derive(Clone, Debug, Default)]
-pub enum Operation {
-    Update {
-        title: Option<String>,
-        description: Option<String>,
-        delegate: Vec<Did>,
-        rescind: Vec<Did>,
-        threshold: Option<usize>,
-        visibility: Option<EditVisibility>,
-        allow: BTreeSet<Did>,
-        disallow: BTreeSet<Did>,
-        payload: Vec<(doc::PayloadId, String, json::Value)>,
-    },
-    AcceptRevision {
-        revision: Rev,
-    },
-    RejectRevision {
-        revision: Rev,
-    },
-    EditRevision {
-        revision: Rev,
-        title: Option<String>,
-        description: Option<String>,
-    },
-    RedactRevision {
-        revision: Rev,
-    },
-    ShowRevision {
-        revision: Rev,
-    },
-    #[default]
-    ListRevisions,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-pub enum EditVisibility {
-    #[default]
-    Public,
-    Private,
-}
-
-#[derive(thiserror::Error, Debug)]
-#[error("'{0}' is not a valid visibility type")]
-pub struct EditVisibilityParseError(String);
-
-impl FromStr for EditVisibility {
-    type Err = EditVisibilityParseError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
-            "public" => Ok(EditVisibility::Public),
-            "private" => Ok(EditVisibility::Private),
-            _ => Err(EditVisibilityParseError(s.to_owned())),
-        }
-    }
-}
-
-#[derive(Default, PartialEq, Eq)]
-pub enum OperationName {
-    Accept,
-    Reject,
-    Edit,
-    Update,
-    Show,
-    Redact,
-    #[default]
-    List,
-}
-
-pub struct Options {
-    pub op: Operation,
-    pub rid: Option<RepoId>,
-    pub interactive: Interactive,
-    pub quiet: bool,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut op: Option<OperationName> = None;
-        let mut revision: Option<Rev> = None;
-        let mut rid: Option<RepoId> = None;
-        let mut title: Option<String> = None;
-        let mut description: Option<String> = None;
-        let mut delegate: Vec<Did> = Vec::new();
-        let mut rescind: Vec<Did> = Vec::new();
-        let mut visibility: Option<EditVisibility> = None;
-        let mut allow: BTreeSet<Did> = BTreeSet::new();
-        let mut disallow: BTreeSet<Did> = BTreeSet::new();
-        let mut threshold: Option<usize> = None;
-        let mut interactive = Interactive::new(io::stdout());
-        let mut payload = Vec::new();
-        let mut quiet = false;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("help") => {
-                    return Err(Error::HelpManual { name: "rad-id" }.into());
-                }
-                Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                Long("title")
-                    if op == Some(OperationName::Edit) || op == Some(OperationName::Update) =>
-                {
-                    title = Some(parser.value()?.to_string_lossy().into());
-                }
-                Long("description")
-                    if op == Some(OperationName::Edit) || op == Some(OperationName::Update) =>
-                {
-                    description = Some(parser.value()?.to_string_lossy().into());
-                }
-                Long("quiet") | Short('q') => {
-                    quiet = true;
-                }
-                Long("no-confirm") => {
-                    interactive = Interactive::No;
-                }
-                Value(val) if op.is_none() => match val.to_string_lossy().as_ref() {
-                    "e" | "edit" => op = Some(OperationName::Edit),
-                    "u" | "update" => op = Some(OperationName::Update),
-                    "l" | "list" => op = Some(OperationName::List),
-                    "s" | "show" => op = Some(OperationName::Show),
-                    "a" | "accept" => op = Some(OperationName::Accept),
-                    "r" | "reject" => op = Some(OperationName::Reject),
-                    "d" | "redact" => op = Some(OperationName::Redact),
-
-                    unknown => anyhow::bail!("unknown operation '{}'", unknown),
-                },
-                Long("repo") => {
-                    let val = parser.value()?;
-                    let val = term::args::rid(&val)?;
-
-                    rid = Some(val);
-                }
-                Long("delegate") => {
-                    let did = term::args::did(&parser.value()?)?;
-                    delegate.push(did);
-                }
-                Long("rescind") => {
-                    let did = term::args::did(&parser.value()?)?;
-                    rescind.push(did);
-                }
-                Long("allow") => {
-                    let value = parser.value()?;
-                    let did = term::args::did(&value)?;
-                    allow.insert(did);
-                }
-                Long("disallow") => {
-                    let value = parser.value()?;
-                    let did = term::args::did(&value)?;
-                    disallow.insert(did);
-                }
-                Long("visibility") => {
-                    let value = parser.value()?;
-                    let value = term::args::parse_value("visibility", value)?;
-
-                    visibility = Some(value);
-                }
-                Long("threshold") => {
-                    threshold = Some(parser.value()?.to_string_lossy().parse()?);
-                }
-                Long("payload") => {
-                    let mut values = parser.values()?;
-                    let id = values
-                        .next()
-                        .ok_or(anyhow!("expected payload id, eg. `xyz.radicle.project`"))?;
-                    let id: doc::PayloadId = term::args::parse_value("payload", id)?;
-
-                    let key = values
-                        .next()
-                        .ok_or(anyhow!("expected payload key, eg. 'defaultBranch'"))?;
-                    let key = term::args::string(&key);
-
-                    let val = values
-                        .next()
-                        .ok_or(anyhow!("expected payload value, eg. '\"heartwood\"'"))?;
-                    let val = val.to_string_lossy().to_string();
-                    let val = json::from_str(val.as_str())
-                        .map_err(|e| anyhow!("invalid JSON value `{val}`: {e}"))?;
-
-                    payload.push((id, key, val));
-                }
-                Value(val) => {
-                    let val = term::args::rev(&val)?;
-                    revision = Some(val);
-                }
-                _ => {
-                    return Err(anyhow!(arg.unexpected()));
-                }
-            }
-        }
-
-        let op = match op.unwrap_or_default() {
-            OperationName::Accept => Operation::AcceptRevision {
-                revision: revision.ok_or_else(|| anyhow!("a revision must be provided"))?,
-            },
-            OperationName::Reject => Operation::RejectRevision {
-                revision: revision.ok_or_else(|| anyhow!("a revision must be provided"))?,
-            },
-            OperationName::Edit => Operation::EditRevision {
-                title,
-                description,
-                revision: revision.ok_or_else(|| anyhow!("a revision must be provided"))?,
-            },
-            OperationName::Show => Operation::ShowRevision {
-                revision: revision.ok_or_else(|| anyhow!("a revision must be provided"))?,
-            },
-            OperationName::List => Operation::ListRevisions,
-            OperationName::Redact => Operation::RedactRevision {
-                revision: revision.ok_or_else(|| anyhow!("a revision must be provided"))?,
-            },
-            OperationName::Update => Operation::Update {
-                title,
-                description,
-                delegate,
-                rescind,
-                threshold,
-                visibility,
-                allow,
-                disallow,
-                payload,
-            },
-        };
-        Ok((
-            Options {
-                rid,
-                op,
-                interactive,
-                quiet,
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    let storage = &profile.storage;
-    let rid = if let Some(rid) = options.rid {
-        rid
-    } else {
-        let (_, rid) = radicle::rad::cwd()?;
-        rid
-    };
-    let repo = storage
-        .repository(rid)
-        .context(anyhow!("repository `{rid}` not found in local storage"))?;
-    let mut identity = Identity::load_mut(&repo)?;
-    let current = identity.current().clone();
-
-    match options.op {
-        Operation::AcceptRevision { revision } => {
-            let revision = get(revision, &identity, &repo)?.clone();
-            let id = revision.id;
-            let signer = term::signer(&profile)?;
-
-            if !revision.is_active() {
-                anyhow::bail!("cannot vote on revision that is {}", revision.state);
-            }
-
-            if options
-                .interactive
-                .confirm(format!("Accept revision {}?", term::format::tertiary(id)))
-            {
-                identity.accept(&revision.id, &signer)?;
-
-                if let Some(revision) = identity.revision(&id) {
-                    // Update the canonical head to point to the latest accepted revision.
-                    if revision.is_accepted() && revision.id == identity.current {
-                        repo.set_identity_head_to(revision.id)?;
-                    }
-                    // TODO: Different output if canonical changed?
-
-                    if !options.quiet {
-                        term::success!("Revision {id} accepted");
-                        print_meta(revision, &current, &profile)?;
-                    }
-                }
-            }
-        }
-        Operation::RejectRevision { revision } => {
-            let revision = get(revision, &identity, &repo)?.clone();
-            let signer = term::signer(&profile)?;
-
-            if !revision.is_active() {
-                anyhow::bail!("cannot vote on revision that is {}", revision.state);
-            }
-
-            if options.interactive.confirm(format!(
-                "Reject revision {}?",
-                term::format::tertiary(revision.id)
-            )) {
-                identity.reject(revision.id, &signer)?;
-
-                if !options.quiet {
-                    term::success!("Revision {} rejected", revision.id);
-                    print_meta(&revision, &current, &profile)?;
-                }
-            }
-        }
-        Operation::EditRevision {
-            revision,
-            title,
-            description,
-        } => {
-            let revision = get(revision, &identity, &repo)?.clone();
-            let signer = term::signer(&profile)?;
-
-            if !revision.is_active() {
-                anyhow::bail!("revision can no longer be edited");
-            }
-            let Some((title, description)) = edit_title_description(title, description)? else {
-                anyhow::bail!("revision title or description missing");
-            };
-            identity.edit(revision.id, title, description, &signer)?;
-
-            if !options.quiet {
-                term::success!("Revision {} edited", revision.id);
-            }
-        }
-        Operation::Update {
-            title,
-            description,
-            delegate: delegates,
-            rescind,
-            threshold,
-            visibility,
-            allow,
-            disallow,
-            payload,
-        } => {
-            let proposal = {
-                let mut proposal = current.doc.clone();
-                proposal.threshold = threshold.unwrap_or(proposal.threshold);
-
-                if !allow.is_disjoint(&disallow) {
-                    let overlap = allow
-                        .intersection(&disallow)
-                        .map(Did::to_string)
-                        .collect::<Vec<_>>();
-                    anyhow::bail!("`--allow` and `--disallow` must not overlap: {overlap:?}")
-                }
-
-                match (&mut proposal.visibility, visibility) {
-                    (Visibility::Public, None | Some(EditVisibility::Public)) if !allow.is_empty() || !disallow.is_empty() => {
-                        return Err(Error::WithHint {
-                            err:
-                            anyhow!("`--allow` and `--disallow` should only be used for private repositories"),
-                            hint: "use `--visibility private` to make the repository private, or perhaps you meant to use `--delegate`/`--rescind`",
-                        }.into())
-                    }
-                    (Visibility::Public, None | Some(EditVisibility::Public)) => { /* no-op */ },
-                    (Visibility::Private { allow: existing }, None | Some(EditVisibility::Private)) => {
-                        for did in allow {
-                            existing.insert(did);
-                        }
-                        for did in disallow {
-                            existing.remove(&did);
-                        }
-                    }
-                    (Visibility::Public, Some(EditVisibility::Private)) => {
-                        // We ignore disallow since only allowing matters and
-                        // the sets are disjoint
-                        proposal.visibility = Visibility::Private { allow };
-                    }
-                    (Visibility::Private { .. }, Some(EditVisibility::Public)) if !allow.is_empty() || !disallow.is_empty() => {
-                        anyhow::bail!("`--allow` and `--disallow` cannot be used with `--visibility public`")
-                    }
-                    (Visibility::Private { .. }, Some(EditVisibility::Public)) => {
-                        proposal.visibility = Visibility::Public;
-                    }
-                }
-                proposal.delegates = NonEmpty::from_vec(
-                    proposal
-                        .delegates
-                        .into_iter()
-                        .chain(delegates)
-                        .filter(|d| !rescind.contains(d))
-                        .collect::<Vec<_>>(),
-                )
-                .ok_or(anyhow!(
-                    "at lease one delegate must be present for the identity to be valid"
-                ))?;
-
-                if let Some(errs) = verify_delegates(&proposal, &repo)? {
-                    term::error(format!("failed to verify delegates for {rid}"));
-                    term::error(format!(
-                        "the threshold of {} delegates cannot be met..",
-                        proposal.threshold
-                    ));
-                    for e in errs {
-                        e.print();
-                    }
-                    anyhow::bail!("fatal: refusing to update identity document");
-                }
-
-                for (id, key, val) in payload {
-                    if let Some(ref mut payload) = proposal.payload.get_mut(&id) {
-                        if let Some(obj) = payload.as_object_mut() {
-                            if val.is_null() {
-                                obj.remove(&key);
-                            } else {
-                                obj.insert(key, val);
-                            }
-                        } else {
-                            anyhow::bail!("payload `{id}` is not a map");
-                        }
-                    } else {
-                        anyhow::bail!("payload `{id}` not found in identity document");
-                    }
-                }
-                // Verify that the project payload can still be parsed into the
-                // `Project` type.
-                if let Err(e) = proposal.project() {
-                    anyhow::bail!("failed to verify `xyz.radicle.project`, {e}");
-                }
-                proposal
-            };
-            if proposal == current.doc {
-                if !options.quiet {
-                    term::print(term::format::italic(
-                        "Nothing to do. The document is up to date. See `rad inspect --identity`.",
-                    ));
-                }
-                return Ok(());
-            }
-            let signer = term::signer(&profile)?;
-            let revision = update(title, description, proposal, &mut identity, &signer)?;
-
-            if revision.is_accepted() && revision.parent == Some(current.id) {
-                // Update the canonical head to point to the latest accepted revision.
-                repo.set_identity_head_to(revision.id)?;
-            }
-            if options.quiet {
-                term::print(revision.id);
-            } else {
-                term::success!(
-                    "Identity revision {} created",
-                    term::format::tertiary(revision.id)
-                );
-                print(&revision, &current, &repo, &profile)?;
-            }
-        }
-        Operation::ListRevisions => {
-            let mut revisions =
-                term::Table::<7, term::Label>::new(term::table::TableOptions::bordered());
-
-            revisions.push([
-                term::format::dim(String::from("●")).into(),
-                term::format::bold(String::from("ID")).into(),
-                term::format::bold(String::from("Title")).into(),
-                term::format::bold(String::from("Author")).into(),
-                term::Label::blank(),
-                term::format::bold(String::from("Status")).into(),
-                term::format::bold(String::from("Created")).into(),
-            ]);
-            revisions.divider();
-
-            for r in identity.revisions().rev() {
-                let icon = match r.state {
-                    identity::State::Active => term::format::tertiary("●"),
-                    identity::State::Accepted => term::format::positive("●"),
-                    identity::State::Rejected => term::format::negative("●"),
-                    identity::State::Stale => term::format::dim("●"),
-                }
-                .into();
-                let state = r.state.to_string().into();
-                let id = term::format::oid(r.id).into();
-                let title = term::label(r.title.to_string());
-                let (alias, author) =
-                    term::format::Author::new(r.author.public_key(), &profile).labels();
-                let timestamp = term::format::timestamp(r.timestamp).into();
-
-                revisions.push([icon, id, title, alias, author, state, timestamp]);
-            }
-            revisions.print();
-        }
-        Operation::RedactRevision { revision } => {
-            let revision = get(revision, &identity, &repo)?.clone();
-            let signer = term::signer(&profile)?;
-
-            if revision.is_accepted() {
-                anyhow::bail!("cannot redact accepted revision");
-            }
-            if options.interactive.confirm(format!(
-                "Redact revision {}?",
-                term::format::tertiary(revision.id)
-            )) {
-                identity.redact(revision.id, &signer)?;
-
-                if !options.quiet {
-                    term::success!("Revision {} redacted", revision.id);
-                }
-            }
-        }
-        Operation::ShowRevision { revision } => {
-            let revision = get(revision, &identity, &repo)?;
-            let previous = revision.parent.unwrap_or(revision.id);
-            let previous = identity
-                .revision(&previous)
-                .ok_or(anyhow!("revision `{previous}` not found"))?;
-
-            print(revision, previous, &repo, &profile)?;
-        }
-    }
-    Ok(())
-}
-
-fn get<'a>(
-    revision: Rev,
-    identity: &'a Identity,
-    repo: &radicle::storage::git::Repository,
-) -> anyhow::Result<&'a Revision> {
-    let id = revision.resolve(&repo.backend)?;
-    let revision = identity
-        .revision(&id)
-        .ok_or(anyhow!("revision `{id}` not found"))?;
-
-    Ok(revision)
-}
-
-fn print_meta(
-    revision: &Revision,
-    previous: &Doc<Verified>,
-    profile: &Profile,
-) -> anyhow::Result<()> {
-    let mut attrs = term::Table::<2, term::Label>::new(Default::default());
-
-    attrs.push([
-        term::format::bold("Title").into(),
-        term::label(revision.title.to_owned()),
-    ]);
-    attrs.push([
-        term::format::bold("Revision").into(),
-        term::label(revision.id.to_string()),
-    ]);
-    attrs.push([
-        term::format::bold("Blob").into(),
-        term::label(revision.blob.to_string()),
-    ]);
-    attrs.push([
-        term::format::bold("Author").into(),
-        term::label(revision.author.to_string()),
-    ]);
-    attrs.push([
-        term::format::bold("State").into(),
-        term::label(revision.state.to_string()),
-    ]);
-    attrs.push([
-        term::format::bold("Quorum").into(),
-        if revision.is_accepted() {
-            term::format::positive("yes").into()
-        } else {
-            term::format::negative("no").into()
-        },
-    ]);
-
-    let mut meta = term::VStack::default()
-        .border(Some(term::colors::FAINT))
-        .child(attrs)
-        .children(if !revision.description.is_empty() {
-            vec![
-                term::Label::blank().boxed(),
-                term::textarea(revision.description.to_owned()).boxed(),
-            ]
-        } else {
-            vec![]
-        })
-        .divider();
-
-    let accepted = revision.accepted().collect::<Vec<_>>();
-    let rejected = revision.rejected().collect::<Vec<_>>();
-    let unknown = previous
-        .delegates
-        .iter()
-        .filter(|id| !accepted.contains(id) && !rejected.contains(id))
-        .collect::<Vec<_>>();
-    let mut signatures = term::Table::<4, _>::default();
-
-    for id in accepted {
-        let author = term::format::Author::new(&id, profile);
-        signatures.push([
-            term::format::positive("✓").into(),
-            id.to_string().into(),
-            author.alias().unwrap_or_default(),
-            author.you().unwrap_or_default(),
-        ]);
-    }
-    for id in rejected {
-        let author = term::format::Author::new(&id, profile);
-        signatures.push([
-            term::format::negative("✗").into(),
-            id.to_string().into(),
-            author.alias().unwrap_or_default(),
-            author.you().unwrap_or_default(),
-        ]);
-    }
-    for id in unknown {
-        let author = term::format::Author::new(id, profile);
-        signatures.push([
-            term::format::dim("?").into(),
-            id.to_string().into(),
-            author.alias().unwrap_or_default(),
-            author.you().unwrap_or_default(),
-        ]);
-    }
-    meta.push(signatures);
-    meta.print();
-
-    Ok(())
-}
-
-fn print(
-    revision: &identity::Revision,
-    previous: &identity::Revision,
-    repo: &radicle::storage::git::Repository,
-    profile: &Profile,
-) -> anyhow::Result<()> {
-    print_meta(revision, previous, profile)?;
-    println!();
-    print_diff(revision.parent.as_ref(), &revision.id, repo)?;
-
-    Ok(())
-}
-
-fn edit_title_description(
-    title: Option<String>,
-    description: Option<String>,
-) -> anyhow::Result<Option<(String, String)>> {
-    const HELP: &str = r#"<!--
-Please enter a patch message for your changes. An empty
-message aborts the patch proposal.
-
-The first line is the patch title. The patch description
-follows, and must be separated with a blank line, just
-like a commit message. Markdown is supported in the title
-and description.
--->"#;
-
-    let result = if let (Some(t), d) = (title.as_ref(), description.as_deref()) {
-        Some((t.to_owned(), d.unwrap_or_default().to_owned()))
-    } else {
-        let result = Message::edit_title_description(title, description, HELP)?;
-        if let Some((title, description)) = result {
-            Some((title, description))
-        } else {
-            None
-        }
-    };
-    Ok(result)
-}
-
-fn update<R: WriteRepository + cob::Store, G: Signer>(
-    title: Option<String>,
-    description: Option<String>,
-    doc: Doc<Verified>,
-    current: &mut IdentityMut<R>,
-    signer: &G,
-) -> anyhow::Result<Revision> {
-    if let Some((title, description)) = edit_title_description(title, description)? {
-        let id = current.update(title, description, &doc, signer)?;
-        let revision = current
-            .revision(&id)
-            .ok_or(anyhow!("update failed: revision {id} is missing"))?;
-
-        Ok(revision.clone())
-    } else {
-        Err(anyhow!("you must provide a revision title and description"))
-    }
-}
-
-fn print_diff(
-    previous: Option<&RevisionId>,
-    current: &RevisionId,
-    repo: &radicle::storage::git::Repository,
-) -> anyhow::Result<()> {
-    let previous = if let Some(previous) = previous {
-        let previous = Doc::<Verified>::load_at(*previous, repo)?;
-        let previous = serde_json::to_string_pretty(&previous.doc)?;
-
-        Some(previous)
-    } else {
-        None
-    };
-    let current = Doc::<Verified>::load_at(*current, repo)?;
-    let current = serde_json::to_string_pretty(&current.doc)?;
-
-    let tmp = tempfile::tempdir()?;
-    let repo = radicle::git::raw::Repository::init_bare(tmp.path())?;
-
-    let previous = if let Some(previous) = previous {
-        let tree = radicle::git::write_tree(&doc::PATH, previous.as_bytes(), &repo)?;
-        Some(tree)
-    } else {
-        None
-    };
-    let current = radicle::git::write_tree(&doc::PATH, current.as_bytes(), &repo)?;
-    let mut opts = radicle::git::raw::DiffOptions::new();
-    opts.context_lines(u32::MAX);
-
-    let diff = repo.diff_tree_to_tree(previous.as_ref(), Some(&current), Some(&mut opts))?;
-    let diff = Diff::try_from(diff)?;
-
-    if let Some(modified) = diff.modified().next() {
-        let diff = modified.diff.to_unified_string()?;
-        print!("{diff}");
-    } else {
-        term::print(term::format::italic("No changes."));
-    }
-    Ok(())
-}
-
-#[derive(Clone)]
-enum VerificationError {
-    MissingDefaultBranch {
-        branch: radicle::git::RefString,
-        did: Did,
-    },
-    MissingDelegate {
-        did: Did,
-    },
-}
-
-impl VerificationError {
-    fn print(&self) {
-        match self {
-            VerificationError::MissingDefaultBranch { branch, did } => term::error(format!(
-                "missing {} for {} in local storage",
-                term::format::secondary(branch),
-                term::format::did(did)
-            )),
-            VerificationError::MissingDelegate { did } => {
-                term::error(format!("the delegate {did} is missing"));
-                term::hint(format!(
-                    "run `rad follow {did}` to follow this missing peer"
-                ));
-            }
-        }
-    }
-}
-
-fn verify_delegates<S, V>(
-    proposal: &Doc<V>,
-    repo: &S,
-) -> anyhow::Result<Option<Vec<VerificationError>>>
-where
-    S: ReadRepository,
-{
-    let dids = &proposal.delegates;
-    let threshold = proposal.threshold;
-    let (canonical, _) = repo.canonical_head()?;
-    let mut missing = Vec::with_capacity(dids.len());
-
-    for did in dids {
-        match refs::SignedRefsAt::load((*did).into(), repo)? {
-            None => {
-                missing.push(VerificationError::MissingDelegate { did: *did });
-            }
-            Some(refs::SignedRefsAt { sigrefs, .. }) => {
-                if sigrefs.get(&canonical).is_none() {
-                    missing.push(VerificationError::MissingDefaultBranch {
-                        branch: canonical.to_ref_string(),
-                        did: *did,
-                    });
-                }
-            }
-        }
-    }
-
-    Ok((dids.len() - missing.len() < threshold).then_some(missing))
-}
diff --git a/radicle-cli/src/commands/inbox.rs b/radicle-cli/src/commands/inbox.rs
deleted file mode 100644
index eaef2ade3..000000000
--- a/radicle-cli/src/commands/inbox.rs
+++ /dev/null
@@ -1,580 +0,0 @@
-use std::ffi::OsString;
-use std::path::Path;
-use std::process;
-
-use anyhow::anyhow;
-
-use git_ref_format::Qualified;
-use localtime::LocalTime;
-use radicle::cob::TypedId;
-use radicle::identity::Identity;
-use radicle::issue::cache::Issues as _;
-use radicle::node::notifications;
-use radicle::node::notifications::*;
-use radicle::patch::cache::Patches as _;
-use radicle::prelude::{Profile, RepoId};
-use radicle::storage::{BranchName, ReadRepository, ReadStorage};
-use radicle::{cob, git, Storage};
-
-use term::Element as _;
-
-use crate::terminal as term;
-use crate::terminal::args;
-use crate::terminal::args::{Args, Error, Help};
-
-pub const HELP: Help = Help {
-    name: "inbox",
-    description: "Manage your Radicle notifications",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad inbox [<option>...]
-    rad inbox list [<option>...]
-    rad inbox show <id> [<option>...]
-    rad inbox clear [<option>...]
-
-    By default, this command lists all items in your inbox.
-    If your working directory is a Radicle repository, it only shows item
-    belonging to this repository, unless `--all` is used.
-
-    The `rad inbox show` command takes a notification ID (which can be found in
-    the `list` command) and displays the information related to that
-    notification. This will mark the notification as read.
-
-    The `rad inbox clear` command will delete all notifications in the inbox.
-
-Options
-
-    --all                Operate on all repositories
-    --repo <rid>         Operate on the given repository (default: rad .)
-    --sort-by <field>    Sort by `id` or `timestamp` (default: timestamp)
-    --reverse, -r        Reverse the list
-    --show-unknown       Show any updates that were not recognized
-    --help               Print help
-"#,
-};
-
-#[derive(Debug, Default, PartialEq, Eq)]
-enum Operation {
-    #[default]
-    List,
-    Show,
-    Clear,
-}
-
-#[derive(Default, Debug)]
-enum Mode {
-    #[default]
-    Contextual,
-    All,
-    ById(Vec<NotificationId>),
-    ByRepo(RepoId),
-}
-
-#[derive(Clone, Copy, Debug)]
-struct SortBy {
-    reverse: bool,
-    field: &'static str,
-}
-
-pub struct Options {
-    op: Operation,
-    mode: Mode,
-    sort_by: SortBy,
-    show_unknown: bool,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut op: Option<Operation> = None;
-        let mut mode = None;
-        let mut ids = Vec::new();
-        let mut reverse = None;
-        let mut field = None;
-        let mut show_unknown = false;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                Long("all") | Short('a') if mode.is_none() => {
-                    mode = Some(Mode::All);
-                }
-                Long("reverse") | Short('r') => {
-                    reverse = Some(true);
-                }
-                Long("show-unknown") => {
-                    show_unknown = true;
-                }
-                Long("sort-by") => {
-                    let val = parser.value()?;
-
-                    match term::args::string(&val).as_str() {
-                        "timestamp" => field = Some("timestamp"),
-                        "id" => field = Some("rowid"),
-                        other => {
-                            return Err(anyhow!(
-                                "unknown sorting field `{other}`, see `rad inbox --help`"
-                            ))
-                        }
-                    }
-                }
-                Long("repo") if mode.is_none() => {
-                    let val = parser.value()?;
-                    let repo = args::rid(&val)?;
-
-                    mode = Some(Mode::ByRepo(repo));
-                }
-                Value(val) if op.is_none() => match val.to_string_lossy().as_ref() {
-                    "list" => op = Some(Operation::List),
-                    "show" => op = Some(Operation::Show),
-                    "clear" => op = Some(Operation::Clear),
-                    cmd => return Err(anyhow!("unknown command `{cmd}`, see `rad inbox --help`")),
-                },
-                Value(val) if op.is_some() && mode.is_none() => {
-                    let id = term::args::number(&val)? as NotificationId;
-                    ids.push(id);
-                }
-                _ => return Err(anyhow::anyhow!(arg.unexpected())),
-            }
-        }
-        let mode = if ids.is_empty() {
-            mode.unwrap_or_default()
-        } else {
-            Mode::ById(ids)
-        };
-        let op = op.unwrap_or_default();
-
-        let sort_by = if let Some(field) = field {
-            SortBy {
-                field,
-                reverse: reverse.unwrap_or(false),
-            }
-        } else {
-            SortBy {
-                field: "timestamp",
-                reverse: true,
-            }
-        };
-
-        Ok((
-            Options {
-                op,
-                mode,
-                sort_by,
-                show_unknown,
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    let storage = &profile.storage;
-    let mut notifs = profile.notifications_mut()?;
-    let Options {
-        op,
-        mode,
-        sort_by,
-        show_unknown,
-    } = options;
-
-    match op {
-        Operation::List => list(
-            mode,
-            sort_by,
-            show_unknown,
-            &notifs.read_only(),
-            storage,
-            &profile,
-        ),
-        Operation::Clear => clear(mode, &mut notifs),
-        Operation::Show => show(mode, &mut notifs, storage, &profile),
-    }
-}
-
-fn list(
-    mode: Mode,
-    sort_by: SortBy,
-    show_unknown: bool,
-    notifs: &notifications::StoreReader,
-    storage: &Storage,
-    profile: &Profile,
-) -> anyhow::Result<()> {
-    let repos: Vec<term::VStack<'_>> = match mode {
-        Mode::Contextual => {
-            if let Ok((_, rid)) = radicle::rad::cwd() {
-                list_repo(rid, sort_by, show_unknown, notifs, storage, profile)?
-                    .into_iter()
-                    .collect()
-            } else {
-                list_all(sort_by, show_unknown, notifs, storage, profile)?
-            }
-        }
-        Mode::ByRepo(rid) => list_repo(rid, sort_by, show_unknown, notifs, storage, profile)?
-            .into_iter()
-            .collect(),
-        Mode::All => list_all(sort_by, show_unknown, notifs, storage, profile)?,
-        Mode::ById(_) => anyhow::bail!("the `list` command does not take IDs"),
-    };
-
-    if repos.is_empty() {
-        term::print(term::format::italic("Your inbox is empty."));
-    } else {
-        for repo in repos {
-            repo.print();
-        }
-    }
-    Ok(())
-}
-
-fn list_all<'a>(
-    sort_by: SortBy,
-    show_unknown: bool,
-    notifs: &notifications::StoreReader,
-    storage: &Storage,
-    profile: &Profile,
-) -> anyhow::Result<Vec<term::VStack<'a>>> {
-    let mut repos = storage.repositories()?;
-    repos.sort_by_key(|r| r.rid);
-
-    let mut vstacks = Vec::new();
-    for repo in repos {
-        let vstack = list_repo(repo.rid, sort_by, show_unknown, notifs, storage, profile)?;
-        vstacks.extend(vstack.into_iter());
-    }
-    Ok(vstacks)
-}
-
-fn list_repo<'a, R: ReadStorage>(
-    rid: RepoId,
-    sort_by: SortBy,
-    show_unknown: bool,
-    notifs: &notifications::StoreReader,
-    storage: &R,
-    profile: &Profile,
-) -> anyhow::Result<Option<term::VStack<'a>>>
-where
-    <R as ReadStorage>::Repository: cob::Store,
-{
-    let mut table = term::Table::new(term::TableOptions {
-        spacing: 3,
-        ..term::TableOptions::default()
-    });
-    let repo = storage.repository(rid)?;
-    let (_, head) = repo.head()?;
-    let doc = repo.identity_doc()?;
-    let proj = doc.project()?;
-    let issues = profile.issues(&repo)?;
-    let patches = profile.patches(&repo)?;
-
-    let mut notifs = notifs.by_repo(&rid, sort_by.field)?.collect::<Vec<_>>();
-    if !sort_by.reverse {
-        // Notifications are returned in descendant order by default.
-        notifs.reverse();
-    }
-
-    for n in notifs {
-        let n: Notification = n?;
-
-        let seen = if n.status.is_read() {
-            term::Label::blank()
-        } else {
-            term::format::tertiary(String::from("●")).into()
-        };
-        let author = n
-            .remote
-            .map(|r| {
-                let (alias, _) = term::format::Author::new(&r, profile).labels();
-                alias
-            })
-            .unwrap_or_default();
-        let notification_id = term::format::dim(format!("{:-03}", n.id)).into();
-        let timestamp = term::format::italic(term::format::timestamp(n.timestamp)).into();
-
-        let NotificationRow {
-            category,
-            summary,
-            state,
-            name,
-        } = match &n.kind {
-            NotificationKind::Branch { name } => NotificationRow::branch(name, head, &n, &repo)?,
-            NotificationKind::Cob { typed_id } => {
-                match NotificationRow::cob(typed_id, &n, &issues, &patches, &repo) {
-                    Ok(Some(row)) => row,
-                    Ok(None) => continue,
-                    Err(e) => {
-                        log::error!(target: "cli", "Error loading notification for {typed_id}: {e}");
-                        continue;
-                    }
-                }
-            }
-            NotificationKind::Unknown { refname } => {
-                if show_unknown {
-                    NotificationRow::unknown(refname, &n, &repo)?
-                } else {
-                    continue;
-                }
-            }
-        };
-        table.push([
-            notification_id,
-            seen,
-            name.into(),
-            summary.into(),
-            category.into(),
-            state.into(),
-            author,
-            timestamp,
-        ]);
-    }
-
-    if table.is_empty() {
-        Ok(None)
-    } else {
-        Ok(Some(
-            term::VStack::default()
-                .border(Some(term::colors::FAINT))
-                .child(term::label(term::format::bold(proj.name())))
-                .divider()
-                .child(table),
-        ))
-    }
-}
-
-struct NotificationRow {
-    category: term::Paint<String>,
-    summary: term::Paint<String>,
-    state: term::Paint<String>,
-    name: term::Paint<term::Paint<String>>,
-}
-
-impl NotificationRow {
-    fn new(
-        category: String,
-        summary: String,
-        state: term::Paint<String>,
-        name: term::Paint<String>,
-    ) -> Self {
-        Self {
-            category: term::format::dim(category),
-            summary: term::Paint::new(summary),
-            state,
-            name: term::format::tertiary(name),
-        }
-    }
-
-    fn branch<S>(
-        name: &BranchName,
-        head: git::Oid,
-        n: &Notification,
-        repo: &S,
-    ) -> anyhow::Result<Self>
-    where
-        S: ReadRepository,
-    {
-        let commit = if let Some(head) = n.update.new() {
-            repo.commit(head)?.summary().unwrap_or_default().to_owned()
-        } else {
-            String::new()
-        };
-
-        let state = match n
-            .update
-            .new()
-            .map(|oid| repo.is_ancestor_of(oid, head))
-            .transpose()
-        {
-            Ok(Some(true)) => term::Paint::<String>::from(term::format::secondary("merged")),
-            Ok(Some(false)) | Ok(None) => term::format::ref_update(&n.update).into(),
-            Err(e) => return Err(e.into()),
-        }
-        .to_owned();
-
-        Ok(Self::new(
-            "branch".to_string(),
-            commit,
-            state,
-            term::format::default(name.to_string()),
-        ))
-    }
-
-    fn cob<S, I, P>(
-        typed_id: &TypedId,
-        n: &Notification,
-        issues: &I,
-        patches: &P,
-        repo: &S,
-    ) -> anyhow::Result<Option<Self>>
-    where
-        S: ReadRepository + cob::Store,
-        I: cob::issue::cache::Issues,
-        P: cob::patch::cache::Patches,
-    {
-        let TypedId { id, .. } = typed_id;
-        let (category, summary, state) = if typed_id.is_issue() {
-            let Some(issue) = issues.get(id)? else {
-                // Issue could have been deleted after notification was created.
-                return Ok(None);
-            };
-            (
-                String::from("issue"),
-                issue.title().to_owned(),
-                term::format::issue::state(issue.state()),
-            )
-        } else if typed_id.is_patch() {
-            let Some(patch) = patches.get(id)? else {
-                // Patch could have been deleted after notification was created.
-                return Ok(None);
-            };
-            (
-                String::from("patch"),
-                patch.title().to_owned(),
-                term::format::patch::state(patch.state()),
-            )
-        } else if typed_id.is_identity() {
-            let Ok(identity) = Identity::get(id, repo) else {
-                log::error!(
-                    target: "cli",
-                    "Error retrieving identity {id} for notification {}", n.id
-                );
-                return Ok(None);
-            };
-            let Some(rev) = n.update.new().and_then(|id| identity.revision(&id)) else {
-                log::error!(
-                    target: "cli",
-                    "Error retrieving identity revision for notification {}", n.id
-                );
-                return Ok(None);
-            };
-            (
-                String::from("id"),
-                rev.title.clone(),
-                term::format::identity::state(&rev.state),
-            )
-        } else {
-            (
-                typed_id.type_name.to_string(),
-                "".to_owned(),
-                term::format::default(String::new()),
-            )
-        };
-        Ok(Some(Self::new(
-            category,
-            summary,
-            state,
-            term::format::cob(id),
-        )))
-    }
-
-    fn unknown<S>(refname: &Qualified<'static>, n: &Notification, repo: &S) -> anyhow::Result<Self>
-    where
-        S: ReadRepository,
-    {
-        let commit = if let Some(head) = n.update.new() {
-            repo.commit(head)?.summary().unwrap_or_default().to_owned()
-        } else {
-            String::new()
-        };
-        Ok(Self::new(
-            "unknown".to_string(),
-            commit,
-            "".into(),
-            term::format::default(refname.to_string()),
-        ))
-    }
-}
-
-fn clear(mode: Mode, notifs: &mut notifications::StoreWriter) -> anyhow::Result<()> {
-    let cleared = match mode {
-        Mode::All => notifs.clear_all()?,
-        Mode::ById(ids) => notifs.clear(&ids)?,
-        Mode::ByRepo(rid) => notifs.clear_by_repo(&rid)?,
-        Mode::Contextual => {
-            if let Ok((_, rid)) = radicle::rad::cwd() {
-                notifs.clear_by_repo(&rid)?
-            } else {
-                return Err(Error::WithHint {
-                    err: anyhow!("not a radicle repository"),
-                    hint: "to clear all repository notifications, use the `--all` flag",
-                }
-                .into());
-            }
-        }
-    };
-    if cleared > 0 {
-        term::success!("Cleared {cleared} item(s) from your inbox");
-    } else {
-        term::print(term::format::italic("Your inbox is empty."));
-    }
-    Ok(())
-}
-
-fn show(
-    mode: Mode,
-    notifs: &mut notifications::StoreWriter,
-    storage: &Storage,
-    profile: &Profile,
-) -> anyhow::Result<()> {
-    let id = match mode {
-        Mode::ById(ids) => match ids.as_slice() {
-            [id] => *id,
-            [] => anyhow::bail!("a Notification ID must be given"),
-            _ => anyhow::bail!("too many Notification IDs given"),
-        },
-        _ => anyhow::bail!("a Notification ID must be given"),
-    };
-    let n = notifs.get(id)?;
-    let repo = storage.repository(n.repo)?;
-
-    match n.kind {
-        NotificationKind::Cob { typed_id } if typed_id.is_issue() => {
-            let issues = profile.issues(&repo)?;
-            let issue = issues.get(&typed_id.id)?.unwrap();
-
-            term::issue::show(
-                &issue,
-                &typed_id.id,
-                term::issue::Format::default(),
-                profile,
-            )?;
-        }
-        NotificationKind::Cob { typed_id } if typed_id.is_patch() => {
-            let patches = profile.patches(&repo)?;
-            let patch = patches.get(&typed_id.id)?.unwrap();
-
-            term::patch::show(&patch, &typed_id.id, false, &repo, None, profile)?;
-        }
-        NotificationKind::Cob { typed_id } if typed_id.is_identity() => {
-            let identity = Identity::get(&typed_id.id, &repo)?;
-
-            term::json::to_pretty(&identity.doc, Path::new("radicle.json"))?.print();
-        }
-        NotificationKind::Branch { .. } => {
-            let refstr = if let Some(remote) = n.remote {
-                n.qualified
-                    .with_namespace(remote.to_component())
-                    .to_string()
-            } else {
-                n.qualified.to_string()
-            };
-            process::Command::new("git")
-                .current_dir(repo.path())
-                .args(["log", refstr.as_str()])
-                .spawn()?
-                .wait()?;
-        }
-        notification => {
-            term::json::to_pretty(&notification, Path::new("notification.json"))?.print();
-        }
-    }
-    notifs.set_status(NotificationStatus::ReadAt(LocalTime::now()), &[id])?;
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/init.rs b/radicle-cli/src/commands/init.rs
deleted file mode 100644
index 59113c19a..000000000
--- a/radicle-cli/src/commands/init.rs
+++ /dev/null
@@ -1,674 +0,0 @@
-#![allow(clippy::or_fun_call)]
-#![allow(clippy::collapsible_else_if)]
-use std::collections::HashSet;
-use std::convert::TryFrom;
-use std::env;
-use std::ffi::OsString;
-use std::path::PathBuf;
-use std::str::FromStr;
-
-use anyhow::{anyhow, bail, Context as _};
-use serde_json as json;
-
-use radicle::crypto::{ssh, Verified};
-use radicle::explorer::ExplorerUrl;
-use radicle::git::RefString;
-use radicle::identity::project::ProjectName;
-use radicle::identity::{RepoId, Visibility};
-use radicle::node::events::UploadPack;
-use radicle::node::policy::Scope;
-use radicle::node::{Event, Handle, NodeId, DEFAULT_SUBSCRIBE_TIMEOUT};
-use radicle::prelude::Doc;
-use radicle::storage::ReadStorage as _;
-use radicle::{profile, Node};
-
-use crate::commands;
-use crate::git;
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-use crate::terminal::Interactive;
-
-pub const HELP: Help = Help {
-    name: "init",
-    description: "Initialize a Radicle repository",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad init [<path>] [<option>...]
-
-Options
-
-        --name <string>            Name of the repository
-        --description <string>     Description of the repository
-        --default-branch <name>    The default branch of the repository
-        --scope <scope>            Repository follow scope: `followed` or `all` (default: all)
-        --private                  Set repository visibility to *private*
-        --public                   Set repository visibility to *public*
-        --existing <rid>           Setup repository as an existing Radicle repository
-    -u, --set-upstream             Setup the upstream of the default branch
-        --setup-signing            Setup the radicle key as a signing key for this repository
-        --no-confirm               Don't ask for confirmation during setup
-        --no-seed                  Don't seed this repository after initializing it
-    -v, --verbose                  Verbose mode
-        --help                     Print help
-"#,
-};
-
-#[derive(Default)]
-pub struct Options {
-    pub path: Option<PathBuf>,
-    pub name: Option<ProjectName>,
-    pub description: Option<String>,
-    pub branch: Option<String>,
-    pub interactive: Interactive,
-    pub visibility: Option<Visibility>,
-    pub existing: Option<RepoId>,
-    pub setup_signing: bool,
-    pub scope: Scope,
-    pub set_upstream: bool,
-    pub verbose: bool,
-    pub seed: bool,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut path: Option<PathBuf> = None;
-
-        let mut name = None;
-        let mut description = None;
-        let mut branch = None;
-        let mut interactive = Interactive::Yes;
-        let mut set_upstream = false;
-        let mut setup_signing = false;
-        let mut scope = Scope::All;
-        let mut existing = None;
-        let mut seed = true;
-        let mut verbose = false;
-        let mut visibility = None;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("name") if name.is_none() => {
-                    let value = parser.value()?;
-                    let value = term::args::string(&value);
-                    let value = ProjectName::try_from(value)?;
-
-                    name = Some(value);
-                }
-                Long("description") if description.is_none() => {
-                    let value = parser
-                        .value()?
-                        .to_str()
-                        .ok_or(anyhow::anyhow!(
-                            "invalid repository description specified with `--description`"
-                        ))?
-                        .to_owned();
-
-                    description = Some(value);
-                }
-                Long("default-branch") if branch.is_none() => {
-                    let value = parser
-                        .value()?
-                        .to_str()
-                        .ok_or(anyhow::anyhow!(
-                            "invalid branch specified with `--default-branch`"
-                        ))?
-                        .to_owned();
-
-                    branch = Some(value);
-                }
-                Long("scope") => {
-                    let value = parser.value()?;
-
-                    scope = term::args::parse_value("scope", value)?;
-                }
-                Long("set-upstream") | Short('u') => {
-                    set_upstream = true;
-                }
-                Long("setup-signing") => {
-                    setup_signing = true;
-                }
-                Long("no-confirm") => {
-                    interactive = Interactive::No;
-                }
-                Long("no-seed") => {
-                    seed = false;
-                }
-                Long("private") => {
-                    visibility = Some(Visibility::private([]));
-                }
-                Long("public") => {
-                    visibility = Some(Visibility::Public);
-                }
-                Long("existing") if existing.is_none() => {
-                    let val = parser.value()?;
-                    let rid = term::args::rid(&val)?;
-
-                    existing = Some(rid);
-                }
-                Long("verbose") | Short('v') => {
-                    verbose = true;
-                }
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                Value(val) if path.is_none() => {
-                    path = Some(val.into());
-                }
-                _ => return Err(anyhow::anyhow!(arg.unexpected())),
-            }
-        }
-
-        Ok((
-            Options {
-                path,
-                name,
-                description,
-                branch,
-                scope,
-                existing,
-                interactive,
-                set_upstream,
-                setup_signing,
-                seed,
-                visibility,
-                verbose,
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    let cwd = env::current_dir()?;
-    let path = options.path.as_deref().unwrap_or(cwd.as_path());
-    let repo = match git::Repository::open(path) {
-        Ok(r) => r,
-        Err(e) if radicle::git::ext::is_not_found_err(&e) => {
-            anyhow::bail!("a Git repository was not found at the given path")
-        }
-        Err(e) => return Err(e.into()),
-    };
-    if let Ok((remote, _)) = git::rad_remote(&repo) {
-        if let Some(remote) = remote.url() {
-            bail!("repository is already initialized with remote {remote}");
-        }
-    }
-
-    if let Some(rid) = options.existing {
-        init_existing(repo, rid, options, &profile)
-    } else {
-        init(repo, options, &profile)
-    }
-}
-
-pub fn init(
-    repo: git::Repository,
-    options: Options,
-    profile: &profile::Profile,
-) -> anyhow::Result<()> {
-    let path = repo
-        .workdir()
-        .unwrap_or_else(|| repo.path())
-        .canonicalize()?;
-    let interactive = options.interactive;
-    let head: String = repo
-        .head()
-        .ok()
-        .and_then(|head| head.shorthand().map(|h| h.to_owned()))
-        .ok_or_else(|| anyhow!("repository head must point to a commit"))?;
-
-    term::headline(format!(
-        "Initializing{}radicle 👾 repository in {}..",
-        if let Some(visibility) = &options.visibility {
-            term::format::spaced(term::format::visibility(visibility))
-        } else {
-            term::format::default(" ").into()
-        },
-        term::format::dim(path.display())
-    ));
-
-    let name: ProjectName = match options.name {
-        Some(name) => name,
-        None => {
-            let default = path.file_name().map(|f| f.to_string_lossy().to_string());
-            term::input(
-                "Name",
-                default,
-                Some("The name of your repository, eg. 'acme'"),
-            )?
-            .try_into()?
-        }
-    };
-    let description = match options.description {
-        Some(desc) => desc,
-        None => term::input("Description", None, Some("You may leave this blank"))?,
-    };
-    let branch = match options.branch {
-        Some(branch) => branch,
-        None if interactive.yes() => term::input(
-            "Default branch",
-            Some(head),
-            Some("Please specify an existing branch"),
-        )?,
-        None => head,
-    };
-    let branch = RefString::try_from(branch.clone())
-        .map_err(|e| anyhow!("invalid branch name {:?}: {}", branch, e))?;
-    let visibility = if let Some(v) = options.visibility {
-        v
-    } else {
-        let selected = term::select(
-            "Visibility",
-            &["public", "private"],
-            "Public repositories are accessible by anyone on the network after initialization",
-        )?;
-        Visibility::from_str(selected)?
-    };
-
-    let signer = term::signer(profile)?;
-    let mut node = radicle::Node::new(profile.socket());
-    let mut spinner = term::spinner("Initializing...");
-    let mut push_cmd = String::from("git push");
-
-    match radicle::rad::init(
-        &repo,
-        name,
-        &description,
-        branch.clone(),
-        visibility,
-        &signer,
-        &profile.storage,
-    ) {
-        Ok((rid, doc, _)) => {
-            let proj = doc.project()?;
-
-            spinner.message(format!(
-                "Repository {} created.",
-                term::format::highlight(proj.name())
-            ));
-            spinner.finish();
-
-            if options.verbose {
-                term::blob(json::to_string_pretty(&proj)?);
-            }
-            // It's important to seed our own repositories to make sure that our node signals
-            // interest for them. This ensures that messages relating to them are relayed to us.
-            if options.seed {
-                profile.seed(rid, options.scope, &mut node)?;
-
-                if doc.visibility.is_public() {
-                    profile.add_inventory(rid, &mut node)?;
-                }
-            }
-
-            if options.set_upstream || git::branch_remote(&repo, proj.default_branch()).is_err() {
-                // Setup eg. `master` -> `rad/master`
-                radicle::git::set_upstream(
-                    &repo,
-                    &*radicle::rad::REMOTE_NAME,
-                    proj.default_branch(),
-                    radicle::git::refs::workdir::branch(proj.default_branch()),
-                )?;
-            } else {
-                push_cmd = format!("git push {} {branch}", *radicle::rad::REMOTE_NAME);
-            }
-
-            if options.setup_signing {
-                // Setup radicle signing key.
-                self::setup_signing(profile.id(), &repo, interactive)?;
-            }
-
-            term::blank();
-            term::info!(
-                "Your Repository ID {} is {}.",
-                term::format::dim("(RID)"),
-                term::format::highlight(rid.urn())
-            );
-            let directory = if path == env::current_dir()? {
-                "this directory".to_owned()
-            } else {
-                term::format::tertiary(path.display()).to_string()
-            };
-            term::info!(
-                "You can show it any time by running {} from {directory}.",
-                term::format::command("rad .")
-            );
-            term::blank();
-
-            // Announce inventory to network.
-            if let Err(e) = announce(rid, doc, &mut node, &profile.config) {
-                term::blank();
-                term::warning(format!(
-                    "There was an error announcing your repository to the network: {e}"
-                ));
-                term::warning("Try again with `rad sync --announce`, or check your logs with `rad node logs`.");
-                term::blank();
-            }
-            term::info!("To push changes, run {}.", term::format::command(push_cmd));
-        }
-        Err(err) => {
-            spinner.failed();
-            anyhow::bail!(err);
-        }
-    }
-
-    Ok(())
-}
-
-pub fn init_existing(
-    working: git::Repository,
-    rid: RepoId,
-    options: Options,
-    profile: &profile::Profile,
-) -> anyhow::Result<()> {
-    let stored = profile.storage.repository(rid)?;
-    let project = stored.project()?;
-    let url = radicle::git::Url::from(rid);
-
-    radicle::git::configure_repository(&working)?;
-    radicle::git::configure_remote(
-        &working,
-        &radicle::rad::REMOTE_NAME,
-        &url,
-        &url.clone().with_namespace(profile.public_key),
-    )?;
-
-    if options.set_upstream {
-        // Setup eg. `master` -> `rad/master`
-        radicle::git::set_upstream(
-            &working,
-            &*radicle::rad::REMOTE_NAME,
-            project.default_branch(),
-            radicle::git::refs::workdir::branch(project.default_branch()),
-        )?;
-    }
-
-    term::success!(
-        "Initialized existing repository {} in {}..",
-        term::format::tertiary(rid),
-        term::format::dim(
-            working
-                .workdir()
-                .unwrap_or_else(|| working.path())
-                .display()
-        ),
-    );
-
-    Ok(())
-}
-
-#[derive(Debug)]
-enum SyncResult<T> {
-    NodeStopped,
-    NoPeersConnected,
-    NotSynced,
-    Synced { result: T },
-}
-
-fn sync(
-    rid: RepoId,
-    node: &mut Node,
-    config: &profile::Config,
-) -> Result<SyncResult<Option<ExplorerUrl>>, radicle::node::Error> {
-    if !node.is_running() {
-        return Ok(SyncResult::NodeStopped);
-    }
-    let mut spinner = term::spinner("Updating inventory..");
-    // N.b. indefinitely subscribe to events and set a lower timeout on events
-    // below.
-    let events = node.subscribe(DEFAULT_SUBSCRIBE_TIMEOUT)?;
-    let sessions = node.sessions()?;
-
-    spinner.message("Announcing..");
-
-    if !sessions.iter().any(|s| s.is_connected()) {
-        return Ok(SyncResult::NoPeersConnected);
-    }
-
-    // Connect to preferred seeds in case we aren't connected.
-    for seed in config.preferred_seeds.iter() {
-        if !sessions.iter().any(|s| s.nid == seed.id) {
-            commands::rad_node::control::connect(
-                node,
-                seed.id,
-                seed.addr.clone(),
-                radicle::node::DEFAULT_TIMEOUT,
-            )
-            .ok();
-        }
-    }
-    // Announce our new inventory to connected nodes.
-    node.announce_inventory()?;
-
-    spinner.message("Syncing..");
-
-    let mut replicas = HashSet::new();
-    // Start upload pack as None and set it if we encounter an event
-    let mut upload_pack = term::upload_pack::UploadPack::new();
-
-    for e in events {
-        match e {
-            Ok(Event::RefsSynced {
-                remote, rid: rid_, ..
-            }) if rid == rid_ => {
-                term::success!("Repository successfully synced to {remote}");
-                replicas.insert(remote);
-                // If we manage to replicate to one of our preferred seeds, we can stop waiting.
-                if config.preferred_seeds.iter().any(|s| s.id == remote) {
-                    break;
-                }
-            }
-            Ok(Event::UploadPack(UploadPack::Write {
-                rid: rid_,
-                remote,
-                progress,
-            })) if rid == rid_ => {
-                log::debug!("Upload progress for {remote}: {progress}");
-            }
-            Ok(Event::UploadPack(UploadPack::PackProgress {
-                rid: rid_,
-                remote,
-                transmitted,
-            })) if rid == rid_ => spinner.message(upload_pack.transmitted(remote, transmitted)),
-            Ok(Event::UploadPack(UploadPack::Done {
-                rid: rid_,
-                remote,
-                status,
-            })) if rid == rid_ => {
-                log::debug!("Upload done for {rid} to {remote} with status: {status}");
-                spinner.message(upload_pack.done(&remote));
-            }
-            Ok(Event::UploadPack(UploadPack::Error {
-                rid: rid_,
-                remote,
-                err,
-            })) if rid == rid_ => {
-                term::warning(format!("Upload error for {rid} to {remote}: {err}"));
-            }
-            Ok(_) => {
-                // Some other irrelevant event received.
-            }
-            Err(radicle::node::Error::TimedOut) => {
-                break;
-            }
-            Err(e) => {
-                spinner.error(&e);
-                return Err(e);
-            }
-        }
-    }
-
-    if !replicas.is_empty() {
-        spinner.message(format!(
-            "Repository successfully synced to {} node(s).",
-            replicas.len()
-        ));
-        spinner.finish();
-
-        for seed in config.preferred_seeds.iter() {
-            if replicas.contains(&seed.id) {
-                return Ok(SyncResult::Synced {
-                    result: Some(config.public_explorer.url(seed.addr.host.to_string(), rid)),
-                });
-            }
-        }
-        Ok(SyncResult::Synced { result: None })
-    } else {
-        spinner.message("Repository successfully announced to the network.");
-        spinner.finish();
-
-        Ok(SyncResult::NotSynced)
-    }
-}
-
-pub fn announce(
-    rid: RepoId,
-    doc: Doc<Verified>,
-    node: &mut Node,
-    config: &profile::Config,
-) -> anyhow::Result<()> {
-    if doc.visibility.is_public() {
-        match sync(rid, node, config) {
-            Ok(SyncResult::Synced {
-                result: Some(url), ..
-            }) => {
-                term::blank();
-                term::info!(
-                    "Your repository has been synced to the network and is \
-                    now discoverable by peers.",
-                );
-                term::info!("View it in your browser at:");
-                term::blank();
-                term::indented(term::format::tertiary(url));
-                term::blank();
-            }
-            Ok(SyncResult::Synced { result: None, .. }) => {
-                term::blank();
-                term::info!(
-                    "Your repository has been synced to the network and is \
-                    now discoverable by peers.",
-                );
-                if !config.preferred_seeds.is_empty() {
-                    term::info!(
-                        "Unfortunately, you were unable to replicate your repository to \
-                        your preferred seeds."
-                    );
-                }
-            }
-            Ok(SyncResult::NotSynced) => {
-                term::blank();
-                term::info!(
-                    "Your repository has been announced to the network and is \
-                    now discoverable by peers.",
-                );
-                term::info!(
-                    "You can check for any nodes that have replicated your repository by running \
-                    `rad sync status`."
-                );
-                term::blank();
-            }
-            Ok(SyncResult::NoPeersConnected) => {
-                term::blank();
-                term::info!(
-                    "You are not connected to any peers. Your repository will be announced as soon as \
-                    your node establishes a connection with the network.");
-                term::info!("Check for peer connections with `rad node status`.");
-                term::blank();
-            }
-            Ok(SyncResult::NodeStopped) => {
-                term::info!(
-                    "Your repository will be announced to the network when you start your node."
-                );
-                term::info!(
-                    "You can start your node with {}.",
-                    term::format::command("rad node start")
-                );
-            }
-            Err(e) => {
-                return Err(e.into());
-            }
-        }
-    } else {
-        term::info!(
-            "You have created a {} repository.",
-            term::format::visibility(&doc.visibility)
-        );
-        term::info!(
-            "This repository will only be visible to you, \
-            and to peers you explicitly allow.",
-        );
-        term::blank();
-        term::info!(
-            "To make it public, run {}.",
-            term::format::command("rad publish")
-        );
-    }
-
-    Ok(())
-}
-
-/// Setup radicle key as commit signing key in repository.
-pub fn setup_signing(
-    node_id: &NodeId,
-    repo: &git::Repository,
-    interactive: Interactive,
-) -> anyhow::Result<()> {
-    let repo = repo
-        .workdir()
-        .ok_or(anyhow!("cannot setup signing in bare repository"))?;
-    let key = ssh::fmt::fingerprint(node_id);
-    let yes = if !git::is_signing_configured(repo)? {
-        term::headline(format!(
-            "Configuring radicle signing key {}...",
-            term::format::tertiary(key)
-        ));
-        true
-    } else if interactive.yes() {
-        term::confirm(format!(
-            "Configure radicle signing key {} in local checkout?",
-            term::format::tertiary(key),
-        ))
-    } else {
-        true
-    };
-
-    if yes {
-        match git::write_gitsigners(repo, [node_id]) {
-            Ok(file) => {
-                git::ignore(repo, file.as_path())?;
-
-                term::success!("Created {} file", term::format::tertiary(file.display()));
-            }
-            Err(err) if err.kind() == std::io::ErrorKind::AlreadyExists => {
-                let ssh_key = ssh::fmt::key(node_id);
-                let gitsigners = term::format::tertiary(".gitsigners");
-                term::success!("Found existing {} file", gitsigners);
-
-                let ssh_keys =
-                    git::read_gitsigners(repo).context("error reading .gitsigners file")?;
-
-                if ssh_keys.contains(&ssh_key) {
-                    term::success!("Signing key is already in {gitsigners} file");
-                } else if term::confirm(format!("Add signing key to {gitsigners}?")) {
-                    git::add_gitsigners(repo, [node_id])?;
-                }
-            }
-            Err(err) => {
-                return Err(err.into());
-            }
-        }
-        git::configure_signing(repo, node_id)?;
-
-        term::success!(
-            "Signing configured in {}",
-            term::format::tertiary(".git/config")
-        );
-    }
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/inspect.rs b/radicle-cli/src/commands/inspect.rs
deleted file mode 100644
index dabd81e6d..000000000
--- a/radicle-cli/src/commands/inspect.rs
+++ /dev/null
@@ -1,401 +0,0 @@
-#![allow(clippy::or_fun_call)]
-use std::collections::HashMap;
-use std::ffi::OsString;
-use std::path::{Path, PathBuf};
-use std::str::FromStr;
-
-use anyhow::{anyhow, Context as _};
-use chrono::prelude::*;
-
-use radicle::identity::RepoId;
-use radicle::identity::{DocAt, Identity};
-use radicle::node::policy::SeedingPolicy;
-use radicle::node::AliasStore as _;
-use radicle::storage::git::{Repository, Storage};
-use radicle::storage::refs::RefsAt;
-use radicle::storage::{ReadRepository, ReadStorage};
-
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-use crate::terminal::json;
-use crate::terminal::Element;
-
-pub const HELP: Help = Help {
-    name: "inspect",
-    description: "Inspect a Radicle repository",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad inspect <path> [<option>...]
-    rad inspect <rid>  [<option>...]
-    rad inspect [<option>...]
-
-    Inspects the given path or RID. If neither is specified,
-    the current repository is inspected.
-
-Options
-
-    --rid        Return the repository identifier (RID)
-    --payload    Inspect the repository's identity payload
-    --refs       Inspect the repository's refs on the local device
-    --sigrefs    Inspect the values of `rad/sigrefs` for all remotes of this repository
-    --identity   Inspect the identity document
-    --visibility Inspect the repository's visibility
-    --delegates  Inspect the repository's delegates
-    --policy     Inspect the repository's seeding policy
-    --history    Show the history of the repository identity document
-    --help       Print help
-"#,
-};
-
-#[derive(Default, Debug, Eq, PartialEq)]
-pub enum Target {
-    Refs,
-    Payload,
-    Delegates,
-    Identity,
-    Visibility,
-    Sigrefs,
-    Policy,
-    History,
-    #[default]
-    RepoId,
-}
-
-#[derive(Default, Debug, Eq, PartialEq)]
-pub struct Options {
-    pub rid: Option<RepoId>,
-    pub target: Target,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut rid: Option<RepoId> = None;
-        let mut target = Target::default();
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                Long("refs") => {
-                    target = Target::Refs;
-                }
-                Long("payload") => {
-                    target = Target::Payload;
-                }
-                Long("policy") => {
-                    target = Target::Policy;
-                }
-                Long("delegates") => {
-                    target = Target::Delegates;
-                }
-                Long("history") => {
-                    target = Target::History;
-                }
-                Long("identity") => {
-                    target = Target::Identity;
-                }
-                Long("sigrefs") => {
-                    target = Target::Sigrefs;
-                }
-                Long("rid") => {
-                    target = Target::RepoId;
-                }
-                Long("visibility") => {
-                    target = Target::Visibility;
-                }
-                Value(val) if rid.is_none() => {
-                    let val = val.to_string_lossy();
-
-                    if let Ok(val) = RepoId::from_str(&val) {
-                        rid = Some(val);
-                    } else if let Ok(val) = PathBuf::from_str(&val) {
-                        rid = radicle::rad::at(val)
-                            .map(|(_, id)| Some(id))
-                            .context("Supplied argument is not a valid path")?;
-                    } else {
-                        return Err(anyhow!("invalid path or RID '{}'", val));
-                    }
-                }
-                _ => return Err(anyhow::anyhow!(arg.unexpected())),
-            }
-        }
-
-        Ok((Options { rid, target }, vec![]))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let rid = match options.rid {
-        Some(rid) => rid,
-        None => radicle::rad::cwd()
-            .map(|(_, rid)| rid)
-            .context("Current directory is not a Radicle repository")?,
-    };
-
-    if options.target == Target::RepoId {
-        term::info!("{}", term::format::highlight(rid.urn()));
-        return Ok(());
-    }
-    let profile = ctx.profile()?;
-    let storage = &profile.storage;
-
-    match options.target {
-        Target::Refs => {
-            let (repo, _) = repo(rid, storage)?;
-            refs(&repo)?;
-        }
-        Target::Payload => {
-            let (_, doc) = repo(rid, storage)?;
-            json::to_pretty(&doc.payload, Path::new("radicle.json"))?.print();
-        }
-        Target::Identity => {
-            let (_, doc) = repo(rid, storage)?;
-            json::to_pretty(&*doc, Path::new("radicle.json"))?.print();
-        }
-        Target::Sigrefs => {
-            let (repo, _) = repo(rid, storage)?;
-            for remote in repo.remote_ids()? {
-                let remote = remote?;
-                let refs = RefsAt::new(&repo, remote)?;
-
-                println!(
-                    "{:<48} {}",
-                    term::format::tertiary(remote.to_human()),
-                    term::format::secondary(refs.at)
-                );
-            }
-        }
-        Target::Policy => {
-            let policies = profile.policies()?;
-            let seed = policies.seed_policy(&rid)?;
-            match seed.policy {
-                SeedingPolicy::Allow { scope } => {
-                    println!(
-                        "Repository {} is {} with scope {}",
-                        term::format::tertiary(&rid),
-                        term::format::positive("being seeded"),
-                        term::format::dim(format!("`{scope}`"))
-                    );
-                }
-                SeedingPolicy::Block => {
-                    println!(
-                        "Repository {} is {}",
-                        term::format::tertiary(&rid),
-                        term::format::negative("not being seeded"),
-                    );
-                }
-            }
-        }
-        Target::Delegates => {
-            let (_, doc) = repo(rid, storage)?;
-            let aliases = profile.aliases();
-            for did in &doc.delegates {
-                if let Some(alias) = aliases.alias(did) {
-                    println!(
-                        "{} {}",
-                        term::format::tertiary(&did),
-                        term::format::parens(term::format::dim(alias))
-                    );
-                } else {
-                    println!("{}", term::format::tertiary(&did));
-                }
-            }
-        }
-        Target::Visibility => {
-            let (_, doc) = repo(rid, storage)?;
-            println!("{}", term::format::visibility(&doc.visibility));
-        }
-        Target::History => {
-            let (repo, _) = repo(rid, storage)?;
-            let identity = Identity::load(&repo)?;
-            let head = repo.identity_head()?;
-            let history = repo.revwalk(head)?;
-
-            for oid in history {
-                let oid = oid?.into();
-                let tip = repo.commit(oid)?;
-
-                let Some(revision) = identity.revision(&tip.id().into()) else {
-                    continue;
-                };
-                if !revision.is_accepted() {
-                    continue;
-                }
-                let doc = &revision.doc;
-                let timezone = if tip.time().sign() == '+' {
-                    #[allow(deprecated)]
-                    FixedOffset::east(tip.time().offset_minutes() * 60)
-                } else {
-                    #[allow(deprecated)]
-                    FixedOffset::west(tip.time().offset_minutes() * 60)
-                };
-                let time = DateTime::<Utc>::from(
-                    std::time::UNIX_EPOCH
-                        + std::time::Duration::from_secs(tip.time().seconds() as u64),
-                )
-                .with_timezone(&timezone)
-                .to_rfc2822();
-
-                println!(
-                    "{} {}",
-                    term::format::yellow("commit"),
-                    term::format::yellow(oid),
-                );
-                if let Ok(parent) = tip.parent_id(0) {
-                    println!("parent {parent}");
-                }
-                println!("blob   {}", revision.blob);
-                println!("date   {time}");
-                println!();
-
-                if let Some(msg) = tip.message() {
-                    for line in msg.lines() {
-                        if line.is_empty() {
-                            println!();
-                        } else {
-                            term::indented(term::format::dim(line));
-                        }
-                    }
-                    term::blank();
-                }
-                for line in json::to_pretty(&doc, Path::new("radicle.json"))? {
-                    println!(" {line}");
-                }
-
-                println!();
-            }
-        }
-        Target::RepoId => {
-            // Handled above.
-        }
-    }
-
-    Ok(())
-}
-
-fn repo(rid: RepoId, storage: &Storage) -> anyhow::Result<(Repository, DocAt)> {
-    let repo = storage
-        .repository(rid)
-        .context("No repository with the given RID exists")?;
-    let doc = repo.identity_doc()?;
-
-    Ok((repo, doc))
-}
-
-fn refs(repo: &radicle::storage::git::Repository) -> anyhow::Result<()> {
-    let mut refs = Vec::new();
-    for r in repo.references()? {
-        let r = r?;
-        if let Some(namespace) = r.namespace {
-            refs.push(format!("{}/{}", namespace, r.name));
-        }
-    }
-
-    print!("{}", tree(refs));
-
-    Ok(())
-}
-
-/// Show the list of given git references as a newline terminated tree `String` similar to the tree command.
-fn tree(mut refs: Vec<String>) -> String {
-    refs.sort();
-
-    // List of references with additional unique entries for each 'directory'.
-    //
-    // i.e. "refs/heads/master" becomes ["refs"], ["refs", "heads"], and ["refs", "heads",
-    // "master"].
-    let mut refs_expanded: Vec<Vec<String>> = Vec::new();
-    // Number of entries per Git 'directory'.
-    let mut ref_entries: HashMap<Vec<String>, usize> = HashMap::new();
-    let mut last: Vec<String> = Vec::new();
-
-    for r in refs {
-        let r: Vec<String> = r.split('/').map(|s| s.to_string()).collect();
-
-        for (i, v) in r.iter().enumerate() {
-            let last_v = last.get(i);
-            if Some(v) != last_v {
-                last = r.clone().iter().take(i + 1).map(String::from).collect();
-
-                refs_expanded.push(last.clone());
-
-                let mut dir = last.clone();
-                dir.pop();
-                if dir.is_empty() {
-                    continue;
-                }
-
-                if let Some(num) = ref_entries.get_mut(&dir) {
-                    *num += 1;
-                } else {
-                    ref_entries.insert(dir, 1);
-                }
-            }
-        }
-    }
-    let mut tree = String::default();
-
-    for mut ref_components in refs_expanded {
-        // Better to explode when things do not go as expected.
-        let name = ref_components.pop().expect("non-empty vector");
-        if ref_components.is_empty() {
-            tree.push_str(&format!("{name}\n"));
-            continue;
-        }
-
-        for i in 1..ref_components.len() {
-            let parent: Vec<String> = ref_components.iter().take(i).cloned().collect();
-
-            let num = ref_entries.get(&parent).unwrap_or(&0);
-            if *num == 0 {
-                tree.push_str("    ");
-            } else {
-                tree.push_str("│   ");
-            }
-        }
-
-        if let Some(num) = ref_entries.get_mut(&ref_components) {
-            if *num == 1 {
-                tree.push_str(&format!("└── {name}\n"));
-            } else {
-                tree.push_str(&format!("├── {name}\n"));
-            }
-            *num -= 1;
-        }
-    }
-
-    tree
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_tree() {
-        let arg = vec![
-            String::from("z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/heads/master"),
-            String::from("z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/rad/id"),
-            String::from("z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/rad/sigrefs"),
-        ];
-        let exp = r#"
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-└── refs
-    ├── heads
-    │   └── master
-    └── rad
-        ├── id
-        └── sigrefs
-"#
-        .trim_start();
-
-        assert_eq!(tree(arg), exp);
-        assert_eq!(tree(vec![String::new()]), "\n");
-    }
-}
diff --git a/radicle-cli/src/commands/issue.rs b/radicle-cli/src/commands/issue.rs
deleted file mode 100644
index 08220e897..000000000
--- a/radicle-cli/src/commands/issue.rs
+++ /dev/null
@@ -1,836 +0,0 @@
-#[path = "issue/cache.rs"]
-mod cache;
-
-use std::collections::BTreeSet;
-use std::ffi::OsString;
-use std::str::FromStr;
-
-use anyhow::{anyhow, Context as _};
-
-use radicle::cob::common::{Label, Reaction};
-use radicle::cob::issue;
-use radicle::cob::issue::{CloseReason, State};
-use radicle::cob::thread;
-use radicle::crypto::Signer;
-use radicle::issue::cache::Issues as _;
-use radicle::prelude::{Did, RepoId};
-use radicle::profile;
-use radicle::storage;
-use radicle::storage::{ReadRepository, WriteRepository, WriteStorage};
-use radicle::Profile;
-use radicle::{cob, Node};
-
-use crate::git::Rev;
-use crate::node;
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-use crate::terminal::format::Author;
-use crate::terminal::issue::Format;
-use crate::terminal::patch::Message;
-use crate::terminal::Element;
-
-pub const HELP: Help = Help {
-    name: "issue",
-    description: "Manage issues",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad issue [<option>...]
-    rad issue delete <issue-id> [<option>...]
-    rad issue edit <issue-id> [<option>...]
-    rad issue list [--assigned <did>] [--all | --closed | --open | --solved] [<option>...]
-    rad issue open [--title <title>] [--description <text>] [--label <label>] [<option>...]
-    rad issue react <issue-id> [--emoji <char>] [--to <comment>] [<option>...]
-    rad issue assign <issue-id> [--add <did>] [--delete <did>] [<option>...]
-    rad issue label <issue-id> [--add <label>] [--delete <label>] [<option>...]
-    rad issue comment <issue-id> [--message <message>] [--reply-to <comment-id>] [<option>...]
-    rad issue show <issue-id> [<option>...]
-    rad issue state <issue-id> [--closed | --open | --solved] [<option>...]
-    rad issue cache [<issue-id>] [<option>...]
-
-Assign options
-
-    -a, --add    <did>     Add an assignee to the issue (may be specified multiple times).
-    -d, --delete <did>     Delete an assignee from the issue (may be specified multiple times).
-
-    Note: --add takes precedence over --delete
-
-Label options
-
-    -a, --add    <label>   Add a label to the issue (may be specified multiple times).
-    -d, --delete <label>   Delete a label from the issue (may be specified multiple times).
-
-    Note: --add takes precedence over --delete
-
-Show options
-
-        --debug                Show the issue as Rust debug output
-
-Options
-
-        --repo <rid>       Operate on the given repository (default: cwd)
-        --no-announce      Don't announce issue to peers
-        --header           Show only the issue header, hiding the comments
-    -q, --quiet            Don't print anything
-        --help             Print help
-"#,
-};
-
-#[derive(Default, Debug, PartialEq, Eq)]
-pub enum OperationName {
-    Assign,
-    Edit,
-    Open,
-    Comment,
-    Delete,
-    Label,
-    #[default]
-    List,
-    React,
-    Show,
-    State,
-    Cache,
-}
-
-/// Command line Peer argument.
-#[derive(Default, Debug, PartialEq, Eq)]
-pub enum Assigned {
-    #[default]
-    Me,
-    Peer(Did),
-}
-
-#[derive(Debug, PartialEq, Eq)]
-pub enum Operation {
-    Edit {
-        id: Rev,
-        title: Option<String>,
-        description: Option<String>,
-    },
-    Open {
-        title: Option<String>,
-        description: Option<String>,
-        labels: Vec<Label>,
-        assignees: Vec<Did>,
-    },
-    Show {
-        id: Rev,
-        format: Format,
-        debug: bool,
-    },
-    Comment {
-        id: Rev,
-        message: Message,
-        reply_to: Option<Rev>,
-    },
-    State {
-        id: Rev,
-        state: State,
-    },
-    Delete {
-        id: Rev,
-    },
-    React {
-        id: Rev,
-        reaction: Reaction,
-        comment_id: Option<thread::CommentId>,
-    },
-    Assign {
-        id: Rev,
-        opts: AssignOptions,
-    },
-    Label {
-        id: Rev,
-        opts: LabelOptions,
-    },
-    List {
-        assigned: Option<Assigned>,
-        state: Option<State>,
-    },
-    Cache {
-        id: Option<Rev>,
-    },
-}
-
-#[derive(Debug, Default, PartialEq, Eq)]
-pub struct AssignOptions {
-    pub add: BTreeSet<Did>,
-    pub delete: BTreeSet<Did>,
-}
-
-#[derive(Debug, Default, PartialEq, Eq)]
-pub struct LabelOptions {
-    pub add: BTreeSet<Label>,
-    pub delete: BTreeSet<Label>,
-}
-
-#[derive(Debug)]
-pub struct Options {
-    pub op: Operation,
-    pub repo: Option<RepoId>,
-    pub announce: bool,
-    pub quiet: bool,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut op: Option<OperationName> = None;
-        let mut id: Option<Rev> = None;
-        let mut assigned: Option<Assigned> = None;
-        let mut title: Option<String> = None;
-        let mut reaction: Option<Reaction> = None;
-        let mut comment_id: Option<thread::CommentId> = None;
-        let mut description: Option<String> = None;
-        let mut state: Option<State> = Some(State::Open);
-        let mut labels = Vec::new();
-        let mut assignees = Vec::new();
-        let mut format = Format::default();
-        let mut message = Message::default();
-        let mut reply_to = None;
-        let mut announce = true;
-        let mut quiet = false;
-        let mut debug = false;
-        let mut assign_opts = AssignOptions::default();
-        let mut label_opts = LabelOptions::default();
-        let mut repo = None;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-
-                // List options.
-                Long("all") if op.is_none() || op == Some(OperationName::List) => {
-                    state = None;
-                }
-                Long("closed") if op.is_none() || op == Some(OperationName::List) => {
-                    state = Some(State::Closed {
-                        reason: CloseReason::Other,
-                    });
-                }
-                Long("open") if op.is_none() || op == Some(OperationName::List) => {
-                    state = Some(State::Open);
-                }
-                Long("solved") if op.is_none() || op == Some(OperationName::List) => {
-                    state = Some(State::Closed {
-                        reason: CloseReason::Solved,
-                    });
-                }
-
-                // Open options.
-                Long("title") if op == Some(OperationName::Open) => {
-                    title = Some(parser.value()?.to_string_lossy().into());
-                }
-                Short('l') | Long("label") if matches!(op, Some(OperationName::Open)) => {
-                    let val = parser.value()?;
-                    let name = term::args::string(&val);
-                    let label = Label::new(name)?;
-
-                    labels.push(label);
-                }
-                Long("assign") if op == Some(OperationName::Open) => {
-                    let val = parser.value()?;
-                    let did = term::args::did(&val)?;
-
-                    assignees.push(did);
-                }
-                Long("description") if op == Some(OperationName::Open) => {
-                    description = Some(parser.value()?.to_string_lossy().into());
-                }
-
-                // State options.
-                Long("closed") if op == Some(OperationName::State) => {
-                    state = Some(State::Closed {
-                        reason: CloseReason::Other,
-                    });
-                }
-                Long("open") if op == Some(OperationName::State) => {
-                    state = Some(State::Open);
-                }
-                Long("solved") if op == Some(OperationName::State) => {
-                    state = Some(State::Closed {
-                        reason: CloseReason::Solved,
-                    });
-                }
-
-                // React options.
-                Long("emoji") if op == Some(OperationName::React) => {
-                    if let Some(emoji) = parser.value()?.to_str() {
-                        reaction =
-                            Some(Reaction::from_str(emoji).map_err(|_| anyhow!("invalid emoji"))?);
-                    }
-                }
-                Long("to") if op == Some(OperationName::React) => {
-                    let oid: String = parser.value()?.to_string_lossy().into();
-                    comment_id = Some(oid.parse()?);
-                }
-
-                // Show options.
-                Long("format") if op == Some(OperationName::Show) => {
-                    let val = parser.value()?;
-                    let val = term::args::string(&val);
-
-                    match val.as_str() {
-                        "header" => format = Format::Header,
-                        "full" => format = Format::Full,
-                        _ => anyhow::bail!("unknown format '{val}'"),
-                    }
-                }
-                Long("debug") if op == Some(OperationName::Show) => {
-                    debug = true;
-                }
-
-                // Comment options.
-                Long("message") | Short('m') if op == Some(OperationName::Comment) => {
-                    let val = parser.value()?;
-                    let txt = term::args::string(&val);
-
-                    message.append(&txt);
-                }
-                Long("reply-to") if op == Some(OperationName::Comment) => {
-                    let val = parser.value()?;
-                    let rev = term::args::rev(&val)?;
-
-                    reply_to = Some(rev);
-                }
-
-                // Assign options
-                Short('a') | Long("add") if op == Some(OperationName::Assign) => {
-                    assign_opts.add.insert(term::args::did(&parser.value()?)?);
-                }
-                Short('d') | Long("delete") if op == Some(OperationName::Assign) => {
-                    assign_opts
-                        .delete
-                        .insert(term::args::did(&parser.value()?)?);
-                }
-                Long("assigned") | Short('a') if assigned.is_none() => {
-                    if let Ok(val) = parser.value() {
-                        let peer = term::args::did(&val)?;
-                        assigned = Some(Assigned::Peer(peer));
-                    } else {
-                        assigned = Some(Assigned::Me);
-                    }
-                }
-
-                // Label options
-                Short('a') | Long("add") if matches!(op, Some(OperationName::Label)) => {
-                    let val = parser.value()?;
-                    let name = term::args::string(&val);
-                    let label = Label::new(name)?;
-
-                    label_opts.add.insert(label);
-                }
-                Short('d') | Long("delete") if matches!(op, Some(OperationName::Label)) => {
-                    let val = parser.value()?;
-                    let name = term::args::string(&val);
-                    let label = Label::new(name)?;
-
-                    label_opts.delete.insert(label);
-                }
-
-                // Options.
-                Long("no-announce") => {
-                    announce = false;
-                }
-                Long("quiet") | Short('q') => {
-                    quiet = true;
-                }
-                Long("repo") => {
-                    let val = parser.value()?;
-                    let rid = term::args::rid(&val)?;
-
-                    repo = Some(rid);
-                }
-
-                Value(val) if op.is_none() => match val.to_string_lossy().as_ref() {
-                    "c" | "comment" => op = Some(OperationName::Comment),
-                    "w" | "show" => op = Some(OperationName::Show),
-                    "d" | "delete" => op = Some(OperationName::Delete),
-                    "e" | "edit" => op = Some(OperationName::Edit),
-                    "l" | "list" => op = Some(OperationName::List),
-                    "o" | "open" => op = Some(OperationName::Open),
-                    "r" | "react" => op = Some(OperationName::React),
-                    "s" | "state" => op = Some(OperationName::State),
-                    "assign" => op = Some(OperationName::Assign),
-                    "label" => op = Some(OperationName::Label),
-                    "cache" => op = Some(OperationName::Cache),
-
-                    unknown => anyhow::bail!("unknown operation '{}'", unknown),
-                },
-                Value(val) if op.is_some() => {
-                    let val = term::args::rev(&val)?;
-                    id = Some(val);
-                }
-                _ => {
-                    return Err(anyhow!(arg.unexpected()));
-                }
-            }
-        }
-
-        let op = match op.unwrap_or_default() {
-            OperationName::Edit => Operation::Edit {
-                id: id.ok_or_else(|| anyhow!("an issue must be provided"))?,
-                title,
-                description,
-            },
-            OperationName::Open => Operation::Open {
-                title,
-                description,
-                labels,
-                assignees,
-            },
-            OperationName::Comment => Operation::Comment {
-                id: id.ok_or_else(|| anyhow!("an issue must be provided"))?,
-                message,
-                reply_to,
-            },
-            OperationName::Show => Operation::Show {
-                id: id.ok_or_else(|| anyhow!("an issue must be provided"))?,
-                format,
-                debug,
-            },
-            OperationName::State => Operation::State {
-                id: id.ok_or_else(|| anyhow!("an issue must be provided"))?,
-                state: state.ok_or_else(|| anyhow!("a state operation must be provided"))?,
-            },
-            OperationName::React => Operation::React {
-                id: id.ok_or_else(|| anyhow!("an issue must be provided"))?,
-                reaction: reaction.ok_or_else(|| anyhow!("a reaction emoji must be provided"))?,
-                comment_id,
-            },
-            OperationName::Delete => Operation::Delete {
-                id: id.ok_or_else(|| anyhow!("an issue to remove must be provided"))?,
-            },
-            OperationName::Assign => Operation::Assign {
-                id: id.ok_or_else(|| anyhow!("an issue to label must be provided"))?,
-                opts: assign_opts,
-            },
-            OperationName::Label => Operation::Label {
-                id: id.ok_or_else(|| anyhow!("an issue to label must be provided"))?,
-                opts: label_opts,
-            },
-            OperationName::List => Operation::List { assigned, state },
-            OperationName::Cache => Operation::Cache { id },
-        };
-
-        Ok((
-            Options {
-                op,
-                repo,
-                announce,
-                quiet,
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    let rid = if let Some(rid) = options.repo {
-        rid
-    } else {
-        radicle::rad::cwd().map(|(_, rid)| rid)?
-    };
-    let repo = profile.storage.repository_mut(rid)?;
-    let announce = options.announce
-        && matches!(
-            &options.op,
-            Operation::Open { .. }
-                | Operation::React { .. }
-                | Operation::State { .. }
-                | Operation::Delete { .. }
-                | Operation::Assign { .. }
-                | Operation::Label { .. }
-                | Operation::Edit { .. }
-                | Operation::Comment { .. }
-        );
-
-    let mut issues = profile.issues_mut(&repo)?;
-
-    match options.op {
-        Operation::Edit {
-            id,
-            title,
-            description,
-        } => {
-            let signer = term::signer(&profile)?;
-            let issue = edit(&mut issues, &repo, id, title, description, &signer)?;
-            if !options.quiet {
-                term::issue::show(&issue, issue.id(), Format::Header, &profile)?;
-            }
-        }
-        Operation::Open {
-            title: Some(title),
-            description: Some(description),
-            labels,
-            assignees,
-        } => {
-            let signer = term::signer(&profile)?;
-            let issue = issues.create(title, description, &labels, &assignees, [], &signer)?;
-            if !options.quiet {
-                term::issue::show(&issue, issue.id(), Format::Header, &profile)?;
-            }
-        }
-        Operation::Comment {
-            id,
-            message,
-            reply_to,
-        } => {
-            let signer = term::signer(&profile)?;
-            let issue_id = id.resolve::<cob::ObjectId>(&repo.backend)?;
-            let mut issue = issues.get_mut(&issue_id)?;
-            let (body, reply_to) = prompt_comment(message, reply_to, &issue, &repo)?;
-            let comment_id = issue.comment(body, reply_to, vec![], &signer)?;
-
-            if options.quiet {
-                term::print(comment_id);
-            } else {
-                let comment = issue.thread().comment(&comment_id).unwrap();
-                term::comment::widget(&comment_id, comment, &profile).print();
-            }
-        }
-        Operation::Show { id, format, debug } => {
-            let id = id.resolve(&repo.backend)?;
-            let issue = issues
-                .get(&id)
-                .map_err(|e| Error::WithHint {
-                    err: e.into(),
-                    hint: "reset the cache with `rad issue cache` and try again",
-                })?
-                .context("No issue with the given ID exists")?;
-            if debug {
-                println!("{:#?}", issue);
-            } else {
-                term::issue::show(&issue, &id, format, &profile)?;
-            }
-        }
-        Operation::State { id, state } => {
-            let signer = term::signer(&profile)?;
-            let id = id.resolve(&repo.backend)?;
-            let mut issue = issues.get_mut(&id)?;
-            issue.lifecycle(state, &signer)?;
-        }
-        Operation::React {
-            id,
-            reaction,
-            comment_id,
-        } => {
-            let id = id.resolve(&repo.backend)?;
-            if let Ok(mut issue) = issues.get_mut(&id) {
-                let signer = term::signer(&profile)?;
-                let comment_id = comment_id.unwrap_or_else(|| {
-                    let (comment_id, _) = term::io::comment_select(&issue).unwrap();
-                    *comment_id
-                });
-                issue.react(comment_id, reaction, true, &signer)?;
-            }
-        }
-        Operation::Open {
-            ref title,
-            ref description,
-            ref labels,
-            ref assignees,
-        } => {
-            let signer = term::signer(&profile)?;
-            open(
-                title.clone(),
-                description.clone(),
-                labels.to_vec(),
-                assignees.to_vec(),
-                &options,
-                &mut issues,
-                &signer,
-                &profile,
-            )?;
-        }
-        Operation::Assign {
-            id,
-            opts: AssignOptions { add, delete },
-        } => {
-            let signer = term::signer(&profile)?;
-            let id = id.resolve(&repo.backend)?;
-            let Ok(mut issue) = issues.get_mut(&id) else {
-                anyhow::bail!("Issue `{id}` not found");
-            };
-            let assignees = issue
-                .assignees()
-                .filter(|did| !delete.contains(did))
-                .chain(add.iter())
-                .cloned()
-                .collect::<Vec<_>>();
-            issue.assign(assignees, &signer)?;
-        }
-        Operation::Label {
-            id,
-            opts: LabelOptions { add, delete },
-        } => {
-            let signer = term::signer(&profile)?;
-            let id = id.resolve(&repo.backend)?;
-            let Ok(mut issue) = issues.get_mut(&id) else {
-                anyhow::bail!("Issue `{id}` not found");
-            };
-            let labels = issue
-                .labels()
-                .filter(|did| !delete.contains(did))
-                .chain(add.iter())
-                .cloned()
-                .collect::<Vec<_>>();
-            issue.label(labels, &signer)?;
-        }
-        Operation::List { assigned, state } => {
-            list(issues, &assigned, &state, &profile)?;
-        }
-        Operation::Delete { id } => {
-            let signer = term::signer(&profile)?;
-            let id = id.resolve(&repo.backend)?;
-            issues.remove(&id, &signer)?;
-        }
-        Operation::Cache { id } => {
-            let id = id.map(|id| id.resolve(&repo.backend)).transpose()?;
-            cache::run(id, &repo, &profile)?;
-        }
-    }
-
-    if announce {
-        let mut node = Node::new(profile.socket());
-        node::announce(
-            &repo,
-            node::SyncSettings::default(),
-            node::SyncReporting::default(),
-            &mut node,
-            &profile,
-        )?;
-    }
-
-    Ok(())
-}
-
-fn list<C>(
-    cache: C,
-    assigned: &Option<Assigned>,
-    state: &Option<State>,
-    profile: &profile::Profile,
-) -> anyhow::Result<()>
-where
-    C: issue::cache::Issues,
-{
-    if cache.is_empty()? {
-        term::print(term::format::italic("Nothing to show."));
-        return Ok(());
-    }
-
-    let assignee = match assigned {
-        Some(Assigned::Me) => Some(*profile.id()),
-        Some(Assigned::Peer(id)) => Some((*id).into()),
-        None => None,
-    };
-
-    let mut all = Vec::new();
-    let issues = cache.list()?;
-    for result in issues {
-        let (id, issue) = match result {
-            Ok((id, issue)) => (id, issue),
-            Err(e) => {
-                // Skip issues that failed to load.
-                log::error!(target: "cli", "Issue load error: {e}");
-                continue;
-            }
-        };
-
-        if let Some(a) = assignee {
-            if !issue.assignees().any(|v| v == &Did::from(a)) {
-                continue;
-            }
-        }
-        if let Some(s) = state {
-            if s != issue.state() {
-                continue;
-            }
-        }
-        all.push((id, issue))
-    }
-
-    all.sort_by(|(id1, i1), (id2, i2)| {
-        let by_timestamp = i2.timestamp().cmp(&i1.timestamp());
-        let by_id = id1.cmp(id2);
-
-        by_timestamp.then(by_id)
-    });
-
-    let mut table = term::Table::new(term::table::TableOptions::bordered());
-    table.push([
-        term::format::dim(String::from("●")).into(),
-        term::format::bold(String::from("ID")).into(),
-        term::format::bold(String::from("Title")).into(),
-        term::format::bold(String::from("Author")).into(),
-        term::Line::blank(),
-        term::format::bold(String::from("Labels")).into(),
-        term::format::bold(String::from("Assignees")).into(),
-        term::format::bold(String::from("Opened")).into(),
-    ]);
-    table.divider();
-
-    for (id, issue) in all {
-        let assigned: String = issue
-            .assignees()
-            .map(|did| {
-                let (alias, _) = Author::new(did.as_key(), profile).labels();
-
-                alias.content().to_owned()
-            })
-            .collect::<Vec<_>>()
-            .join(", ");
-
-        let mut labels = issue.labels().map(|t| t.to_string()).collect::<Vec<_>>();
-        labels.sort();
-
-        let author = issue.author().id;
-        let (alias, did) = Author::new(&author, profile).labels();
-
-        table.push([
-            match issue.state() {
-                State::Open => term::format::positive("●").into(),
-                State::Closed { .. } => term::format::negative("●").into(),
-            },
-            term::format::tertiary(term::format::cob(&id))
-                .to_owned()
-                .into(),
-            term::format::default(issue.title().to_owned()).into(),
-            alias.into(),
-            did.into(),
-            term::format::secondary(labels.join(", ")).into(),
-            if assigned.is_empty() {
-                term::format::dim(String::default()).into()
-            } else {
-                term::format::primary(assigned.to_string()).dim().into()
-            },
-            term::format::timestamp(issue.timestamp())
-                .dim()
-                .italic()
-                .into(),
-        ]);
-    }
-    table.print();
-
-    Ok(())
-}
-
-fn open<R, G>(
-    title: Option<String>,
-    description: Option<String>,
-    labels: Vec<Label>,
-    assignees: Vec<Did>,
-    options: &Options,
-    cache: &mut issue::Cache<issue::Issues<'_, R>, cob::cache::StoreWriter>,
-    signer: &G,
-    profile: &Profile,
-) -> anyhow::Result<()>
-where
-    R: ReadRepository + WriteRepository + cob::Store,
-    G: Signer,
-{
-    let (title, description) = if let (Some(t), Some(d)) = (title.as_ref(), description.as_ref()) {
-        (t.to_owned(), d.to_owned())
-    } else if let Some((t, d)) = term::issue::get_title_description(title, description)? {
-        (t, d)
-    } else {
-        anyhow::bail!("aborting issue creation due to empty title or description");
-    };
-    let issue = cache.create(
-        &title,
-        description,
-        labels.as_slice(),
-        assignees.as_slice(),
-        [],
-        signer,
-    )?;
-
-    if !options.quiet {
-        term::issue::show(&issue, issue.id(), Format::Header, profile)?;
-    }
-    Ok(())
-}
-
-fn edit<'a, 'g, R, G>(
-    issues: &'g mut issue::Cache<issue::Issues<'a, R>, cob::cache::StoreWriter>,
-    repo: &storage::git::Repository,
-    id: Rev,
-    title: Option<String>,
-    description: Option<String>,
-    signer: &G,
-) -> anyhow::Result<issue::IssueMut<'a, 'g, R, cob::cache::StoreWriter>>
-where
-    R: WriteRepository + ReadRepository + cob::Store,
-    G: radicle::crypto::Signer,
-{
-    let id = id.resolve(&repo.backend)?;
-    let mut issue = issues.get_mut(&id)?;
-    let (root, _) = issue.root();
-    let root = *root;
-
-    if title.is_some() || description.is_some() {
-        // Editing by command line arguments.
-        issue.transaction("Edit", signer, |tx| {
-            if let Some(t) = title {
-                tx.edit(t)?;
-            }
-            if let Some(d) = description {
-                tx.edit_comment(root, d, vec![])?;
-            }
-            Ok(())
-        })?;
-        return Ok(issue);
-    }
-
-    // Editing via the editor.
-    let Some((title, description)) = term::issue::get_title_description(
-        Some(title.unwrap_or(issue.title().to_owned())),
-        Some(description.unwrap_or(issue.description().to_owned())),
-    )?
-    else {
-        return Ok(issue);
-    };
-
-    issue.transaction("Edit", signer, |tx| {
-        tx.edit(title)?;
-        tx.edit_comment(root, description, vec![])?;
-
-        Ok(())
-    })?;
-
-    Ok(issue)
-}
-
-/// Get a comment from the user, by prompting.
-pub fn prompt_comment<R: WriteRepository + radicle::cob::Store>(
-    message: Message,
-    reply_to: Option<Rev>,
-    issue: &issue::Issue,
-    repo: &R,
-) -> anyhow::Result<(String, thread::CommentId)> {
-    let (root, r) = issue.root();
-    let (reply_to, help) = if let Some(rev) = reply_to {
-        let id = rev.resolve::<radicle::git::Oid>(repo.raw())?;
-        let parent = issue
-            .thread()
-            .comment(&id)
-            .ok_or(anyhow::anyhow!("comment '{rev}' not found"))?;
-
-        (id, parent.body().trim())
-    } else {
-        (*root, r.body().trim())
-    };
-    let help = format!("\n{}\n", term::format::html::commented(help));
-    let body = message.get(&help)?;
-
-    if body.is_empty() {
-        anyhow::bail!("aborting operation due to empty comment");
-    }
-    Ok((body, reply_to))
-}
diff --git a/radicle-cli/src/commands/issue/cache.rs b/radicle-cli/src/commands/issue/cache.rs
deleted file mode 100644
index 65da84e6f..000000000
--- a/radicle-cli/src/commands/issue/cache.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use std::ops::ControlFlow;
-
-use radicle::issue::IssueId;
-use radicle::storage::git::Repository;
-use radicle::Profile;
-
-use crate::terminal as term;
-
-pub fn run(id: Option<IssueId>, repository: &Repository, profile: &Profile) -> anyhow::Result<()> {
-    let mut issues = profile.issues_mut(repository)?;
-
-    match id {
-        Some(id) => {
-            issues.write(&id)?;
-            term::success!("Successfully cached issue `{id}`");
-        }
-        None => issues.write_all(|result, progress| {
-            match result {
-                Ok((id, _)) => term::success!(
-                    "Successfully cached issue {id} ({}/{})",
-                    progress.seen(),
-                    progress.total()
-                ),
-                Err(e) => term::warning(format!("Failed to retrieve issue: {e}")),
-            };
-            ControlFlow::Continue(())
-        })?,
-    }
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/ls.rs b/radicle-cli/src/commands/ls.rs
deleted file mode 100644
index c26cd8400..000000000
--- a/radicle-cli/src/commands/ls.rs
+++ /dev/null
@@ -1,164 +0,0 @@
-use std::ffi::OsString;
-
-use radicle::storage::{ReadStorage, RepositoryInfo};
-
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-
-use term::Element;
-
-pub const HELP: Help = Help {
-    name: "ls",
-    description: "List repositories",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad ls [<option>...]
-
-    By default, this command shows you all repositories that you have forked or initialized.
-    If you wish to see all seeded repositories, use the `--all` option.
-
-Options
-
-    --private       Show only private repositories
-    --public        Show only public repositories
-    --seeded, -s    Show all seeded repositories
-    --all, -a       Show all repositories in storage
-    --verbose, -v   Verbose output
-    --help          Print help
-"#,
-};
-
-pub struct Options {
-    #[allow(dead_code)]
-    verbose: bool,
-    public: bool,
-    private: bool,
-    all: bool,
-    seeded: bool,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut verbose = false;
-        let mut private = false;
-        let mut public = false;
-        let mut all = false;
-        let mut seeded = false;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                Long("all") | Short('a') => {
-                    all = true;
-                }
-                Long("seeded") | Short('s') => {
-                    seeded = true;
-                }
-                Long("private") => {
-                    private = true;
-                }
-                Long("public") => {
-                    public = true;
-                }
-                Long("verbose") | Short('v') => verbose = true,
-                _ => return Err(anyhow::anyhow!(arg.unexpected())),
-            }
-        }
-
-        Ok((
-            Options {
-                verbose,
-                private,
-                public,
-                all,
-                seeded,
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    let storage = &profile.storage;
-    let repos = storage.repositories()?;
-    let policy = profile.policies()?;
-    let mut table = term::Table::new(term::TableOptions::bordered());
-    let mut rows = Vec::new();
-
-    if repos.is_empty() {
-        return Ok(());
-    }
-
-    for RepositoryInfo {
-        rid,
-        head,
-        doc,
-        refs,
-        ..
-    } in repos
-    {
-        if doc.visibility.is_public() && options.private && !options.public {
-            continue;
-        }
-        if !doc.visibility.is_public() && !options.private && options.public {
-            continue;
-        }
-        if refs.is_none() && !options.all && !options.seeded {
-            continue;
-        }
-        let seeded = policy.is_seeding(&rid)?;
-
-        if !seeded && !options.all {
-            continue;
-        }
-        if !seeded && options.seeded {
-            continue;
-        }
-        let proj = match doc.project() {
-            Ok(p) => p,
-            Err(e) => {
-                log::error!(target: "cli", "Error loading project payload for {rid}: {e}");
-                continue;
-            }
-        };
-        let head = term::format::oid(head).into();
-
-        rows.push([
-            term::format::bold(proj.name().to_owned()),
-            term::format::tertiary(rid.urn()),
-            if seeded {
-                term::format::visibility(&doc.visibility).into()
-            } else {
-                term::format::dim("local").into()
-            },
-            term::format::secondary(head),
-            term::format::italic(proj.description().to_owned()),
-        ]);
-    }
-    rows.sort();
-
-    if rows.is_empty() {
-        term::print(term::format::italic("Nothing to show."));
-    } else {
-        table.push([
-            "Name".into(),
-            "RID".into(),
-            "Visibility".into(),
-            "Head".into(),
-            "Description".into(),
-        ]);
-        table.divider();
-        table.extend(rows);
-        table.print();
-    }
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/node.rs b/radicle-cli/src/commands/node.rs
deleted file mode 100644
index 8695ba0f2..000000000
--- a/radicle-cli/src/commands/node.rs
+++ /dev/null
@@ -1,303 +0,0 @@
-use std::ffi::OsString;
-use std::path::PathBuf;
-use std::time;
-
-use anyhow::anyhow;
-
-use radicle::node::config::ConnectAddress;
-use radicle::node::routing::Store;
-use radicle::node::Handle as _;
-use radicle::node::{Address, Node, NodeId, PeerAddr};
-use radicle::prelude::RepoId;
-
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-use crate::terminal::Element as _;
-
-#[path = "node/commands.rs"]
-mod commands;
-#[path = "node/control.rs"]
-pub mod control;
-#[path = "node/events.rs"]
-mod events;
-#[path = "node/routing.rs"]
-pub mod routing;
-
-pub const HELP: Help = Help {
-    name: "node",
-    description: "Control and query the Radicle Node",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad node status [<option>...]
-    rad node start [--foreground] [--verbose] [<option>...] [-- <node-option>...]
-    rad node stop [<option>...]
-    rad node logs [-n <lines>]
-    rad node debug [<option>...]
-    rad node connect <nid>@<addr> [<option>...]
-    rad node routing [--rid <rid>] [--nid <nid>] [--json] [<option>...]
-    rad node inventory [<option>...]
-    rad node events [--timeout <secs>] [-n <count>] [<option>...]
-    rad node config [--addresses]
-    rad node db <command> [<option>..]
-
-    For `<node-option>` see `radicle-node --help`.
-
-Start options
-
-    --foreground         Start the node in the foreground
-    --path <path>        Start node binary at path (default: radicle-node)
-    --verbose, -v        Verbose output
-
-Routing options
-
-    --rid <rid>          Show the routing table entries for the given RID
-    --nid <nid>          Show the routing table entries for the given NID
-    --json               Output the routing table as json
-
-Events options
-
-    --timeout <secs>     How long to wait to receive an event before giving up
-    --count, -n <count>  Exit after <count> events
-
-General options
-
-    --help               Print help
-"#,
-};
-
-pub struct Options {
-    op: Operation,
-}
-
-pub enum Operation {
-    Connect {
-        addr: PeerAddr<NodeId, Address>,
-        timeout: time::Duration,
-    },
-    Config {
-        addresses: bool,
-    },
-    Db {
-        args: Vec<OsString>,
-    },
-    Events {
-        timeout: time::Duration,
-        count: usize,
-    },
-    Routing {
-        json: bool,
-        rid: Option<RepoId>,
-        nid: Option<NodeId>,
-    },
-    Start {
-        foreground: bool,
-        verbose: bool,
-        path: PathBuf,
-        options: Vec<OsString>,
-    },
-    Logs {
-        lines: usize,
-    },
-    Status,
-    Inventory,
-    Debug,
-    Sessions,
-    Stop,
-}
-
-#[derive(Default, PartialEq, Eq)]
-pub enum OperationName {
-    Connect,
-    Config,
-    Db,
-    Events,
-    Routing,
-    Logs,
-    Start,
-    #[default]
-    Status,
-    Inventory,
-    Debug,
-    Sessions,
-    Stop,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut foreground = false;
-        let mut options = vec![];
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut op: Option<OperationName> = None;
-        let mut nid: Option<NodeId> = None;
-        let mut rid: Option<RepoId> = None;
-        let mut json: bool = false;
-        let mut addr: Option<PeerAddr<NodeId, Address>> = None;
-        let mut lines: usize = 60;
-        let mut count: usize = usize::MAX;
-        let mut timeout = time::Duration::MAX;
-        let mut addresses = false;
-        let mut path = None;
-        let mut verbose = false;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                Value(val) if op.is_none() => match val.to_string_lossy().as_ref() {
-                    "connect" => op = Some(OperationName::Connect),
-                    "db" => op = Some(OperationName::Db),
-                    "events" => op = Some(OperationName::Events),
-                    "logs" => op = Some(OperationName::Logs),
-                    "config" => op = Some(OperationName::Config),
-                    "routing" => op = Some(OperationName::Routing),
-                    "inventory" => op = Some(OperationName::Inventory),
-                    "start" => op = Some(OperationName::Start),
-                    "status" => op = Some(OperationName::Status),
-                    "stop" => op = Some(OperationName::Stop),
-                    "sessions" => op = Some(OperationName::Sessions),
-                    "debug" => op = Some(OperationName::Debug),
-
-                    unknown => anyhow::bail!("unknown operation '{}'", unknown),
-                },
-                Value(val) if matches!(op, Some(OperationName::Connect)) => {
-                    addr = Some(val.parse()?);
-                }
-                Long("rid") if matches!(op, Some(OperationName::Routing)) => {
-                    let val = parser.value()?;
-                    rid = term::args::rid(&val).ok();
-                }
-                Long("nid") if matches!(op, Some(OperationName::Routing)) => {
-                    let val = parser.value()?;
-                    nid = term::args::nid(&val).ok();
-                }
-                Long("json") if matches!(op, Some(OperationName::Routing)) => json = true,
-                Long("timeout")
-                    if op == Some(OperationName::Events) || op == Some(OperationName::Connect) =>
-                {
-                    let val = parser.value()?;
-                    timeout = term::args::seconds(&val)?;
-                }
-                Long("count") | Short('n') if matches!(op, Some(OperationName::Events)) => {
-                    let val = parser.value()?;
-                    count = term::args::number(&val)?;
-                }
-                Long("foreground") if matches!(op, Some(OperationName::Start)) => {
-                    foreground = true;
-                }
-                Long("addresses") if matches!(op, Some(OperationName::Config)) => {
-                    addresses = true;
-                }
-                Long("verbose") | Short('v') if matches!(op, Some(OperationName::Start)) => {
-                    verbose = true;
-                }
-                Long("path") if matches!(op, Some(OperationName::Start)) => {
-                    let val = parser.value()?;
-                    path = Some(PathBuf::from(val));
-                }
-                Short('n') if matches!(op, Some(OperationName::Logs)) => {
-                    lines = parser.value()?.parse()?;
-                }
-                Value(val) if matches!(op, Some(OperationName::Start)) => {
-                    options.push(val);
-                }
-                Value(val) if matches!(op, Some(OperationName::Db)) => {
-                    options.push(val);
-                }
-                _ => return Err(anyhow!(arg.unexpected())),
-            }
-        }
-
-        let op = match op.unwrap_or_default() {
-            OperationName::Connect => Operation::Connect {
-                addr: addr.ok_or_else(|| {
-                    anyhow!("an address of the form `<nid>@<host>:<port>` must be provided")
-                })?,
-                timeout,
-            },
-            OperationName::Config => Operation::Config { addresses },
-            OperationName::Db => Operation::Db { args: options },
-            OperationName::Events => Operation::Events { timeout, count },
-            OperationName::Routing => Operation::Routing { rid, nid, json },
-            OperationName::Logs => Operation::Logs { lines },
-            OperationName::Start => Operation::Start {
-                foreground,
-                verbose,
-                options,
-                path: path.unwrap_or(PathBuf::from("radicle-node")),
-            },
-            OperationName::Inventory => Operation::Inventory,
-            OperationName::Status => Operation::Status,
-            OperationName::Debug => Operation::Debug,
-            OperationName::Sessions => Operation::Sessions,
-            OperationName::Stop => Operation::Stop,
-        };
-        Ok((Options { op }, vec![]))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    let mut node = Node::new(profile.socket());
-
-    match options.op {
-        Operation::Connect { addr, timeout } => {
-            control::connect(&mut node, addr.id, addr.addr, timeout)?
-        }
-        Operation::Config { addresses } => {
-            if addresses {
-                let cfg = node.config()?;
-                for addr in cfg.external_addresses {
-                    term::print(ConnectAddress::from((*profile.id(), addr)).to_string());
-                }
-            } else {
-                control::config(&node)?;
-            }
-        }
-        Operation::Db { args } => {
-            commands::db(&profile, args)?;
-        }
-        Operation::Debug => {
-            control::debug(&mut node)?;
-        }
-        Operation::Sessions => {
-            let sessions = control::sessions(&node)?;
-            if let Some(table) = sessions {
-                table.print();
-            }
-        }
-        Operation::Events { timeout, count } => {
-            events::run(node, count, timeout)?;
-        }
-        Operation::Routing { rid, nid, json } => {
-            let store = profile.database()?;
-            routing::run(&store, rid, nid, json)?;
-        }
-        Operation::Logs { lines } => control::logs(lines, Some(time::Duration::MAX), &profile)?,
-        Operation::Start {
-            foreground,
-            options,
-            path,
-            verbose,
-        } => {
-            control::start(node, !foreground, verbose, options, &path, &profile)?;
-        }
-        Operation::Inventory => {
-            for rid in profile.routing()?.get_inventory(profile.id())? {
-                println!("{}", term::format::tertiary(rid));
-            }
-        }
-        Operation::Status => {
-            control::status(&node, &profile)?;
-        }
-        Operation::Stop => {
-            control::stop(node)?;
-        }
-    }
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/node/commands.rs b/radicle-cli/src/commands/node/commands.rs
deleted file mode 100644
index c0b3daefb..000000000
--- a/radicle-cli/src/commands/node/commands.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use std::ffi::OsString;
-
-use anyhow::anyhow;
-use radicle::Profile;
-use radicle_term as term;
-
-#[derive(PartialEq, Eq)]
-pub enum Operation {
-    Exec { query: String },
-}
-
-pub fn db(profile: &Profile, args: Vec<OsString>) -> anyhow::Result<()> {
-    use lexopt::prelude::*;
-
-    let mut parser = lexopt::Parser::from_args(args);
-    let mut op: Option<Operation> = None;
-
-    while let Some(arg) = parser.next()? {
-        match arg {
-            Value(cmd) if op.is_none() => match cmd.to_string_lossy().as_ref() {
-                "exec" => {
-                    let val = parser
-                        .value()
-                        .map_err(|_| anyhow!("a query to execute must be provided for `exec`"))?;
-                    op = Some(Operation::Exec {
-                        query: val.to_string_lossy().to_string(),
-                    });
-                }
-                unknown => anyhow::bail!("unknown operation '{unknown}'"),
-            },
-            _ => return Err(anyhow!(arg.unexpected())),
-        }
-    }
-
-    match op.ok_or_else(|| anyhow!("a command must be provided, eg. `rad node db exec`"))? {
-        Operation::Exec { query } => {
-            let db = profile.database_mut()?;
-            db.execute(query)?;
-
-            let changed = db.change_count();
-            if changed > 0 {
-                term::success!("{changed} row(s) affected.");
-            } else {
-                term::print(term::format::italic("No rows affected."));
-            }
-        }
-    }
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/node/control.rs b/radicle-cli/src/commands/node/control.rs
deleted file mode 100644
index 5e86a957b..000000000
--- a/radicle-cli/src/commands/node/control.rs
+++ /dev/null
@@ -1,309 +0,0 @@
-use std::ffi::OsString;
-use std::fs::{File, OpenOptions};
-use std::io::{BufRead, BufReader, Read, Seek, SeekFrom};
-use std::{fs, io, path::Path, process, thread, time};
-
-use anyhow::anyhow;
-use localtime::LocalTime;
-
-use radicle::node;
-use radicle::node::{Address, ConnectResult, Handle as _, NodeId};
-use radicle::Node;
-use radicle::{profile, Profile};
-
-use crate::terminal as term;
-use crate::terminal::Element as _;
-
-/// How long to wait for the node to start before returning an error.
-pub const NODE_START_TIMEOUT: time::Duration = time::Duration::from_secs(6);
-/// Node log file name.
-pub const NODE_LOG: &str = "node.log";
-/// Node log old file name, after rotation.
-pub const NODE_LOG_OLD: &str = "node.log.old";
-
-pub fn start(
-    node: Node,
-    daemon: bool,
-    verbose: bool,
-    mut options: Vec<OsString>,
-    cmd: &Path,
-    profile: &Profile,
-) -> anyhow::Result<()> {
-    if node.is_running() {
-        term::success!("Node is already running.");
-        return Ok(());
-    }
-    let envs = if profile.keystore.is_encrypted()? {
-        // Ask passphrase here, otherwise it'll be a fatal error when running the daemon
-        // without `RAD_PASSPHRASE`.
-        let validator = term::io::PassphraseValidator::new(profile.keystore.clone());
-        let passphrase = if let Some(phrase) = profile::env::passphrase() {
-            phrase
-        } else if let Ok(phrase) = term::io::passphrase(validator) {
-            phrase
-        } else {
-            anyhow::bail!("your radicle passphrase is required to start your node");
-        };
-        Some((profile::env::RAD_PASSPHRASE, passphrase))
-    } else {
-        None
-    };
-
-    // Since we checked that the node is not running, it's safe to use `--force`
-    // here.
-    if !options.contains(&OsString::from("--force")) {
-        options.push(OsString::from("--force"));
-    }
-    if daemon {
-        let log = log_rotate(profile)?;
-        let child = process::Command::new(cmd)
-            .args(options)
-            .envs(envs)
-            .stdin(process::Stdio::null())
-            .stdout(process::Stdio::from(log.try_clone()?))
-            .stderr(process::Stdio::from(log))
-            .spawn()
-            .map_err(|e| anyhow!("failed to start node process {cmd:?}: {e}"))?;
-        let pid = term::format::parens(term::format::dim(child.id()));
-
-        if verbose {
-            logs(0, Some(time::Duration::from_secs(1)), profile)?;
-        } else {
-            let started = time::Instant::now();
-            let mut spinner = term::spinner(format!("Node starting.. {pid}"));
-
-            loop {
-                if node.is_running() {
-                    spinner.message(format!("Node started {pid}"));
-                    spinner.finish();
-
-                    term::print(term::format::dim(
-                        "To stay in sync with the network, leave the node running in the background.",
-                    ));
-                    term::info!(
-                        "{} {}{}",
-                        term::format::dim("To learn more, run"),
-                        term::format::command("rad node --help"),
-                        term::format::dim("."),
-                    );
-                    break;
-                } else if started.elapsed() >= NODE_START_TIMEOUT {
-                    anyhow::bail!(
-                        "node failed to start. Try running it with `rad node start --foreground`, \
-                        or check the logs with `rad node logs`"
-                    );
-                }
-                thread::sleep(time::Duration::from_millis(60));
-            }
-        }
-    } else {
-        let mut child = process::Command::new(cmd)
-            .args(options)
-            .envs(envs)
-            .spawn()
-            .map_err(|e| anyhow!("failed to start node process {cmd:?}: {e}"))?;
-
-        child.wait()?;
-    }
-
-    Ok(())
-}
-
-pub fn stop(node: Node) -> anyhow::Result<()> {
-    let mut spinner = term::spinner("Stopping node...");
-    if node.shutdown().is_err() {
-        spinner.error("node is not running");
-    } else {
-        spinner.message("Node stopped");
-        spinner.finish();
-    }
-    Ok(())
-}
-
-pub fn debug(node: &mut Node) -> anyhow::Result<()> {
-    let json = node.debug()?;
-    term::json::to_pretty(&json, Path::new("debug.json"))?.print();
-
-    Ok(())
-}
-
-pub fn logs(lines: usize, follow: Option<time::Duration>, profile: &Profile) -> anyhow::Result<()> {
-    let logs = profile.home.node().join("node.log");
-
-    let mut file = BufReader::new(File::open(logs)?);
-    file.seek(SeekFrom::End(0))?;
-
-    let mut tail = Vec::new();
-    let mut nlines = 0;
-
-    for i in (1..=file.stream_position()?).rev() {
-        let mut buf = [0; 1];
-        file.seek(SeekFrom::Start(i - 1))?;
-        file.read_exact(&mut buf)?;
-
-        if buf[0] == b'\n' {
-            nlines += 1;
-        }
-        if nlines > lines {
-            break;
-        }
-        tail.push(buf[0]);
-    }
-    tail.reverse();
-
-    print!("{}", term::format::dim(String::from_utf8_lossy(&tail)));
-
-    if let Some(timeout) = follow {
-        file.seek(SeekFrom::End(0))?;
-
-        let start = time::Instant::now();
-
-        while start.elapsed() < timeout {
-            let mut line = String::new();
-            let len = file.read_line(&mut line)?;
-
-            if len == 0 {
-                thread::sleep(time::Duration::from_millis(250));
-            } else {
-                print!("{}", term::format::dim(line));
-            }
-        }
-    }
-    Ok(())
-}
-
-pub fn connect(
-    node: &mut Node,
-    nid: NodeId,
-    addr: Address,
-    timeout: time::Duration,
-) -> anyhow::Result<()> {
-    let spinner = term::spinner(format!(
-        "Connecting to {}@{addr}...",
-        term::format::node(&nid)
-    ));
-    match node.connect(
-        nid,
-        addr,
-        node::ConnectOptions {
-            persistent: true,
-            timeout,
-        },
-    ) {
-        Ok(ConnectResult::Connected) => spinner.finish(),
-        Ok(ConnectResult::Disconnected { reason }) => spinner.error(reason),
-        Err(err) => return Err(err.into()),
-    }
-    Ok(())
-}
-
-pub fn status(node: &Node, profile: &Profile) -> anyhow::Result<()> {
-    if node.is_running() {
-        let listen = node
-            .listen_addrs()?
-            .into_iter()
-            .map(|addr| addr.to_string())
-            .collect::<Vec<_>>();
-
-        if listen.is_empty() {
-            term::success!("Node is {}.", term::format::positive("running"));
-        } else {
-            term::success!(
-                "Node is {} and listening on {}.",
-                term::format::positive("running"),
-                listen.join(", ")
-            );
-        }
-    } else {
-        term::info!("Node is {}.", term::format::negative("stopped"));
-        term::info!(
-            "To start it, run {}.",
-            term::format::command("rad node start")
-        );
-        return Ok(());
-    }
-
-    let sessions = sessions(node)?;
-    if let Some(table) = sessions {
-        term::blank();
-        table.print();
-    }
-
-    if profile.home.node().join("node.log").exists() {
-        term::blank();
-        // If we're running the node via `systemd` for example, there won't be a log file
-        // and this will fail.
-        logs(10, None, profile)?;
-    }
-    Ok(())
-}
-
-pub fn sessions(node: &Node) -> Result<Option<term::Table<4, term::Label>>, node::Error> {
-    let sessions = node.sessions()?;
-    if sessions.is_empty() {
-        return Ok(None);
-    }
-    let mut table = term::Table::new(term::table::TableOptions::bordered());
-    let now = LocalTime::now();
-
-    table.push([
-        term::format::bold("Peer").into(),
-        term::format::bold("Address").into(),
-        term::format::bold("State").into(),
-        term::format::bold("Since").into(),
-    ]);
-    table.divider();
-
-    for sess in sessions {
-        let nid = term::format::tertiary(sess.nid).into();
-        let (addr, state, time) = match sess.state {
-            node::State::Initial => (
-                term::Label::blank(),
-                term::Label::from(term::format::dim("initial")),
-                term::Label::blank(),
-            ),
-            node::State::Attempted => (
-                sess.addr.to_string().into(),
-                term::Label::from(term::format::tertiary("attempted")),
-                term::Label::blank(),
-            ),
-            node::State::Connected { since, .. } => (
-                sess.addr.to_string().into(),
-                term::Label::from(term::format::positive("connected")),
-                term::format::dim(now - since).into(),
-            ),
-            node::State::Disconnected { since, .. } => (
-                sess.addr.to_string().into(),
-                term::Label::from(term::format::negative("disconnected")),
-                term::format::dim(now - since).into(),
-            ),
-        };
-        table.push([nid, addr, state, time]);
-    }
-    Ok(Some(table))
-}
-
-pub fn config(node: &Node) -> anyhow::Result<()> {
-    let cfg = node.config()?;
-    let cfg = serde_json::to_string_pretty(&cfg)?;
-
-    println!("{cfg}");
-
-    Ok(())
-}
-
-fn log_rotate(profile: &Profile) -> io::Result<File> {
-    let base = profile.home.node();
-    if base.join(NODE_LOG).exists() {
-        // Let this fail, eg. if the file doesn't exist.
-        fs::remove_file(base.join(NODE_LOG_OLD)).ok();
-        fs::rename(base.join(NODE_LOG), base.join(NODE_LOG_OLD))?;
-    }
-
-    let log = OpenOptions::new()
-        .write(true)
-        .create_new(true)
-        .open(base.join(NODE_LOG))?;
-
-    Ok(log)
-}
diff --git a/radicle-cli/src/commands/node/events.rs b/radicle-cli/src/commands/node/events.rs
deleted file mode 100644
index a90ef920f..000000000
--- a/radicle-cli/src/commands/node/events.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use std::time;
-
-use radicle::node::{Event, Handle};
-
-pub fn run<H>(node: H, count: usize, timeout: time::Duration) -> anyhow::Result<()>
-where
-    H: Handle<Event = Result<Event, <H as Handle>::Error>>,
-{
-    let events = node.subscribe(timeout)?;
-    for (i, event) in events.into_iter().enumerate() {
-        let event = event?;
-        let obj = serde_json::to_string(&event)?;
-
-        println!("{obj}");
-
-        // Only output up to `count` events.
-        if i + 1 >= count {
-            break;
-        }
-    }
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/node/routing.rs b/radicle-cli/src/commands/node/routing.rs
deleted file mode 100644
index bcb50411d..000000000
--- a/radicle-cli/src/commands/node/routing.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use radicle::node;
-use radicle::prelude::{NodeId, RepoId};
-
-use crate::terminal as term;
-use crate::terminal::Element;
-
-pub fn run<S: node::routing::Store>(
-    routing: &S,
-    rid: Option<RepoId>,
-    nid: Option<NodeId>,
-    json: bool,
-) -> anyhow::Result<()> {
-    // Filters entries by RID or NID exclusively, or show all of them if none given.
-    let entries = routing.entries()?.filter(|(rid_, nid_)| {
-        (nid.is_none() || Some(nid_) == nid.as_ref())
-            && (rid.is_none() || Some(rid_) == rid.as_ref())
-    });
-
-    if json {
-        print_json(entries);
-    } else {
-        print_table(entries);
-    }
-
-    Ok(())
-}
-
-fn print_table(entries: impl IntoIterator<Item = (RepoId, NodeId)>) {
-    let mut t = term::Table::new(term::table::TableOptions::bordered());
-    t.header([
-        term::format::default(String::from("RID")),
-        term::format::default(String::from("NID")),
-    ]);
-    t.divider();
-
-    for (rid, nid) in entries {
-        t.push([
-            term::format::highlight(rid.to_string()),
-            term::format::node(&nid),
-        ]);
-    }
-    t.print();
-}
-
-fn print_json(entries: impl IntoIterator<Item = (RepoId, NodeId)>) {
-    for (rid, nid) in entries {
-        println!("{}", serde_json::json!({ "rid": rid, "nid": nid }));
-    }
-}
diff --git a/radicle-cli/src/commands/patch.rs b/radicle-cli/src/commands/patch.rs
deleted file mode 100644
index bf54a7e3e..000000000
--- a/radicle-cli/src/commands/patch.rs
+++ /dev/null
@@ -1,956 +0,0 @@
-#[path = "patch/archive.rs"]
-mod archive;
-#[path = "patch/assign.rs"]
-mod assign;
-#[path = "patch/cache.rs"]
-mod cache;
-#[path = "patch/checkout.rs"]
-mod checkout;
-#[path = "patch/comment.rs"]
-mod comment;
-#[path = "patch/delete.rs"]
-mod delete;
-#[path = "patch/diff.rs"]
-mod diff;
-#[path = "patch/edit.rs"]
-mod edit;
-#[path = "patch/label.rs"]
-mod label;
-#[path = "patch/list.rs"]
-mod list;
-#[path = "patch/ready.rs"]
-mod ready;
-#[path = "patch/redact.rs"]
-mod redact;
-#[path = "patch/resolve.rs"]
-mod resolve;
-#[path = "patch/review.rs"]
-mod review;
-#[path = "patch/show.rs"]
-mod show;
-#[path = "patch/update.rs"]
-mod update;
-
-use std::collections::BTreeSet;
-use std::ffi::OsString;
-
-use anyhow::anyhow;
-
-use radicle::cob::patch::PatchId;
-use radicle::cob::{patch, Label};
-use radicle::git::RefString;
-use radicle::patch::cache::Patches as _;
-use radicle::storage::git::transport;
-use radicle::{prelude::*, Node};
-
-use crate::git::Rev;
-use crate::node;
-use crate::terminal as term;
-use crate::terminal::args::{string, Args, Error, Help};
-use crate::terminal::patch::Message;
-
-pub const HELP: Help = Help {
-    name: "patch",
-    description: "Manage patches",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad patch [<option>...]
-    rad patch list [--all|--merged|--open|--archived|--draft|--authored] [--author <did>]... [<option>...]
-    rad patch show <patch-id> [<option>...]
-    rad patch diff <patch-id> [<option>...]
-    rad patch archive <patch-id> [--undo] [<option>...]
-    rad patch update <patch-id> [<option>...]
-    rad patch checkout <patch-id> [<option>...]
-    rad patch review <patch-id> [--accept | --reject] [-m [<string>]] [-d | --delete] [<option>...]
-    rad patch resolve <patch-id> [--review <review-id>] [--comment <comment-id>] [--unresolve] [<option>...]
-    rad patch delete <patch-id> [<option>...]
-    rad patch redact <revision-id> [<option>...]
-    rad patch assign <revision-id> [--add <did>] [--delete <did>] [<option>...]
-    rad patch label <revision-id> [--add <label>] [--delete <label>] [<option>...]
-    rad patch ready <patch-id> [--undo] [<option>...]
-    rad patch edit <patch-id> [<option>...]
-    rad patch set <patch-id> [<option>...]
-    rad patch comment <patch-id | revision-id> [<option>...]
-    rad patch cache [<patch-id>] [<option>...]
-
-Show options
-
-    -p, --patch                Show the actual patch diff
-    -v, --verbose              Show additional information about the patch
-        --debug                Show the patch as Rust debug output
-
-Diff options
-
-    -r, --revision <id>        The revision to diff (default: latest)
-
-Comment options
-
-    -m, --message <string>     Provide a comment message via the command-line
-        --reply-to <comment>   The comment to reply to
-
-Edit options
-
-    -m, --message [<string>]   Provide a comment message to the patch or revision (default: prompt)
-
-Review options
-
-    -r, --revision <id>        Review the given revision of the patch
-    -p, --patch                Review by patch hunks
-        --hunk <index>         Only review a specific hunk
-        --accept               Accept a patch or set of hunks
-        --reject               Reject a patch or set of hunks
-    -U, --unified <n>          Generate diffs with <n> lines of context instead of the usual three
-    -d, --delete               Delete a review draft
-    -m, --message [<string>]   Provide a comment with the review (default: prompt)
-
-Resolve options
-
-    --review <id>              The review id which the comment is under
-    --comment <id>             The comment to (un)resolve
-    --undo                     Unresolve the comment
-
-Assign options
-
-    -a, --add    <did>         Add an assignee to the patch (may be specified multiple times).
-                               Note: --add will take precedence over --delete
-
-    -d, --delete <did>         Delete an assignee from the patch (may be specified multiple times).
-                               Note: --add will take precedence over --delete
-
-Archive options
-
-        --undo                 Unarchive a patch
-
-Label options
-
-    -a, --add    <label>       Add a label to the patch (may be specified multiple times).
-                               Note: --add will take precedence over --delete
-
-    -d, --delete <label>       Delete a label from the patch (may be specified multiple times).
-                               Note: --add will take precedence over --delete
-
-Update options
-
-    -b, --base <revspec>       Provide a Git revision as the base commit
-    -m, --message [<string>]   Provide a comment message to the patch or revision (default: prompt)
-        --no-message           Leave the patch or revision comment message blank
-
-List options
-
-        --all                  Show all patches, including merged and archived patches
-        --archived             Show only archived patches
-        --merged               Show only merged patches
-        --open                 Show only open patches (default)
-        --draft                Show only draft patches
-        --authored             Show only patches that you have authored
-        --author <did>         Show only patched where the given user is an author
-                               (may be specified multiple times)
-
-Ready options
-
-        --undo                 Convert a patch back to a draft
-
-Checkout options
-
-        --revision <id>        Checkout the given revision of the patch
-        --name <string>        Provide a name for the branch to checkout
-        --remote <string>      Provide the git remote to use as the upstream
-    -f, --force                Checkout the head of the revision, even if the branch already exists
-
-Set options
-
-        --remote <string>      Provide the git remote to use as the upstream
-
-Other options
-
-        --repo <rid>           Operate on the given repository (default: cwd)
-        --[no-]announce        Announce changes made to the network
-    -q, --quiet                Quiet output
-        --help                 Print help
-"#,
-};
-
-#[derive(Debug, Default, PartialEq, Eq)]
-pub enum OperationName {
-    Assign,
-    Show,
-    Diff,
-    Update,
-    Archive,
-    Delete,
-    Checkout,
-    Comment,
-    Ready,
-    Review,
-    Resolve,
-    Label,
-    #[default]
-    List,
-    Edit,
-    Redact,
-    Set,
-    Cache,
-}
-
-#[derive(Debug, Default, PartialEq, Eq)]
-pub struct AssignOptions {
-    pub add: BTreeSet<Did>,
-    pub delete: BTreeSet<Did>,
-}
-
-#[derive(Debug, Default, PartialEq, Eq)]
-pub struct LabelOptions {
-    pub add: BTreeSet<Label>,
-    pub delete: BTreeSet<Label>,
-}
-
-#[derive(Debug)]
-pub enum Operation {
-    Show {
-        patch_id: Rev,
-        diff: bool,
-        debug: bool,
-    },
-    Diff {
-        patch_id: Rev,
-        revision_id: Option<Rev>,
-    },
-    Update {
-        patch_id: Rev,
-        base_id: Option<Rev>,
-        message: Message,
-    },
-    Archive {
-        patch_id: Rev,
-        undo: bool,
-    },
-    Ready {
-        patch_id: Rev,
-        undo: bool,
-    },
-    Delete {
-        patch_id: Rev,
-    },
-    Checkout {
-        patch_id: Rev,
-        revision_id: Option<Rev>,
-        opts: checkout::Options,
-    },
-    Comment {
-        revision_id: Rev,
-        message: Message,
-        reply_to: Option<Rev>,
-    },
-    Review {
-        patch_id: Rev,
-        revision_id: Option<Rev>,
-        opts: review::Options,
-    },
-    Resolve {
-        patch_id: Rev,
-        review_id: Rev,
-        comment_id: Rev,
-        undo: bool,
-    },
-    Assign {
-        patch_id: Rev,
-        opts: AssignOptions,
-    },
-    Label {
-        patch_id: Rev,
-        opts: LabelOptions,
-    },
-    List {
-        filter: Option<patch::Status>,
-    },
-    Edit {
-        patch_id: Rev,
-        revision_id: Option<Rev>,
-        message: Message,
-    },
-    Redact {
-        revision_id: Rev,
-    },
-    Set {
-        patch_id: Rev,
-        remote: Option<RefString>,
-    },
-    Cache {
-        patch_id: Option<Rev>,
-    },
-}
-
-impl Operation {
-    fn is_announce(&self) -> bool {
-        match self {
-            Operation::Update { .. }
-            | Operation::Archive { .. }
-            | Operation::Ready { .. }
-            | Operation::Delete { .. }
-            | Operation::Comment { .. }
-            | Operation::Review { .. }
-            | Operation::Resolve { .. }
-            | Operation::Assign { .. }
-            | Operation::Label { .. }
-            | Operation::Edit { .. }
-            | Operation::Redact { .. }
-            | Operation::Set { .. } => true,
-            Operation::Show { .. }
-            | Operation::Diff { .. }
-            | Operation::Checkout { .. }
-            | Operation::List { .. }
-            | Operation::Cache { .. } => false,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct Options {
-    pub op: Operation,
-    pub repo: Option<RepoId>,
-    pub announce: bool,
-    pub verbose: bool,
-    pub quiet: bool,
-    pub authored: bool,
-    pub authors: Vec<Did>,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut op: Option<OperationName> = None;
-        let mut verbose = false;
-        let mut quiet = false;
-        let mut authored = false;
-        let mut authors = vec![];
-        let mut announce = true;
-        let mut patch_id = None;
-        let mut revision_id = None;
-        let mut review_id = None;
-        let mut comment_id = None;
-        let mut message = Message::default();
-        let mut filter = Some(patch::Status::Open);
-        let mut diff = false;
-        let mut debug = false;
-        let mut undo = false;
-        let mut reply_to: Option<Rev> = None;
-        let mut checkout_opts = checkout::Options::default();
-        let mut remote: Option<RefString> = None;
-        let mut assign_opts = AssignOptions::default();
-        let mut label_opts = LabelOptions::default();
-        let mut review_op = review::Operation::default();
-        let mut base_id = None;
-        let mut repo = None;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                // Options.
-                Long("message") | Short('m') => {
-                    if message != Message::Blank {
-                        // We skip this code when `no-message` is specified.
-                        let txt: String = term::args::string(&parser.value()?);
-                        message.append(&txt);
-                    }
-                }
-                Long("no-message") => {
-                    message = Message::Blank;
-                }
-                Long("announce") => {
-                    announce = true;
-                }
-                Long("no-announce") => {
-                    announce = false;
-                }
-
-                // Show options.
-                Long("patch") | Short('p') if op == Some(OperationName::Show) => {
-                    diff = true;
-                }
-                Long("debug") if op == Some(OperationName::Show) => {
-                    debug = true;
-                }
-
-                // Ready options.
-                Long("undo") if op == Some(OperationName::Ready) => {
-                    undo = true;
-                }
-
-                // Archive options.
-                Long("undo") if op == Some(OperationName::Archive) => {
-                    undo = true;
-                }
-
-                // Update options.
-                Short('b') | Long("base") if op == Some(OperationName::Update) => {
-                    let val = parser.value()?;
-                    let rev = term::args::rev(&val)?;
-
-                    base_id = Some(rev);
-                }
-
-                // Comment options.
-                Long("reply-to") if op == Some(OperationName::Comment) => {
-                    let val = parser.value()?;
-                    let rev = term::args::rev(&val)?;
-
-                    reply_to = Some(rev);
-                }
-
-                // Edit options.
-                Long("revision") | Short('r') if op == Some(OperationName::Edit) => {
-                    let val = parser.value()?;
-                    let rev = term::args::rev(&val)?;
-
-                    revision_id = Some(rev);
-                }
-
-                // Review/diff options.
-                Long("revision") | Short('r')
-                    if op == Some(OperationName::Review) || op == Some(OperationName::Diff) =>
-                {
-                    let val = parser.value()?;
-                    let rev = term::args::rev(&val)?;
-
-                    revision_id = Some(rev);
-                }
-                Long("patch") | Short('p') if op == Some(OperationName::Review) => {
-                    if let review::Operation::Review { by_hunk, .. } = &mut review_op {
-                        *by_hunk = true;
-                    } else {
-                        return Err(arg.unexpected().into());
-                    }
-                }
-                Long("unified") | Short('U') if op == Some(OperationName::Review) => {
-                    if let review::Operation::Review { unified, .. } = &mut review_op {
-                        let val = parser.value()?;
-                        *unified = term::args::number(&val)?;
-                    } else {
-                        return Err(arg.unexpected().into());
-                    }
-                }
-                Long("hunk") if op == Some(OperationName::Review) => {
-                    if let review::Operation::Review { hunk, .. } = &mut review_op {
-                        let val = parser.value()?;
-                        let val = term::args::number(&val)
-                            .map_err(|e| anyhow!("invalid hunk value: {e}"))?;
-
-                        *hunk = Some(val);
-                    } else {
-                        return Err(arg.unexpected().into());
-                    }
-                }
-                Long("delete") | Short('d') if op == Some(OperationName::Review) => {
-                    review_op = review::Operation::Delete;
-                }
-                Long("accept") if op == Some(OperationName::Review) => {
-                    if let review::Operation::Review {
-                        verdict: verdict @ None,
-                        ..
-                    } = &mut review_op
-                    {
-                        *verdict = Some(patch::Verdict::Accept);
-                    } else {
-                        return Err(arg.unexpected().into());
-                    }
-                }
-                Long("reject") if op == Some(OperationName::Review) => {
-                    if let review::Operation::Review {
-                        verdict: verdict @ None,
-                        ..
-                    } = &mut review_op
-                    {
-                        *verdict = Some(patch::Verdict::Reject);
-                    } else {
-                        return Err(arg.unexpected().into());
-                    }
-                }
-
-                // Resolve options
-                Long("undo") if op == Some(OperationName::Resolve) => {
-                    undo = true;
-                }
-                Long("review") if op == Some(OperationName::Resolve) => {
-                    let val = parser.value()?;
-                    let rev = term::args::rev(&val)?;
-
-                    review_id = Some(rev);
-                }
-                Long("comment") if op == Some(OperationName::Resolve) => {
-                    let val = parser.value()?;
-                    let rev = term::args::rev(&val)?;
-
-                    comment_id = Some(rev);
-                }
-
-                // Checkout options
-                Long("revision") if op == Some(OperationName::Checkout) => {
-                    let val = parser.value()?;
-                    let rev = term::args::rev(&val)?;
-
-                    revision_id = Some(rev);
-                }
-
-                Long("force") | Short('f') if op == Some(OperationName::Checkout) => {
-                    checkout_opts.force = true;
-                }
-
-                Long("name") if op == Some(OperationName::Checkout) => {
-                    let val = parser.value()?;
-                    checkout_opts.name = Some(term::args::refstring("name", val)?);
-                }
-
-                Long("remote") if op == Some(OperationName::Checkout) => {
-                    let val = parser.value()?;
-                    checkout_opts.remote = Some(term::args::refstring("remote", val)?);
-                }
-
-                // Assign options.
-                Short('a') | Long("add") if matches!(op, Some(OperationName::Assign)) => {
-                    assign_opts.add.insert(term::args::did(&parser.value()?)?);
-                }
-
-                Short('d') | Long("delete") if matches!(op, Some(OperationName::Assign)) => {
-                    assign_opts
-                        .delete
-                        .insert(term::args::did(&parser.value()?)?);
-                }
-
-                // Label options.
-                Short('a') | Long("add") if matches!(op, Some(OperationName::Label)) => {
-                    let val = parser.value()?;
-                    let name = term::args::string(&val);
-                    let label = Label::new(name)?;
-
-                    label_opts.add.insert(label);
-                }
-
-                Short('d') | Long("delete") if matches!(op, Some(OperationName::Label)) => {
-                    let val = parser.value()?;
-                    let name = term::args::string(&val);
-                    let label = Label::new(name)?;
-
-                    label_opts.delete.insert(label);
-                }
-
-                // Set options.
-                Long("remote") if op == Some(OperationName::Set) => {
-                    let val = parser.value()?;
-                    remote = Some(term::args::refstring("remote", val)?);
-                }
-
-                // List options.
-                Long("all") => {
-                    filter = None;
-                }
-                Long("draft") => {
-                    filter = Some(patch::Status::Draft);
-                }
-                Long("archived") => {
-                    filter = Some(patch::Status::Archived);
-                }
-                Long("merged") => {
-                    filter = Some(patch::Status::Merged);
-                }
-                Long("open") => {
-                    filter = Some(patch::Status::Open);
-                }
-                Long("authored") => {
-                    authored = true;
-                }
-                Long("author") if op == Some(OperationName::List) => {
-                    authors.push(term::args::did(&parser.value()?)?);
-                }
-
-                // Common.
-                Long("verbose") | Short('v') => {
-                    verbose = true;
-                }
-                Long("quiet") | Short('q') => {
-                    quiet = true;
-                }
-                Long("repo") => {
-                    let val = parser.value()?;
-                    let rid = term::args::rid(&val)?;
-
-                    repo = Some(rid);
-                }
-                Long("help") => {
-                    return Err(Error::HelpManual { name: "rad-patch" }.into());
-                }
-                Short('h') => {
-                    return Err(Error::Help.into());
-                }
-
-                Value(val) if op.is_none() => match val.to_string_lossy().as_ref() {
-                    "l" | "list" => op = Some(OperationName::List),
-                    "s" | "show" => op = Some(OperationName::Show),
-                    "u" | "update" => op = Some(OperationName::Update),
-                    "d" | "delete" => op = Some(OperationName::Delete),
-                    "c" | "checkout" => op = Some(OperationName::Checkout),
-                    "a" | "archive" => op = Some(OperationName::Archive),
-                    "y" | "ready" => op = Some(OperationName::Ready),
-                    "e" | "edit" => op = Some(OperationName::Edit),
-                    "r" | "redact" => op = Some(OperationName::Redact),
-                    "diff" => op = Some(OperationName::Diff),
-                    "assign" => op = Some(OperationName::Assign),
-                    "label" => op = Some(OperationName::Label),
-                    "comment" => op = Some(OperationName::Comment),
-                    "review" => op = Some(OperationName::Review),
-                    "resolve" => op = Some(OperationName::Resolve),
-                    "set" => op = Some(OperationName::Set),
-                    "cache" => op = Some(OperationName::Cache),
-                    unknown => anyhow::bail!("unknown operation '{}'", unknown),
-                },
-                Value(val) if op == Some(OperationName::Redact) => {
-                    let rev = term::args::rev(&val)?;
-                    revision_id = Some(rev);
-                }
-                Value(val)
-                    if patch_id.is_none()
-                        && [
-                            Some(OperationName::Show),
-                            Some(OperationName::Diff),
-                            Some(OperationName::Update),
-                            Some(OperationName::Delete),
-                            Some(OperationName::Archive),
-                            Some(OperationName::Ready),
-                            Some(OperationName::Checkout),
-                            Some(OperationName::Comment),
-                            Some(OperationName::Review),
-                            Some(OperationName::Resolve),
-                            Some(OperationName::Edit),
-                            Some(OperationName::Set),
-                            Some(OperationName::Assign),
-                            Some(OperationName::Label),
-                            Some(OperationName::Cache),
-                        ]
-                        .contains(&op) =>
-                {
-                    let val = string(&val);
-                    patch_id = Some(Rev::from(val));
-                }
-                _ => return Err(anyhow::anyhow!(arg.unexpected())),
-            }
-        }
-
-        let op = match op.unwrap_or_default() {
-            OperationName::List => Operation::List { filter },
-            OperationName::Show => Operation::Show {
-                patch_id: patch_id.ok_or_else(|| anyhow!("a patch must be provided"))?,
-                diff,
-                debug,
-            },
-            OperationName::Diff => Operation::Diff {
-                patch_id: patch_id.ok_or_else(|| anyhow!("a patch must be provided"))?,
-                revision_id,
-            },
-            OperationName::Delete => Operation::Delete {
-                patch_id: patch_id.ok_or_else(|| anyhow!("a patch must be provided"))?,
-            },
-            OperationName::Update => Operation::Update {
-                patch_id: patch_id.ok_or_else(|| anyhow!("a patch must be provided"))?,
-                base_id,
-                message,
-            },
-            OperationName::Archive => Operation::Archive {
-                patch_id: patch_id.ok_or_else(|| anyhow!("a patch id must be provided"))?,
-                undo,
-            },
-            OperationName::Checkout => Operation::Checkout {
-                patch_id: patch_id.ok_or_else(|| anyhow!("a patch must be provided"))?,
-                revision_id,
-                opts: checkout_opts,
-            },
-            OperationName::Comment => Operation::Comment {
-                revision_id: patch_id
-                    .ok_or_else(|| anyhow!("a patch or revision must be provided"))?,
-                message,
-                reply_to,
-            },
-            OperationName::Review => Operation::Review {
-                patch_id: patch_id
-                    .ok_or_else(|| anyhow!("a patch or revision must be provided"))?,
-                revision_id,
-                opts: review::Options {
-                    message,
-                    op: review_op,
-                },
-            },
-            OperationName::Resolve => Operation::Resolve {
-                patch_id: patch_id
-                    .ok_or_else(|| anyhow!("a patch or revision must be provided"))?,
-                review_id: review_id.ok_or_else(|| anyhow!("a review must be provided"))?,
-                comment_id: comment_id.ok_or_else(|| anyhow!("a comment must be provided"))?,
-                undo,
-            },
-            OperationName::Ready => Operation::Ready {
-                patch_id: patch_id.ok_or_else(|| anyhow!("a patch must be provided"))?,
-                undo,
-            },
-            OperationName::Edit => Operation::Edit {
-                patch_id: patch_id.ok_or_else(|| anyhow!("a patch must be provided"))?,
-                revision_id,
-                message,
-            },
-            OperationName::Redact => Operation::Redact {
-                revision_id: revision_id.ok_or_else(|| anyhow!("a revision must be provided"))?,
-            },
-            OperationName::Assign => Operation::Assign {
-                patch_id: patch_id.ok_or_else(|| anyhow!("a patch must be provided"))?,
-                opts: assign_opts,
-            },
-            OperationName::Label => Operation::Label {
-                patch_id: patch_id.ok_or_else(|| anyhow!("a patch must be provided"))?,
-                opts: label_opts,
-            },
-            OperationName::Set => Operation::Set {
-                patch_id: patch_id.ok_or_else(|| anyhow!("a patch must be provided"))?,
-                remote,
-            },
-            OperationName::Cache => Operation::Cache { patch_id },
-        };
-
-        Ok((
-            Options {
-                op,
-                repo,
-                verbose,
-                quiet,
-                announce,
-                authored,
-                authors,
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let (workdir, rid) = if let Some(rid) = options.repo {
-        (None, rid)
-    } else {
-        radicle::rad::cwd()
-            .map(|(workdir, rid)| (Some(workdir), rid))
-            .map_err(|_| anyhow!("this command must be run in the context of a repository"))?
-    };
-
-    let profile = ctx.profile()?;
-    let repository = profile.storage.repository(rid)?;
-    let announce = options.announce && options.op.is_announce();
-
-    transport::local::register(profile.storage.clone());
-
-    match options.op {
-        Operation::List { filter } => {
-            let mut authors: BTreeSet<Did> = options.authors.iter().cloned().collect();
-            if options.authored {
-                authors.insert(profile.did());
-            }
-            list::run(filter.as_ref(), authors, &repository, &profile)?;
-        }
-        Operation::Show {
-            patch_id,
-            diff,
-            debug,
-        } => {
-            let patch_id = patch_id.resolve(&repository.backend)?;
-            show::run(
-                &patch_id,
-                diff,
-                debug,
-                options.verbose,
-                &profile,
-                &repository,
-                workdir.as_ref(),
-            )?;
-        }
-        Operation::Diff {
-            patch_id,
-            revision_id,
-        } => {
-            let patch_id = patch_id.resolve(&repository.backend)?;
-            let revision_id = revision_id
-                .map(|rev| rev.resolve::<radicle::git::Oid>(&repository.backend))
-                .transpose()?
-                .map(patch::RevisionId::from);
-            diff::run(&patch_id, revision_id, &repository, &profile)?;
-        }
-        Operation::Update {
-            ref patch_id,
-            ref base_id,
-            ref message,
-        } => {
-            let patch_id = patch_id.resolve(&repository.backend)?;
-            let base_id = base_id
-                .as_ref()
-                .map(|base| base.resolve(&repository.backend))
-                .transpose()?;
-            let workdir = workdir.ok_or(anyhow!(
-                "this command must be run from a repository checkout"
-            ))?;
-
-            update::run(
-                patch_id,
-                base_id,
-                message.clone(),
-                &profile,
-                &repository,
-                &workdir,
-            )?;
-        }
-        Operation::Archive { ref patch_id, undo } => {
-            let patch_id = patch_id.resolve::<PatchId>(&repository.backend)?;
-            archive::run(&patch_id, undo, &profile, &repository)?;
-        }
-        Operation::Ready { ref patch_id, undo } => {
-            let patch_id = patch_id.resolve::<PatchId>(&repository.backend)?;
-
-            if !ready::run(&patch_id, undo, &profile, &repository)? {
-                if undo {
-                    anyhow::bail!("the patch must be open to be put in draft state");
-                } else {
-                    anyhow::bail!("this patch must be in draft state to be put in open state");
-                }
-            }
-        }
-        Operation::Delete { patch_id } => {
-            let patch_id = patch_id.resolve::<PatchId>(&repository.backend)?;
-            delete::run(&patch_id, &profile, &repository)?;
-        }
-        Operation::Checkout {
-            patch_id,
-            revision_id,
-            opts,
-        } => {
-            let patch_id = patch_id.resolve::<radicle::git::Oid>(&repository.backend)?;
-            let revision_id = revision_id
-                .map(|rev| rev.resolve::<radicle::git::Oid>(&repository.backend))
-                .transpose()?
-                .map(patch::RevisionId::from);
-            let workdir = workdir.ok_or(anyhow!(
-                "this command must be run from a repository checkout"
-            ))?;
-            checkout::run(
-                &patch::PatchId::from(patch_id),
-                revision_id,
-                &repository,
-                &workdir,
-                &profile,
-                opts,
-            )?;
-        }
-        Operation::Comment {
-            revision_id,
-            message,
-            reply_to,
-        } => {
-            comment::run(
-                revision_id,
-                message,
-                reply_to,
-                options.quiet,
-                &repository,
-                &profile,
-            )?;
-        }
-        Operation::Review {
-            patch_id,
-            revision_id,
-            opts,
-        } => {
-            let patch_id = patch_id.resolve(&repository.backend)?;
-            let revision_id = revision_id
-                .map(|rev| rev.resolve::<radicle::git::Oid>(&repository.backend))
-                .transpose()?
-                .map(patch::RevisionId::from);
-            review::run(patch_id, revision_id, opts, &profile, &repository)?;
-        }
-        Operation::Resolve {
-            ref patch_id,
-            ref review_id,
-            ref comment_id,
-            undo,
-        } => {
-            let patch = patch_id.resolve(&repository.backend)?;
-            let review = patch::ReviewId::from(
-                review_id.resolve::<radicle::cob::EntryId>(&repository.backend)?,
-            );
-            let comment = comment_id.resolve(&repository.backend)?;
-            if undo {
-                resolve::unresolve(patch, review, comment, &repository, &profile)?;
-                term::success!("Unresolved comment {comment_id}");
-            } else {
-                resolve::resolve(patch, review, comment, &repository, &profile)?;
-                term::success!("Resolved comment {comment_id}");
-            }
-        }
-        Operation::Edit {
-            patch_id,
-            revision_id,
-            message,
-        } => {
-            let patch_id = patch_id.resolve(&repository.backend)?;
-            let revision_id = revision_id
-                .map(|id| id.resolve::<radicle::git::Oid>(&repository.backend))
-                .transpose()?
-                .map(patch::RevisionId::from);
-            edit::run(&patch_id, revision_id, message, &profile, &repository)?;
-        }
-        Operation::Redact { revision_id } => {
-            redact::run(&revision_id, &profile, &repository)?;
-        }
-        Operation::Assign {
-            patch_id,
-            opts: AssignOptions { add, delete },
-        } => {
-            let patch_id = patch_id.resolve(&repository.backend)?;
-            assign::run(&patch_id, add, delete, &profile, &repository)?;
-        }
-        Operation::Label {
-            patch_id,
-            opts: LabelOptions { add, delete },
-        } => {
-            let patch_id = patch_id.resolve(&repository.backend)?;
-            label::run(&patch_id, add, delete, &profile, &repository)?;
-        }
-        Operation::Set { patch_id, remote } => {
-            let patches = profile.patches(&repository)?;
-            let patch_id = patch_id.resolve(&repository.backend)?;
-            let patch = patches
-                .get(&patch_id)?
-                .ok_or_else(|| anyhow!("patch {patch_id} not found"))?;
-            let workdir = workdir.ok_or(anyhow!(
-                "this command must be run from a repository checkout"
-            ))?;
-            radicle::rad::setup_patch_upstream(
-                &patch_id,
-                *patch.head(),
-                &workdir,
-                remote.as_ref().unwrap_or(&radicle::rad::REMOTE_NAME),
-                true,
-            )?;
-        }
-        Operation::Cache { patch_id } => {
-            let patch_id = patch_id
-                .map(|id| id.resolve(&repository.backend))
-                .transpose()?;
-            cache::run(patch_id, &repository, &profile)?;
-        }
-    }
-
-    if announce {
-        let mut node = Node::new(profile.socket());
-        node::announce(
-            &repository,
-            node::SyncSettings::default(),
-            node::SyncReporting::default(),
-            &mut node,
-            &profile,
-        )?;
-    }
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/patch/archive.rs b/radicle-cli/src/commands/patch/archive.rs
deleted file mode 100644
index 170038e82..000000000
--- a/radicle-cli/src/commands/patch/archive.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-use super::*;
-
-use radicle::prelude::*;
-use radicle::storage::git::Repository;
-
-pub fn run(
-    patch_id: &PatchId,
-    undo: bool,
-    profile: &Profile,
-    repository: &Repository,
-) -> anyhow::Result<()> {
-    let signer = term::signer(profile)?;
-    let mut patches = profile.patches_mut(repository)?;
-    let Ok(mut patch) = patches.get_mut(patch_id) else {
-        anyhow::bail!("Patch `{patch_id}` not found");
-    };
-
-    if undo {
-        patch.unarchive(&signer)?;
-    } else {
-        patch.archive(&signer)?;
-    }
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/patch/assign.rs b/radicle-cli/src/commands/patch/assign.rs
deleted file mode 100644
index c96db74c3..000000000
--- a/radicle-cli/src/commands/patch/assign.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use std::collections::BTreeSet;
-
-use super::*;
-
-use radicle::prelude::Did;
-use radicle::storage::git::Repository;
-
-use crate::terminal as term;
-
-pub fn run(
-    patch_id: &PatchId,
-    add: BTreeSet<Did>,
-    delete: BTreeSet<Did>,
-    profile: &Profile,
-    repository: &Repository,
-) -> anyhow::Result<()> {
-    let signer = term::signer(profile)?;
-    let mut patches = profile.patches_mut(repository)?;
-    let Ok(mut patch) = patches.get_mut(patch_id) else {
-        anyhow::bail!("Patch `{patch_id}` not found");
-    };
-    let assignees = patch
-        .assignees()
-        .filter(|did| !delete.contains(did))
-        .chain(add)
-        .collect::<BTreeSet<_>>();
-    patch.assign(assignees, &signer)?;
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/patch/cache.rs b/radicle-cli/src/commands/patch/cache.rs
deleted file mode 100644
index 5cbf77a55..000000000
--- a/radicle-cli/src/commands/patch/cache.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use std::ops::ControlFlow;
-
-use radicle::patch::PatchId;
-use radicle::storage::git::Repository;
-use radicle::Profile;
-
-use crate::terminal as term;
-
-pub fn run(id: Option<PatchId>, repository: &Repository, profile: &Profile) -> anyhow::Result<()> {
-    let mut patches = profile.patches_mut(repository)?;
-
-    match id {
-        Some(id) => {
-            patches.write(&id)?;
-            term::success!("Successfully cached patch `{id}`");
-        }
-        None => patches.write_all(|result, progress| {
-            match result {
-                Ok((id, _)) => term::success!(
-                    "Successfully cached patch {id} ({}/{})",
-                    progress.seen(),
-                    progress.total()
-                ),
-                Err(e) => term::warning(format!("Failed to retrieve patch: {e}")),
-            };
-            ControlFlow::Continue(())
-        })?,
-    }
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/patch/checkout.rs b/radicle-cli/src/commands/patch/checkout.rs
deleted file mode 100644
index f5f776712..000000000
--- a/radicle-cli/src/commands/patch/checkout.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-use anyhow::anyhow;
-
-use git_ref_format::Qualified;
-use radicle::cob::patch;
-use radicle::cob::patch::RevisionId;
-use radicle::git::RefString;
-use radicle::patch::cache::Patches as _;
-use radicle::patch::PatchId;
-use radicle::storage::git::Repository;
-use radicle::{git, rad, Profile};
-
-use crate::terminal as term;
-
-#[derive(Debug, Default)]
-pub struct Options {
-    pub name: Option<RefString>,
-    pub remote: Option<RefString>,
-    pub force: bool,
-}
-
-impl Options {
-    fn branch(&self, id: &PatchId) -> anyhow::Result<RefString> {
-        match &self.name {
-            Some(refname) => Ok(Qualified::from_refstr(refname)
-                .map_or_else(|| refname.clone(), |q| q.to_ref_string())),
-            // SAFETY: Patch IDs are valid refstrings.
-            None => Ok(git::refname!("patch")
-                .join(RefString::try_from(term::format::cob(id).item).unwrap())),
-        }
-    }
-}
-
-pub fn run(
-    patch_id: &PatchId,
-    revision_id: Option<RevisionId>,
-    stored: &Repository,
-    working: &git::raw::Repository,
-    profile: &Profile,
-    opts: Options,
-) -> anyhow::Result<()> {
-    let patches = profile.patches(stored)?;
-    let patch = patches
-        .get(patch_id)?
-        .ok_or_else(|| anyhow!("Patch `{patch_id}` not found"))?;
-
-    let (revision_id, revision) = match revision_id {
-        Some(id) => (
-            id,
-            patch
-                .revision(&id)
-                .ok_or_else(|| anyhow!("Patch revision `{id}` not found"))?,
-        ),
-        None => patch.latest(),
-    };
-
-    let mut spinner = term::spinner("Performing checkout...");
-    let patch_branch = opts.branch(patch_id)?;
-
-    let commit =
-        match working.find_branch(patch_branch.as_str(), radicle::git::raw::BranchType::Local) {
-            Ok(branch) if opts.force => {
-                let commit = find_patch_commit(revision, stored, working)?;
-                let mut r = branch.into_reference();
-                r.set_target(commit.id(), &format!("force update '{patch_branch}'"))?;
-                commit
-            }
-            Ok(branch) => {
-                let head = branch.get().peel_to_commit()?;
-                if head.id() != *revision.head() {
-                    anyhow::bail!(
-                        "branch '{patch_branch}' already exists (use `--force` to overwrite)"
-                    );
-                }
-                head
-            }
-            Err(e) if radicle::git::is_not_found_err(&e) => {
-                let commit = find_patch_commit(revision, stored, working)?;
-                // Create patch branch and switch to it.
-                working.branch(patch_branch.as_str(), &commit, true)?;
-                commit
-            }
-            Err(e) => return Err(e.into()),
-        };
-
-    if opts.force {
-        let mut builder = radicle::git::raw::build::CheckoutBuilder::new();
-        builder.force();
-        working.checkout_tree(commit.as_object(), Some(&mut builder))?;
-    } else {
-        working.checkout_tree(commit.as_object(), None)?;
-    }
-    working.set_head(&git::refs::workdir::branch(&patch_branch))?;
-
-    spinner.message(format!(
-        "Switched to branch {} at revision {}",
-        term::format::highlight(&patch_branch),
-        term::format::dim(term::format::oid(revision_id)),
-    ));
-    spinner.finish();
-
-    if let Some(branch) = rad::setup_patch_upstream(
-        patch_id,
-        revision.head(),
-        working,
-        opts.remote.as_ref().unwrap_or(&radicle::rad::REMOTE_NAME),
-        false,
-    )? {
-        let tracking = branch
-            .name()?
-            .ok_or_else(|| anyhow!("failed to create tracking branch: invalid name"))?;
-        term::success!(
-            "Branch {} setup to track {}",
-            term::format::highlight(patch_branch),
-            term::format::tertiary(tracking)
-        );
-    }
-    Ok(())
-}
-
-/// Try to find the patch head in our working copy, and if we don't find it,
-/// fetch it from storage first.
-fn find_patch_commit<'a>(
-    revision: &patch::Revision,
-    stored: &Repository,
-    working: &'a git::raw::Repository,
-) -> anyhow::Result<git::raw::Commit<'a>> {
-    let head = *revision.head();
-    let workdir = working
-        .workdir()
-        .ok_or(anyhow::anyhow!("repository is a bare git repository "))?;
-
-    match working.find_commit(head) {
-        Ok(commit) => Ok(commit),
-        Err(e) if git::ext::is_not_found_err(&e) => {
-            git::process::fetch_local(workdir, stored, [head.into()])?;
-            working.find_commit(head).map_err(|e| e.into())
-        }
-        Err(e) => Err(e.into()),
-    }
-}
diff --git a/radicle-cli/src/commands/patch/comment.rs b/radicle-cli/src/commands/patch/comment.rs
deleted file mode 100644
index cf3773695..000000000
--- a/radicle-cli/src/commands/patch/comment.rs
+++ /dev/null
@@ -1,77 +0,0 @@
-use super::*;
-
-use radicle::cob;
-use radicle::cob::patch;
-use radicle::cob::thread::CommentId;
-use radicle::patch::ByRevision;
-use radicle::prelude::*;
-use radicle::storage::git::Repository;
-
-use crate::git;
-use crate::terminal as term;
-use crate::terminal::Element as _;
-
-pub fn run(
-    revision_id: git::Rev,
-    message: term::patch::Message,
-    reply_to: Option<git::Rev>,
-    quiet: bool,
-    repo: &Repository,
-    profile: &Profile,
-) -> anyhow::Result<()> {
-    let signer = term::signer(profile)?;
-    let mut patches = profile.patches_mut(repo)?;
-
-    let revision_id = revision_id.resolve::<cob::EntryId>(&repo.backend)?;
-    let ByRevision {
-        id: patch_id,
-        patch,
-        revision_id,
-        revision,
-    } = patches
-        .find_by_revision(&patch::RevisionId::from(revision_id))?
-        .ok_or_else(|| anyhow!("Patch revision `{revision_id}` not found"))?;
-    let mut patch = patch::PatchMut::new(patch_id, patch, &mut patches);
-    let (body, reply_to) = prompt(message, reply_to, &revision, repo)?;
-    let comment_id = patch.comment(revision_id, body, reply_to, None, vec![], &signer)?;
-    let comment = patch
-        .revision(&revision_id)
-        .ok_or(anyhow!("error retrieving revision `{revision_id}`"))?
-        .discussion()
-        .comment(&comment_id)
-        .ok_or(anyhow!("error retrieving comment `{comment_id}`"))?;
-
-    if quiet {
-        term::print(comment_id);
-    } else {
-        term::comment::widget(&comment_id, comment, profile).print();
-    }
-    Ok(())
-}
-
-/// Get a comment from the user, by prompting.
-pub fn prompt<R: WriteRepository + radicle::cob::Store>(
-    message: Message,
-    reply_to: Option<Rev>,
-    revision: &patch::Revision,
-    repo: &R,
-) -> anyhow::Result<(String, Option<CommentId>)> {
-    let (reply_to, help) = if let Some(rev) = reply_to {
-        let id = rev.resolve::<radicle::git::Oid>(repo.raw())?;
-        let parent = revision
-            .discussion()
-            .comment(&id)
-            .ok_or(anyhow::anyhow!("comment '{rev}' not found"))?;
-
-        (Some(id), parent.body().trim())
-    } else {
-        (None, revision.description().trim())
-    };
-    let help = format!("\n{}\n", term::format::html::commented(help));
-    let body = message.get(&help)?;
-
-    if body.is_empty() {
-        anyhow::bail!("aborting operation due to empty comment");
-    }
-    Ok((body, reply_to))
-}
diff --git a/radicle-cli/src/commands/patch/delete.rs b/radicle-cli/src/commands/patch/delete.rs
deleted file mode 100644
index 4d2c0e635..000000000
--- a/radicle-cli/src/commands/patch/delete.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use radicle::prelude::*;
-use radicle::storage::git::Repository;
-
-use super::*;
-
-pub fn run(patch_id: &PatchId, profile: &Profile, repository: &Repository) -> anyhow::Result<()> {
-    let signer = &term::signer(profile)?;
-    let mut patches = profile.patches_mut(repository)?;
-    patches.remove(patch_id, signer)?;
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/patch/diff.rs b/radicle-cli/src/commands/patch/diff.rs
deleted file mode 100644
index 560caef2f..000000000
--- a/radicle-cli/src/commands/patch/diff.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use std::process;
-
-use radicle::cob::patch;
-use radicle::storage::git::Repository;
-
-use super::*;
-
-pub fn run(
-    patch_id: &PatchId,
-    revision_id: Option<patch::RevisionId>,
-    stored: &Repository,
-    profile: &Profile,
-) -> anyhow::Result<()> {
-    let patches = profile.patches(stored)?;
-    let Some(patch) = patches.get(patch_id)? else {
-        anyhow::bail!("Patch `{patch_id}` not found");
-    };
-    let revision = if let Some(r) = revision_id {
-        patch
-            .revision(&r)
-            .ok_or(anyhow!("revision `{r}` not found"))?
-    } else {
-        let (_, r) = patch.latest();
-        r
-    };
-    let (from, to) = revision.range();
-
-    process::Command::new("rad")
-        .current_dir(stored.path())
-        .args(["diff", from.to_string().as_str(), to.to_string().as_str()])
-        .stdout(process::Stdio::inherit())
-        .stderr(process::Stdio::inherit())
-        .spawn()?
-        .wait()?;
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/patch/edit.rs b/radicle-cli/src/commands/patch/edit.rs
deleted file mode 100644
index 3b49f79e2..000000000
--- a/radicle-cli/src/commands/patch/edit.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-use super::*;
-
-use radicle::cob::{self, patch, resolve_embed};
-use radicle::crypto;
-use radicle::prelude::*;
-use radicle::storage::git::Repository;
-
-use crate::terminal as term;
-
-pub fn run(
-    patch_id: &PatchId,
-    revision_id: Option<patch::RevisionId>,
-    message: term::patch::Message,
-    profile: &Profile,
-    repository: &Repository,
-) -> anyhow::Result<()> {
-    let signer = term::signer(profile)?;
-    let mut patches = profile.patches_mut(repository)?;
-    let Ok(patch) = patches.get_mut(patch_id) else {
-        anyhow::bail!("Patch `{patch_id}` not found");
-    };
-
-    let (title, description) = term::patch::get_edit_message(message, &patch)?;
-
-    match revision_id {
-        Some(id) => edit_revision(patch, id, title, description, repository, &signer),
-        None => edit_root(patch, title, description, repository, &signer),
-    }
-}
-
-fn edit_root<G>(
-    mut patch: patch::PatchMut<'_, '_, Repository, cob::cache::StoreWriter>,
-    title: String,
-    description: String,
-    repository: &Repository,
-    signer: &G,
-) -> anyhow::Result<()>
-where
-    G: crypto::Signer,
-{
-    let title = if title != patch.title() {
-        Some(title)
-    } else {
-        None
-    };
-    let description = if description != patch.description() {
-        Some(description)
-    } else {
-        None
-    };
-
-    if title.is_none() && description.is_none() {
-        // Nothing to do.
-        return Ok(());
-    }
-
-    let (root, _) = patch.root();
-    let target = patch.target();
-    let embeds = patch
-        .embeds()
-        .iter()
-        .filter_map(|embed| resolve_embed(repository, embed.clone()))
-        .collect::<Vec<_>>();
-
-    patch.transaction("Edit root", signer, |tx| {
-        if let Some(t) = title {
-            tx.edit(t, target)?;
-        }
-        if let Some(d) = description {
-            tx.edit_revision(root, d, embeds)?;
-        }
-        Ok(())
-    })?;
-
-    Ok(())
-}
-
-fn edit_revision<G>(
-    mut patch: patch::PatchMut<'_, '_, Repository, cob::cache::StoreWriter>,
-    revision: patch::RevisionId,
-    mut title: String,
-    description: String,
-    repository: &Repository,
-    signer: &G,
-) -> anyhow::Result<()>
-where
-    G: crypto::Signer,
-{
-    let embeds = patch
-        .embeds()
-        .iter()
-        .filter_map(|embed| resolve_embed(repository, embed.clone()))
-        .collect::<Vec<_>>();
-    let description = if description.is_empty() {
-        title
-    } else {
-        title.push('\n');
-        title.push_str(&description);
-        title
-    };
-    patch.transaction("Edit revision", signer, |tx| {
-        tx.edit_revision(revision, description, embeds)?;
-        Ok(())
-    })?;
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/patch/label.rs b/radicle-cli/src/commands/patch/label.rs
deleted file mode 100644
index 009c8f457..000000000
--- a/radicle-cli/src/commands/patch/label.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use super::*;
-
-use radicle::storage::git::Repository;
-
-use crate::terminal as term;
-
-pub fn run(
-    patch_id: &PatchId,
-    add: BTreeSet<Label>,
-    delete: BTreeSet<Label>,
-    profile: &Profile,
-    repository: &Repository,
-) -> anyhow::Result<()> {
-    let signer = term::signer(profile)?;
-    let mut patches = profile.patches_mut(repository)?;
-    let Ok(mut patch) = patches.get_mut(patch_id) else {
-        anyhow::bail!("Patch `{patch_id}` not found");
-    };
-    let labels = patch
-        .labels()
-        .filter(|l| !delete.contains(l))
-        .chain(add.iter())
-        .cloned()
-        .collect::<Vec<_>>();
-    patch.label(labels, &signer)?;
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/patch/list.rs b/radicle-cli/src/commands/patch/list.rs
deleted file mode 100644
index 3edf5c91a..000000000
--- a/radicle-cli/src/commands/patch/list.rs
+++ /dev/null
@@ -1,160 +0,0 @@
-use std::collections::{BTreeMap, BTreeSet};
-
-use radicle::cob::patch;
-use radicle::cob::patch::{Patch, PatchId};
-use radicle::patch::cache::Patches as _;
-use radicle::prelude::*;
-use radicle::profile::Profile;
-use radicle::storage::git::Repository;
-
-use term::format::Author;
-use term::table::{Table, TableOptions};
-use term::Element as _;
-
-use crate::terminal as term;
-use crate::terminal::patch as common;
-
-/// List patches.
-pub fn run(
-    filter: Option<&patch::Status>,
-    authors: BTreeSet<Did>,
-    repository: &Repository,
-    profile: &Profile,
-) -> anyhow::Result<()> {
-    let patches = profile.patches(repository)?;
-
-    let mut all = Vec::new();
-    let iter = match filter {
-        Some(status) => patches.list_by_status(status)?,
-        None => patches.list()?,
-    };
-    for patch in iter {
-        let (id, patch) = match patch {
-            Ok((id, patch)) => (id, patch),
-            Err(e) => {
-                // Skip patches that failed to load.
-                log::error!(target: "cli", "Patch load error: {e}");
-                continue;
-            }
-        };
-        if !authors.is_empty() {
-            if !authors.contains(patch.author().id()) {
-                continue;
-            }
-        }
-        all.push((id, patch));
-    }
-
-    if all.is_empty() {
-        term::print(term::format::italic("Nothing to show."));
-        return Ok(());
-    }
-
-    let mut table = Table::<10, term::Line>::new(TableOptions {
-        spacing: 2,
-        border: Some(term::colors::FAINT),
-        ..TableOptions::default()
-    });
-
-    table.push([
-        term::format::dim(String::from("●")).into(),
-        term::format::bold(String::from("ID")).into(),
-        term::format::bold(String::from("Title")).into(),
-        term::format::bold(String::from("Author")).into(),
-        term::Line::blank(),
-        term::format::bold(String::from("Reviews")).into(),
-        term::format::bold(String::from("Head")).into(),
-        term::format::bold(String::from("+")).into(),
-        term::format::bold(String::from("-")).into(),
-        term::format::bold(String::from("Updated")).into(),
-    ]);
-    table.divider();
-
-    let me = *profile.id();
-    all.sort_by(|(id1, p1), (id2, p2)| {
-        let is_me = (p2.author().id().as_key() == &me).cmp(&(p1.author().id().as_key() == &me));
-        let by_id = id1.cmp(id2);
-        let by_rev_time = p2.updated_at().cmp(&p1.updated_at());
-
-        is_me.then(by_rev_time).then(by_id)
-    });
-
-    let mut errors = Vec::new();
-    for (id, patch) in &mut all {
-        match row(id, patch, repository, profile) {
-            Ok(r) => table.push(r),
-            Err(e) => errors.push((patch.title(), id, e.to_string())),
-        }
-    }
-    table.print();
-
-    if !errors.is_empty() {
-        for (title, id, error) in errors {
-            term::error(format!("patch {title:?} ({id}) failed to load: {error}",));
-        }
-    }
-
-    Ok(())
-}
-
-/// Patch row.
-pub fn row(
-    id: &PatchId,
-    patch: &Patch,
-    repository: &Repository,
-    profile: &Profile,
-) -> anyhow::Result<[term::Line; 10]> {
-    let state = patch.state();
-    let (_, revision) = patch.latest();
-    let (from, to) = revision.range();
-    let stats = common::diff_stats(repository.raw(), &from, &to)?;
-    let author = patch.author().id;
-    let (alias, did) = Author::new(&author, profile).labels();
-    let mut delegates = repository
-        .delegates()?
-        .into_iter()
-        .map(|delegate| (*delegate, term::format::patch::verdict(None)))
-        .collect::<BTreeMap<_, _>>();
-    for (key, review) in revision.reviews() {
-        delegates
-            .entry(*key)
-            .and_modify(|verdict| *verdict = term::format::patch::verdict(review.verdict()));
-    }
-    let n = delegates.len();
-    let reviews = delegates
-        .values()
-        .cloned()
-        .map(term::Label::from)
-        // TODO(finto): poor man's intersperse
-        // https://doc.rust-lang.org/std/iter/trait.Iterator.html#method.intersperse
-        .enumerate()
-        .flat_map(|(i, label)| {
-            if i == n - 1 {
-                vec![label].into_iter()
-            } else {
-                vec![label, term::Label::space()].into_iter()
-            }
-        })
-        .collect::<Vec<_>>();
-
-    Ok([
-        match state {
-            patch::State::Open { .. } => term::format::positive("●").into(),
-            patch::State::Archived { .. } => term::format::yellow("●").into(),
-            patch::State::Draft => term::format::dim("●").into(),
-            patch::State::Merged { .. } => term::format::primary("✔").into(),
-        },
-        term::format::tertiary(term::format::cob(id)).into(),
-        term::format::default(patch.title().to_owned()).into(),
-        alias.into(),
-        did.into(),
-        reviews.into(),
-        term::format::secondary(term::format::oid(revision.head())).into(),
-        term::format::positive(format!("+{}", stats.insertions())).into(),
-        term::format::negative(format!("-{}", stats.deletions())).into(),
-        term::format::timestamp(patch.updated_at())
-            .dim()
-            .italic()
-            .into(),
-    ])
-}
diff --git a/radicle-cli/src/commands/patch/ready.rs b/radicle-cli/src/commands/patch/ready.rs
deleted file mode 100644
index 6a7147f66..000000000
--- a/radicle-cli/src/commands/patch/ready.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-use super::*;
-
-use radicle::prelude::*;
-use radicle::storage::git::Repository;
-
-pub fn run(
-    patch_id: &PatchId,
-    undo: bool,
-    profile: &Profile,
-    repository: &Repository,
-) -> anyhow::Result<bool> {
-    let signer = term::signer(profile)?;
-    let mut patches = profile.patches_mut(repository)?;
-    let Ok(mut patch) = patches.get_mut(patch_id) else {
-        anyhow::bail!("Patch `{patch_id}` not found");
-    };
-
-    if undo {
-        patch.unready(&signer)
-    } else {
-        patch.ready(&signer)
-    }
-    .map_err(anyhow::Error::from)
-}
diff --git a/radicle-cli/src/commands/patch/redact.rs b/radicle-cli/src/commands/patch/redact.rs
deleted file mode 100644
index 3e26bb942..000000000
--- a/radicle-cli/src/commands/patch/redact.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-use radicle::cob::patch;
-use radicle::git::Oid;
-use radicle::prelude::*;
-use radicle::storage::git::Repository;
-
-use crate::git;
-
-use super::*;
-
-pub fn run(
-    revision_id: &git::Rev,
-    profile: &Profile,
-    repository: &Repository,
-) -> anyhow::Result<()> {
-    let signer = &term::signer(profile)?;
-    let mut patches = profile.patches_mut(repository)?;
-
-    let revision_id = revision_id.resolve::<Oid>(&repository.backend)?;
-    let patch::ByRevision {
-        id: patch_id,
-        revision_id,
-        ..
-    } = patches
-        .find_by_revision(&patch::RevisionId::from(revision_id))?
-        .ok_or_else(|| anyhow!("Patch revision `{revision_id}` not found"))?;
-    let Ok(mut patch) = patches.get_mut(&patch_id) else {
-        anyhow::bail!("Patch `{patch_id}` not found");
-    };
-
-    patch.redact(revision_id, signer)?;
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/patch/resolve.rs b/radicle-cli/src/commands/patch/resolve.rs
deleted file mode 100644
index da594e7c0..000000000
--- a/radicle-cli/src/commands/patch/resolve.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use anyhow::anyhow;
-use radicle::cob::thread::CommentId;
-use radicle::patch::{self, PatchId};
-use radicle::patch::{cache::Patches as _, ReviewId};
-use radicle::storage::git::Repository;
-use radicle::Profile;
-
-use crate::terminal as term;
-
-pub fn resolve(
-    patch_id: PatchId,
-    review: ReviewId,
-    comment: CommentId,
-    repo: &Repository,
-    profile: &Profile,
-) -> anyhow::Result<()> {
-    let signer = term::signer(profile)?;
-    let mut patches = profile.patches_mut(repo)?;
-    let patch = patches
-        .get(&patch_id)?
-        .ok_or_else(|| anyhow!("Patch `{patch_id}` not found"))?;
-    let mut patch = patch::PatchMut::new(patch_id, patch, &mut patches);
-    patch.resolve_review_comment(review, comment, &signer)?;
-    Ok(())
-}
-
-pub fn unresolve(
-    patch_id: PatchId,
-    review: ReviewId,
-    comment: CommentId,
-    repo: &Repository,
-    profile: &Profile,
-) -> anyhow::Result<()> {
-    let signer = term::signer(profile)?;
-    let mut patches = profile.patches_mut(repo)?;
-    let patch = patches
-        .get(&patch_id)?
-        .ok_or_else(|| anyhow!("Patch `{patch_id}` not found"))?;
-    let mut patch = patch::PatchMut::new(patch_id, patch, &mut patches);
-    patch.unresolve_review_comment(review, comment, &signer)?;
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/patch/review.rs b/radicle-cli/src/commands/patch/review.rs
deleted file mode 100644
index 418d8ed9b..000000000
--- a/radicle-cli/src/commands/patch/review.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-#[path = "review/builder.rs"]
-mod builder;
-
-use anyhow::{anyhow, Context};
-
-use radicle::cob::patch::{PatchId, RevisionId, Verdict};
-use radicle::git;
-use radicle::prelude::*;
-use radicle::storage::git::Repository;
-
-use crate::terminal as term;
-use crate::terminal::patch::Message;
-
-/// Review help message.
-pub const REVIEW_HELP_MSG: &str = r#"
-<!--
-You may enter a review comment here. If you leave this blank,
-no comment will be attached to your review.
-
-Markdown supported.
--->
-"#;
-
-#[derive(Debug, PartialEq, Eq)]
-pub enum Operation {
-    Delete,
-    Review {
-        by_hunk: bool,
-        unified: usize,
-        hunk: Option<usize>,
-        verdict: Option<Verdict>,
-    },
-}
-
-impl Default for Operation {
-    fn default() -> Self {
-        Self::Review {
-            by_hunk: false,
-            unified: 3,
-            hunk: None,
-            verdict: None,
-        }
-    }
-}
-
-#[derive(Debug, Default)]
-pub struct Options {
-    pub message: Message,
-    pub op: Operation,
-}
-
-pub fn run(
-    patch_id: PatchId,
-    revision_id: Option<RevisionId>,
-    options: Options,
-    profile: &Profile,
-    repository: &Repository,
-) -> anyhow::Result<()> {
-    let signer = term::signer(profile)?;
-    let _project = repository.identity_doc().context(format!(
-        "couldn't load repository {} from local state",
-        repository.id
-    ))?;
-    let mut patches = profile.patches_mut(repository)?;
-    let mut patch = patches
-        .get_mut(&patch_id)
-        .context(format!("couldn't find patch {patch_id} locally"))?;
-
-    let (revision_id, revision) = match revision_id {
-        Some(id) => (
-            id,
-            patch
-                .revision(&id)
-                .ok_or_else(|| anyhow!("Patch revision `{id}` not found"))?,
-        ),
-        None => patch.latest(),
-    };
-
-    let patch_id_pretty = term::format::tertiary(term::format::cob(&patch_id));
-    match options.op {
-        Operation::Review {
-            verdict,
-            by_hunk,
-            unified,
-            hunk,
-        } if by_hunk => {
-            let mut opts = git::raw::DiffOptions::new();
-            opts.patience(true)
-                .minimal(true)
-                .context_lines(unified as u32);
-
-            builder::ReviewBuilder::new(patch_id, signer, repository)
-                .hunk(hunk)
-                .verdict(verdict)
-                .run(revision, &mut opts)?;
-        }
-        Operation::Review { verdict, .. } => {
-            let message = options.message.get(REVIEW_HELP_MSG)?;
-            let message = message.replace(REVIEW_HELP_MSG.trim(), "");
-            let message = if message.is_empty() {
-                None
-            } else {
-                Some(message)
-            };
-            patch.review(revision_id, verdict, message, vec![], &signer)?;
-
-            match verdict {
-                Some(Verdict::Accept) => {
-                    term::success!(
-                        "Patch {} {}",
-                        patch_id_pretty,
-                        term::format::highlight("accepted")
-                    );
-                }
-                Some(Verdict::Reject) => {
-                    term::success!(
-                        "Patch {} {}",
-                        patch_id_pretty,
-                        term::format::negative("rejected")
-                    );
-                }
-                None => {
-                    term::success!("Patch {} reviewed", patch_id_pretty);
-                }
-            }
-        }
-        Operation::Delete => {
-            let name = git::refs::storage::draft::review(profile.id(), &patch_id);
-
-            match repository.backend.find_reference(&name) {
-                Ok(mut r) => r.delete()?,
-                Err(e) => {
-                    anyhow::bail!("Couldn't delete review reference '{name}': {e}");
-                }
-            }
-        }
-    }
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/patch/review/builder.rs b/radicle-cli/src/commands/patch/review/builder.rs
deleted file mode 100644
index be420a510..000000000
--- a/radicle-cli/src/commands/patch/review/builder.rs
+++ /dev/null
@@ -1,1272 +0,0 @@
-//! Review builder.
-//!
-//! This module enables a user to review a patch by interactively viewing and accepting diff hunks.
-//! The interaction and output is modeled around `git add -p`.
-//!
-//! To implement this behavior, we keep a hidden Git tree object that tracks the state of the
-//! repository including the accepted hunks. Thus, every time a diff hunk is accepted, it is applied
-//! to that tree. We call that tree the "brain", as it tracks what the code reviewer has reviewed.
-//!
-//! The brain starts out equalling the tree of the base branch, and eventually, when the brain
-//! matches the tree of the patch being reviewed (by accepting hunks), we can say that the patch has
-//! been fully reviewed.
-//!
-use std::collections::VecDeque;
-use std::fmt::Write as _;
-use std::ops::{Deref, Not, Range};
-use std::path::{Path, PathBuf};
-use std::str::FromStr;
-use std::{fmt, io};
-
-use radicle::cob;
-use radicle::cob::patch::{PatchId, Revision, Verdict};
-use radicle::cob::{CodeLocation, CodeRange};
-use radicle::git;
-use radicle::prelude::*;
-use radicle::storage::git::{cob::DraftStore, Repository};
-use radicle_git_ext::Oid;
-use radicle_surf::diff::*;
-use radicle_term::{Element, VStack};
-
-use crate::git::pretty_diff::ToPretty;
-use crate::git::pretty_diff::{Blob, Blobs, Repo};
-use crate::git::unified_diff::{self, FileHeader};
-use crate::git::unified_diff::{Encode, HunkHeader};
-use crate::terminal as term;
-use crate::terminal::highlight::Highlighter;
-
-/// Help message shown to user.
-const HELP: &str = "\
-y - accept this hunk
-n - ignore this hunk
-c - comment on this hunk
-j - leave this hunk undecided, see next hunk
-k - leave this hunk undecided, see previous hunk
-s - split the current hunk into smaller hunks
-q - quit; do not accept this hunk nor any of the remaining ones
-? - print help";
-
-/// A terminal or file where the review UI output can be written to.
-trait PromptWriter: io::Write {
-    /// Is the writer a terminal?
-    fn is_terminal(&self) -> bool;
-}
-
-impl PromptWriter for Box<dyn PromptWriter> {
-    fn is_terminal(&self) -> bool {
-        self.deref().is_terminal()
-    }
-}
-
-impl<T: io::Write + io::IsTerminal> PromptWriter for T {
-    fn is_terminal(&self) -> bool {
-        <Self as io::IsTerminal>::is_terminal(self)
-    }
-}
-
-/// The actions that a user can carry out on a review item.
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub enum ReviewAction {
-    Accept,
-    Ignore,
-    Comment,
-    Split,
-    Next,
-    Previous,
-    Help,
-    Quit,
-}
-
-impl ReviewAction {
-    /// Ask the user what action to take.
-    fn prompt(
-        mut input: impl io::BufRead,
-        mut output: impl io::Write,
-        prompt: impl fmt::Display,
-    ) -> io::Result<Option<Self>> {
-        write!(&mut output, "{prompt} ")?;
-
-        let mut s = String::new();
-        input.read_line(&mut s)?;
-
-        if s.trim().is_empty() {
-            return Ok(None);
-        }
-        Self::from_str(s.trim())
-            .map(Some)
-            .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))
-    }
-}
-
-impl std::fmt::Display for ReviewAction {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Accept => write!(f, "y"),
-            Self::Ignore => write!(f, "n"),
-            Self::Comment => write!(f, "c"),
-            Self::Split => write!(f, "s"),
-            Self::Next => write!(f, "j"),
-            Self::Previous => write!(f, "k"),
-            Self::Help => write!(f, "?"),
-            Self::Quit => write!(f, "q"),
-        }
-    }
-}
-
-impl FromStr for ReviewAction {
-    type Err = io::Error;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
-            "y" => Ok(Self::Accept),
-            "n" => Ok(Self::Ignore),
-            "c" => Ok(Self::Comment),
-            "s" => Ok(Self::Split),
-            "j" => Ok(Self::Next),
-            "k" => Ok(Self::Previous),
-            "?" => Ok(Self::Help),
-            "q" => Ok(Self::Quit),
-            _ => Err(io::Error::new(
-                io::ErrorKind::InvalidInput,
-                format!("invalid action '{s}'"),
-            )),
-        }
-    }
-}
-
-/// A single review item. Can be a hunk or eg. a file move.
-/// Files are usually split into multiple review items.
-#[derive(Debug)]
-pub enum ReviewItem {
-    FileAdded {
-        path: PathBuf,
-        header: FileHeader,
-        new: DiffFile,
-        hunk: Option<Hunk<Modification>>,
-    },
-    FileDeleted {
-        path: PathBuf,
-        header: FileHeader,
-        old: DiffFile,
-        hunk: Option<Hunk<Modification>>,
-    },
-    FileModified {
-        path: PathBuf,
-        header: FileHeader,
-        old: DiffFile,
-        new: DiffFile,
-        hunk: Option<Hunk<Modification>>,
-    },
-    FileMoved {
-        moved: Moved,
-    },
-    FileCopied {
-        copied: Copied,
-    },
-    FileEofChanged {
-        path: PathBuf,
-        header: FileHeader,
-        old: DiffFile,
-        new: DiffFile,
-        eof: EofNewLine,
-    },
-    FileModeChanged {
-        path: PathBuf,
-        header: FileHeader,
-        old: DiffFile,
-        new: DiffFile,
-    },
-}
-
-impl ReviewItem {
-    fn hunk(&self) -> Option<&Hunk<Modification>> {
-        match self {
-            Self::FileAdded { hunk, .. } => hunk.as_ref(),
-            Self::FileDeleted { hunk, .. } => hunk.as_ref(),
-            Self::FileModified { hunk, .. } => hunk.as_ref(),
-            _ => None,
-        }
-    }
-
-    fn hunk_header(&self) -> Option<HunkHeader> {
-        self.hunk().and_then(|h| HunkHeader::try_from(h).ok())
-    }
-
-    fn paths(&self) -> (Option<(&Path, Oid)>, Option<(&Path, Oid)>) {
-        match self {
-            Self::FileAdded { path, new, .. } => (None, Some((path, new.oid))),
-            Self::FileDeleted { path, old, .. } => (Some((path, old.oid)), None),
-            Self::FileMoved { moved } => (
-                Some((&moved.old_path, moved.old.oid)),
-                Some((&moved.new_path, moved.new.oid)),
-            ),
-            Self::FileCopied { copied } => (
-                Some((&copied.old_path, copied.old.oid)),
-                Some((&copied.new_path, copied.new.oid)),
-            ),
-            Self::FileModified { path, old, new, .. } => {
-                (Some((path, old.oid)), Some((path, new.oid)))
-            }
-            Self::FileEofChanged { path, old, new, .. } => {
-                (Some((path, old.oid)), Some((path, new.oid)))
-            }
-            Self::FileModeChanged { path, old, new, .. } => {
-                (Some((path, old.oid)), Some((path, new.oid)))
-            }
-        }
-    }
-
-    fn file_header(&self) -> FileHeader {
-        match self {
-            Self::FileAdded { header, .. } => header.clone(),
-            Self::FileDeleted { header, .. } => header.clone(),
-            Self::FileMoved { moved } => FileHeader::Moved {
-                old_path: moved.old_path.clone(),
-                new_path: moved.new_path.clone(),
-            },
-            Self::FileCopied { copied } => FileHeader::Copied {
-                old_path: copied.old_path.clone(),
-                new_path: copied.new_path.clone(),
-            },
-            Self::FileModified { header, .. } => header.clone(),
-            Self::FileEofChanged { header, .. } => header.clone(),
-            Self::FileModeChanged { header, .. } => header.clone(),
-        }
-    }
-
-    fn blobs<R: Repo>(&self, repo: &R) -> Blobs<(PathBuf, Blob)> {
-        let (old, new) = self.paths();
-        Blobs::from_paths(old, new, repo)
-    }
-
-    fn pretty<R: Repo>(&self, repo: &R) -> Box<dyn Element> {
-        let mut hi = Highlighter::default();
-        let blobs = self.blobs(repo);
-        let highlighted = blobs.highlight(&mut hi);
-        let header = self.file_header();
-
-        match self {
-            Self::FileMoved { moved } => moved.pretty(&mut hi, &header, repo),
-            Self::FileCopied { copied } => copied.pretty(&mut hi, &header, repo),
-            Self::FileModified { hunk, .. }
-            | Self::FileAdded { hunk, .. }
-            | Self::FileDeleted { hunk, .. } => {
-                let header = header.pretty(&mut hi, &None, repo);
-                let vstack = term::VStack::default()
-                    .border(Some(term::colors::FAINT))
-                    .padding(1)
-                    .child(header);
-
-                if let Some(hunk) = hunk {
-                    let hunk = hunk.pretty(&mut hi, &highlighted, repo);
-                    if !hunk.is_empty() {
-                        return vstack.divider().merge(hunk).boxed();
-                    }
-                }
-                vstack
-            }
-            Self::FileEofChanged { eof, .. } => match eof {
-                EofNewLine::NewMissing => {
-                    VStack::default().child(term::Label::new("`\\n` missing at end-of-file"))
-                }
-                EofNewLine::OldMissing => {
-                    VStack::default().child(term::Label::new("`\\n` added at end-of-file"))
-                }
-                _ => VStack::default(),
-            },
-            Self::FileModeChanged { .. } => VStack::default(),
-        }
-        .boxed()
-    }
-}
-
-/// Queue of items (usually hunks) left to review.
-#[derive(Default)]
-pub struct ReviewQueue {
-    /// Hunks left to review.
-    queue: VecDeque<(usize, ReviewItem)>,
-}
-
-impl ReviewQueue {
-    /// Add a file to the queue.
-    /// Mostly splits files into individual review items (eg. hunks) to review.
-    fn add_file(&mut self, file: FileDiff) {
-        let header = FileHeader::from(&file);
-
-        match file {
-            FileDiff::Moved(moved) => {
-                self.add_item(ReviewItem::FileMoved { moved });
-            }
-            FileDiff::Copied(copied) => {
-                self.add_item(ReviewItem::FileCopied { copied });
-            }
-            FileDiff::Added(a) => {
-                self.add_item(ReviewItem::FileAdded {
-                    path: a.path,
-                    header: header.clone(),
-                    new: a.new,
-                    hunk: if let DiffContent::Plain {
-                        hunks: Hunks(mut hs),
-                        ..
-                    } = a.diff
-                    {
-                        hs.pop()
-                    } else {
-                        None
-                    },
-                });
-            }
-            FileDiff::Deleted(d) => {
-                self.add_item(ReviewItem::FileDeleted {
-                    path: d.path,
-                    header: header.clone(),
-                    old: d.old,
-                    hunk: if let DiffContent::Plain {
-                        hunks: Hunks(mut hs),
-                        ..
-                    } = d.diff
-                    {
-                        hs.pop()
-                    } else {
-                        None
-                    },
-                });
-            }
-            FileDiff::Modified(m) => {
-                if m.old.mode != m.new.mode {
-                    self.add_item(ReviewItem::FileModeChanged {
-                        path: m.path.clone(),
-                        header: header.clone(),
-                        old: m.old.clone(),
-                        new: m.new.clone(),
-                    });
-                }
-                match m.diff {
-                    DiffContent::Empty => {
-                        // Likely a file mode change, which is handled above.
-                    }
-                    DiffContent::Binary => {
-                        self.add_item(ReviewItem::FileModified {
-                            path: m.path.clone(),
-                            header: header.clone(),
-                            old: m.old.clone(),
-                            new: m.new.clone(),
-                            hunk: None,
-                        });
-                    }
-                    DiffContent::Plain {
-                        hunks: Hunks(hunks),
-                        eof,
-                        ..
-                    } => {
-                        for hunk in hunks {
-                            self.add_item(ReviewItem::FileModified {
-                                path: m.path.clone(),
-                                header: header.clone(),
-                                old: m.old.clone(),
-                                new: m.new.clone(),
-                                hunk: Some(hunk),
-                            });
-                        }
-                        if let EofNewLine::OldMissing | EofNewLine::NewMissing = eof {
-                            self.add_item(ReviewItem::FileEofChanged {
-                                path: m.path.clone(),
-                                header: header.clone(),
-                                old: m.old.clone(),
-                                new: m.new.clone(),
-                                eof,
-                            })
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    fn add_item(&mut self, item: ReviewItem) {
-        self.queue.push_back((self.queue.len(), item));
-    }
-}
-
-impl From<Diff> for ReviewQueue {
-    fn from(diff: Diff) -> Self {
-        let mut queue = Self::default();
-        for file in diff.into_files() {
-            queue.add_file(file);
-        }
-        queue
-    }
-}
-
-impl std::ops::Deref for ReviewQueue {
-    type Target = VecDeque<(usize, ReviewItem)>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.queue
-    }
-}
-
-impl std::ops::DerefMut for ReviewQueue {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.queue
-    }
-}
-
-impl Iterator for ReviewQueue {
-    type Item = (usize, ReviewItem);
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.queue.pop_front()
-    }
-}
-
-/// Builds a review for a single file.
-/// Adjusts line deltas when a hunk is ignored.
-pub struct FileReviewBuilder {
-    header: FileHeader,
-    delta: i32,
-}
-
-impl FileReviewBuilder {
-    fn new(item: &ReviewItem) -> Self {
-        Self {
-            header: item.file_header(),
-            delta: 0,
-        }
-    }
-
-    fn set_item(&mut self, item: &ReviewItem) -> &mut Self {
-        let header = item.file_header();
-        if self.header != header {
-            self.header = header;
-            self.delta = 0;
-        }
-        self
-    }
-
-    fn ignore_item(&mut self, item: &ReviewItem) {
-        if let Some(h) = item.hunk_header() {
-            self.delta += h.new_size as i32 - h.old_size as i32;
-        }
-    }
-
-    fn item_diff(&mut self, item: ReviewItem) -> Result<git::raw::Diff, Error> {
-        let mut buf = Vec::new();
-        let mut writer = unified_diff::Writer::new(&mut buf);
-        writer.encode(&self.header)?;
-
-        if let (Some(h), Some(mut header)) = (item.hunk(), item.hunk_header()) {
-            header.old_line_no -= self.delta as u32;
-            header.new_line_no -= self.delta as u32;
-
-            let h = Hunk {
-                header: header.to_unified_string()?.as_bytes().to_owned().into(),
-                lines: h.lines.clone(),
-                old: h.old.clone(),
-                new: h.new.clone(),
-            };
-            writer.encode(&h)?;
-        }
-        drop(writer);
-
-        git::raw::Diff::from_buffer(&buf).map_err(Error::from)
-    }
-}
-
-/// Represents the reviewer's brain, ie. what they have seen or not seen in terms
-/// of changes introduced by a patch.
-pub struct Brain<'a> {
-    /// Where the review draft is being stored.
-    refname: git::Namespaced<'a>,
-    /// The commit pointed to by the ref.
-    head: git::raw::Commit<'a>,
-    /// The tree of accepted changes pointed to by the head commit.
-    accepted: git::raw::Tree<'a>,
-}
-
-impl<'a> Brain<'a> {
-    /// Create a new brain in the repository.
-    fn new(
-        patch: PatchId,
-        remote: &NodeId,
-        base: git::raw::Commit,
-        repo: &'a git::raw::Repository,
-    ) -> Result<Self, git::raw::Error> {
-        let refname = Self::refname(&patch, remote);
-        let author = repo.signature()?;
-        let oid = repo.commit(
-            Some(refname.as_str()),
-            &author,
-            &author,
-            &format!("Review for {patch}"),
-            &base.tree()?,
-            // TODO: Verify this is necessary, shouldn't matter.
-            &[&base],
-        )?;
-        let head = repo.find_commit(oid)?;
-        let tree = head.tree()?;
-
-        Ok(Self {
-            refname,
-            head,
-            accepted: tree,
-        })
-    }
-
-    /// Return the content identifier of this brain. This represents the state of the
-    /// accepted hunks, ie. the git tree.
-    fn cid(&self) -> Oid {
-        self.accepted.id().into()
-    }
-
-    /// Load an existing brain from the repository.
-    fn load(
-        patch: PatchId,
-        remote: &NodeId,
-        repo: &'a git::raw::Repository,
-    ) -> Result<Self, git::raw::Error> {
-        // TODO: Validate this leads to correct UX for potentially abandoned drafts on
-        // past revisions.
-        let refname = Self::refname(&patch, remote);
-        let head = repo.find_reference(&refname)?.peel_to_commit()?;
-        let tree = head.tree()?;
-
-        Ok(Self {
-            refname,
-            head,
-            accepted: tree,
-        })
-    }
-
-    /// Accept changes to the brain.
-    fn accept(
-        &mut self,
-        diff: git::raw::Diff,
-        repo: &'a git::raw::Repository,
-    ) -> Result<(), git::raw::Error> {
-        let mut index = repo.apply_to_tree(&self.accepted, &diff, None)?;
-        let accepted = index.write_tree_to(repo)?;
-        self.accepted = repo.find_tree(accepted)?;
-
-        // Update review with new brain.
-        let head = self.head.amend(
-            Some(&self.refname),
-            None,
-            None,
-            None,
-            None,
-            Some(&self.accepted),
-        )?;
-        self.head = repo.find_commit(head)?;
-
-        Ok(())
-    }
-
-    /// Get the brain's refname given the patch and remote.
-    fn refname(patch: &PatchId, remote: &NodeId) -> git::Namespaced<'a> {
-        git::refs::storage::draft::review(remote, patch)
-    }
-}
-
-/// Builds a patch review interactively, across multiple files.
-pub struct ReviewBuilder<'a, G> {
-    /// Patch being reviewed.
-    patch_id: PatchId,
-    /// Signer.
-    signer: G,
-    /// Stored copy of repository.
-    repo: &'a Repository,
-    /// Single hunk review.
-    hunk: Option<usize>,
-    /// Verdict for review items.
-    verdict: Option<Verdict>,
-}
-
-impl<'a, G: Signer> ReviewBuilder<'a, G> {
-    /// Create a new review builder.
-    pub fn new(patch_id: PatchId, signer: G, repo: &'a Repository) -> Self {
-        Self {
-            patch_id,
-            signer,
-            repo,
-            hunk: None,
-            verdict: None,
-        }
-    }
-
-    /// Review a single hunk. Set to `None` to review all hunks.
-    pub fn hunk(mut self, hunk: Option<usize>) -> Self {
-        self.hunk = hunk;
-        self
-    }
-
-    /// Give this verdict to all review items. Set to `None` to not give a verdict.
-    pub fn verdict(mut self, verdict: Option<Verdict>) -> Self {
-        self.verdict = verdict;
-        self
-    }
-
-    /// Run the review builder for the given revision.
-    pub fn run(self, revision: &Revision, opts: &mut git::raw::DiffOptions) -> anyhow::Result<()> {
-        let repo = self.repo.raw();
-        let signer = &self.signer;
-        let base = repo.find_commit((*revision.base()).into())?;
-        let patch_id = self.patch_id;
-        let tree = {
-            let commit = repo.find_commit(revision.head().into())?;
-            commit.tree()?
-        };
-
-        let stdout = io::stdout().lock();
-        let mut stdin = io::stdin().lock();
-        let mut writer: Box<dyn PromptWriter> = if self.hunk.is_some() || !stdout.is_terminal() {
-            Box::new(stdout)
-        } else {
-            Box::new(io::stderr().lock())
-        };
-        let mut brain = if let Ok(b) = Brain::load(self.patch_id, signer.public_key(), repo) {
-            term::success!(
-                "Loaded existing review {} for patch {}",
-                term::format::secondary(term::format::parens(term::format::oid(b.head.id()))),
-                term::format::tertiary(&patch_id)
-            );
-            b
-        } else {
-            Brain::new(self.patch_id, signer.public_key(), base, repo)?
-        };
-        let diff = self.diff(&brain.accepted, &tree, repo, opts)?;
-        let drafts = DraftStore::new(*signer.public_key(), self.repo).with(
-            signer.public_key(),
-            &cob::patch::TYPENAME,
-            &patch_id,
-        )?;
-        let mut patches = cob::patch::Cache::no_cache(&drafts)?;
-        let mut patch = patches.get_mut(&patch_id)?;
-        let mut queue = ReviewQueue::from(diff);
-
-        if queue.is_empty() {
-            term::success!("All hunks have been reviewed");
-            return Ok(());
-        }
-
-        let review = if let Some(r) = revision.review_by(signer.public_key()) {
-            r.id()
-        } else {
-            patch.review(
-                revision.id(),
-                // This is amended before the review is finalized, if all hunks are
-                // accepted. We can't set this to `None`, as that will be invalid without
-                // a review summary.
-                Some(Verdict::Reject),
-                None,
-                vec![],
-                signer,
-            )?
-        };
-
-        // File review for the current file. Starts out as `None` and is set on the first hunk.
-        // Keeps track of deltas for hunk offsets.
-        let mut file: Option<FileReviewBuilder> = None;
-        let total = queue.len();
-
-        while let Some((ix, item)) = queue.next() {
-            if let Some(hunk) = self.hunk {
-                if hunk != ix + 1 {
-                    continue;
-                }
-            }
-            let progress = term::format::secondary(format!("({}/{total})", ix + 1));
-            let file = match file.as_mut() {
-                Some(fr) => fr.set_item(&item),
-                None => file.insert(FileReviewBuilder::new(&item)),
-            };
-            term::element::write_to(
-                &item.pretty(repo),
-                &mut writer,
-                term::Constraint::from_env().unwrap_or_default(),
-            )?;
-
-            // Prompts the user for action on the above hunk.
-            match self.prompt(&mut stdin, &mut writer, progress) {
-                // When a hunk is accepted, we convert it to unified diff format,
-                // and apply it to the `brain`.
-                Some(ReviewAction::Accept) => {
-                    // Compute hunk diff and update brain by applying it.
-                    let diff = file.item_diff(item)?;
-                    brain.accept(diff, repo)?;
-
-                    if self.hunk.is_some() {
-                        term::success!("Updated brain to {}", brain.cid());
-                    }
-                }
-                Some(ReviewAction::Ignore) => {
-                    // Do nothing. Hunk will be reviewable again next time.
-                    file.ignore_item(&item);
-                }
-                Some(ReviewAction::Comment) => {
-                    let (old, new) = item.paths();
-                    let path = old.or(new);
-
-                    if let (Some(hunk), Some((path, _))) = (item.hunk(), path) {
-                        let builder = CommentBuilder::new(revision.head(), path.to_path_buf());
-                        let comments = builder.edit(hunk)?;
-
-                        patch.transaction("Review comments", signer, |tx| {
-                            for comment in comments {
-                                tx.review_comment(
-                                    review,
-                                    comment.body,
-                                    Some(comment.location),
-                                    None,   // Not a reply.
-                                    vec![], // No embeds.
-                                )?;
-                            }
-                            Ok(())
-                        })?;
-                    } else {
-                        eprintln!(
-                            "{}",
-                            term::format::tertiary(
-                                "Commenting on binary blobs is not yet implemented"
-                            )
-                            .bold()
-                        );
-                        queue.push_front((ix, item));
-                    }
-                }
-                Some(ReviewAction::Split) => {
-                    eprintln!(
-                        "{}",
-                        term::format::tertiary("Splitting is not yet implemented").bold()
-                    );
-                    queue.push_front((ix, item));
-                }
-                Some(ReviewAction::Next) => {
-                    queue.push_back((ix, item));
-                }
-                Some(ReviewAction::Previous) => {
-                    queue.push_front((ix, item));
-
-                    if let Some(e) = queue.pop_back() {
-                        queue.push_front(e);
-                    }
-                }
-                Some(ReviewAction::Quit) => {
-                    break;
-                }
-                Some(ReviewAction::Help) => {
-                    eprintln!("{}", term::format::tertiary(HELP).bold());
-                    queue.push_front((ix, item));
-                }
-                None => {
-                    eprintln!(
-                        "{}",
-                        term::format::secondary(format!(
-                            "{} hunk(s) remaining to review",
-                            queue.len() + 1
-                        ))
-                    );
-                    queue.push_front((ix, item));
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    fn diff(
-        &self,
-        brain: &git::raw::Tree<'_>,
-        tree: &git::raw::Tree<'_>,
-        repo: &'a git::raw::Repository,
-        opts: &mut git::raw::DiffOptions,
-    ) -> Result<Diff, Error> {
-        let mut find_opts = git::raw::DiffFindOptions::new();
-        find_opts.exact_match_only(true);
-        find_opts.all(true);
-        find_opts.copies(false); // We don't support finding copies at the moment.
-
-        let mut diff = repo.diff_tree_to_tree(Some(brain), Some(tree), Some(opts))?;
-        diff.find_similar(Some(&mut find_opts))?;
-
-        let diff = Diff::try_from(diff)?;
-
-        Ok(diff)
-    }
-
-    fn prompt(
-        &self,
-        mut input: impl io::BufRead,
-        output: &mut impl PromptWriter,
-        progress: impl fmt::Display,
-    ) -> Option<ReviewAction> {
-        if let Some(v) = self.verdict {
-            match v {
-                Verdict::Accept => Some(ReviewAction::Accept),
-                Verdict::Reject => Some(ReviewAction::Ignore),
-            }
-        } else if output.is_terminal() {
-            let prompt = term::format::secondary("Accept this hunk? [y,n,c,j,k,q,?]").bold();
-
-            ReviewAction::prompt(&mut input, output, format!("{progress} {prompt}"))
-                .unwrap_or(Some(ReviewAction::Help))
-        } else {
-            Some(ReviewAction::Ignore)
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Eq)]
-struct ReviewComment {
-    location: CodeLocation,
-    body: String,
-}
-
-#[derive(thiserror::Error, Debug)]
-enum Error {
-    #[error(transparent)]
-    Diff(#[from] unified_diff::Error),
-    #[error(transparent)]
-    Surf(#[from] radicle_surf::diff::git::error::Diff),
-    #[error(transparent)]
-    Io(#[from] io::Error),
-    #[error(transparent)]
-    Format(#[from] std::fmt::Error),
-    #[error(transparent)]
-    Git(#[from] git::raw::Error),
-}
-
-#[derive(Debug)]
-struct CommentBuilder {
-    commit: Oid,
-    path: PathBuf,
-    comments: Vec<ReviewComment>,
-}
-
-impl CommentBuilder {
-    fn new(commit: Oid, path: PathBuf) -> Self {
-        Self {
-            commit,
-            path,
-            comments: Vec::new(),
-        }
-    }
-
-    fn edit(mut self, hunk: &Hunk<Modification>) -> Result<Vec<ReviewComment>, Error> {
-        let mut input = String::new();
-        for line in hunk.to_unified_string()?.lines() {
-            writeln!(&mut input, "> {line}")?;
-        }
-        let output = term::Editor::new().extension("diff").edit(input)?;
-
-        if let Some(output) = output {
-            let header = HunkHeader::try_from(hunk)?;
-            self.add_hunk(header, &output);
-        }
-        Ok(self.comments())
-    }
-
-    fn add_hunk(&mut self, hunk: HunkHeader, input: &str) -> &mut Self {
-        let lines = input.trim().lines().map(|l| l.trim());
-        let (mut old_line, mut new_line) = (hunk.old_line_no as usize, hunk.new_line_no as usize);
-        let (mut old_start, mut new_start) = (old_line, new_line);
-        let mut comment = String::new();
-
-        for line in lines {
-            if line.starts_with('>') {
-                if !comment.is_empty() {
-                    self.add_comment(
-                        &hunk,
-                        &comment,
-                        old_start..old_line - 1,
-                        new_start..new_line - 1,
-                    );
-
-                    old_start = old_line - 1;
-                    new_start = new_line - 1;
-
-                    comment.clear();
-                }
-                match line.trim_start_matches('>').trim_start().chars().next() {
-                    Some('-') => old_line += 1,
-                    Some('+') => new_line += 1,
-                    _ => {
-                        old_line += 1;
-                        new_line += 1;
-                    }
-                }
-            } else {
-                comment.push_str(line);
-                comment.push('\n');
-            }
-        }
-        if !comment.is_empty() {
-            self.add_comment(
-                &hunk,
-                &comment,
-                old_start..old_line - 1,
-                new_start..new_line - 1,
-            );
-        }
-        self
-    }
-
-    fn add_comment(
-        &mut self,
-        hunk: &HunkHeader,
-        comment: &str,
-        mut old_range: Range<usize>,
-        mut new_range: Range<usize>,
-    ) {
-        // Empty lines between quoted text can generate empty comments
-        // that should be filtered out.
-        if comment.trim().is_empty() {
-            return;
-        }
-        // Top-level comment, it should apply to the whole hunk.
-        if old_range.is_empty() && new_range.is_empty() {
-            old_range = hunk.old_line_no as usize..(hunk.old_line_no + hunk.old_size + 1) as usize;
-            new_range = hunk.new_line_no as usize..(hunk.new_line_no + hunk.new_size + 1) as usize;
-        }
-        let old_range = old_range
-            .is_empty()
-            .not()
-            .then_some(old_range)
-            .map(|range| CodeRange::Lines { range });
-        let new_range = (new_range)
-            .is_empty()
-            .not()
-            .then_some(new_range)
-            .map(|range| CodeRange::Lines { range });
-
-        self.comments.push(ReviewComment {
-            location: CodeLocation {
-                commit: self.commit,
-                path: self.path.clone(),
-                old: old_range,
-                new: new_range,
-            },
-            body: comment.trim().to_owned(),
-        });
-    }
-
-    fn comments(self) -> Vec<ReviewComment> {
-        self.comments
-    }
-}
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_review_comments_basic() {
-        let input = r#"
-> @@ -2559,18 +2560,18 @@ where
->                  // Only consider onion addresses if configured.
->                  AddressType::Onion => self.config.onion.is_some(),
->                  AddressType::Dns | AddressType::Ipv4 | AddressType::Ipv6 => true,
-> -            })
-> -            .take(wanted)
-> -            .collect::<Vec<_>>(); // # -2564
-
-Comment #1.
-
-> +            });
->
-> -        if available.len() < target {
-> -            log::warn!( # -2567
-> +        // Peers we are going to attempt connections to.
-> +        let connect = available.take(wanted).collect::<Vec<_>>();
-
-Comment #2.
-
-> +        if connect.len() < wanted {
-> +            log::debug!(
->                  target: "service",
-> -                "Not enough available peers to connect to (available={}, target={target})",
-> -                available.len()
-
-Comment #3.
-
-> +                "Not enough available peers to connect to (available={}, wanted={wanted})",
-
-Comment #4.
-
-> +                connect.len()
->              );
->          }
-> -        for (id, ka) in available {
-> +        for (id, ka) in connect {
->              self.connect(id, ka.addr.clone());
->          }
->     }
-
-Comment #5.
-
-"#;
-
-        let commit = Oid::from_str("a32c4b93e2573fd83b15ac1ad6bf1317dc8fd760").unwrap();
-        let path = PathBuf::from_str("main.rs").unwrap();
-        let expected = &[
-            (ReviewComment {
-                location: CodeLocation {
-                    commit,
-                    path: path.clone(),
-                    old: Some(CodeRange::Lines { range: 2559..2565 }),
-                    new: Some(CodeRange::Lines { range: 2560..2563 }),
-                },
-                body: "Comment #1.".to_owned(),
-            }),
-            (ReviewComment {
-                location: CodeLocation {
-                    commit,
-                    path: path.clone(),
-                    old: Some(CodeRange::Lines { range: 2565..2568 }),
-                    new: Some(CodeRange::Lines { range: 2563..2567 }),
-                },
-                body: "Comment #2.".to_owned(),
-            }),
-            (ReviewComment {
-                location: CodeLocation {
-                    commit,
-                    path: path.clone(),
-                    old: Some(CodeRange::Lines { range: 2568..2571 }),
-                    new: Some(CodeRange::Lines { range: 2567..2570 }),
-                },
-                body: "Comment #3.".to_owned(),
-            }),
-            (ReviewComment {
-                location: CodeLocation {
-                    commit,
-                    path: path.clone(),
-                    old: None,
-                    new: Some(CodeRange::Lines { range: 2570..2571 }),
-                },
-                body: "Comment #4.".to_owned(),
-            }),
-            (ReviewComment {
-                location: CodeLocation {
-                    commit,
-                    path: path.clone(),
-                    old: Some(CodeRange::Lines { range: 2571..2577 }),
-                    new: Some(CodeRange::Lines { range: 2571..2578 }),
-                },
-                body: "Comment #5.".to_owned(),
-            }),
-        ];
-
-        let mut builder = CommentBuilder::new(commit, path.clone());
-        builder.add_hunk(
-            HunkHeader {
-                old_line_no: 2559,
-                old_size: 18,
-                new_line_no: 2560,
-                new_size: 18,
-                text: vec![],
-            },
-            input,
-        );
-        let actual = builder.comments();
-
-        assert_eq!(actual.len(), expected.len(), "{actual:#?}");
-
-        for (left, right) in actual.iter().zip(expected) {
-            assert_eq!(left, right);
-        }
-    }
-
-    #[test]
-    fn test_review_comments_multiline() {
-        let input = r#"
-> @@ -2559,9 +2560,7 @@ where
->                  // Only consider onion addresses if configured.
->                  AddressType::Onion => self.config.onion.is_some(),
->                  AddressType::Dns | AddressType::Ipv4 | AddressType::Ipv6 => true,
-> -            })
-> -            .take(wanted)
-> -            .collect::<Vec<_>>(); // # -2564
-
-Blah blah blah blah blah blah blah.
-Blah blah blah.
-
-Blaah blaah blaah blaah blaah blaah blaah.
-blaah blaah blaah.
-
-Blaaah blaaah blaaah.
-
-> +            });
->
-> -        if available.len() < target {
-> -            log::warn!( # -2567
-> +        // Peers we are going to attempt connections to.
-> +        let connect = available.take(wanted).collect::<Vec<_>>();
-
-Woof woof.
-Woof.
-Woof.
-
-Woof.
-
-"#;
-
-        let commit = Oid::from_str("a32c4b93e2573fd83b15ac1ad6bf1317dc8fd760").unwrap();
-        let path = PathBuf::from_str("main.rs").unwrap();
-        let expected = &[
-            (ReviewComment {
-                location: CodeLocation {
-                    commit,
-                    path: path.clone(),
-                    old: Some(CodeRange::Lines { range: 2559..2565 }),
-                    new: Some(CodeRange::Lines { range: 2560..2563 }),
-                },
-                body: r#"
-Blah blah blah blah blah blah blah.
-Blah blah blah.
-
-Blaah blaah blaah blaah blaah blaah blaah.
-blaah blaah blaah.
-
-Blaaah blaaah blaaah.
-"#
-                .trim()
-                .to_owned(),
-            }),
-            (ReviewComment {
-                location: CodeLocation {
-                    commit,
-                    path: path.clone(),
-                    old: Some(CodeRange::Lines { range: 2565..2568 }),
-                    new: Some(CodeRange::Lines { range: 2563..2567 }),
-                },
-                body: r#"
-Woof woof.
-Woof.
-Woof.
-
-Woof.
-"#
-                .trim()
-                .to_owned(),
-            }),
-        ];
-
-        let mut builder = CommentBuilder::new(commit, path.clone());
-        builder.add_hunk(
-            HunkHeader {
-                old_line_no: 2559,
-                old_size: 9,
-                new_line_no: 2560,
-                new_size: 7,
-                text: vec![],
-            },
-            input,
-        );
-        let actual = builder.comments();
-
-        assert_eq!(actual.len(), expected.len(), "{actual:#?}");
-
-        for (left, right) in actual.iter().zip(expected) {
-            assert_eq!(left, right);
-        }
-    }
-
-    #[test]
-    fn test_review_comments_before() {
-        let input = r#"
-This is a top-level comment.
-
-> @@ -2559,9 +2560,7 @@ where
->                  // Only consider onion addresses if configured.
->                  AddressType::Onion => self.config.onion.is_some(),
->                  AddressType::Dns | AddressType::Ipv4 | AddressType::Ipv6 => true,
-> -            })
-> -            .take(wanted)
-> -            .collect::<Vec<_>>(); // # -2564
-> +            });
->
-> -        if available.len() < target {
-> -            log::warn!( # -2567
-> +        // Peers we are going to attempt connections to.
-> +        let connect = available.take(wanted).collect::<Vec<_>>();
-"#;
-
-        let commit = Oid::from_str("a32c4b93e2573fd83b15ac1ad6bf1317dc8fd760").unwrap();
-        let path = PathBuf::from_str("main.rs").unwrap();
-        let expected = &[(ReviewComment {
-            location: CodeLocation {
-                commit,
-                path: path.clone(),
-                old: Some(CodeRange::Lines { range: 2559..2569 }),
-                new: Some(CodeRange::Lines { range: 2560..2568 }),
-            },
-            body: "This is a top-level comment.".to_owned(),
-        })];
-
-        let mut builder = CommentBuilder::new(commit, path.clone());
-        builder.add_hunk(
-            HunkHeader {
-                old_line_no: 2559,
-                old_size: 9,
-                new_line_no: 2560,
-                new_size: 7,
-                text: vec![],
-            },
-            input,
-        );
-        let actual = builder.comments();
-
-        assert_eq!(actual.len(), expected.len(), "{actual:#?}");
-
-        for (left, right) in actual.iter().zip(expected) {
-            assert_eq!(left, right);
-        }
-    }
-
-    #[test]
-    fn test_review_comments_split_hunk() {
-        let input = r#"
-> @@ -2559,6 +2560,4 @@ where
->                  // Only consider onion addresses if configured.
->                  AddressType::Onion => self.config.onion.is_some(),
->                  AddressType::Dns | AddressType::Ipv4 | AddressType::Ipv6 => true,
-> -            })
-> -            .take(wanted)
-
-> -            .collect::<Vec<_>>();
-> +            });
-
-Comment on a split hunk.
-"#;
-
-        let commit = Oid::from_str("a32c4b93e2573fd83b15ac1ad6bf1317dc8fd760").unwrap();
-        let path = PathBuf::from_str("main.rs").unwrap();
-        let expected = &[(ReviewComment {
-            location: CodeLocation {
-                commit,
-                path: path.clone(),
-                old: Some(CodeRange::Lines { range: 2564..2565 }),
-                new: Some(CodeRange::Lines { range: 2563..2564 }),
-            },
-            body: "Comment on a split hunk.".to_owned(),
-        })];
-
-        let mut builder = CommentBuilder::new(commit, path.clone());
-        builder.add_hunk(
-            HunkHeader {
-                old_line_no: 2559,
-                old_size: 6,
-                new_line_no: 2560,
-                new_size: 4,
-                text: vec![],
-            },
-            input,
-        );
-        let actual = builder.comments();
-
-        assert_eq!(actual.len(), expected.len(), "{actual:#?}");
-
-        for (left, right) in actual.iter().zip(expected) {
-            assert_eq!(left, right);
-        }
-    }
-}
diff --git a/radicle-cli/src/commands/patch/show.rs b/radicle-cli/src/commands/patch/show.rs
deleted file mode 100644
index 9fab1cad1..000000000
--- a/radicle-cli/src/commands/patch/show.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-use std::process;
-
-use radicle::cob::patch;
-use radicle::git;
-use radicle::storage::git::Repository;
-
-use crate::terminal as term;
-
-use super::*;
-
-fn show_patch_diff(patch: &patch::Patch, stored: &Repository) -> anyhow::Result<()> {
-    let (from, to) = patch.range()?;
-    let range = format!("{}..{}", from, to);
-
-    process::Command::new("git")
-        .current_dir(stored.path())
-        .args(["log", "--patch", &range])
-        .stdout(process::Stdio::inherit())
-        .stderr(process::Stdio::inherit())
-        .spawn()?
-        .wait()?;
-
-    Ok(())
-}
-
-pub fn run(
-    patch_id: &PatchId,
-    diff: bool,
-    debug: bool,
-    verbose: bool,
-    profile: &Profile,
-    stored: &Repository,
-    workdir: Option<&git::raw::Repository>,
-) -> anyhow::Result<()> {
-    let patches = profile.patches(stored)?;
-    let Some(patch) = patches.get(patch_id).map_err(|e| Error::WithHint {
-        err: e.into(),
-        hint: "reset the cache with `rad patch cache` and try again",
-    })?
-    else {
-        anyhow::bail!("Patch `{patch_id}` not found");
-    };
-
-    if debug {
-        println!("{:#?}", patch);
-        return Ok(());
-    }
-    term::patch::show(&patch, patch_id, verbose, stored, workdir, profile)?;
-
-    if diff {
-        term::blank();
-        show_patch_diff(&patch, stored)?;
-        term::blank();
-    }
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/patch/update.rs b/radicle-cli/src/commands/patch/update.rs
deleted file mode 100644
index 447653669..000000000
--- a/radicle-cli/src/commands/patch/update.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use radicle::cob::patch;
-use radicle::git;
-use radicle::prelude::*;
-use radicle::storage::git::Repository;
-
-use crate::terminal as term;
-use crate::terminal::patch::*;
-
-/// Run patch update.
-pub fn run(
-    patch_id: patch::PatchId,
-    base_id: Option<git::raw::Oid>,
-    message: term::patch::Message,
-    profile: &Profile,
-    repository: &Repository,
-    workdir: &git::raw::Repository,
-) -> anyhow::Result<()> {
-    // `HEAD`; This is what we are proposing as a patch.
-    let head_branch = try_branch(workdir.head()?)?;
-
-    let (_, target_oid) = get_merge_target(repository, &head_branch)?;
-    let mut patches = profile.patches_mut(repository)?;
-    let Ok(mut patch) = patches.get_mut(&patch_id) else {
-        anyhow::bail!("Patch `{patch_id}` not found");
-    };
-
-    let head_oid = branch_oid(&head_branch)?;
-    let base_oid = match base_id {
-        Some(oid) => oid,
-        None => repository.backend.merge_base(*target_oid, *head_oid)?,
-    };
-
-    // N.b. we don't update if both the head and base are the same as
-    // any previous revision
-    if patch
-        .revisions()
-        .any(|(_, revision)| revision.head() == head_oid && **revision.base() == base_oid)
-    {
-        return Ok(());
-    }
-
-    let (_, revision) = patch.latest();
-    let message = term::patch::get_update_message(message, workdir, revision, &head_oid)?;
-    let signer = term::signer(profile)?;
-    let revision = patch.update(message, base_oid, *head_oid, &signer)?;
-
-    term::print(revision);
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/path.rs b/radicle-cli/src/commands/path.rs
deleted file mode 100644
index 19bbe2383..000000000
--- a/radicle-cli/src/commands/path.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-#![allow(clippy::or_fun_call)]
-use std::ffi::OsString;
-
-use anyhow::anyhow;
-
-use radicle::profile;
-
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-
-pub const HELP: Help = Help {
-    name: "path",
-    description: "Display the Radicle home path",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad path [<option>...]
-
-    If no argument is specified, the Radicle home path is displayed.
-
-Options
-
-    --help    Print help
-
-"#,
-};
-
-pub struct Options {}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-
-        #[allow(clippy::never_loop)]
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                _ => return Err(anyhow!(arg.unexpected())),
-            }
-        }
-
-        Ok((Options {}, vec![]))
-    }
-}
-
-pub fn run(_options: Options, _ctx: impl term::Context) -> anyhow::Result<()> {
-    let home = profile::home()?;
-
-    println!("{}", home.path().display());
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/publish.rs b/radicle-cli/src/commands/publish.rs
deleted file mode 100644
index 01d81d3ba..000000000
--- a/radicle-cli/src/commands/publish.rs
+++ /dev/null
@@ -1,138 +0,0 @@
-use std::ffi::OsString;
-
-use anyhow::{anyhow, Context as _};
-
-use radicle::identity::{Identity, Visibility};
-use radicle::node::Handle as _;
-use radicle::prelude::RepoId;
-use radicle::storage::{SignRepository, ValidateRepository, WriteRepository, WriteStorage};
-
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-
-pub const HELP: Help = Help {
-    name: "publish",
-    description: "Publish a repository to the network",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad publish [<rid>] [<option>...]
-
-    Publishing a private repository makes it public and discoverable
-    on the network.
-
-    By default, this command will publish the current repository.
-    If an `<rid>` is specified, that repository will be published instead.
-
-    Note that this command can only be run for repositories with a
-    single delegate. The delegate must be the currently authenticated
-    user. For repositories with more than one delegate, the `rad id`
-    command must be used.
-
-Options
-
-    --help                    Print help
-"#,
-};
-
-#[derive(Default, Debug)]
-pub struct Options {
-    pub rid: Option<RepoId>,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut rid = None;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                Value(val) if rid.is_none() => {
-                    rid = Some(term::args::rid(&val)?);
-                }
-                arg => {
-                    return Err(anyhow!(arg.unexpected()));
-                }
-            }
-        }
-
-        Ok((Options { rid }, vec![]))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    let rid = match options.rid {
-        Some(rid) => rid,
-        None => radicle::rad::cwd()
-            .map(|(_, rid)| rid)
-            .context("Current directory is not a Radicle repository")?,
-    };
-
-    let repo = profile.storage.repository_mut(rid)?;
-    let mut identity = Identity::load_mut(&repo)?;
-    let mut doc = identity.doc().clone();
-
-    if doc.visibility.is_public() {
-        return Err(Error::WithHint {
-            err: anyhow!("repository is already public"),
-            hint: "to announce the repository to the network, run `rad sync --inventory`",
-        }
-        .into());
-    }
-    if !doc.is_delegate(profile.id()) {
-        return Err(anyhow!("only the repository delegate can publish it"));
-    }
-    if doc.delegates.len() > 1 {
-        return Err(Error::WithHint {
-            err: anyhow!(
-                "only repositories with a single delegate can be published with this command"
-            ),
-            hint: "see `rad id --help` to publish repositories with more than one delegate",
-        }
-        .into());
-    }
-    let signer = profile.signer()?;
-
-    // Update identity document.
-    doc.visibility = Visibility::Public;
-
-    identity.update("Publish repository", "", &doc, &signer)?;
-    repo.sign_refs(&signer)?;
-    repo.set_identity_head()?;
-    let validations = repo.validate()?;
-
-    if !validations.is_empty() {
-        for err in validations {
-            term::error(format!("validation error: {err}"));
-        }
-        anyhow::bail!("fatal: repository storage is corrupt");
-    }
-    let mut node = radicle::Node::new(profile.socket());
-    let spinner = term::spinner("Updating inventory..");
-
-    // The repository is now part of our inventory.
-    profile.add_inventory(rid, &mut node)?;
-    spinner.finish();
-
-    term::success!(
-        "Repository is now {}",
-        term::format::visibility(&doc.visibility)
-    );
-
-    if !node.is_running() {
-        term::warning(format!(
-            "Your node is not running. Start your node with {} to announce your repository \
-            to the network",
-            term::format::command("rad node start")
-        ));
-    }
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/remote.rs b/radicle-cli/src/commands/remote.rs
deleted file mode 100644
index 8d95a88d9..000000000
--- a/radicle-cli/src/commands/remote.rs
+++ /dev/null
@@ -1,230 +0,0 @@
-//! Remote Command implementation
-#[path = "remote/add.rs"]
-pub mod add;
-#[path = "remote/list.rs"]
-pub mod list;
-#[path = "remote/rm.rs"]
-pub mod rm;
-
-use std::ffi::OsString;
-
-use anyhow::anyhow;
-
-use radicle::git::RefString;
-use radicle::prelude::NodeId;
-use radicle::storage::ReadStorage;
-
-use crate::terminal as term;
-use crate::terminal::args;
-use crate::terminal::{Args, Context, Help};
-
-pub const HELP: Help = Help {
-    name: "remote",
-    description: "Manage a repository's remotes",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad remote [<option>...]
-    rad remote list [--tracked | --untracked | --all] [<option>...]
-    rad remote add (<did> | <nid>) [--name <string>] [<option>...]
-    rad remote rm <name> [<option>...]
-
-List options
-
-    --tracked     Show all remotes that are listed in the working copy
-    --untracked   Show all remotes that are listed in the Radicle storage
-    --all         Show all remotes in both the Radicle storage and the working copy
-
-Add options
-
-    --name        Override the name of the remote that by default is set to the node alias
-    --[no-]fetch  Fetch the remote from local storage (default: fetch)
-    --[no-]sync   Sync the remote refs from the network (default: sync)
-
-Options
-
-    --help        Print help
-"#,
-};
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-pub enum OperationName {
-    Add,
-    Rm,
-    #[default]
-    List,
-}
-
-#[derive(Debug)]
-pub enum Operation {
-    Add {
-        id: NodeId,
-        name: Option<RefString>,
-        fetch: bool,
-        sync: bool,
-    },
-    Rm {
-        name: RefString,
-    },
-    List {
-        option: ListOption,
-    },
-}
-
-#[derive(Debug, Default)]
-pub enum ListOption {
-    All,
-    #[default]
-    Tracked,
-    Untracked,
-}
-
-#[derive(Debug)]
-pub struct Options {
-    pub op: Operation,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut op: Option<OperationName> = None;
-        let mut id: Option<NodeId> = None;
-        let mut name: Option<RefString> = None;
-        let mut list_op: ListOption = ListOption::default();
-        let mut fetch = true;
-        let mut sync = true;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("help") | Short('h') => {
-                    return Err(args::Error::Help.into());
-                }
-                Long("name") | Short('n') => {
-                    let value = parser.value()?;
-                    let value = args::refstring("name", value)?;
-
-                    name = Some(value);
-                }
-                Value(val) if op.is_none() => match val.to_string_lossy().as_ref() {
-                    "a" | "add" => op = Some(OperationName::Add),
-                    "l" | "list" => op = Some(OperationName::List),
-                    "r" | "rm" => op = Some(OperationName::Rm),
-                    unknown => anyhow::bail!("unknown operation '{}'", unknown),
-                },
-
-                // List options
-                Long("all") if op.unwrap_or_default() == OperationName::List => {
-                    list_op = ListOption::All;
-                }
-                Long("tracked") if op.unwrap_or_default() == OperationName::List => {
-                    list_op = ListOption::Tracked;
-                }
-                Long("untracked") if op.unwrap_or_default() == OperationName::List => {
-                    list_op = ListOption::Untracked;
-                }
-
-                // Add options
-                Long("sync") if op == Some(OperationName::Add) => {
-                    sync = true;
-                }
-                Long("no-sync") if op == Some(OperationName::Add) => {
-                    sync = false;
-                }
-                Long("fetch") if op == Some(OperationName::Add) => {
-                    fetch = true;
-                }
-                Long("no-fetch") if op == Some(OperationName::Add) => {
-                    fetch = false;
-                }
-                Value(val) if op == Some(OperationName::Add) && id.is_none() => {
-                    let nid = args::pubkey(&val)?;
-                    id = Some(nid);
-                }
-
-                // Remove options
-                Value(val) if op == Some(OperationName::Rm) && name.is_none() => {
-                    let val = args::string(&val);
-                    let val = RefString::try_from(val)
-                        .map_err(|e| anyhow!("invalid remote name specified: {e}"))?;
-
-                    name = Some(val);
-                }
-                _ => return Err(anyhow::anyhow!(arg.unexpected())),
-            }
-        }
-
-        let op = match op.unwrap_or_default() {
-            OperationName::Add => Operation::Add {
-                id: id.ok_or(anyhow!(
-                    "`DID` required, try running `rad remote add <did>`"
-                ))?,
-                name,
-                fetch,
-                sync,
-            },
-            OperationName::List => Operation::List { option: list_op },
-            OperationName::Rm => Operation::Rm {
-                name: name.ok_or(anyhow!("name required, see `rad remote`"))?,
-            },
-        };
-
-        Ok((Options { op }, vec![]))
-    }
-}
-
-pub fn run(options: Options, ctx: impl Context) -> anyhow::Result<()> {
-    let (working, rid) = radicle::rad::cwd()
-        .map_err(|_| anyhow!("this command must be run in the context of a repository"))?;
-    let profile = ctx.profile()?;
-
-    match options.op {
-        Operation::Add {
-            ref id,
-            name,
-            fetch,
-            sync,
-        } => {
-            let proj = profile.storage.repository(rid)?.project()?;
-            let branch = proj.default_branch();
-
-            self::add::run(
-                rid,
-                id,
-                name,
-                Some(branch.clone()),
-                &profile,
-                &working,
-                fetch,
-                sync,
-            )?
-        }
-        Operation::Rm { ref name } => self::rm::run(name, &working)?,
-        Operation::List { option } => match option {
-            ListOption::All => {
-                let tracked = list::tracked(&working)?;
-                let untracked = list::untracked(rid, &profile, tracked.iter())?;
-                // Only include a blank line if we're printing both tracked and untracked
-                let include_blank_line = !tracked.is_empty() && !untracked.is_empty();
-
-                list::print_tracked(tracked.iter());
-                if include_blank_line {
-                    term::blank();
-                }
-                list::print_untracked(untracked.iter());
-            }
-            ListOption::Tracked => {
-                let tracked = list::tracked(&working)?;
-                list::print_tracked(tracked.iter());
-            }
-            ListOption::Untracked => {
-                let tracked = list::tracked(&working)?;
-                let untracked = list::untracked(rid, &profile, tracked.iter())?;
-                list::print_untracked(untracked.iter());
-            }
-        },
-    };
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/remote/add.rs b/radicle-cli/src/commands/remote/add.rs
deleted file mode 100644
index ae44b8990..000000000
--- a/radicle-cli/src/commands/remote/add.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use std::str::FromStr;
-
-use radicle::git;
-use radicle::git::RefString;
-use radicle::prelude::*;
-use radicle::Profile;
-use radicle_crypto::PublicKey;
-
-use crate::commands::rad_checkout as checkout;
-use crate::commands::rad_follow as follow;
-use crate::commands::rad_sync as sync;
-use crate::node::SyncSettings;
-use crate::project::SetupRemote;
-
-pub fn run(
-    rid: RepoId,
-    nid: &PublicKey,
-    name: Option<RefString>,
-    tracking: Option<BranchName>,
-    profile: &Profile,
-    repo: &git::raw::Repository,
-    fetch: bool,
-    sync: bool,
-) -> anyhow::Result<()> {
-    if sync {
-        let mut node = radicle::Node::new(profile.socket());
-
-        if !profile.policies()?.is_following(nid)? {
-            let alias = name.as_ref().and_then(|n| Alias::from_str(n.as_str()).ok());
-
-            follow::follow(*nid, alias, &mut node, profile)?;
-            sync::fetch(
-                rid,
-                SyncSettings::default().with_profile(profile),
-                &mut node,
-            )?;
-        }
-    }
-    let aliases = profile.aliases();
-    let setup = SetupRemote {
-        rid,
-        tracking,
-        fetch,
-        repo,
-    };
-    checkout::setup_remote(&setup, nid, name, &aliases)?;
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/remote/list.rs b/radicle-cli/src/commands/remote/list.rs
deleted file mode 100644
index f5c40fd21..000000000
--- a/radicle-cli/src/commands/remote/list.rs
+++ /dev/null
@@ -1,119 +0,0 @@
-use std::collections::HashSet;
-
-use radicle::git::Url;
-use radicle::identity::{Did, RepoId};
-use radicle::node::{Alias, AliasStore as _, NodeId};
-use radicle::storage::ReadStorage as _;
-use radicle::Profile;
-use radicle_term::{Element, Table};
-
-use crate::git;
-use crate::terminal as term;
-
-#[derive(Debug)]
-pub enum Direction {
-    Push(Url),
-    Fetch(Url),
-}
-
-#[derive(Debug)]
-pub struct Tracked {
-    name: String,
-    direction: Option<Direction>,
-}
-
-impl Tracked {
-    fn namespace(&self) -> Option<NodeId> {
-        match self.direction.as_ref()? {
-            Direction::Push(url) => url.namespace,
-            Direction::Fetch(url) => url.namespace,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct Untracked {
-    remote: NodeId,
-    alias: Option<Alias>,
-}
-
-pub fn tracked(working: &git::Repository) -> anyhow::Result<Vec<Tracked>> {
-    Ok(git::rad_remotes(working)?
-        .into_iter()
-        .flat_map(|remote| {
-            [
-                Tracked {
-                    name: remote.name.clone(),
-                    direction: Some(Direction::Fetch(remote.url)),
-                },
-                Tracked {
-                    name: remote.name,
-                    direction: remote.pushurl.map(Direction::Push),
-                },
-            ]
-        })
-        .collect())
-}
-
-pub fn untracked<'a>(
-    rid: RepoId,
-    profile: &Profile,
-    tracked: impl Iterator<Item = &'a Tracked>,
-) -> anyhow::Result<Vec<Untracked>> {
-    let repo = profile.storage.repository(rid)?;
-    let aliases = profile.aliases();
-    let remotes = repo.remote_ids()?;
-    let git_remotes = tracked
-        .filter_map(|tracked| tracked.namespace())
-        .collect::<HashSet<_>>();
-    Ok(remotes
-        .filter_map(|remote| {
-            remote
-                .map(|remote| {
-                    (!git_remotes.contains(&remote)).then_some(Untracked {
-                        remote,
-                        alias: aliases.alias(&remote),
-                    })
-                })
-                .transpose()
-        })
-        .collect::<Result<Vec<_>, _>>()?)
-}
-
-pub fn print_tracked<'a>(tracked: impl Iterator<Item = &'a Tracked>) {
-    let mut table = Table::default();
-    for Tracked { direction, name } in tracked {
-        let Some(direction) = direction else {
-            continue;
-        };
-
-        let (dir, url) = match direction {
-            Direction::Push(url) => ("push", url),
-            Direction::Fetch(url) => ("fetch", url),
-        };
-        let description = url.namespace.map_or(
-            term::format::dim("(canonical upstream)".to_string()).italic(),
-            |namespace| term::format::tertiary(namespace.to_string()),
-        );
-        table.push([
-            term::format::bold(name.clone()),
-            description,
-            term::format::parens(term::format::secondary(dir.to_owned())),
-        ]);
-    }
-    table.print();
-}
-
-pub fn print_untracked<'a>(untracked: impl Iterator<Item = &'a Untracked>) {
-    let mut t = Table::default();
-    for Untracked { remote, alias } in untracked {
-        t.push([
-            match alias {
-                None => term::format::secondary("n/a".to_string()),
-                Some(alias) => term::format::secondary(alias.to_string()),
-            },
-            term::format::highlight(Did::from(remote).to_string()),
-        ])
-    }
-    t.print();
-}
diff --git a/radicle-cli/src/commands/remote/rm.rs b/radicle-cli/src/commands/remote/rm.rs
deleted file mode 100644
index dc2a91e16..000000000
--- a/radicle-cli/src/commands/remote/rm.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use crate::git;
-use crate::terminal as term;
-
-pub fn run(name: &str, repository: &git::Repository) -> anyhow::Result<()> {
-    if !git::is_remote(repository, name)? {
-        anyhow::bail!("remote `{name}` not found");
-    }
-    repository.remote_delete(name)?;
-    term::success!("Remote `{name}` removed");
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/seed.rs b/radicle-cli/src/commands/seed.rs
deleted file mode 100644
index 6c8b6c4fa..000000000
--- a/radicle-cli/src/commands/seed.rs
+++ /dev/null
@@ -1,224 +0,0 @@
-use std::collections::BTreeSet;
-use std::ffi::OsString;
-use std::time;
-
-use anyhow::anyhow;
-
-use radicle::node::policy;
-use radicle::node::policy::{Policy, Scope};
-use radicle::node::Handle;
-use radicle::{prelude::*, storage, Node};
-use radicle_term::Element as _;
-
-use crate::commands::rad_sync as sync;
-use crate::node::SyncSettings;
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-
-pub const HELP: Help = Help {
-    name: "seed",
-    description: "Manage repository seeding policies",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad seed [<rid>] [--[no-]fetch] [--from <nid>] [--scope <scope>] [<option>...]
-
-    The `seed` command, when no Repository ID (<rid>) is provided, will list the
-    repositories being seeded.
-
-    When a Repository ID (<rid>) is provided it updates or creates the seeding policy for
-    that repository. To delete a seeding policy, use the `rad unseed` command.
-
-    When seeding a repository, a scope can be specified: this can be either `all` or
-    `followed`. When using `all`, all remote nodes will be followed for that repository.
-    On the other hand, with `followed`, only the repository delegates will be followed,
-    plus any remote that is explicitly followed via `rad follow <nid>`.
-
-Options
-
-    --[no-]fetch           Fetch repository after updating seeding policy
-    --from <nid>           Fetch from the given node (may be specified multiple times)
-    --timeout <secs>       Fetch timeout in seconds (default: 9)
-    --scope <scope>        Peer follow scope for this repository
-    --verbose, -v          Verbose output
-    --help                 Print help
-"#,
-};
-
-#[derive(Debug)]
-pub enum Operation {
-    Seed {
-        rid: RepoId,
-        fetch: bool,
-        seeds: BTreeSet<NodeId>,
-        timeout: time::Duration,
-        scope: Scope,
-    },
-    List,
-}
-
-#[derive(Debug)]
-pub struct Options {
-    pub op: Operation,
-    pub verbose: bool,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut rid: Option<RepoId> = None;
-        let mut scope: Option<Scope> = None;
-        let mut fetch: Option<bool> = None;
-        let mut timeout = time::Duration::from_secs(9);
-        let mut seeds: BTreeSet<NodeId> = BTreeSet::new();
-        let mut verbose = false;
-
-        while let Some(arg) = parser.next()? {
-            match &arg {
-                Value(val) => {
-                    rid = Some(term::args::rid(val)?);
-                }
-                Long("scope") => {
-                    let val = parser.value()?;
-                    scope = Some(term::args::parse_value("scope", val)?);
-                }
-                Long("fetch") => {
-                    fetch = Some(true);
-                }
-                Long("no-fetch") => {
-                    fetch = Some(false);
-                }
-                Long("from") => {
-                    let val = parser.value()?;
-                    let nid = term::args::nid(&val)?;
-
-                    seeds.insert(nid);
-                }
-                Long("timeout") | Short('t') => {
-                    let value = parser.value()?;
-                    let secs = term::args::parse_value("timeout", value)?;
-
-                    timeout = time::Duration::from_secs(secs);
-                }
-                Long("verbose") | Short('v') => verbose = true,
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                _ => {
-                    return Err(anyhow!(arg.unexpected()));
-                }
-            }
-        }
-
-        let op = match rid {
-            Some(rid) => Operation::Seed {
-                rid,
-                fetch: fetch.unwrap_or(true),
-                scope: scope.unwrap_or(Scope::All),
-                timeout,
-                seeds,
-            },
-            None => Operation::List,
-        };
-
-        Ok((Options { op, verbose }, vec![]))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    let mut node = radicle::Node::new(profile.socket());
-
-    match options.op {
-        Operation::Seed {
-            rid,
-            fetch,
-            scope,
-            timeout,
-            seeds,
-        } => {
-            update(rid, scope, &mut node, &profile)?;
-
-            if fetch && node.is_running() {
-                sync::fetch(
-                    rid,
-                    SyncSettings::default()
-                        .seeds(seeds)
-                        .timeout(timeout)
-                        .with_profile(&profile),
-                    &mut node,
-                )?;
-            }
-        }
-        Operation::List => seeding(&profile)?,
-    }
-
-    Ok(())
-}
-
-pub fn update(
-    rid: RepoId,
-    scope: Scope,
-    node: &mut Node,
-    profile: &Profile,
-) -> Result<(), anyhow::Error> {
-    let updated = profile.seed(rid, scope, node)?;
-    let outcome = if updated { "updated" } else { "exists" };
-
-    if let Ok(repo) = profile.storage.repository(rid) {
-        if repo.identity_doc()?.visibility.is_public() {
-            profile.add_inventory(rid, node)?;
-            term::success!("Inventory updated with {}", term::format::tertiary(rid));
-        }
-    }
-
-    term::success!(
-        "Seeding policy {outcome} for {} with scope '{scope}'",
-        term::format::tertiary(rid),
-    );
-
-    Ok(())
-}
-
-pub fn seeding(profile: &Profile) -> anyhow::Result<()> {
-    let store = profile.policies()?;
-    let storage = &profile.storage;
-    let mut t = term::Table::new(term::table::TableOptions::bordered());
-
-    t.header([
-        term::format::default(String::from("Repository")),
-        term::format::default(String::from("Name")),
-        term::format::default(String::from("Policy")),
-        term::format::default(String::from("Scope")),
-    ]);
-    t.divider();
-
-    for policy::SeedPolicy { rid, policy } in store.seed_policies()? {
-        let id = rid.to_string();
-        let name = storage
-            .repository(rid)
-            .map_err(storage::RepositoryError::from)
-            .and_then(|repo| repo.project().map(|proj| proj.name().to_string()))
-            .unwrap_or_default();
-        let scope = policy.scope().unwrap_or_default().to_string();
-        let policy = term::format::policy(&Policy::from(policy));
-
-        t.push([
-            term::format::tertiary(id),
-            name.into(),
-            policy,
-            term::format::dim(scope),
-        ])
-    }
-
-    if t.is_empty() {
-        term::print(term::format::dim("No seeding policies to show."));
-    } else {
-        t.print();
-    }
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/self.rs b/radicle-cli/src/commands/self.rs
deleted file mode 100644
index aad6768a8..000000000
--- a/radicle-cli/src/commands/self.rs
+++ /dev/null
@@ -1,203 +0,0 @@
-use std::ffi::OsString;
-
-use radicle::crypto::ssh;
-use radicle::Profile;
-
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-use crate::terminal::Element as _;
-
-pub const HELP: Help = Help {
-    name: "self",
-    description: "Show information about your identity and device",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad self [<option>...]
-
-Options
-
-    --did                Show your DID
-    --alias              Show your Node alias
-    --nid                Show your Node ID (NID)
-    --home               Show your Radicle home
-    --config             Show the location of your configuration file
-    --ssh-key            Show your public key in OpenSSH format
-    --ssh-fingerprint    Show your public key fingerprint in OpenSSH format
-    --help               Show help
-"#,
-};
-
-#[derive(Debug)]
-enum Show {
-    Alias,
-    NodeId,
-    Did,
-    Home,
-    Config,
-    SshKey,
-    SshFingerprint,
-    All,
-}
-
-#[derive(Debug)]
-pub struct Options {
-    show: Show,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut show: Option<Show> = None;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("alias") if show.is_none() => {
-                    show = Some(Show::Alias);
-                }
-                Long("nid") if show.is_none() => {
-                    show = Some(Show::NodeId);
-                }
-                Long("did") if show.is_none() => {
-                    show = Some(Show::Did);
-                }
-                Long("home") if show.is_none() => {
-                    show = Some(Show::Home);
-                }
-                Long("config") if show.is_none() => {
-                    show = Some(Show::Config);
-                }
-                Long("ssh-key") if show.is_none() => {
-                    show = Some(Show::SshKey);
-                }
-                Long("ssh-fingerprint") if show.is_none() => {
-                    show = Some(Show::SshFingerprint);
-                }
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                _ => return Err(anyhow::anyhow!(arg.unexpected())),
-            }
-        }
-
-        Ok((
-            Options {
-                show: show.unwrap_or(Show::All),
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-
-    match options.show {
-        Show::Alias => {
-            term::print(profile.config.alias());
-        }
-        Show::NodeId => {
-            term::print(profile.id());
-        }
-        Show::Did => {
-            term::print(profile.did());
-        }
-        Show::Home => {
-            term::print(profile.home().path().display());
-        }
-        Show::Config => {
-            term::print(profile.home.config().display());
-        }
-        Show::SshKey => {
-            term::print(ssh::fmt::key(profile.id()));
-        }
-        Show::SshFingerprint => {
-            term::print(ssh::fmt::fingerprint(profile.id()));
-        }
-        Show::All => all(&profile)?,
-    }
-
-    Ok(())
-}
-
-fn all(profile: &Profile) -> anyhow::Result<()> {
-    let mut table = term::Table::<2, term::Label>::default();
-
-    table.push([
-        term::format::style("Alias").into(),
-        term::format::primary(profile.config.alias()).into(),
-    ]);
-
-    let did = profile.did();
-    table.push([
-        term::format::style("DID").into(),
-        term::format::tertiary(did).into(),
-    ]);
-
-    let node_id = profile.id();
-    table.push([
-        term::format::style("└╴Node ID (NID)").into(),
-        term::format::tertiary(node_id).into(),
-    ]);
-
-    let ssh_agent = match ssh::agent::Agent::connect() {
-        Ok(c) => term::format::positive(format!(
-            "running ({})",
-            c.pid().map(|p| p.to_string()).unwrap_or(String::from("?"))
-        )),
-        Err(e) if e.is_not_running() => term::format::yellow(String::from("not running")),
-        Err(e) => term::format::negative(format!("error: {e}")),
-    };
-    table.push([
-        term::format::style("SSH").into(),
-        ssh_agent.to_string().into(),
-    ]);
-
-    let ssh_short = ssh::fmt::fingerprint(node_id);
-    table.push([
-        term::format::style("├╴Key (hash)").into(),
-        term::format::tertiary(ssh_short).into(),
-    ]);
-
-    let ssh_long = ssh::fmt::key(node_id);
-    table.push([
-        term::format::style("└╴Key (full)").into(),
-        term::format::tertiary(ssh_long).into(),
-    ]);
-
-    let home = profile.home();
-    table.push([
-        term::format::style("Home").into(),
-        term::format::tertiary(home.path().display()).into(),
-    ]);
-
-    let config_path = profile.home.config();
-    table.push([
-        term::format::style("├╴Config").into(),
-        term::format::tertiary(config_path.display()).into(),
-    ]);
-
-    let storage_path = profile.home.storage();
-    table.push([
-        term::format::style("├╴Storage").into(),
-        term::format::tertiary(storage_path.display()).into(),
-    ]);
-
-    let keys_path = profile.home.keys();
-    table.push([
-        term::format::style("├╴Keys").into(),
-        term::format::tertiary(keys_path.display()).into(),
-    ]);
-
-    table.push([
-        term::format::style("└╴Node").into(),
-        term::format::tertiary(profile.home.node().display()).into(),
-    ]);
-
-    table.print();
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/stats.rs b/radicle-cli/src/commands/stats.rs
deleted file mode 100644
index ed425c112..000000000
--- a/radicle-cli/src/commands/stats.rs
+++ /dev/null
@@ -1,199 +0,0 @@
-use std::ffi::OsString;
-use std::path::Path;
-
-use localtime::LocalDuration;
-use localtime::LocalTime;
-use radicle::git;
-use radicle::issue::cache::Issues as _;
-use radicle::node::address;
-use radicle::node::routing;
-use radicle::patch::cache::Patches as _;
-use radicle::storage::{ReadRepository, ReadStorage, WriteRepository};
-use radicle_term::Element;
-use serde::Serialize;
-
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-
-pub const HELP: Help = Help {
-    name: "stats",
-    description: "Displays aggregated repository and node metrics",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad stats [<option>...]
-
-Options
-
-    --help       Print help
-"#,
-};
-
-#[derive(Default, Serialize)]
-#[serde(rename_all = "camelCase")]
-struct NodeStats {
-    all: usize,
-    public_daily: usize,
-    online_daily: usize,
-    online_weekly: usize,
-    seeding_weekly: usize,
-}
-
-#[derive(Default, Serialize)]
-#[serde(rename_all = "camelCase")]
-struct LocalStats {
-    repos: usize,
-    issues: usize,
-    patches: usize,
-    pushes: usize,
-    forks: usize,
-}
-
-#[derive(Default, Serialize)]
-#[serde(rename_all = "camelCase")]
-struct RepoStats {
-    unique: usize,
-    replicas: usize,
-}
-
-#[derive(Default, Serialize)]
-#[serde(rename_all = "camelCase")]
-struct Stats {
-    local: LocalStats,
-    repos: RepoStats,
-    nodes: NodeStats,
-}
-
-#[derive(Default, Debug, Eq, PartialEq)]
-pub struct Options {}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-
-        #[allow(clippy::never_loop)]
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                _ => return Err(anyhow::anyhow!(arg.unexpected())),
-            }
-        }
-
-        Ok((Options {}, vec![]))
-    }
-}
-
-pub fn run(_options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    let storage = &profile.storage;
-    let mut stats = Stats::default();
-
-    for repo in storage.repositories()? {
-        let repo = storage.repository(repo.rid)?;
-        let issues = profile.issues(&repo)?.counts()?;
-        let patches = profile.patches(&repo)?.counts()?;
-
-        stats.local.issues += issues.total();
-        stats.local.patches += patches.total();
-        stats.local.repos += 1;
-
-        for remote in repo.remote_ids()? {
-            let remote = remote?;
-            let sigrefs = repo.reference_oid(&remote, &git::refs::storage::SIGREFS_BRANCH)?;
-            let mut walk = repo.raw().revwalk()?;
-            walk.push(*sigrefs)?;
-
-            stats.local.pushes += walk.count();
-            stats.local.forks += 1;
-        }
-    }
-
-    let now = LocalTime::now();
-    let db = profile.database()?;
-    stats.nodes.all = address::Store::nodes(&db)?;
-    stats.repos.replicas = routing::Store::len(&db)?;
-
-    {
-        let row = db
-            .db
-            .prepare("SELECT COUNT(DISTINCT repo) FROM routing")?
-            // SAFETY: `COUNT` always returns a row.
-            .into_iter()
-            .next()
-            .unwrap()?;
-        let count = row.read::<i64, _>(0) as usize;
-
-        stats.repos.unique = count;
-    }
-
-    {
-        let since = now - LocalDuration::from_mins(60 * 24); // 1 day.
-        let mut stmt = db.db.prepare(
-            "SELECT COUNT(DISTINCT node) FROM announcements WHERE timestamp >= ?1 AND timestamp < ?2",
-        )?;
-        stmt.bind((1, since.as_millis() as i64))?;
-        stmt.bind((2, now.as_millis() as i64))?;
-
-        // SAFETY: `COUNT` always returns a row.
-        let row = stmt.iter().next().unwrap()?;
-        stats.nodes.online_daily = row.read::<i64, _>(0) as usize;
-
-        let since = now - LocalDuration::from_mins(60 * 24 * 7); // 1 week.
-        stmt.reset()?;
-        stmt.bind((1, since.as_millis() as i64))?;
-        stmt.bind((2, now.as_millis() as i64))?;
-
-        let row = stmt.iter().next().unwrap()?;
-        stats.nodes.online_weekly = row.read::<i64, _>(0) as usize;
-    }
-
-    {
-        let since = now - LocalDuration::from_mins(60 * 24); // 1 day.
-        let mut stmt = db.db.prepare(
-            "SELECT COUNT(DISTINCT ann.node) FROM announcements as ann
-             JOIN addresses AS addr
-             ON ann.node == addr.node
-             WHERE ann.timestamp >= ?1 AND ann.timestamp < ?2",
-        )?;
-        stmt.bind((1, since.as_millis() as i64))?;
-        stmt.bind((2, now.as_millis() as i64))?;
-
-        let row = stmt
-            .into_iter()
-            .next()
-            // SAFETY: `COUNT` always returns a row.
-            .unwrap()?;
-        let count = row.read::<i64, _>(0) as usize;
-
-        stats.nodes.public_daily = count;
-    }
-
-    {
-        let since = now - LocalDuration::from_mins(60 * 24 * 7); // 1 week.
-        let mut stmt = db.db.prepare(
-            "SELECT COUNT(DISTINCT node) FROM routing
-             WHERE timestamp >= ?1 AND timestamp < ?2",
-        )?;
-        stmt.bind((1, since.as_millis() as i64))?;
-        stmt.bind((2, now.as_millis() as i64))?;
-
-        let row = stmt
-            .into_iter()
-            .next()
-            // SAFETY: `COUNT` always returns a row.
-            .unwrap()?;
-        let count = row.read::<i64, _>(0) as usize;
-
-        stats.nodes.seeding_weekly = count;
-    }
-
-    let output = term::json::to_pretty(&stats, Path::new("stats.json"))?;
-    output.print();
-
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/sync.rs b/radicle-cli/src/commands/sync.rs
deleted file mode 100644
index 87279c764..000000000
--- a/radicle-cli/src/commands/sync.rs
+++ /dev/null
@@ -1,598 +0,0 @@
-use std::cmp::Ordering;
-use std::collections::BTreeSet;
-use std::collections::VecDeque;
-use std::ffi::OsString;
-use std::str::FromStr;
-use std::time;
-
-use anyhow::{anyhow, Context as _};
-
-use radicle::node;
-use radicle::node::AliasStore;
-use radicle::node::Seed;
-use radicle::node::{FetchResult, FetchResults, Handle as _, Node, SyncStatus};
-use radicle::prelude::{NodeId, Profile, RepoId};
-use radicle::storage::{ReadStorage, RemoteRepository};
-use radicle_term::Element;
-
-use crate::node::SyncReporting;
-use crate::node::SyncSettings;
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-use crate::terminal::format::Author;
-use crate::terminal::{Table, TableOptions};
-
-pub const HELP: Help = Help {
-    name: "sync",
-    description: "Sync repositories to the network",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad sync [--fetch | --announce] [<rid>] [<option>...]
-    rad sync --inventory [<option>...]
-    rad sync status [<rid>] [<option>...]
-
-    By default, the current repository is synchronized both ways.
-    If an <rid> is specified, that repository is synced instead.
-
-    The process begins by fetching changes from connected seeds,
-    followed by announcing local refs to peers, thereby prompting
-    them to fetch from us.
-
-    When `--fetch` is specified, any number of seeds may be given
-    using the `--seed` option, eg. `--seed <nid>@<addr>:<port>`.
-
-    When `--replicas` is specified, the given replication factor will try
-    to be matched. For example, `--replicas 5` will sync with 5 seeds.
-
-    When `--fetch` or `--announce` are specified on their own, this command
-    will only fetch or announce.
-
-    If `--inventory` is specified, the node's inventory is announced to
-    the network. This mode does not take an `<rid>`.
-
-Commands
-
-    status                    Display the sync status of a repository
-
-Options
-
-        --sort-by   <field>   Sort the table by column (options: nid, alias, status)
-    -f, --fetch               Turn on fetching (default: true)
-    -a, --announce            Turn on ref announcing (default: true)
-    -i, --inventory           Turn on inventory announcing (default: false)
-        --timeout   <secs>    How many seconds to wait while syncing
-        --seed      <nid>     Sync with the given node (may be specified multiple times)
-    -r, --replicas  <count>   Sync with a specific number of seeds
-    -v, --verbose             Verbose output
-        --debug               Print debug information afer sync
-        --help                Print help
-"#,
-};
-
-#[derive(Debug, Clone, PartialEq, Eq, Default)]
-pub enum Operation {
-    Synchronize(SyncMode),
-    #[default]
-    Status,
-}
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-pub enum SortBy {
-    Nid,
-    Alias,
-    #[default]
-    Status,
-}
-
-impl FromStr for SortBy {
-    type Err = &'static str;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
-            "nid" => Ok(Self::Nid),
-            "alias" => Ok(Self::Alias),
-            "status" => Ok(Self::Status),
-            _ => Err("invalid `--sort-by` field"),
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum SyncMode {
-    Repo {
-        settings: SyncSettings,
-        direction: SyncDirection,
-    },
-    Inventory,
-}
-
-impl Default for SyncMode {
-    fn default() -> Self {
-        Self::Repo {
-            settings: SyncSettings::default(),
-            direction: SyncDirection::default(),
-        }
-    }
-}
-
-#[derive(Debug, Default, PartialEq, Eq, Clone)]
-pub enum SyncDirection {
-    Fetch,
-    Announce,
-    #[default]
-    Both,
-}
-
-#[derive(Default, Debug)]
-pub struct Options {
-    pub rid: Option<RepoId>,
-    pub debug: bool,
-    pub verbose: bool,
-    pub sort_by: SortBy,
-    pub op: Operation,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut verbose = false;
-        let mut timeout = time::Duration::from_secs(9);
-        let mut rid = None;
-        let mut fetch = false;
-        let mut announce = false;
-        let mut inventory = false;
-        let mut debug = false;
-        let mut replicas = None;
-        let mut seeds = BTreeSet::new();
-        let mut sort_by = SortBy::default();
-        let mut op: Option<Operation> = None;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("debug") => {
-                    debug = true;
-                }
-                Long("verbose") | Short('v') => {
-                    verbose = true;
-                }
-                Long("fetch") | Short('f') => {
-                    fetch = true;
-                }
-                Long("replicas") | Short('r') => {
-                    let val = parser.value()?;
-                    let count = term::args::number(&val)?;
-
-                    if count == 0 {
-                        anyhow::bail!("value for `--replicas` must be greater than zero");
-                    }
-                    replicas = Some(count);
-                }
-                Long("seed") => {
-                    let val = parser.value()?;
-                    let nid = term::args::nid(&val)?;
-
-                    seeds.insert(nid);
-                }
-                Long("announce") | Short('a') => {
-                    announce = true;
-                }
-                Long("inventory") | Short('i') => {
-                    inventory = true;
-                }
-                Long("sort-by") if matches!(op, Some(Operation::Status)) => {
-                    let value = parser.value()?;
-                    sort_by = value.parse()?;
-                }
-                Long("timeout") | Short('t') => {
-                    let value = parser.value()?;
-                    let secs = term::args::parse_value("timeout", value)?;
-
-                    timeout = time::Duration::from_secs(secs);
-                }
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                Value(val) if rid.is_none() => match val.to_string_lossy().as_ref() {
-                    "s" | "status" => {
-                        op = Some(Operation::Status);
-                    }
-                    _ => {
-                        rid = Some(term::args::rid(&val)?);
-                    }
-                },
-                arg => {
-                    return Err(anyhow!(arg.unexpected()));
-                }
-            }
-        }
-
-        let sync = if inventory && fetch {
-            anyhow::bail!("`--inventory` cannot be used with `--fetch`");
-        } else if inventory {
-            SyncMode::Inventory
-        } else {
-            let direction = match (fetch, announce) {
-                (true, true) | (false, false) => SyncDirection::Both,
-                (true, false) => SyncDirection::Fetch,
-                (false, true) => SyncDirection::Announce,
-            };
-            let mut settings = SyncSettings::default().timeout(timeout);
-
-            if let Some(r) = replicas {
-                settings.replicas = r;
-            }
-            if !seeds.is_empty() {
-                settings.seeds = seeds;
-            }
-            SyncMode::Repo {
-                settings,
-                direction,
-            }
-        };
-
-        Ok((
-            Options {
-                rid,
-                debug,
-                verbose,
-                sort_by,
-                op: op.unwrap_or(Operation::Synchronize(sync)),
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    let mut node = radicle::Node::new(profile.socket());
-    if !node.is_running() {
-        anyhow::bail!(
-            "to sync a repository, your node must be running. To start it, run `rad node start`"
-        );
-    }
-
-    match options.op {
-        Operation::Status => {
-            let rid = match options.rid {
-                Some(rid) => rid,
-                None => {
-                    let (_, rid) = radicle::rad::cwd()
-                        .context("Current directory is not a Radicle repository")?;
-                    rid
-                }
-            };
-            sync_status(rid, &mut node, &profile, &options)?;
-        }
-        Operation::Synchronize(SyncMode::Repo {
-            settings,
-            direction,
-        }) => {
-            let rid = match options.rid {
-                Some(rid) => rid,
-                None => {
-                    let (_, rid) = radicle::rad::cwd()
-                        .context("Current directory is not a Radicle repository")?;
-                    rid
-                }
-            };
-            let settings = settings.clone().with_profile(&profile);
-
-            if [SyncDirection::Fetch, SyncDirection::Both].contains(&direction) {
-                if !profile.policies()?.is_seeding(&rid)? {
-                    anyhow::bail!("repository {rid} is not seeded");
-                }
-                let results = fetch(rid, settings.clone(), &mut node)?;
-                let success = results.success().count();
-                let failed = results.failed().count();
-
-                if results.is_empty() {
-                    term::error(format!("no seeds found for {rid}"));
-                } else if success == 0 {
-                    term::error(format!("repository fetch from {failed} seed(s) failed"));
-                } else {
-                    term::success!("Fetched repository from {success} seed(s)");
-                }
-            }
-            if [SyncDirection::Announce, SyncDirection::Both].contains(&direction) {
-                announce_refs(rid, settings, options.debug, &mut node, &profile)?;
-            }
-        }
-        Operation::Synchronize(SyncMode::Inventory) => {
-            announce_inventory(node)?;
-        }
-    }
-    Ok(())
-}
-
-fn sync_status(
-    rid: RepoId,
-    node: &mut Node,
-    profile: &Profile,
-    options: &Options,
-) -> anyhow::Result<()> {
-    let mut table = Table::<7, term::Label>::new(TableOptions::bordered());
-    let mut seeds: Vec<_> = node.seeds(rid)?.into();
-    let local_nid = node.nid()?;
-    let aliases = profile.aliases();
-
-    table.push([
-        term::format::dim(String::from("●")).into(),
-        term::format::bold(String::from("Node")).into(),
-        term::Label::blank(),
-        term::format::bold(String::from("Address")).into(),
-        term::format::bold(String::from("Status")).into(),
-        term::format::bold(String::from("Tip")).into(),
-        term::format::bold(String::from("Timestamp")).into(),
-    ]);
-    table.divider();
-
-    sort_seeds_by(local_nid, &mut seeds, &aliases, &options.sort_by);
-
-    for seed in seeds {
-        let (icon, status, head, time) = match seed.sync {
-            Some(SyncStatus::Synced { at }) => (
-                term::format::positive("●"),
-                term::format::positive(if seed.nid != local_nid { "synced" } else { "" }),
-                term::format::oid(at.oid),
-                term::format::timestamp(at.timestamp),
-            ),
-            Some(SyncStatus::OutOfSync { remote, local, .. }) => (
-                if seed.nid != local_nid {
-                    term::format::negative("●")
-                } else {
-                    term::format::yellow("●")
-                },
-                if seed.nid != local_nid {
-                    term::format::negative("out-of-sync")
-                } else {
-                    term::format::yellow("unannounced")
-                },
-                term::format::oid(if seed.nid != local_nid {
-                    remote.oid
-                } else {
-                    local.oid
-                }),
-                term::format::timestamp(remote.timestamp),
-            ),
-            None if options.verbose => (
-                term::format::dim("●"),
-                term::format::dim("unknown"),
-                term::paint(String::new()),
-                term::paint(String::new()),
-            ),
-            None => continue,
-        };
-        let addr = seed
-            .addrs
-            .first()
-            .map(|a| a.addr.to_string())
-            .unwrap_or_default()
-            .into();
-        let (alias, nid) = Author::new(&seed.nid, profile).labels();
-
-        table.push([
-            icon.into(),
-            alias,
-            nid,
-            addr,
-            status.into(),
-            term::format::secondary(head).into(),
-            time.dim().italic().into(),
-        ]);
-    }
-    table.print();
-
-    Ok(())
-}
-
-fn announce_refs(
-    rid: RepoId,
-    settings: SyncSettings,
-    debug: bool,
-    node: &mut Node,
-    profile: &Profile,
-) -> anyhow::Result<()> {
-    let Ok(repo) = profile.storage.repository(rid) else {
-        return Err(anyhow!(
-            "nothing to announce, repository {rid} is not available locally"
-        ));
-    };
-    if let Err(e) = repo.remote(&profile.public_key) {
-        if e.is_not_found() {
-            term::print(term::format::italic(
-                "Nothing to announce, you don't have a fork of this repository.",
-            ));
-            return Ok(());
-        } else {
-            return Err(anyhow!("failed to load local fork of {rid}: {e}"));
-        }
-    }
-
-    crate::node::announce(
-        &repo,
-        settings,
-        SyncReporting {
-            debug,
-            ..SyncReporting::default()
-        },
-        node,
-        profile,
-    )?;
-
-    Ok(())
-}
-
-pub fn announce_inventory(mut node: Node) -> anyhow::Result<()> {
-    let peers = node.sessions()?.iter().filter(|s| s.is_connected()).count();
-    let spinner = term::spinner(format!("Announcing inventory to {peers} peers.."));
-
-    node.announce_inventory()?;
-    spinner.finish();
-
-    Ok(())
-}
-
-pub fn fetch(
-    rid: RepoId,
-    settings: SyncSettings,
-    node: &mut Node,
-) -> Result<FetchResults, node::Error> {
-    let local = node.nid()?;
-    // Get seeds. This consults the local routing table only.
-    let seeds = node.seeds(rid)?;
-    let replicas = settings.replicas;
-    let mut results = FetchResults::default();
-    let (connected, mut disconnected) = seeds.partition();
-
-    // Fetch from specified seeds.
-    for nid in &settings.seeds {
-        fetch_from(rid, nid, settings.timeout, &mut results, node)?;
-        // We are done when we either hit our replica count,
-        // or fetch from all the specified seeds.
-        if results.success().count() >= replicas {
-            return Ok(results);
-        }
-        if settings
-            .seeds
-            .iter()
-            .all(|nid| results.get(nid).map_or(false, |r| r.is_success()))
-        {
-            return Ok(results);
-        }
-    }
-
-    // Fetch from connected seeds.
-    let mut connected = connected
-        .into_iter()
-        .filter(|c| !results.contains(&c.nid))
-        .map(|c| c.nid)
-        .take(replicas)
-        .collect::<VecDeque<_>>();
-    while results.success().count() < replicas {
-        let Some(nid) = connected.pop_front() else {
-            break;
-        };
-        fetch_from(rid, &nid, settings.timeout, &mut results, node)?;
-    }
-
-    // Try to connect to disconnected seeds and fetch from them.
-    while results.success().count() < replicas {
-        let Some(seed) = disconnected.pop() else {
-            break;
-        };
-        if seed.nid == local {
-            // Skip our own node.
-            continue;
-        }
-        if connect(
-            seed.nid,
-            seed.addrs.into_iter().map(|ka| ka.addr),
-            settings.timeout,
-            node,
-        ) {
-            fetch_from(rid, &seed.nid, settings.timeout, &mut results, node)?;
-        }
-    }
-
-    Ok(results)
-}
-
-fn connect(
-    nid: NodeId,
-    addrs: impl Iterator<Item = node::Address>,
-    timeout: time::Duration,
-    node: &mut Node,
-) -> bool {
-    // Try all addresses until one succeeds.
-    for addr in addrs {
-        let spinner = term::spinner(format!(
-            "Connecting to {}@{}..",
-            term::format::tertiary(term::format::node(&nid)),
-            &addr
-        ));
-        let cr = node.connect(
-            nid,
-            addr,
-            node::ConnectOptions {
-                persistent: false,
-                timeout,
-            },
-        );
-
-        match cr {
-            Ok(node::ConnectResult::Connected) => {
-                spinner.finish();
-                return true;
-            }
-            Ok(node::ConnectResult::Disconnected { reason }) => {
-                spinner.error(reason);
-                continue;
-            }
-            Err(e) => {
-                spinner.error(e);
-                continue;
-            }
-        }
-    }
-    false
-}
-
-fn fetch_from(
-    rid: RepoId,
-    seed: &NodeId,
-    timeout: time::Duration,
-    results: &mut FetchResults,
-    node: &mut Node,
-) -> Result<(), node::Error> {
-    let spinner = term::spinner(format!(
-        "Fetching {} from {}..",
-        term::format::tertiary(rid),
-        term::format::tertiary(term::format::node(seed))
-    ));
-    let result = node.fetch(rid, *seed, timeout)?;
-
-    match &result {
-        FetchResult::Success { .. } => {
-            spinner.finish();
-        }
-        FetchResult::Failed { reason } => {
-            spinner.error(reason);
-        }
-    }
-    results.push(*seed, result);
-
-    Ok(())
-}
-
-fn sort_seeds_by(local: NodeId, seeds: &mut [Seed], aliases: &impl AliasStore, sort_by: &SortBy) {
-    let compare = |a: &Seed, b: &Seed| match sort_by {
-        SortBy::Nid => a.nid.cmp(&b.nid),
-        SortBy::Alias => {
-            let a = aliases.alias(&a.nid);
-            let b = aliases.alias(&b.nid);
-            a.cmp(&b)
-        }
-        SortBy::Status => match (&a.sync, &b.sync) {
-            (Some(_), None) => Ordering::Less,
-            (None, Some(_)) => Ordering::Greater,
-            (Some(a), Some(b)) => a.cmp(b).reverse(),
-            (None, None) => Ordering::Equal,
-        },
-    };
-
-    // Always show our local node first.
-    seeds.sort_by(|a, b| {
-        if a.nid == local {
-            Ordering::Less
-        } else if b.nid == local {
-            Ordering::Greater
-        } else {
-            compare(a, b)
-        }
-    });
-}
diff --git a/radicle-cli/src/commands/unblock.rs b/radicle-cli/src/commands/unblock.rs
deleted file mode 100644
index 6a144c3fc..000000000
--- a/radicle-cli/src/commands/unblock.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-use std::ffi::OsString;
-
-use radicle::prelude::{NodeId, RepoId};
-
-use crate::terminal as term;
-use crate::terminal::args;
-use crate::terminal::args::{Args, Error, Help};
-
-pub const HELP: Help = Help {
-    name: "unblock",
-    description: "Unblock repositories or nodes to allow them to be seeded or followed",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad unblock <rid> [<option>...]
-    rad unblock <nid> [<option>...]
-
-    Unblock a repository or remote to allow it to be seeded or followed.
-
-Options
-
-    --help          Print help
-"#,
-};
-
-enum Target {
-    Node(NodeId),
-    Repo(RepoId),
-}
-
-impl std::fmt::Display for Target {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Node(nid) => nid.fmt(f),
-            Self::Repo(rid) => rid.fmt(f),
-        }
-    }
-}
-
-pub struct Options {
-    target: Target,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut target = None;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                Value(val) if target.is_none() => {
-                    if let Ok(rid) = args::rid(&val) {
-                        target = Some(Target::Repo(rid));
-                    } else if let Ok(nid) = args::nid(&val) {
-                        target = Some(Target::Node(nid));
-                    } else {
-                        return Err(anyhow::anyhow!(
-                            "invalid repository or remote specified, see `rad unblock --help`"
-                        ));
-                    }
-                }
-                _ => return Err(anyhow::anyhow!(arg.unexpected())),
-            }
-        }
-
-        Ok((
-            Options {
-                target: target.ok_or(anyhow::anyhow!(
-                    "a repository or remote to unblock must be specified, see `rad unblock --help`"
-                ))?,
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    let mut policies = profile.policies_mut()?;
-
-    let updated = match options.target {
-        Target::Node(nid) => policies.unblock_nid(&nid)?,
-        Target::Repo(rid) => policies.unblock_rid(&rid)?,
-    };
-
-    if updated {
-        term::success!("The 'block' policy for {} is removed", options.target);
-    } else {
-        term::info!("No 'block' policy exists for {}", options.target)
-    }
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/unfollow.rs b/radicle-cli/src/commands/unfollow.rs
deleted file mode 100644
index d821a125e..000000000
--- a/radicle-cli/src/commands/unfollow.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use std::ffi::OsString;
-
-use anyhow::anyhow;
-
-use radicle::node::{Handle, NodeId};
-
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-
-pub const HELP: Help = Help {
-    name: "unfollow",
-    description: "Unfollow a peer",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad unfollow <nid> [<option>...]
-
-    The `unfollow` command takes a Node ID (<nid>), optionally in DID format,
-    and removes the follow policy for that peer.
-
-Options
-
-    --verbose, -v          Verbose output
-    --help                 Print help
-"#,
-};
-
-#[derive(Debug)]
-pub struct Options {
-    pub nid: NodeId,
-    pub verbose: bool,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut nid: Option<NodeId> = None;
-        let mut verbose = false;
-
-        while let Some(arg) = parser.next()? {
-            match &arg {
-                Value(val) if nid.is_none() => {
-                    if let Ok(did) = term::args::did(val) {
-                        nid = Some(did.into());
-                    } else if let Ok(val) = term::args::nid(val) {
-                        nid = Some(val);
-                    } else {
-                        anyhow::bail!("invalid Node ID `{}` specified", val.to_string_lossy());
-                    }
-                }
-                Long("verbose") | Short('v') => verbose = true,
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                _ => {
-                    return Err(anyhow!(arg.unexpected()));
-                }
-            }
-        }
-
-        Ok((
-            Options {
-                nid: nid.ok_or_else(|| anyhow!("a Node ID must be specified"))?,
-                verbose,
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    let mut node = radicle::Node::new(profile.socket());
-    let nid = options.nid;
-
-    let unfollowed = match node.unfollow(nid) {
-        Ok(updated) => updated,
-        Err(e) if e.is_connection_err() => {
-            let mut config = profile.policies_mut()?;
-            config.unfollow(&nid)?
-        }
-        Err(e) => return Err(e.into()),
-    };
-    if unfollowed {
-        term::success!("Follow policy for {} removed", term::format::tertiary(nid),);
-    }
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/unseed.rs b/radicle-cli/src/commands/unseed.rs
deleted file mode 100644
index ca4c7df8f..000000000
--- a/radicle-cli/src/commands/unseed.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use std::ffi::OsString;
-
-use anyhow::anyhow;
-
-use radicle::{prelude::*, Node};
-
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-
-pub const HELP: Help = Help {
-    name: "unseed",
-    description: "Remove repository seeding policies",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad unseed <rid> [<option>...]
-
-    The `unseed` command removes the seeding policy, if found,
-    for the given repository.
-
-Options
-
-    --help      Print help
-"#,
-};
-
-#[derive(Debug)]
-pub struct Options {
-    rid: RepoId,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut rid: Option<RepoId> = None;
-
-        while let Some(arg) = parser.next()? {
-            match &arg {
-                Value(val) => {
-                    rid = Some(term::args::rid(val)?);
-                }
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                _ => {
-                    return Err(anyhow!(arg.unexpected()));
-                }
-            }
-        }
-
-        Ok((
-            Options {
-                rid: rid.ok_or(anyhow!(
-                    "A Repository ID must be provided; see `rad unseed --help`"
-                ))?,
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    let mut node = radicle::Node::new(profile.socket());
-
-    delete(options.rid, &mut node, &profile)?;
-
-    Ok(())
-}
-
-pub fn delete(rid: RepoId, node: &mut Node, profile: &Profile) -> anyhow::Result<()> {
-    if profile.unseed(rid, node)? {
-        term::success!("Seeding policy for {} removed", term::format::tertiary(rid));
-    }
-    Ok(())
-}
diff --git a/radicle-cli/src/commands/watch.rs b/radicle-cli/src/commands/watch.rs
deleted file mode 100644
index 55b19fb5b..000000000
--- a/radicle-cli/src/commands/watch.rs
+++ /dev/null
@@ -1,175 +0,0 @@
-use std::ffi::OsString;
-use std::{thread, time};
-
-use anyhow::{anyhow, Context as _};
-
-use radicle::git;
-use radicle::prelude::{NodeId, RepoId};
-use radicle::storage::{ReadRepository, ReadStorage};
-
-use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
-
-pub const HELP: Help = Help {
-    name: "wait",
-    description: "Wait for some state to be updated",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
-
-    rad watch -r <ref> [-t <oid>] [--repo <rid>] [<option>...]
-
-    Watches a Git reference, and optionally exits when it reaches a target value.
-    If no target value is passed, exits when the target changes.
-
-Options
-
-        --repo      <rid>       The repository to watch (default: `rad .`)
-        --node      <nid>       The namespace under which this reference exists
-                                (default: `rad self --nid`)
-    -r, --ref       <ref>       The fully-qualified Git reference (branch, tag, etc.) to watch,
-                                eg. 'refs/heads/master'
-    -t, --target    <oid>       The target OID (commit hash) that when reached,
-                                will cause the command to exit
-    -i, --interval  <millis>    How often, in milliseconds, to check the reference target
-                                (default: 1000)
-        --timeout   <millis>    Timeout, in milliseconds (default: none)
-    -h, --help                  Print help
-"#,
-};
-
-pub struct Options {
-    rid: Option<RepoId>,
-    refstr: git::RefString,
-    target: Option<git::Oid>,
-    nid: Option<NodeId>,
-    interval: time::Duration,
-    timeout: time::Duration,
-}
-
-impl Args for Options {
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_args(args);
-        let mut rid = None;
-        let mut nid: Option<NodeId> = None;
-        let mut target: Option<git::Oid> = None;
-        let mut refstr: Option<git::RefString> = None;
-        let mut interval: Option<time::Duration> = None;
-        let mut timeout: time::Duration = time::Duration::MAX;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("repo") => {
-                    let value = parser.value()?;
-                    let value = term::args::rid(&value)?;
-
-                    rid = Some(value);
-                }
-                Long("node") => {
-                    let value = parser.value()?;
-                    let value = term::args::nid(&value)?;
-
-                    nid = Some(value);
-                }
-                Long("ref") | Short('r') => {
-                    let value = parser.value()?;
-                    let value = term::args::refstring("ref", value)?;
-
-                    refstr = Some(value);
-                }
-                Long("target") | Short('t') => {
-                    let value = parser.value()?;
-                    let value = term::args::oid(&value)?;
-
-                    target = Some(value);
-                }
-                Long("interval") | Short('i') => {
-                    let value = parser.value()?;
-                    let value = term::args::milliseconds(&value)?;
-
-                    interval = Some(value);
-                }
-                Long("timeout") => {
-                    let value = parser.value()?;
-                    let value = term::args::milliseconds(&value)?;
-
-                    timeout = value;
-                }
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                _ => return Err(anyhow::anyhow!(arg.unexpected())),
-            }
-        }
-
-        Ok((
-            Options {
-                rid,
-                refstr: refstr.ok_or_else(|| anyhow!("a reference must be provided"))?,
-                nid,
-                target,
-                interval: interval.unwrap_or(time::Duration::from_secs(1)),
-                timeout,
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
-    let profile = ctx.profile()?;
-    let storage = &profile.storage;
-    let qualified = options
-        .refstr
-        .qualified()
-        .ok_or_else(|| anyhow!("reference must be fully-qualified, eg. 'refs/heads/master'"))?;
-    let nid = options.nid.unwrap_or(profile.public_key);
-    let rid = match options.rid {
-        Some(rid) => rid,
-        None => {
-            let (_, rid) =
-                radicle::rad::cwd().context("Current directory is not a Radicle repository")?;
-            rid
-        }
-    };
-    let repo = storage.repository(rid)?;
-    let now = time::SystemTime::now();
-
-    if let Some(target) = options.target {
-        while reference(&repo, &nid, &qualified)? != Some(target) {
-            thread::sleep(options.interval);
-            if now.elapsed()? >= options.timeout {
-                anyhow::bail!("timed out after {}ms", options.timeout.as_millis());
-            }
-        }
-    } else {
-        let initial = reference(&repo, &nid, &qualified)?;
-
-        loop {
-            thread::sleep(options.interval);
-            let oid = reference(&repo, &nid, &qualified)?;
-            if oid != initial {
-                term::info!("{}", oid.unwrap_or(git::raw::Oid::zero().into()));
-                break;
-            }
-            if now.elapsed()? >= options.timeout {
-                anyhow::bail!("timed out after {}ms", options.timeout.as_millis());
-            }
-        }
-    }
-    Ok(())
-}
-
-fn reference<R: ReadRepository>(
-    repo: &R,
-    nid: &NodeId,
-    qual: &git::Qualified,
-) -> Result<Option<git::Oid>, git::raw::Error> {
-    match repo.reference_oid(nid, qual) {
-        Ok(oid) => Ok(Some(oid)),
-        Err(e) if git::ext::is_not_found_err(&e) => Ok(None),
-        Err(e) => Err(e),
-    }
-}
diff --git a/radicle-cli/src/git.rs b/radicle-cli/src/git.rs
deleted file mode 100644
index ab0f5c6a9..000000000
--- a/radicle-cli/src/git.rs
+++ /dev/null
@@ -1,410 +0,0 @@
-//! Git-related functions and types.
-
-pub mod ddiff;
-pub mod pretty_diff;
-pub mod unified_diff;
-
-use std::collections::HashSet;
-use std::fmt::Display;
-use std::fs::{File, OpenOptions};
-use std::io;
-use std::io::Write;
-use std::ops::{Deref, DerefMut};
-use std::path::{Path, PathBuf};
-use std::process::Command;
-use std::str::FromStr;
-
-use anyhow::anyhow;
-use anyhow::Context as _;
-use thiserror::Error;
-
-use radicle::crypto::ssh;
-use radicle::git;
-use radicle::git::raw as git2;
-use radicle::git::{Version, VERSION_REQUIRED};
-use radicle::prelude::{NodeId, RepoId};
-use radicle::storage::git::transport;
-
-pub use radicle::git::raw::{
-    build::CheckoutBuilder, AnnotatedCommit, Commit, Direction, ErrorCode, MergeAnalysis,
-    MergeOptions, Oid, Reference, Repository, Signature,
-};
-
-pub const CONFIG_COMMIT_GPG_SIGN: &str = "commit.gpgsign";
-pub const CONFIG_SIGNING_KEY: &str = "user.signingkey";
-pub const CONFIG_GPG_FORMAT: &str = "gpg.format";
-pub const CONFIG_GPG_SSH_PROGRAM: &str = "gpg.ssh.program";
-pub const CONFIG_GPG_SSH_ALLOWED_SIGNERS: &str = "gpg.ssh.allowedSignersFile";
-
-/// Git revision parameter. Supports extended SHA-1 syntax.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Rev(String);
-
-impl Rev {
-    /// Return the revision as a string.
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
-
-    /// Resolve the revision to an [`From<git2::Oid>`].
-    pub fn resolve<T>(&self, repo: &git2::Repository) -> Result<T, git2::Error>
-    where
-        T: From<git2::Oid>,
-    {
-        let object = repo.revparse_single(self.as_str())?;
-        Ok(object.id().into())
-    }
-}
-
-impl Display for Rev {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl From<String> for Rev {
-    fn from(value: String) -> Self {
-        Rev(value)
-    }
-}
-
-#[derive(Error, Debug)]
-pub enum RemoteError {
-    #[error("url malformed: {0}")]
-    ParseUrl(#[from] transport::local::UrlError),
-    #[error("remote `url` not found")]
-    MissingUrl,
-    #[error("remote `name` not found")]
-    MissingName,
-}
-
-#[derive(Clone)]
-pub struct Remote<'a> {
-    pub name: String,
-    pub url: radicle::git::Url,
-    pub pushurl: Option<radicle::git::Url>,
-
-    inner: git2::Remote<'a>,
-}
-
-impl<'a> TryFrom<git2::Remote<'a>> for Remote<'a> {
-    type Error = RemoteError;
-
-    fn try_from(value: git2::Remote<'a>) -> Result<Self, Self::Error> {
-        let url = value.url().map_or(Err(RemoteError::MissingUrl), |url| {
-            Ok(radicle::git::Url::from_str(url)?)
-        })?;
-        let pushurl = value
-            .pushurl()
-            .map(radicle::git::Url::from_str)
-            .transpose()?;
-        let name = value.name().ok_or(RemoteError::MissingName)?;
-
-        Ok(Self {
-            name: name.to_owned(),
-            url,
-            pushurl,
-            inner: value,
-        })
-    }
-}
-
-impl<'a> Deref for Remote<'a> {
-    type Target = git2::Remote<'a>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.inner
-    }
-}
-
-impl<'a> DerefMut for Remote<'a> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.inner
-    }
-}
-
-/// Get the git repository in the current directory.
-pub fn repository() -> Result<Repository, anyhow::Error> {
-    match Repository::open(".") {
-        Ok(repo) => Ok(repo),
-        Err(err) => Err(err).context("the current working directory is not a git repository"),
-    }
-}
-
-/// Execute a git command by spawning a child process.
-pub fn git<S: AsRef<std::ffi::OsStr>>(
-    repo: &std::path::Path,
-    args: impl IntoIterator<Item = S>,
-) -> Result<String, io::Error> {
-    radicle::git::run::<_, _, &str, &str>(repo, args, [])
-}
-
-/// Configure SSH signing in the given git repo, for the given peer.
-pub fn configure_signing(repo: &Path, node_id: &NodeId) -> Result<(), anyhow::Error> {
-    let key = ssh::fmt::key(node_id);
-
-    git(repo, ["config", "--local", CONFIG_SIGNING_KEY, &key])?;
-    git(repo, ["config", "--local", CONFIG_GPG_FORMAT, "ssh"])?;
-    git(repo, ["config", "--local", CONFIG_COMMIT_GPG_SIGN, "true"])?;
-    git(
-        repo,
-        ["config", "--local", CONFIG_GPG_SSH_PROGRAM, "ssh-keygen"],
-    )?;
-    git(
-        repo,
-        [
-            "config",
-            "--local",
-            CONFIG_GPG_SSH_ALLOWED_SIGNERS,
-            ".gitsigners",
-        ],
-    )?;
-
-    Ok(())
-}
-
-/// Write a `.gitsigners` file in the given repository.
-/// Fails if the file already exists.
-pub fn write_gitsigners<'a>(
-    repo: &Path,
-    signers: impl IntoIterator<Item = &'a NodeId>,
-) -> Result<PathBuf, io::Error> {
-    let path = Path::new(".gitsigners");
-    let mut file = OpenOptions::new()
-        .write(true)
-        .create_new(true)
-        .open(repo.join(path))?;
-
-    for node_id in signers.into_iter() {
-        write_gitsigner(&mut file, node_id)?;
-    }
-    Ok(path.to_path_buf())
-}
-
-/// Add signers to the repository's `.gitsigners` file.
-pub fn add_gitsigners<'a>(
-    path: &Path,
-    signers: impl IntoIterator<Item = &'a NodeId>,
-) -> Result<(), io::Error> {
-    let mut file = OpenOptions::new()
-        .append(true)
-        .open(path.join(".gitsigners"))?;
-
-    for node_id in signers.into_iter() {
-        write_gitsigner(&mut file, node_id)?;
-    }
-    Ok(())
-}
-
-/// Read a `.gitsigners` file. Returns SSH keys.
-pub fn read_gitsigners(path: &Path) -> Result<HashSet<String>, io::Error> {
-    use std::io::BufRead;
-
-    let mut keys = HashSet::new();
-    let file = File::open(path.join(".gitsigners"))?;
-
-    for line in io::BufReader::new(file).lines() {
-        let line = line?;
-        if let Some((label, key)) = line.split_once(' ') {
-            if let Ok(peer) = NodeId::from_str(label) {
-                let expected = ssh::fmt::key(&peer);
-                if key != expected {
-                    return Err(io::Error::new(
-                        io::ErrorKind::InvalidData,
-                        "key does not match peer id",
-                    ));
-                }
-            }
-            keys.insert(key.to_owned());
-        }
-    }
-    Ok(keys)
-}
-
-/// Add a path to the repository's git ignore file. Creates the
-/// ignore file if it does not exist.
-pub fn ignore(repo: &Path, item: &Path) -> Result<(), io::Error> {
-    let mut ignore = OpenOptions::new()
-        .append(true)
-        .create(true)
-        .open(repo.join(".gitignore"))?;
-
-    writeln!(ignore, "{}", item.display())
-}
-
-/// Check whether SSH or GPG signing is configured in the given repository.
-pub fn is_signing_configured(repo: &Path) -> Result<bool, anyhow::Error> {
-    Ok(git(repo, ["config", CONFIG_SIGNING_KEY]).is_ok())
-}
-
-/// Return the list of radicle remotes for the given repository.
-pub fn rad_remotes(repo: &git2::Repository) -> anyhow::Result<Vec<Remote>> {
-    let remotes: Vec<_> = repo
-        .remotes()?
-        .iter()
-        .filter_map(|name| {
-            let remote = repo.find_remote(name?).ok()?;
-            Remote::try_from(remote).ok()
-        })
-        .collect();
-    Ok(remotes)
-}
-
-/// Check if the git remote is configured for the `Repository`.
-pub fn is_remote(repo: &git2::Repository, alias: &str) -> anyhow::Result<bool> {
-    match repo.find_remote(alias) {
-        Ok(_) => Ok(true),
-        Err(err) if err.code() == git2::ErrorCode::NotFound => Ok(false),
-        Err(err) => Err(err.into()),
-    }
-}
-
-/// Get the repository's "rad" remote.
-pub fn rad_remote(repo: &Repository) -> anyhow::Result<(git2::Remote, RepoId)> {
-    match radicle::rad::remote(repo) {
-        Ok((remote, id)) => Ok((remote, id)),
-        Err(radicle::rad::RemoteError::NotFound(_)) => Err(anyhow!(
-            "could not find radicle remote in git config; did you forget to run `rad init`?"
-        )),
-        Err(err) => Err(err).context("could not read git remote configuration"),
-    }
-}
-
-pub fn remove_remote(repo: &Repository, rid: &RepoId) -> anyhow::Result<()> {
-    // N.b. ensure that we are removing the remote for the correct RID
-    match radicle::rad::remote(repo) {
-        Ok((_, rid_)) => {
-            if rid_ != *rid {
-                return Err(radicle::rad::RemoteError::RidMismatch {
-                    found: rid_,
-                    expected: *rid,
-                }
-                .into());
-            }
-        }
-        Err(radicle::rad::RemoteError::NotFound(_)) => return Ok(()),
-        Err(err) => return Err(err).context("could not read git remote configuration"),
-    };
-
-    match radicle::rad::remove_remote(repo) {
-        Ok(()) => Ok(()),
-        Err(err) => Err(err).context("could not read git remote configuration"),
-    }
-}
-
-/// Setup an upstream tracking branch for the given remote and branch.
-/// Creates the tracking branch if it does not exist.
-///
-/// > scooby/master...rad/scooby/heads/master
-///
-pub fn set_tracking(repo: &Repository, remote: &NodeId, branch: &str) -> anyhow::Result<String> {
-    // The tracking branch name, eg. 'scooby/master'
-    let branch_name = format!("{remote}/{branch}");
-    // The remote branch being tracked, eg. 'rad/scooby/heads/master'
-    let remote_branch_name = format!("rad/{remote}/heads/{branch}");
-    // The target reference this branch should be set to.
-    let target = format!("refs/remotes/{remote_branch_name}");
-    let reference = repo.find_reference(&target)?;
-    let commit = reference.peel_to_commit()?;
-
-    repo.branch(&branch_name, &commit, true)?
-        .set_upstream(Some(&remote_branch_name))?;
-
-    Ok(branch_name)
-}
-
-/// Get the name of the remote of the given branch, if any.
-pub fn branch_remote(repo: &Repository, branch: &str) -> anyhow::Result<String> {
-    let cfg = repo.config()?;
-    let remote = cfg.get_string(&format!("branch.{branch}.remote"))?;
-
-    Ok(remote)
-}
-
-/// Check that the system's git version is supported. Returns an error otherwise.
-pub fn check_version() -> Result<Version, anyhow::Error> {
-    let git_version = git::version()?;
-
-    if git_version < VERSION_REQUIRED {
-        anyhow::bail!("a minimum git version of {} is required", VERSION_REQUIRED);
-    }
-    Ok(git_version)
-}
-
-/// Parse a remote refspec into a peer id and ref.
-pub fn parse_remote(refspec: &str) -> Option<(NodeId, &str)> {
-    refspec
-        .strip_prefix("refs/remotes/")
-        .and_then(|s| s.split_once('/'))
-        .and_then(|(peer, r)| NodeId::from_str(peer).ok().map(|p| (p, r)))
-}
-
-pub fn view_diff(
-    repo: &git2::Repository,
-    left: &git2::Oid,
-    right: &git2::Oid,
-) -> anyhow::Result<()> {
-    // TODO(erikli): Replace with repo.diff()
-    let workdir = repo
-        .workdir()
-        .ok_or_else(|| anyhow!("Could not get workdir current repository."))?;
-
-    let left = format!("{:.7}", left.to_string());
-    let right = format!("{:.7}", right.to_string());
-
-    let mut git = Command::new("git")
-        .current_dir(workdir)
-        .args(["diff", &left, &right])
-        .spawn()?;
-    git.wait()?;
-
-    Ok(())
-}
-
-pub fn add_tag(
-    repo: &git2::Repository,
-    message: &str,
-    patch_tag_name: &str,
-) -> anyhow::Result<git2::Oid> {
-    let head = repo.head()?;
-    let commit = head.peel(git2::ObjectType::Commit).unwrap();
-    let oid = repo.tag(patch_tag_name, &commit, &repo.signature()?, message, false)?;
-
-    Ok(oid)
-}
-
-fn write_gitsigner(mut w: impl io::Write, signer: &NodeId) -> io::Result<()> {
-    writeln!(w, "{} {}", signer, ssh::fmt::key(signer))
-}
-
-/// From a commit hash, return the signer's fingerprint, if any.
-pub fn commit_ssh_fingerprint(path: &Path, sha1: &str) -> Result<Option<String>, io::Error> {
-    use std::io::BufRead;
-    use std::io::BufReader;
-
-    let output = Command::new("git")
-        .current_dir(path) // We need to place the command execution in the git dir
-        .args(["show", sha1, "--pretty=%GF", "--raw"])
-        .output()?;
-
-    if !output.status.success() {
-        return Err(io::Error::new(
-            io::ErrorKind::Other,
-            String::from_utf8_lossy(&output.stderr),
-        ));
-    }
-
-    let string = BufReader::new(output.stdout.as_slice())
-        .lines()
-        .next()
-        .transpose()?;
-
-    // We only return a fingerprint if it's not an empty string
-    if let Some(s) = string {
-        if !s.is_empty() {
-            return Ok(Some(s));
-        }
-    }
-
-    Ok(None)
-}
diff --git a/radicle-cli/src/git/ddiff.rs b/radicle-cli/src/git/ddiff.rs
deleted file mode 100644
index 55b5a71c5..000000000
--- a/radicle-cli/src/git/ddiff.rs
+++ /dev/null
@@ -1,421 +0,0 @@
-//! `DDiff` is a diff between diffs.  The type aids in the review of a `Patch` to a project by
-//! providing useful context between `Patch` updates a regular `Diff` will miss.
-//!
-//! For example, lets start with a file containing a list of words.
-//!
-//! ```text
-//! componentwise
-//! reusing
-//! simplest
-//! crag
-//! offended
-//! omitting
-//! ```
-//! Where a change is proposed to the file replacing a set of lines.  The example includes the
-//! `HunkHeader` "@ .. @" for completeness, but it can be mostly ignored.
-//!
-//! ```text
-//! @@ -0,6 +0,6 @@
-//! componentwise
-//! reusing
-//! -simplest
-//! -crag
-//! -offended
-//! +interpreters
-//! +soiled
-//! +snuffing
-//! omitting
-//! ```
-//!
-//! The author updates the `Patch` to keep 'offended' and remove 'interpreters'.
-//!
-//! ```text
-//! @@ -0,6 +0,6 @@
-//! componentwise
-//! reusing
-//! -simplest
-//! -crag
-//!  offended
-//! -interpreters
-//! +soiled
-//! +snuffing
-//! omitting
-//! ```
-//! The `DDiff` will show the what changes are being made, overlayed on to the original diff and
-//! the diff's original file as context.
-//!
-//! ```text
-//! @@ -0,9 +0,8 @@
-//!   componentwise
-//!   reusing
-//!  -simplest
-//!  -crag
-//! --offended
-//! + offended
-//! -+interpreters
-//!  +soiled
-//!  +snuffing
-//!   omitting
-//! ```
-//!
-//! An alternative is to review a `Diff` between the resulting files after the first and second
-//! Patch versions were applied.  The first `Patch` changes and original file contents are one
-//! making it unclear what are changes to the `Patch` or changes to the original file.
-//!
-//! ```text
-//! @@ -0,9 +0,8 @@
-//!  componentwise
-//!  reusing
-//! +offended
-//! -interpreters
-//!  soiled
-//!  snuffing
-//!  omitting
-//! ```
-use radicle_surf::diff::*;
-
-use std::io;
-
-use crate::git::unified_diff;
-use crate::git::unified_diff::{Encode, Writer};
-use crate::terminal as term;
-
-/// Either the modification of a single diff [`Line`], or just contextual
-/// information.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum DiffModification {
-    /// An addition line is to be added.
-    AdditionAddition { line: Line, line_no: u32 },
-    AdditionContext {
-        line: Line,
-        line_no_old: u32,
-        line_no_new: u32,
-    },
-    /// An addition line is to be removed.
-    AdditionDeletion { line: Line, line_no: u32 },
-    /// A context line is to be added.
-    ContextAddition { line: Line, line_no: u32 },
-    /// A contextual line in a file, i.e. there were no changes to the line.
-    ContextContext {
-        line: Line,
-        line_no_old: u32,
-        line_no_new: u32,
-    },
-    /// A context line is to be removed.
-    ContextDeletion { line: Line, line_no: u32 },
-    /// A deletion line is to be added.
-    DeletionAddition { line: Line, line_no: u32 },
-    /// A deletion line in a diff, i.e. there were no changes to the line.
-    DeletionContext {
-        line: Line,
-        line_no_old: u32,
-        line_no_new: u32,
-    },
-    /// A deletion line is to be removed.
-    DeletionDeletion { line: Line, line_no: u32 },
-}
-
-impl unified_diff::Decode for Hunk<DiffModification> {
-    fn decode(r: &mut impl io::BufRead) -> Result<Self, unified_diff::Error> {
-        let header = unified_diff::HunkHeader::decode(r)?;
-
-        let mut lines = Vec::new();
-        let mut new_line: u32 = 0;
-        let mut old_line: u32 = 0;
-
-        while old_line < header.old_size || new_line < header.new_size {
-            if old_line > header.old_size {
-                return Err(unified_diff::Error::syntax(format!(
-                    "expected '{0}' old lines",
-                    header.old_size,
-                )));
-            } else if new_line > header.new_size {
-                return Err(unified_diff::Error::syntax(format!(
-                    "expected '{0}' new lines",
-                    header.new_size,
-                )));
-            }
-
-            let mut line = DiffModification::decode(r).map_err(|e| {
-                if e.is_eof() {
-                    unified_diff::Error::syntax(format!(
-                        "expected '{}' old lines and '{}' new lines, but found '{}' and '{}'",
-                        header.old_size, header.new_size, old_line, new_line,
-                    ))
-                } else {
-                    e
-                }
-            })?;
-
-            match &mut line {
-                DiffModification::AdditionAddition { line_no, .. } => {
-                    *line_no = new_line;
-                    new_line += 1;
-                }
-                DiffModification::AdditionContext {
-                    line_no_old,
-                    line_no_new,
-                    ..
-                } => {
-                    *line_no_old = old_line;
-                    *line_no_new = new_line;
-                    old_line += 1;
-                    new_line += 1;
-                }
-                DiffModification::AdditionDeletion { line_no, .. } => {
-                    *line_no = old_line;
-                    old_line += 1;
-                }
-                DiffModification::ContextAddition { line_no, .. } => {
-                    *line_no = new_line;
-                    new_line += 1;
-                }
-                DiffModification::ContextContext {
-                    line_no_old,
-                    line_no_new,
-                    ..
-                } => {
-                    *line_no_old = old_line;
-                    *line_no_new = new_line;
-                    old_line += 1;
-                    new_line += 1;
-                }
-                DiffModification::ContextDeletion { line_no, .. } => {
-                    *line_no = old_line;
-                    old_line += 1;
-                }
-                DiffModification::DeletionAddition { line_no, .. } => {
-                    *line_no = new_line;
-                    new_line += 1;
-                }
-                DiffModification::DeletionContext {
-                    line_no_old,
-                    line_no_new,
-                    ..
-                } => {
-                    *line_no_old = old_line;
-                    *line_no_new = new_line;
-                    old_line += 1;
-                    new_line += 1;
-                }
-                DiffModification::DeletionDeletion { line_no, .. } => {
-                    *line_no = old_line;
-                    old_line += 1;
-                }
-            };
-
-            lines.push(line);
-        }
-
-        Ok(Hunk {
-            header: Line::from(header.to_unified_string()?),
-            lines,
-            old: header.old_line_range(),
-            new: header.new_line_range(),
-        })
-    }
-}
-
-impl unified_diff::Encode for Hunk<DiffModification> {
-    fn encode(&self, w: &mut Writer) -> Result<(), unified_diff::Error> {
-        // TODO: Remove trailing newlines accurately.
-        // trim_end() will destroy diff information if the diff has a trailing whitespace on
-        // purpose.
-        w.magenta(self.header.from_utf8_lossy().trim_end())?;
-        for l in &self.lines {
-            l.encode(w)?;
-        }
-        Ok(())
-    }
-}
-
-/// The DDiff version of `FileDiff`.
-#[derive(Clone, Debug, PartialEq)]
-pub struct FileDDiff {
-    pub path: std::path::PathBuf,
-    pub old: DiffFile,
-    pub new: DiffFile,
-    pub hunks: Hunks<DiffModification>,
-    pub eof: EofNewLine,
-}
-
-impl From<&FileDDiff> for unified_diff::FileHeader {
-    fn from(value: &FileDDiff) -> Self {
-        unified_diff::FileHeader::Modified {
-            path: value.path.clone(),
-            old: value.old.clone(),
-            new: value.new.clone(),
-            binary: false,
-        }
-    }
-}
-
-impl unified_diff::Decode for DiffModification {
-    fn decode(r: &mut impl std::io::BufRead) -> Result<Self, unified_diff::Error> {
-        let mut line = String::new();
-        if r.read_line(&mut line)? == 0 {
-            return Err(unified_diff::Error::UnexpectedEof);
-        }
-
-        let mut chars = line.chars();
-
-        let first = chars.next().ok_or(unified_diff::Error::UnexpectedEof)?;
-        let second = chars.next().ok_or(unified_diff::Error::UnexpectedEof)?;
-
-        let line = match (first, second) {
-            ('+', '+') => DiffModification::AdditionAddition {
-                line: chars.as_str().to_string().into(),
-                line_no: 0,
-            },
-            ('+', '-') => DiffModification::DeletionAddition {
-                line: chars.as_str().to_string().into(),
-                line_no: 0,
-            },
-            ('+', ' ') => DiffModification::ContextAddition {
-                line: chars.as_str().to_string().into(),
-                line_no: 0,
-            },
-            ('-', '+') => DiffModification::AdditionDeletion {
-                line: chars.as_str().to_string().into(),
-                line_no: 0,
-            },
-            ('-', '-') => DiffModification::DeletionDeletion {
-                line: chars.as_str().to_string().into(),
-                line_no: 0,
-            },
-            ('-', ' ') => DiffModification::ContextDeletion {
-                line: chars.as_str().to_string().into(),
-                line_no: 0,
-            },
-            (' ', '+') => DiffModification::AdditionContext {
-                line: chars.as_str().to_string().into(),
-                line_no_old: 0,
-                line_no_new: 0,
-            },
-            (' ', '-') => DiffModification::DeletionContext {
-                line: chars.as_str().to_string().into(),
-                line_no_old: 0,
-                line_no_new: 0,
-            },
-            (' ', ' ') => DiffModification::ContextContext {
-                line: chars.as_str().to_string().into(),
-                line_no_old: 0,
-                line_no_new: 0,
-            },
-            (v1, v2) => {
-                return Err(unified_diff::Error::syntax(format!(
-                    "indicator character expected, but got '{0}{1}'",
-                    v1, v2
-                )))
-            }
-        };
-
-        Ok(line)
-    }
-}
-
-impl unified_diff::Encode for DiffModification {
-    fn encode(&self, w: &mut unified_diff::Writer) -> Result<(), unified_diff::Error> {
-        match self {
-            DiffModification::AdditionAddition { line, .. } => {
-                let s = format!("++{}", String::from_utf8_lossy(line.as_bytes()).trim_end());
-                w.write(s, term::Style::new(term::Color::Green))?;
-            }
-            DiffModification::AdditionDeletion { line, .. } => {
-                let s = format!("-+{}", String::from_utf8_lossy(line.as_bytes()).trim_end());
-                w.write(s, term::Style::new(term::Color::Red))?;
-            }
-            DiffModification::ContextAddition { line, .. } => {
-                let s = format!("+ {}", String::from_utf8_lossy(line.as_bytes()).trim_end());
-                w.write(s, term::Style::new(term::Color::Green))?;
-            }
-            DiffModification::DeletionAddition { line, .. } => {
-                let s = format!("+-{}", String::from_utf8_lossy(line.as_bytes()).trim_end());
-                w.write(s, term::Style::new(term::Color::Green))?;
-            }
-            DiffModification::DeletionDeletion { line, .. } => {
-                let s = format!("--{}", String::from_utf8_lossy(line.as_bytes()).trim_end());
-                w.write(s, term::Style::new(term::Color::Red))?;
-            }
-            DiffModification::ContextDeletion { line, .. } => {
-                let s = format!("- {}", String::from_utf8_lossy(line.as_bytes()).trim_end());
-                w.write(s, term::Style::new(term::Color::Red))?;
-            }
-            DiffModification::AdditionContext { line, .. } => {
-                let s = format!(" +{}", String::from_utf8_lossy(line.as_bytes()).trim_end());
-                w.write(s, term::Style::new(term::Color::Green).dim())?
-            }
-            DiffModification::DeletionContext { line, .. } => {
-                let s = format!(" -{}", String::from_utf8_lossy(line.as_bytes()).trim_end());
-                w.write(s, term::Style::new(term::Color::Red).dim())?;
-            }
-            DiffModification::ContextContext { line, .. } => {
-                let s = format!("  {}", String::from_utf8_lossy(line.as_bytes()).trim_end());
-                w.write(s, term::Style::default().dim())?;
-            }
-        }
-
-        Ok(())
-    }
-}
-
-impl unified_diff::Encode for FileDDiff {
-    fn encode(&self, w: &mut unified_diff::Writer) -> Result<(), unified_diff::Error> {
-        w.encode(&unified_diff::FileHeader::from(self))?;
-        for h in self.hunks.iter() {
-            h.encode(w)?;
-        }
-
-        Ok(())
-    }
-}
-
-/// A diff of a diff.
-#[derive(Clone, Debug, PartialEq, Default)]
-pub struct DDiff {
-    files: Vec<FileDDiff>,
-}
-
-impl DDiff {
-    /// Returns an iterator of the file in the diff.
-    pub fn files(&self) -> impl Iterator<Item = &FileDDiff> {
-        self.files.iter()
-    }
-
-    /// Returns owned files in the diff.
-    pub fn into_files(self) -> Vec<FileDDiff> {
-        self.files
-    }
-}
-
-impl unified_diff::Encode for DDiff {
-    fn encode(&self, w: &mut unified_diff::Writer) -> Result<(), unified_diff::Error> {
-        for v in self.files() {
-            v.encode(w)?;
-        }
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use crate::git::unified_diff::{Decode, Encode};
-
-    #[test]
-    fn diff_encode_decode_ddiff_hunk() {
-        let ddiff = Hunk::<DiffModification>::parse(include_str!(concat!(
-            env!("CARGO_MANIFEST_DIR"),
-            "/tests/data/ddiff_hunk.diff"
-        )))
-        .unwrap();
-        assert_eq!(
-            include_str!(concat!(
-                env!("CARGO_MANIFEST_DIR"),
-                "/tests/data/ddiff_hunk.diff"
-            )),
-            ddiff.to_unified_string().unwrap()
-        );
-    }
-}
diff --git a/radicle-cli/src/git/pretty_diff.rs b/radicle-cli/src/git/pretty_diff.rs
deleted file mode 100644
index 22187398e..000000000
--- a/radicle-cli/src/git/pretty_diff.rs
+++ /dev/null
@@ -1,620 +0,0 @@
-use std::fs;
-use std::path::{Path, PathBuf};
-
-use radicle::git;
-use radicle_git_ext::Oid;
-use radicle_surf::diff;
-use radicle_surf::diff::{Added, Copied, Deleted, FileStats, Hunks, Modified, Moved};
-use radicle_surf::diff::{Diff, DiffContent, FileDiff, Hunk, Modification};
-use radicle_term as term;
-use term::cell::Cell;
-use term::VStack;
-
-use crate::git::unified_diff::FileHeader;
-use crate::terminal::highlight::{Highlighter, Theme};
-
-use super::unified_diff::{Decode, HunkHeader};
-
-/// Blob returned by the [`Repo`] trait.
-#[derive(PartialEq, Eq, Debug)]
-pub enum Blob {
-    Binary,
-    Empty,
-    Plain(Vec<u8>),
-}
-
-/// A repository of Git blobs.
-pub trait Repo {
-    /// Lookup a blob from the repo.
-    fn blob(&self, oid: git::Oid) -> Result<Blob, git::raw::Error>;
-    /// Lookup a file in the workdir.
-    fn file(&self, path: &Path) -> Option<Blob>;
-}
-
-impl Repo for git::raw::Repository {
-    fn blob(&self, oid: git::Oid) -> Result<Blob, git::raw::Error> {
-        let blob = self.find_blob(*oid)?;
-
-        if blob.is_binary() {
-            Ok(Blob::Binary)
-        } else {
-            let content = blob.content();
-
-            if content.is_empty() {
-                Ok(Blob::Empty)
-            } else {
-                Ok(Blob::Plain(blob.content().to_vec()))
-            }
-        }
-    }
-
-    fn file(&self, path: &Path) -> Option<Blob> {
-        self.workdir()
-            .and_then(|dir| fs::read(dir.join(path)).ok())
-            .map(|content| {
-                // A file is considered binary if there is a zero byte in the first 8 kilobytes
-                // of the file. This is the same heuristic Git uses.
-                let binary = content.iter().take(8192).any(|b| *b == 0);
-                if binary {
-                    Blob::Binary
-                } else {
-                    Blob::Plain(content)
-                }
-            })
-    }
-}
-
-/// Blobs passed down to the hunk renderer.
-#[derive(Debug)]
-pub struct Blobs<T> {
-    pub old: Option<T>,
-    pub new: Option<T>,
-}
-
-impl<T> Blobs<T> {
-    pub fn new(old: Option<T>, new: Option<T>) -> Self {
-        Self { old, new }
-    }
-}
-
-impl Blobs<(PathBuf, Blob)> {
-    pub fn highlight(&self, hi: &mut Highlighter) -> Blobs<Vec<term::Line>> {
-        let mut blobs = Blobs::default();
-        if let Some((path, Blob::Plain(content))) = &self.old {
-            blobs.old = hi.highlight(path, content).ok();
-        }
-        if let Some((path, Blob::Plain(content))) = &self.new {
-            blobs.new = hi.highlight(path, content).ok();
-        }
-        blobs
-    }
-
-    pub fn from_paths<R: Repo>(
-        old: Option<(&Path, Oid)>,
-        new: Option<(&Path, Oid)>,
-        repo: &R,
-    ) -> Blobs<(PathBuf, Blob)> {
-        Blobs::new(
-            old.and_then(|(path, oid)| {
-                repo.blob(oid)
-                    .ok()
-                    .or_else(|| repo.file(path))
-                    .map(|blob| (path.to_path_buf(), blob))
-            }),
-            new.and_then(|(path, oid)| {
-                repo.blob(oid)
-                    .ok()
-                    .or_else(|| repo.file(path))
-                    .map(|blob| (path.to_path_buf(), blob))
-            }),
-        )
-    }
-}
-
-impl<T> Default for Blobs<T> {
-    fn default() -> Self {
-        Self {
-            old: None,
-            new: None,
-        }
-    }
-}
-
-/// Types that can be rendered as pretty diffs.
-pub trait ToPretty {
-    /// The output of the render process.
-    type Output: term::Element;
-    /// Context that can be passed down from parent objects during rendering.
-    type Context;
-
-    /// Render to pretty diff output.
-    fn pretty<R: Repo>(
-        &self,
-        hi: &mut Highlighter,
-        context: &Self::Context,
-        repo: &R,
-    ) -> Self::Output;
-}
-
-impl ToPretty for Diff {
-    type Output = term::VStack<'static>;
-    type Context = ();
-
-    fn pretty<R: Repo>(
-        &self,
-        hi: &mut Highlighter,
-        context: &Self::Context,
-        repo: &R,
-    ) -> Self::Output {
-        term::VStack::default()
-            .padding(0)
-            .children(self.files().flat_map(|f| {
-                [
-                    f.pretty(hi, context, repo).boxed(),
-                    term::Line::blank().boxed(), // Blank line between files.
-                ]
-            }))
-    }
-}
-
-impl ToPretty for FileHeader {
-    type Output = term::Line;
-    type Context = Option<FileStats>;
-
-    fn pretty<R: Repo>(
-        &self,
-        _hi: &mut Highlighter,
-        stats: &Self::Context,
-        _repo: &R,
-    ) -> Self::Output {
-        let theme = Theme::default();
-        let (mut header, badge, binary) = match self {
-            FileHeader::Added { path, binary, .. } => (
-                term::Line::new(path.display().to_string()),
-                Some(term::format::badge_positive("created")),
-                *binary,
-            ),
-            FileHeader::Moved {
-                old_path, new_path, ..
-            } => (
-                term::Line::spaced([
-                    term::label(old_path.display().to_string()),
-                    term::label("->".to_string()),
-                    term::label(new_path.display().to_string()),
-                ]),
-                Some(term::format::badge_secondary("moved")),
-                false,
-            ),
-            FileHeader::Deleted { path, binary, .. } => (
-                term::Line::new(path.display().to_string()),
-                Some(term::format::badge_negative("deleted")),
-                *binary,
-            ),
-            FileHeader::Modified {
-                path,
-                old,
-                new,
-                binary,
-                ..
-            } => {
-                if old.mode != new.mode {
-                    (
-                        term::Line::spaced([
-                            term::label(path.display().to_string()),
-                            term::label(format!("{:o}", u32::from(old.mode.clone())))
-                                .fg(term::Color::Blue),
-                            term::label("->".to_string()),
-                            term::label(format!("{:o}", u32::from(new.mode.clone())))
-                                .fg(term::Color::Blue),
-                        ]),
-                        Some(term::format::badge_secondary("mode changed")),
-                        *binary,
-                    )
-                } else {
-                    (term::Line::new(path.display().to_string()), None, *binary)
-                }
-            }
-            FileHeader::Copied {
-                old_path, new_path, ..
-            } => (
-                term::Line::spaced([
-                    term::label(old_path.display().to_string()),
-                    term::label("->".to_string()),
-                    term::label(new_path.display().to_string()),
-                ]),
-                Some(term::format::badge_secondary("copied")),
-                false,
-            ),
-        };
-
-        if binary {
-            header.push(term::Label::space());
-            header.push(term::label(term::format::badge_yellow("binary")));
-        }
-
-        let (additions, deletions) = if let Some(stats) = stats {
-            (stats.additions, stats.deletions)
-        } else {
-            (0, 0)
-        };
-        if deletions > 0 {
-            header.push(term::Label::space());
-            header.push(term::label(format!("-{deletions}")).fg(theme.color("negative.light")));
-        }
-        if additions > 0 {
-            header.push(term::Label::space());
-            header.push(term::label(format!("+{additions}")).fg(theme.color("positive.light")));
-        }
-        if let Some(badge) = badge {
-            header.push(term::Label::space());
-            header.push(badge);
-        }
-        header
-    }
-}
-
-impl ToPretty for FileDiff {
-    type Output = term::VStack<'static>;
-    type Context = ();
-
-    fn pretty<R: Repo>(
-        &self,
-        hi: &mut Highlighter,
-        _context: &Self::Context,
-        repo: &R,
-    ) -> Self::Output {
-        let header = FileHeader::from(self);
-
-        match self {
-            FileDiff::Added(f) => f.pretty(hi, &header, repo),
-            FileDiff::Deleted(f) => f.pretty(hi, &header, repo),
-            FileDiff::Modified(f) => f.pretty(hi, &header, repo),
-            FileDiff::Moved(f) => f.pretty(hi, &header, repo),
-            FileDiff::Copied(f) => f.pretty(hi, &header, repo),
-        }
-    }
-}
-
-impl ToPretty for DiffContent {
-    type Output = term::VStack<'static>;
-    type Context = Blobs<(PathBuf, Blob)>;
-
-    fn pretty<R: Repo>(
-        &self,
-        hi: &mut Highlighter,
-        blobs: &Self::Context,
-        repo: &R,
-    ) -> Self::Output {
-        let mut vstack = term::VStack::default().padding(0);
-
-        match self {
-            DiffContent::Plain {
-                hunks: Hunks(hunks),
-                ..
-            } => {
-                let blobs = blobs.highlight(hi);
-
-                for (i, h) in hunks.iter().enumerate() {
-                    vstack.push(h.pretty(hi, &blobs, repo));
-                    if i != hunks.len() - 1 {
-                        vstack = vstack.divider();
-                    }
-                }
-            }
-            DiffContent::Empty => {}
-            DiffContent::Binary => {}
-        }
-        vstack
-    }
-}
-
-impl ToPretty for Moved {
-    type Output = term::VStack<'static>;
-    type Context = FileHeader;
-
-    fn pretty<R: Repo>(
-        &self,
-        hi: &mut Highlighter,
-        header: &Self::Context,
-        repo: &R,
-    ) -> Self::Output {
-        let header = header.pretty(hi, &self.diff.stats().copied(), repo);
-
-        term::VStack::default()
-            .border(Some(term::colors::FAINT))
-            .padding(1)
-            .child(term::Line::default().extend(header))
-    }
-}
-
-impl ToPretty for Added {
-    type Output = term::VStack<'static>;
-    type Context = FileHeader;
-
-    fn pretty<R: Repo>(
-        &self,
-        hi: &mut Highlighter,
-        header: &Self::Context,
-        repo: &R,
-    ) -> Self::Output {
-        let old = None;
-        let new = Some((self.path.as_path(), self.new.oid));
-
-        pretty_modification(header, &self.diff, old, new, repo, hi)
-    }
-}
-
-impl ToPretty for Deleted {
-    type Output = term::VStack<'static>;
-    type Context = FileHeader;
-
-    fn pretty<R: Repo>(
-        &self,
-        hi: &mut Highlighter,
-        header: &Self::Context,
-        repo: &R,
-    ) -> Self::Output {
-        let old = Some((self.path.as_path(), self.old.oid));
-        let new = None;
-
-        pretty_modification(header, &self.diff, old, new, repo, hi)
-    }
-}
-
-impl ToPretty for Modified {
-    type Output = term::VStack<'static>;
-    type Context = FileHeader;
-
-    fn pretty<R: Repo>(
-        &self,
-        hi: &mut Highlighter,
-        header: &Self::Context,
-        repo: &R,
-    ) -> Self::Output {
-        let old = Some((self.path.as_path(), self.old.oid));
-        let new = Some((self.path.as_path(), self.new.oid));
-
-        pretty_modification(header, &self.diff, old, new, repo, hi)
-    }
-}
-
-impl ToPretty for Copied {
-    type Output = term::VStack<'static>;
-    type Context = FileHeader;
-
-    fn pretty<R: Repo>(
-        &self,
-        hi: &mut Highlighter,
-        _context: &Self::Context,
-        repo: &R,
-    ) -> Self::Output {
-        let header = FileHeader::Copied {
-            old_path: self.old_path.clone(),
-            new_path: self.old_path.clone(),
-        }
-        .pretty(hi, &self.diff.stats().copied(), repo);
-
-        term::VStack::default()
-            .border(Some(term::colors::FAINT))
-            .padding(1)
-            .child(header)
-    }
-}
-
-impl ToPretty for HunkHeader {
-    type Output = term::Line;
-    type Context = ();
-
-    fn pretty<R: Repo>(
-        &self,
-        _hi: &mut Highlighter,
-        _context: &Self::Context,
-        _repo: &R,
-    ) -> Self::Output {
-        term::Line::spaced([
-            term::label(format!(
-                "@@ -{},{} +{},{} @@",
-                self.old_line_no, self.old_size, self.new_line_no, self.new_size,
-            ))
-            .fg(term::colors::fixed::FAINT),
-            term::label(String::from_utf8_lossy(&self.text).to_string())
-                .fg(term::colors::fixed::DIM),
-        ])
-    }
-}
-
-impl ToPretty for Hunk<Modification> {
-    type Output = term::VStack<'static>;
-    type Context = Blobs<Vec<term::Line>>;
-
-    fn pretty<R: Repo>(
-        &self,
-        hi: &mut Highlighter,
-        blobs: &Self::Context,
-        repo: &R,
-    ) -> Self::Output {
-        let mut vstack = term::VStack::default().padding(0);
-        let mut table = term::Table::<5, term::Filled<term::Line>>::new(term::TableOptions {
-            overflow: false,
-            spacing: 0,
-            border: None,
-        });
-        let theme = Theme::default();
-
-        if let Ok(header) = HunkHeader::from_bytes(self.header.as_bytes()) {
-            vstack.push(header.pretty(hi, &(), repo));
-        }
-        for line in &self.lines {
-            match line {
-                Modification::Addition(a) => {
-                    table.push([
-                        term::Label::space()
-                            .pad(5)
-                            .bg(theme.color("positive"))
-                            .to_line()
-                            .filled(theme.color("positive")),
-                        term::label(a.line_no.to_string())
-                            .pad(5)
-                            .fg(theme.color("positive.light"))
-                            .to_line()
-                            .filled(theme.color("positive")),
-                        term::label(" + ")
-                            .fg(theme.color("positive.light"))
-                            .to_line()
-                            .filled(theme.color("positive.dark")),
-                        line.pretty(hi, blobs, repo)
-                            .filled(theme.color("positive.dark")),
-                        term::Line::blank().filled(term::Color::default()),
-                    ]);
-                }
-                Modification::Deletion(a) => {
-                    table.push([
-                        term::label(a.line_no.to_string())
-                            .pad(5)
-                            .fg(theme.color("negative.light"))
-                            .to_line()
-                            .filled(theme.color("negative")),
-                        term::Label::space()
-                            .pad(5)
-                            .fg(theme.color("dim"))
-                            .to_line()
-                            .filled(theme.color("negative")),
-                        term::label(" - ")
-                            .fg(theme.color("negative.light"))
-                            .to_line()
-                            .filled(theme.color("negative.dark")),
-                        line.pretty(hi, blobs, repo)
-                            .filled(theme.color("negative.dark")),
-                        term::Line::blank().filled(term::Color::default()),
-                    ]);
-                }
-                Modification::Context {
-                    line_no_old,
-                    line_no_new,
-                    ..
-                } => {
-                    table.push([
-                        term::label(line_no_old.to_string())
-                            .pad(5)
-                            .fg(theme.color("dim"))
-                            .to_line()
-                            .filled(theme.color("faint")),
-                        term::label(line_no_new.to_string())
-                            .pad(5)
-                            .fg(theme.color("dim"))
-                            .to_line()
-                            .filled(theme.color("faint")),
-                        term::label("   ").to_line().filled(term::Color::default()),
-                        line.pretty(hi, blobs, repo).filled(term::Color::default()),
-                        term::Line::blank().filled(term::Color::default()),
-                    ]);
-                }
-            }
-        }
-        vstack.push(table);
-        vstack
-    }
-}
-
-impl ToPretty for Modification {
-    type Output = term::Line;
-    type Context = Blobs<Vec<term::Line>>;
-
-    fn pretty<R: Repo>(
-        &self,
-        _hi: &mut Highlighter,
-        blobs: &Blobs<Vec<term::Line>>,
-        _repo: &R,
-    ) -> Self::Output {
-        match self {
-            Modification::Deletion(diff::Deletion { line, line_no }) => {
-                if let Some(lines) = &blobs.old.as_ref() {
-                    lines[*line_no as usize - 1].clone()
-                } else {
-                    term::Line::new(String::from_utf8_lossy(line.as_bytes()).as_ref())
-                }
-            }
-            Modification::Addition(diff::Addition { line, line_no }) => {
-                if let Some(lines) = &blobs.new.as_ref() {
-                    lines[*line_no as usize - 1].clone()
-                } else {
-                    term::Line::new(String::from_utf8_lossy(line.as_bytes()).as_ref())
-                }
-            }
-            Modification::Context {
-                line, line_no_new, ..
-            } => {
-                // Nb. we can check in the old or the new blob, we choose the new.
-                if let Some(lines) = &blobs.new.as_ref() {
-                    lines[*line_no_new as usize - 1].clone()
-                } else {
-                    term::Line::new(String::from_utf8_lossy(line.as_bytes()).as_ref())
-                }
-            }
-        }
-    }
-}
-
-/// Render a file added, deleted or modified.
-fn pretty_modification<R: Repo>(
-    header: &FileHeader,
-    diff: &DiffContent,
-    old: Option<(&Path, Oid)>,
-    new: Option<(&Path, Oid)>,
-    repo: &R,
-    hi: &mut Highlighter,
-) -> VStack<'static> {
-    let blobs = Blobs::from_paths(old, new, repo);
-    let header = header.pretty(hi, &diff.stats().copied(), repo);
-    let vstack = term::VStack::default()
-        .border(Some(term::colors::FAINT))
-        .padding(1)
-        .child(header);
-
-    let body = diff.pretty(hi, &blobs, repo);
-    if body.is_empty() {
-        vstack
-    } else {
-        vstack.divider().merge(body)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use std::ffi::OsStr;
-
-    use term::Constraint;
-    use term::Element;
-
-    use super::*;
-    use radicle::git::raw::RepositoryOpenFlags;
-    use radicle::git::raw::{Oid, Repository};
-
-    #[test]
-    #[ignore]
-    fn test_pretty() {
-        let repo = Repository::open_ext::<_, _, &[&OsStr]>(
-            env!("CARGO_MANIFEST_DIR"),
-            RepositoryOpenFlags::all(),
-            &[],
-        )
-        .unwrap();
-        let commit = repo
-            .find_commit(Oid::from_str("5078396028e2ec5660aa54a00208f6e11df84aa9").unwrap())
-            .unwrap();
-        let parent = commit.parents().next().unwrap();
-        let old_tree = parent.tree().unwrap();
-        let new_tree = commit.tree().unwrap();
-        let diff = repo
-            .diff_tree_to_tree(Some(&old_tree), Some(&new_tree), None)
-            .unwrap();
-        let diff = Diff::try_from(diff).unwrap();
-
-        let mut hi = Highlighter::default();
-        let pretty = diff.pretty(&mut hi, &(), &repo);
-
-        pretty
-            .write(Constraint::from_env().unwrap_or_default())
-            .unwrap();
-    }
-}
diff --git a/radicle-cli/src/git/unified_diff.rs b/radicle-cli/src/git/unified_diff.rs
deleted file mode 100644
index d7b698d5f..000000000
--- a/radicle-cli/src/git/unified_diff.rs
+++ /dev/null
@@ -1,639 +0,0 @@
-//! Formatting support for Git's [diff format](https://git-scm.com/docs/diff-format).
-use std::fmt;
-use std::io;
-use std::path::PathBuf;
-
-use radicle_surf::diff::FileStats;
-use thiserror::Error;
-
-use radicle::git;
-use radicle::git::raw::Oid;
-use radicle_surf::diff;
-use radicle_surf::diff::{Diff, DiffContent, DiffFile, FileDiff, Hunk, Hunks, Line, Modification};
-
-use crate::terminal as term;
-
-#[derive(Debug, Error)]
-pub enum Error {
-    /// Attempt to decode from a source with no data left.
-    #[error("unexpected end of file")]
-    UnexpectedEof,
-    #[error(transparent)]
-    Io(#[from] io::Error),
-    /// Catchall for syntax error messages.
-    #[error("{0}")]
-    Syntax(String),
-    #[error(transparent)]
-    ParseInt(#[from] std::num::ParseIntError),
-    #[error(transparent)]
-    Utf8(#[from] std::string::FromUtf8Error),
-}
-
-impl Error {
-    pub fn syntax(msg: impl ToString) -> Self {
-        Self::Syntax(msg.to_string())
-    }
-
-    pub fn is_eof(&self) -> bool {
-        match self {
-            Self::UnexpectedEof => true,
-            Self::Io(e) => e.kind() == io::ErrorKind::UnexpectedEof,
-            _ => false,
-        }
-    }
-}
-
-/// The kind of FileDiff Header which can be used to print the FileDiff information which precedes
-/// `Hunks`.
-#[derive(Debug, Clone, PartialEq)]
-pub enum FileHeader {
-    Added {
-        path: PathBuf,
-        new: DiffFile,
-        binary: bool,
-    },
-    Copied {
-        old_path: PathBuf,
-        new_path: PathBuf,
-    },
-    Deleted {
-        path: PathBuf,
-        old: DiffFile,
-        binary: bool,
-    },
-    Modified {
-        path: PathBuf,
-        old: DiffFile,
-        new: DiffFile,
-        binary: bool,
-    },
-    Moved {
-        old_path: PathBuf,
-        new_path: PathBuf,
-    },
-}
-
-impl std::convert::From<&FileDiff> for FileHeader {
-    // TODO: Pathnames with 'unusual names' need to be quoted.
-    fn from(value: &FileDiff) -> Self {
-        match value {
-            FileDiff::Modified(v) => FileHeader::Modified {
-                path: v.path.clone(),
-                old: v.old.clone(),
-                new: v.new.clone(),
-                binary: matches!(v.diff, DiffContent::Binary),
-            },
-            FileDiff::Added(v) => FileHeader::Added {
-                path: v.path.clone(),
-                new: v.new.clone(),
-                binary: matches!(v.diff, DiffContent::Binary),
-            },
-            FileDiff::Copied(c) => FileHeader::Copied {
-                old_path: c.old_path.clone(),
-                new_path: c.new_path.clone(),
-            },
-            FileDiff::Deleted(v) => FileHeader::Deleted {
-                path: v.path.clone(),
-                old: v.old.clone(),
-                binary: matches!(v.diff, DiffContent::Binary),
-            },
-            FileDiff::Moved(v) => FileHeader::Moved {
-                old_path: v.old_path.clone(),
-                new_path: v.new_path.clone(),
-            },
-        }
-    }
-}
-
-/// Meta data which precedes a `Hunk`s content.
-///
-/// For example:
-/// @@ -24,8 +24,6 @@ use radicle_surf::diff::*;
-#[derive(Clone, Debug, Default, PartialEq)]
-pub struct HunkHeader {
-    /// Line the hunk started in the old file.
-    pub old_line_no: u32,
-    /// Number of removed and context lines.
-    pub old_size: u32,
-    /// Line the hunk started in the new file.
-    pub new_line_no: u32,
-    /// Number of added and context lines.
-    pub new_size: u32,
-    /// Trailing text for the Hunk Header.
-    ///
-    /// From Git's documentation "Hunk headers mention the name of the function to which the hunk
-    /// applies. See "Defining a custom hunk-header" in gitattributes for details of how to tailor
-    /// to this to specific languages.".  It is likely best to leave this empty when generating
-    /// diffs.
-    pub text: Vec<u8>,
-}
-
-impl TryFrom<&Hunk<Modification>> for HunkHeader {
-    type Error = Error;
-
-    fn try_from(hunk: &Hunk<Modification>) -> Result<Self, Self::Error> {
-        let mut r = io::BufReader::new(hunk.header.as_bytes());
-        Self::decode(&mut r)
-    }
-}
-
-impl HunkHeader {
-    pub fn old_line_range(&self) -> std::ops::Range<u32> {
-        let start: u32 = self.old_line_no;
-        let end: u32 = self.old_line_no + self.old_size;
-        start..end + 1
-    }
-
-    pub fn new_line_range(&self) -> std::ops::Range<u32> {
-        let start: u32 = self.new_line_no;
-        let end: u32 = self.new_line_no + self.new_size;
-        start..end + 1
-    }
-}
-
-/// Diff-related types that can be decoded from the unified diff format.
-pub trait Decode: Sized {
-    /// Decode, and fail if we reach the end of the stream.
-    fn decode(r: &mut impl io::BufRead) -> Result<Self, Error>;
-
-    /// Decode, and return a `None` if we reached the end of the stream.
-    fn try_decode(r: &mut impl io::BufRead) -> Result<Option<Self>, Error> {
-        match Self::decode(r) {
-            Ok(v) => Ok(Some(v)),
-            Err(Error::UnexpectedEof) => Ok(None),
-            Err(e) => Err(e),
-        }
-    }
-
-    /// Decode from a string input.
-    fn parse(s: &str) -> Result<Self, Error> {
-        Self::from_bytes(s.as_bytes())
-    }
-
-    /// Decode from a string input.
-    fn from_bytes(bytes: &[u8]) -> Result<Self, Error> {
-        let mut r = io::BufReader::new(bytes);
-        Self::decode(&mut r)
-    }
-}
-
-/// Diff-related types that can be encoded intro the unified diff format.
-pub trait Encode: Sized {
-    /// Encode type into diff writer.
-    fn encode(&self, w: &mut Writer) -> Result<(), Error>;
-
-    /// Encode into unified diff string.
-    fn to_unified_string(&self) -> Result<String, Error> {
-        let mut buf = Vec::new();
-        let mut w = Writer::new(&mut buf);
-
-        w.encode(self)?;
-        drop(w);
-
-        String::from_utf8(buf).map_err(Error::from)
-    }
-}
-
-impl Decode for Diff {
-    /// Decode from git's unified diff format, consuming the entire input.
-    fn decode(r: &mut impl io::BufRead) -> Result<Self, Error> {
-        let mut s = String::new();
-
-        r.read_to_string(&mut s)?;
-
-        let d = git::raw::Diff::from_buffer(s.as_ref())
-            .map_err(|e| Error::syntax(format!("decoding unified diff: {}", e)))?;
-        let d = Diff::try_from(d)
-            .map_err(|e| Error::syntax(format!("decoding unified diff: {}", e)))?;
-
-        Ok(d)
-    }
-}
-
-impl Encode for Diff {
-    fn encode(&self, w: &mut Writer) -> Result<(), Error> {
-        for fdiff in self.files() {
-            fdiff.encode(w)?;
-        }
-        Ok(())
-    }
-}
-
-impl Decode for DiffContent {
-    fn decode(r: &mut impl io::BufRead) -> Result<Self, Error> {
-        let mut hunks = Vec::default();
-        let mut additions = 0;
-        let mut deletions = 0;
-
-        while let Some(h) = Hunk::try_decode(r)? {
-            for l in &h.lines {
-                match l {
-                    Modification::Addition(_) => additions += 1,
-                    Modification::Deletion(_) => deletions += 1,
-                    _ => {}
-                }
-            }
-            hunks.push(h);
-        }
-
-        if hunks.is_empty() {
-            Ok(DiffContent::Empty)
-        } else {
-            // TODO: Handle case for binary.
-            Ok(DiffContent::Plain {
-                hunks: Hunks::from(hunks),
-                stats: FileStats {
-                    additions,
-                    deletions,
-                },
-                // TODO: Properly handle EndOfLine field
-                eof: diff::EofNewLine::NoneMissing,
-            })
-        }
-    }
-}
-
-impl Encode for DiffContent {
-    fn encode(&self, w: &mut Writer) -> Result<(), Error> {
-        match self {
-            DiffContent::Plain { hunks, .. } => {
-                for h in hunks.iter() {
-                    h.encode(w)?;
-                }
-            }
-            DiffContent::Empty => {}
-            DiffContent::Binary => todo!("DiffContent::Binary encoding not implemented"),
-        }
-        Ok(())
-    }
-}
-
-impl Encode for FileDiff {
-    fn encode(&self, w: &mut Writer) -> Result<(), Error> {
-        w.encode(&FileHeader::from(self))?;
-        match self {
-            FileDiff::Modified(f) => {
-                w.encode(&f.diff)?;
-            }
-            FileDiff::Added(f) => {
-                w.encode(&f.diff)?;
-            }
-            FileDiff::Copied(f) => {
-                w.encode(&f.diff)?;
-            }
-            FileDiff::Deleted(f) => {
-                w.encode(&f.diff)?;
-            }
-            FileDiff::Moved(f) => {
-                // Nb. We only display diffs as moves when the file was not changed.
-                w.encode(&f.diff)?;
-            }
-        }
-
-        Ok(())
-    }
-}
-
-impl Encode for FileHeader {
-    fn encode(&self, w: &mut Writer) -> Result<(), Error> {
-        match self {
-            FileHeader::Modified { path, old, new, .. } => {
-                w.meta(format!(
-                    "diff --git a/{} b/{}",
-                    path.display(),
-                    path.display()
-                ))?;
-
-                if old.mode == new.mode {
-                    w.meta(format!(
-                        "index {}..{} {:o}",
-                        term::format::oid(old.oid),
-                        term::format::oid(new.oid),
-                        u32::from(old.mode.clone()),
-                    ))?;
-                } else {
-                    w.meta(format!("old mode {:o}", u32::from(old.mode.clone())))?;
-                    w.meta(format!("new mode {:o}", u32::from(new.mode.clone())))?;
-                    w.meta(format!(
-                        "index {}..{}",
-                        term::format::oid(old.oid),
-                        term::format::oid(new.oid)
-                    ))?;
-                }
-
-                w.meta(format!("--- a/{}", path.display()))?;
-                w.meta(format!("+++ b/{}", path.display()))?;
-            }
-            FileHeader::Added { path, new, .. } => {
-                w.meta(format!(
-                    "diff --git a/{} b/{}",
-                    path.display(),
-                    path.display()
-                ))?;
-
-                w.meta(format!("new file mode {:o}", u32::from(new.mode.clone())))?;
-                w.meta(format!(
-                    "index {}..{}",
-                    term::format::oid(Oid::zero()),
-                    term::format::oid(new.oid),
-                ))?;
-
-                w.meta("--- /dev/null")?;
-                w.meta(format!("+++ b/{}", path.display()))?;
-            }
-            FileHeader::Copied { .. } => todo!(),
-            FileHeader::Deleted { path, old, .. } => {
-                w.meta(format!(
-                    "diff --git a/{} b/{}",
-                    path.display(),
-                    path.display()
-                ))?;
-
-                w.meta(format!(
-                    "deleted file mode {:o}",
-                    u32::from(old.mode.clone())
-                ))?;
-                w.meta(format!(
-                    "index {}..{}",
-                    term::format::oid(old.oid),
-                    term::format::oid(Oid::zero())
-                ))?;
-
-                w.meta(format!("--- a/{}", path.display()))?;
-                w.meta("+++ /dev/null".to_string())?;
-            }
-            FileHeader::Moved { old_path, new_path } => {
-                w.meta(format!(
-                    "diff --git a/{} b/{}",
-                    old_path.display(),
-                    new_path.display()
-                ))?;
-                w.meta("similarity index 100%")?;
-                w.meta(format!("rename from {}", old_path.display()))?;
-                w.meta(format!("rename to {}", new_path.display()))?;
-            }
-        };
-        Ok(())
-    }
-}
-
-impl Decode for HunkHeader {
-    fn decode(r: &mut impl io::BufRead) -> Result<Self, Error> {
-        let mut line = String::default();
-        if r.read_line(&mut line)? == 0 {
-            return Err(Error::UnexpectedEof);
-        };
-
-        let mut header = HunkHeader::default();
-        let s = line
-            .strip_prefix("@@ -")
-            .ok_or(Error::syntax("missing '@@ -'"))?;
-
-        let (old, s) = s
-            .split_once(" +")
-            .ok_or(Error::syntax("missing new line information"))?;
-        let (line_no, size) = old.split_once(',').unwrap_or((old, "1"));
-
-        header.old_line_no = line_no.parse()?;
-        header.old_size = size.parse()?;
-
-        let (new, s) = s
-            .split_once(" @@")
-            .ok_or(Error::syntax("closing '@@' is missing"))?;
-        let (line_no, size) = new.split_once(',').unwrap_or((new, "1"));
-
-        header.new_line_no = line_no.parse()?;
-        header.new_size = size.parse()?;
-
-        let s = s.strip_prefix(' ').unwrap_or(s);
-        header.text = s.as_bytes().to_vec();
-
-        Ok(header)
-    }
-}
-
-impl Encode for HunkHeader {
-    fn encode(&self, w: &mut Writer) -> Result<(), Error> {
-        let old = if self.old_size == 1 {
-            format!("{}", self.old_line_no)
-        } else {
-            format!("{},{}", self.old_line_no, self.old_size)
-        };
-        let new = if self.new_size == 1 {
-            format!("{}", self.new_line_no)
-        } else {
-            format!("{},{}", self.new_line_no, self.new_size)
-        };
-        let text = if self.text.is_empty() {
-            "".to_string()
-        } else {
-            format!(" {}", String::from_utf8_lossy(&self.text))
-        };
-        w.meta(format!("@@ -{old} +{new} @@{text}"))?;
-
-        Ok(())
-    }
-}
-
-impl Decode for Hunk<Modification> {
-    fn decode(r: &mut impl io::BufRead) -> Result<Self, Error> {
-        let header = HunkHeader::decode(r)?;
-
-        let mut lines = Vec::new();
-        let mut new_line: u32 = 0;
-        let mut old_line: u32 = 0;
-
-        while old_line < header.old_size || new_line < header.new_size {
-            if old_line > header.old_size {
-                return Err(Error::syntax(format!(
-                    "expected '{}' old lines",
-                    header.old_size
-                )));
-            } else if new_line > header.new_size {
-                return Err(Error::syntax(format!(
-                    "expected '{0}' new lines",
-                    header.new_size
-                )));
-            }
-
-            let Some(line) = Modification::try_decode(r)? else {
-                return Err(Error::syntax(format!(
-                    "expected '{}' old lines and '{}' new lines, but found '{}' and '{}'",
-                    header.old_size, header.new_size, old_line, new_line,
-                )));
-            };
-
-            let line = match line {
-                Modification::Addition(v) => {
-                    let l = Modification::addition(v.line, header.new_line_no + new_line);
-                    new_line += 1;
-                    l
-                }
-                Modification::Deletion(v) => {
-                    let l = Modification::deletion(v.line, header.old_line_no + old_line);
-                    old_line += 1;
-                    l
-                }
-                Modification::Context { line, .. } => {
-                    let l = Modification::Context {
-                        line,
-                        line_no_old: header.old_line_no + old_line,
-                        line_no_new: header.new_line_no + new_line,
-                    };
-                    new_line += 1;
-                    old_line += 1;
-                    l
-                }
-            };
-
-            lines.push(line);
-        }
-
-        Ok(Hunk {
-            header: Line::from(header.to_unified_string()?),
-            lines,
-            old: header.old_line_range(),
-            new: header.new_line_range(),
-        })
-    }
-}
-
-impl Encode for Hunk<Modification> {
-    fn encode(&self, w: &mut Writer) -> Result<(), Error> {
-        // TODO: Remove trailing newlines accurately.
-        // `trim_end()` will destroy diff information if the diff has a trailing whitespace on
-        // purpose.
-        w.magenta(self.header.from_utf8_lossy().trim_end())?;
-        for l in &self.lines {
-            l.encode(w)?;
-        }
-
-        Ok(())
-    }
-}
-
-impl Decode for Modification {
-    fn decode(r: &mut impl io::BufRead) -> Result<Self, Error> {
-        let mut line = String::new();
-        if r.read_line(&mut line)? == 0 {
-            return Err(Error::UnexpectedEof);
-        };
-
-        let mut chars = line.chars();
-        let l = match chars.next() {
-            Some('+') => Modification::addition(chars.as_str().to_string(), 0),
-            Some('-') => Modification::deletion(chars.as_str().to_string(), 0),
-            Some(' ') => Modification::Context {
-                line: chars.as_str().to_string().into(),
-                line_no_old: 0,
-                line_no_new: 0,
-            },
-            Some(c) => {
-                return Err(Error::syntax(format!(
-                    "indicator character expected, but got '{c}'",
-                )))
-            }
-            None => return Err(Error::UnexpectedEof),
-        };
-
-        Ok(l)
-    }
-}
-
-impl Encode for Modification {
-    fn encode(&self, w: &mut Writer) -> Result<(), Error> {
-        match self {
-            Modification::Deletion(radicle_surf::diff::Deletion { line, .. }) => {
-                let s = format!("-{}", String::from_utf8_lossy(line.as_bytes()).trim_end());
-                w.write(s, term::Style::new(term::Color::Red))?;
-            }
-            Modification::Addition(radicle_surf::diff::Addition { line, .. }) => {
-                let s = format!("+{}", String::from_utf8_lossy(line.as_bytes()).trim_end());
-                w.write(s, term::Style::new(term::Color::Green))?;
-            }
-            Modification::Context { line, .. } => {
-                let s = format!(" {}", String::from_utf8_lossy(line.as_bytes()).trim_end());
-                w.write(s, term::Style::default().dim())?;
-            }
-        }
-
-        Ok(())
-    }
-}
-
-/// An IO Writer with color printing to the terminal.
-pub struct Writer<'a> {
-    styled: bool,
-    stream: Box<dyn io::Write + 'a>,
-}
-
-impl<'a> Writer<'a> {
-    pub fn new(w: impl io::Write + 'a) -> Self {
-        Self {
-            styled: false,
-            stream: Box::new(w),
-        }
-    }
-
-    pub fn encode<T: Encode>(&mut self, arg: &T) -> Result<(), Error> {
-        arg.encode(self)?;
-        Ok(())
-    }
-
-    pub fn styled(mut self, value: bool) -> Self {
-        self.styled = value;
-        self
-    }
-
-    pub fn write(&mut self, s: impl fmt::Display, style: term::Style) -> io::Result<()> {
-        if self.styled {
-            writeln!(self.stream, "{}", term::Paint::new(s).with_style(style))
-        } else {
-            writeln!(self.stream, "{s}")
-        }
-    }
-
-    pub fn meta(&mut self, s: impl fmt::Display) -> io::Result<()> {
-        self.write(s, term::Style::new(term::Color::Yellow))
-    }
-
-    pub fn magenta(&mut self, s: impl fmt::Display) -> io::Result<()> {
-        self.write(s, term::Style::new(term::Color::Magenta))
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_diff_encode_decode_diff() {
-        let diff_a = diff::Diff::parse(include_str!(concat!(
-            env!("CARGO_MANIFEST_DIR"),
-            "/tests/data/diff.diff"
-        )))
-        .unwrap();
-        assert_eq!(
-            include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/data/diff.diff")),
-            diff_a.to_unified_string().unwrap()
-        );
-    }
-
-    #[test]
-    fn test_diff_content_encode_decode_content() {
-        let diff_content = diff::DiffContent::parse(include_str!(concat!(
-            env!("CARGO_MANIFEST_DIR"),
-            "/tests/data/diff_body.diff"
-        )))
-        .unwrap();
-        assert_eq!(
-            include_str!(concat!(
-                env!("CARGO_MANIFEST_DIR"),
-                "/tests/data/diff_body.diff"
-            )),
-            diff_content.to_unified_string().unwrap()
-        );
-    }
-
-    // TODO: Test parsing a real diff from this repository.
-}
diff --git a/radicle-cli/src/lib.rs b/radicle-cli/src/lib.rs
deleted file mode 100644
index 32019151d..000000000
--- a/radicle-cli/src/lib.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#![allow(clippy::collapsible_if)]
-#![allow(clippy::or_fun_call)]
-#![allow(clippy::too_many_arguments)]
-pub mod commands;
-pub mod git;
-pub mod node;
-pub mod pager;
-pub mod project;
-pub mod terminal;
diff --git a/radicle-cli/src/main.rs b/radicle-cli/src/main.rs
deleted file mode 100644
index 3b3972273..000000000
--- a/radicle-cli/src/main.rs
+++ /dev/null
@@ -1,353 +0,0 @@
-use std::ffi::OsString;
-use std::io::{self, Write};
-use std::{io::ErrorKind, iter, process};
-
-use anyhow::anyhow;
-
-use radicle::version::Version;
-use radicle_cli::commands::*;
-use radicle_cli::terminal as term;
-
-pub const NAME: &str = "rad";
-pub const PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
-pub const RADICLE_VERSION: &str = env!("RADICLE_VERSION");
-pub const DESCRIPTION: &str = "Radicle command line interface";
-pub const GIT_HEAD: &str = env!("GIT_HEAD");
-pub const TIMESTAMP: &str = env!("SOURCE_DATE_EPOCH");
-pub const VERSION: Version = Version {
-    name: NAME,
-    version: RADICLE_VERSION,
-    commit: GIT_HEAD,
-    timestamp: TIMESTAMP,
-};
-
-#[derive(Debug)]
-enum Command {
-    Other(Vec<OsString>),
-    Help,
-    Version { json: bool },
-}
-
-fn main() {
-    if let Some(lvl) = radicle::logger::env_level() {
-        radicle::logger::init(lvl).ok();
-    }
-    if let Err(e) = radicle::io::set_file_limit(4096) {
-        log::warn!(target: "cli", "Unable to set open file limit: {e}");
-    }
-    match parse_args().map_err(Some).and_then(run) {
-        Ok(_) => process::exit(0),
-        Err(err) => {
-            if let Some(err) = err {
-                term::error(format!("rad: {err}"));
-            }
-            process::exit(1);
-        }
-    }
-}
-
-fn parse_args() -> anyhow::Result<Command> {
-    use lexopt::prelude::*;
-
-    let mut parser = lexopt::Parser::from_env();
-    let mut command = None;
-    let mut json = false;
-
-    while let Some(arg) = parser.next()? {
-        match arg {
-            Long("json") => {
-                json = true;
-            }
-            Long("help") | Short('h') => {
-                command = Some(Command::Help);
-            }
-            Long("version") => {
-                command = Some(Command::Version { json: false });
-            }
-            Value(val) if command.is_none() => {
-                if val == *"." {
-                    command = Some(Command::Other(vec![OsString::from("inspect")]));
-                } else if val == "version" {
-                    command = Some(Command::Version { json: false });
-                } else {
-                    let args = iter::once(val)
-                        .chain(iter::from_fn(|| parser.value().ok()))
-                        .collect();
-
-                    command = Some(Command::Other(args))
-                }
-            }
-            _ => return Err(anyhow::anyhow!(arg.unexpected())),
-        }
-    }
-    if let Some(Command::Version { json: j }) = &mut command {
-        *j = json;
-    }
-    Ok(command.unwrap_or_else(|| Command::Other(vec![])))
-}
-
-fn print_help() -> anyhow::Result<()> {
-    VERSION.write(&mut io::stdout())?;
-    println!("{DESCRIPTION}");
-    println!();
-
-    rad_help::run(Default::default(), term::DefaultContext)
-}
-
-fn run(command: Command) -> Result<(), Option<anyhow::Error>> {
-    match command {
-        Command::Version { json } => {
-            let mut stdout = io::stdout();
-            if json {
-                VERSION
-                    .write_json(&mut stdout)
-                    .map_err(|e| Some(e.into()))?;
-                writeln!(&mut stdout).ok();
-            } else {
-                VERSION.write(&mut stdout).map_err(|e| Some(e.into()))?;
-            }
-        }
-        Command::Help => {
-            print_help()?;
-        }
-        Command::Other(args) => {
-            let exe = args.first();
-
-            if let Some(Some(exe)) = exe.map(|s| s.to_str()) {
-                run_other(exe, &args[1..])?;
-            } else {
-                print_help()?;
-            }
-        }
-    }
-
-    Ok(())
-}
-
-fn run_other(exe: &str, args: &[OsString]) -> Result<(), Option<anyhow::Error>> {
-    match exe {
-        "auth" => {
-            term::run_command_args::<rad_auth::Options, _>(
-                rad_auth::HELP,
-                rad_auth::run,
-                args.to_vec(),
-            );
-        }
-        "block" => {
-            term::run_command_args::<rad_block::Options, _>(
-                rad_block::HELP,
-                rad_block::run,
-                args.to_vec(),
-            );
-        }
-        "checkout" => {
-            term::run_command_args::<rad_checkout::Options, _>(
-                rad_checkout::HELP,
-                rad_checkout::run,
-                args.to_vec(),
-            );
-        }
-        "clone" => {
-            term::run_command_args::<rad_clone::Options, _>(
-                rad_clone::HELP,
-                rad_clone::run,
-                args.to_vec(),
-            );
-        }
-        "cob" => {
-            term::run_command_args::<rad_cob::Options, _>(
-                rad_cob::HELP,
-                rad_cob::run,
-                args.to_vec(),
-            );
-        }
-        "config" => {
-            term::run_command_args::<rad_config::Options, _>(
-                rad_config::HELP,
-                rad_config::run,
-                args.to_vec(),
-            );
-        }
-        "diff" => {
-            term::run_command_args::<rad_diff::Options, _>(
-                rad_diff::HELP,
-                rad_diff::run,
-                args.to_vec(),
-            );
-        }
-        "debug" => {
-            term::run_command_args::<rad_debug::Options, _>(
-                rad_debug::HELP,
-                rad_debug::run,
-                args.to_vec(),
-            );
-        }
-        "follow" => {
-            term::run_command_args::<rad_follow::Options, _>(
-                rad_follow::HELP,
-                rad_follow::run,
-                args.to_vec(),
-            );
-        }
-        "fork" => {
-            term::run_command_args::<rad_fork::Options, _>(
-                rad_fork::HELP,
-                rad_fork::run,
-                args.to_vec(),
-            );
-        }
-        "help" => {
-            term::run_command_args::<rad_help::Options, _>(
-                rad_help::HELP,
-                rad_help::run,
-                args.to_vec(),
-            );
-        }
-        "id" => {
-            term::run_command_args::<rad_id::Options, _>(rad_id::HELP, rad_id::run, args.to_vec());
-        }
-        "inbox" => term::run_command_args::<rad_inbox::Options, _>(
-            rad_inbox::HELP,
-            rad_inbox::run,
-            args.to_vec(),
-        ),
-        "init" => {
-            term::run_command_args::<rad_init::Options, _>(
-                rad_init::HELP,
-                rad_init::run,
-                args.to_vec(),
-            );
-        }
-        "inspect" => {
-            term::run_command_args::<rad_inspect::Options, _>(
-                rad_inspect::HELP,
-                rad_inspect::run,
-                args.to_vec(),
-            );
-        }
-        "issue" => {
-            term::run_command_args::<rad_issue::Options, _>(
-                rad_issue::HELP,
-                rad_issue::run,
-                args.to_vec(),
-            );
-        }
-        "ls" => {
-            term::run_command_args::<rad_ls::Options, _>(rad_ls::HELP, rad_ls::run, args.to_vec());
-        }
-        "node" => {
-            term::run_command_args::<rad_node::Options, _>(
-                rad_node::HELP,
-                rad_node::run,
-                args.to_vec(),
-            );
-        }
-        "patch" => {
-            term::run_command_args::<rad_patch::Options, _>(
-                rad_patch::HELP,
-                rad_patch::run,
-                args.to_vec(),
-            );
-        }
-        "path" => {
-            term::run_command_args::<rad_path::Options, _>(
-                rad_path::HELP,
-                rad_path::run,
-                args.to_vec(),
-            );
-        }
-        "publish" => {
-            term::run_command_args::<rad_publish::Options, _>(
-                rad_publish::HELP,
-                rad_publish::run,
-                args.to_vec(),
-            );
-        }
-        "clean" => {
-            term::run_command_args::<rad_clean::Options, _>(
-                rad_clean::HELP,
-                rad_clean::run,
-                args.to_vec(),
-            );
-        }
-        "self" => {
-            term::run_command_args::<rad_self::Options, _>(
-                rad_self::HELP,
-                rad_self::run,
-                args.to_vec(),
-            );
-        }
-        "sync" => {
-            term::run_command_args::<rad_sync::Options, _>(
-                rad_sync::HELP,
-                rad_sync::run,
-                args.to_vec(),
-            );
-        }
-        "seed" => {
-            term::run_command_args::<rad_seed::Options, _>(
-                rad_seed::HELP,
-                rad_seed::run,
-                args.to_vec(),
-            );
-        }
-        "unblock" => {
-            term::run_command_args::<rad_unblock::Options, _>(
-                rad_unblock::HELP,
-                rad_unblock::run,
-                args.to_vec(),
-            );
-        }
-        "unfollow" => {
-            term::run_command_args::<rad_unfollow::Options, _>(
-                rad_unfollow::HELP,
-                rad_unfollow::run,
-                args.to_vec(),
-            );
-        }
-        "unseed" => {
-            term::run_command_args::<rad_unseed::Options, _>(
-                rad_unseed::HELP,
-                rad_unseed::run,
-                args.to_vec(),
-            );
-        }
-        "remote" => term::run_command_args::<rad_remote::Options, _>(
-            rad_remote::HELP,
-            rad_remote::run,
-            args.to_vec(),
-        ),
-        "stats" => term::run_command_args::<rad_stats::Options, _>(
-            rad_stats::HELP,
-            rad_stats::run,
-            args.to_vec(),
-        ),
-        "watch" => term::run_command_args::<rad_watch::Options, _>(
-            rad_watch::HELP,
-            rad_watch::run,
-            args.to_vec(),
-        ),
-        other => {
-            let exe = format!("{NAME}-{exe}");
-            let status = process::Command::new(exe).args(args).status();
-
-            match status {
-                Ok(status) => {
-                    if !status.success() {
-                        return Err(None);
-                    }
-                }
-                Err(err) => {
-                    if let ErrorKind::NotFound = err.kind() {
-                        return Err(Some(anyhow!(
-                            "`{other}` is not a command. See `rad --help` for a list of commands.",
-                        )));
-                    } else {
-                        return Err(Some(err.into()));
-                    }
-                }
-            }
-        }
-    }
-    Ok(())
-}
diff --git a/radicle-cli/src/node.rs b/radicle-cli/src/node.rs
deleted file mode 100644
index 3c4ed4fd0..000000000
--- a/radicle-cli/src/node.rs
+++ /dev/null
@@ -1,295 +0,0 @@
-use core::time;
-use std::collections::BTreeSet;
-use std::io;
-use std::io::Write;
-use std::ops::ControlFlow;
-
-use radicle::node::{self, AnnounceResult};
-use radicle::node::{Handle as _, NodeId};
-use radicle::storage::{ReadRepository, RepositoryError};
-use radicle::{Node, Profile};
-use radicle_term::format;
-
-use crate::terminal as term;
-
-/// Default time to wait for syncing to complete.
-pub const DEFAULT_SYNC_TIMEOUT: time::Duration = time::Duration::from_secs(9);
-
-/// Repository sync settings.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct SyncSettings {
-    /// Sync with at least N replicas.
-    pub replicas: usize,
-    /// Sync with the given list of seeds.
-    pub seeds: BTreeSet<NodeId>,
-    /// How long to wait for syncing to complete.
-    pub timeout: time::Duration,
-}
-
-impl SyncSettings {
-    /// Set sync timeout. Defaults to [`DEFAULT_SYNC_TIMEOUT`].
-    pub fn timeout(mut self, timeout: time::Duration) -> Self {
-        self.timeout = timeout;
-        self
-    }
-
-    /// Set replicas.
-    pub fn replicas(mut self, replicas: usize) -> Self {
-        self.replicas = replicas;
-        self
-    }
-
-    /// Set seeds.
-    pub fn seeds(mut self, seeds: impl IntoIterator<Item = NodeId>) -> Self {
-        self.seeds = seeds.into_iter().collect();
-        self
-    }
-
-    /// Use profile to populate sync settings, by adding preferred seeds if no seeds are specified,
-    /// and removing the local node from the set.
-    pub fn with_profile(mut self, profile: &Profile) -> Self {
-        // If no seeds were specified, add the preferred seeds.
-        if self.seeds.is_empty() {
-            self.seeds = profile
-                .config
-                .preferred_seeds
-                .iter()
-                .map(|p| p.id)
-                .collect();
-        }
-        // Remove our local node from the seed set just in case it was added by mistake.
-        self.seeds.remove(profile.id());
-        self
-    }
-}
-
-impl Default for SyncSettings {
-    fn default() -> Self {
-        Self {
-            replicas: 3,
-            seeds: BTreeSet::new(),
-            timeout: DEFAULT_SYNC_TIMEOUT,
-        }
-    }
-}
-
-/// Error while syncing.
-#[derive(thiserror::Error, Debug)]
-pub enum SyncError {
-    #[error(transparent)]
-    Repository(#[from] RepositoryError),
-    #[error(transparent)]
-    Node(#[from] radicle::node::Error),
-    #[error("all seeds timed out")]
-    AllSeedsTimedOut,
-}
-
-impl SyncError {
-    fn is_connection_err(&self) -> bool {
-        match self {
-            Self::Node(e) => e.is_connection_err(),
-            _ => false,
-        }
-    }
-}
-
-/// Writes sync output.
-#[derive(Debug)]
-pub enum SyncWriter {
-    /// Write to standard out.
-    Stdout(io::Stdout),
-    /// Write to standard error.
-    Stderr(io::Stderr),
-    /// Discard output, like [`std::io::sink`].
-    Sink,
-}
-
-impl Clone for SyncWriter {
-    fn clone(&self) -> Self {
-        match self {
-            Self::Stdout(_) => Self::Stdout(io::stdout()),
-            Self::Stderr(_) => Self::Stderr(io::stderr()),
-            Self::Sink => Self::Sink,
-        }
-    }
-}
-
-impl io::Write for SyncWriter {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        match self {
-            Self::Stdout(stdout) => stdout.write(buf),
-            Self::Stderr(stderr) => stderr.write(buf),
-            Self::Sink => Ok(buf.len()),
-        }
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        match self {
-            Self::Stdout(stdout) => stdout.flush(),
-            Self::Stderr(stderr) => stderr.flush(),
-            Self::Sink => Ok(()),
-        }
-    }
-}
-
-/// Configures how sync progress is reported.
-pub struct SyncReporting {
-    /// Progress messages or animations.
-    pub progress: SyncWriter,
-    /// Completion messages.
-    pub completion: SyncWriter,
-    /// Debug output.
-    pub debug: bool,
-}
-
-impl Default for SyncReporting {
-    fn default() -> Self {
-        Self {
-            progress: SyncWriter::Stderr(io::stderr()),
-            completion: SyncWriter::Stdout(io::stdout()),
-            debug: false,
-        }
-    }
-}
-
-/// Announce changes to the network.
-pub fn announce<R: ReadRepository>(
-    repo: &R,
-    settings: SyncSettings,
-    reporting: SyncReporting,
-    node: &mut Node,
-    profile: &Profile,
-) -> Result<AnnounceResult, SyncError> {
-    match announce_(repo, settings, reporting, node, profile) {
-        Ok(result) => Ok(result),
-        Err(e) if e.is_connection_err() => {
-            term::hint("Node is stopped. To announce changes to the network, start it with `rad node start`.");
-            Ok(AnnounceResult::default())
-        }
-        Err(e) => Err(e),
-    }
-}
-
-fn announce_<R: ReadRepository>(
-    repo: &R,
-    settings: SyncSettings,
-    mut reporting: SyncReporting,
-    node: &mut Node,
-    profile: &Profile,
-) -> Result<AnnounceResult, SyncError> {
-    let rid = repo.id();
-    let doc = repo.identity_doc()?;
-    let mut settings = settings.with_profile(profile);
-    let unsynced: Vec<_> = if doc.visibility.is_public() {
-        // All seeds.
-        let all = node.seeds(rid)?;
-        if all.is_empty() {
-            term::info!(&mut reporting.completion; "No seeds found for {rid}.");
-            return Ok(AnnounceResult::default());
-        }
-        // Seeds in sync with us.
-        let synced = all
-            .iter()
-            .filter(|s| s.is_synced())
-            .map(|s| s.nid)
-            .collect::<BTreeSet<_>>();
-        // Replicas not counting our local replica.
-        let replicas = synced.iter().filter(|nid| *nid != profile.id()).count();
-        // Maximum replication factor we can achieve.
-        let max_replicas = all.iter().filter(|s| &s.nid != profile.id()).count();
-        // If the seeds we specified in the sync settings are all synced.
-        let is_seeds_synced = settings.seeds.iter().all(|s| synced.contains(s));
-        // If we met our desired replica count. Note that this can never exceed the maximum count.
-        let is_replicas_synced = replicas >= settings.replicas.min(max_replicas);
-
-        // Nothing to do if we've met our sync state.
-        if is_seeds_synced && is_replicas_synced {
-            term::success!(
-                &mut reporting.completion;
-                "Nothing to announce, already in sync with {replicas} node(s) (see `rad sync status`)"
-            );
-            return Ok(AnnounceResult::default());
-        }
-        // Return nodes we can announce to. They don't have to be connected directly.
-        all.iter()
-            .filter(|s| !s.is_synced() && &s.nid != profile.id())
-            .map(|s| s.nid)
-            .collect()
-    } else {
-        node.sessions()?
-            .into_iter()
-            .filter(|s| s.state.is_connected() && doc.is_visible_to(&s.nid))
-            .map(|s| s.nid)
-            .collect()
-    };
-
-    if unsynced.is_empty() {
-        term::info!(&mut reporting.completion; "No seeds to announce to for {rid}. (see `rad sync status`)");
-        return Ok(AnnounceResult::default());
-    }
-    // Cap the replicas to the maximum achievable.
-    // Nb. It's impossible to know if a replica follows our node. This means that if we announce
-    // only our refs, and the replica doesn't follow us, it won't fetch from us.
-    settings.replicas = settings.replicas.min(unsynced.len());
-
-    let mut spinner = term::spinner_to(
-        format!("Found {} seed(s)..", unsynced.len()),
-        reporting.completion.clone(),
-        reporting.progress.clone(),
-    );
-    let result = node.announce(
-        rid,
-        unsynced,
-        settings.timeout,
-        |event, replicas| match event {
-            node::AnnounceEvent::Announced => ControlFlow::Continue(()),
-            node::AnnounceEvent::RefsSynced { remote, time } => {
-                spinner.message(format!(
-                    "Synced with {} in {}..",
-                    format::dim(remote),
-                    format::dim(format!("{time:?}"))
-                ));
-
-                // We're done syncing when both of these conditions are met:
-                //
-                // 1. We've matched or exceeded our target replica count.
-                // 2. We've synced with one of the seeds specified manually.
-                if replicas.len() >= settings.replicas
-                    && (settings.seeds.is_empty()
-                        || settings.seeds.iter().any(|s| replicas.contains_key(s)))
-                {
-                    ControlFlow::Break(())
-                } else {
-                    ControlFlow::Continue(())
-                }
-            }
-        },
-    )?;
-
-    if result.synced.is_empty() {
-        spinner.failed();
-    } else {
-        spinner.message(format!("Synced with {} node(s)", result.synced.len()));
-        spinner.finish();
-
-        if reporting.debug {
-            for (seed, time) in &result.synced {
-                writeln!(
-                    &mut reporting.completion,
-                    "  {}",
-                    term::format::dim(format!("Synced with {seed} in {time:?}")),
-                )
-                .ok();
-            }
-        }
-    }
-    for seed in &result.timed_out {
-        if settings.seeds.contains(seed) {
-            term::notice!(&mut reporting.completion; "Seed {seed} timed out..");
-        }
-    }
-    if result.synced.is_empty() {
-        return Err(SyncError::AllSeedsTimedOut);
-    }
-    Ok(result)
-}
diff --git a/radicle-cli/src/pager.rs b/radicle-cli/src/pager.rs
deleted file mode 100644
index 35bf358ba..000000000
--- a/radicle-cli/src/pager.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use std::io;
-use std::process::{Command, Stdio};
-
-use radicle_term::element;
-use radicle_term::{Constraint, Element};
-
-use crate::terminal;
-
-/// Output the given element through a pager, if necessary.
-/// If it fits within the screen, don't run it through a pager.
-pub fn run(elem: impl Element) -> io::Result<()> {
-    let Some(constraint) = Constraint::from_env() else {
-        return elem.write(Constraint::UNBOUNDED);
-    };
-    let Some(rows) = terminal::rows() else {
-        return elem.write(Constraint::UNBOUNDED);
-    };
-    if elem.size(Constraint::UNBOUNDED).rows <= rows {
-        return elem.write(Constraint::UNBOUNDED);
-    }
-    let Some(pager) = radicle::profile::env::pager() else {
-        return elem.write(Constraint::UNBOUNDED);
-    };
-    let Some(parts) = shlex::split(&pager) else {
-        return elem.write(Constraint::UNBOUNDED);
-    };
-    let Some((program, args)) = parts.split_first() else {
-        return elem.write(Constraint::UNBOUNDED);
-    };
-
-    let mut child = Command::new(program)
-        .stdin(Stdio::piped())
-        .stdout(Stdio::inherit())
-        .stderr(Stdio::inherit())
-        .args(args)
-        .spawn()?;
-
-    let writer = child.stdin.as_mut().unwrap();
-    let result = element::write_to(&elem, writer, constraint);
-
-    child.wait()?;
-
-    match result {
-        // This error is expected when the pager is exited.
-        Err(e) if e.kind() == io::ErrorKind::BrokenPipe => {}
-        Err(e) => return Err(e),
-        Ok(_) => {}
-    }
-
-    Ok(())
-}
diff --git a/radicle-cli/src/project.rs b/radicle-cli/src/project.rs
deleted file mode 100644
index 3480c9241..000000000
--- a/radicle-cli/src/project.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use radicle::prelude::*;
-
-use crate::git;
-use radicle::git::RefStr;
-use radicle::node::NodeId;
-
-/// Setup a repository remote and tracking branch.
-pub struct SetupRemote<'a> {
-    /// The repository id.
-    pub rid: RepoId,
-    /// Whether or not to setup a remote tracking branch.
-    pub tracking: Option<BranchName>,
-    /// Whether or not to fetch the remote immediately.
-    pub fetch: bool,
-    /// The repository in which to setup the remote.
-    pub repo: &'a git::Repository,
-}
-
-impl<'a> SetupRemote<'a> {
-    /// Run the setup for the given peer.
-    pub fn run(
-        &self,
-        name: impl AsRef<RefStr>,
-        node: NodeId,
-    ) -> anyhow::Result<(git::Remote, Option<BranchName>)> {
-        let remote_url = radicle::git::Url::from(self.rid).with_namespace(node);
-        let remote_name = name.as_ref();
-
-        if git::is_remote(self.repo, remote_name)? {
-            anyhow::bail!("remote `{remote_name}` already exists");
-        }
-
-        let remote =
-            radicle::git::configure_remote(self.repo, remote_name, &remote_url, &remote_url)?;
-        let mut remote = git::Remote::try_from(remote)?;
-
-        // Fetch the refs into the working copy.
-        if self.fetch {
-            remote.fetch::<&str>(&[], None, None)?;
-        }
-        // Setup remote-tracking branch.
-        if let Some(branch) = &self.tracking {
-            let tracking_branch = remote_name.join(branch);
-            let local_branch = radicle::git::refs::workdir::branch(tracking_branch.as_refstr());
-            radicle::git::set_upstream(self.repo, remote_name, &tracking_branch, local_branch)?;
-
-            return Ok((remote, Some(tracking_branch)));
-        }
-        Ok((remote, None))
-    }
-}
diff --git a/radicle-cli/src/terminal.rs b/radicle-cli/src/terminal.rs
deleted file mode 100644
index 5e351ec33..000000000
--- a/radicle-cli/src/terminal.rs
+++ /dev/null
@@ -1,162 +0,0 @@
-pub mod args;
-pub use args::{Args, Error, Help};
-pub mod format;
-pub mod io;
-pub use io::signer;
-pub mod comment;
-pub mod highlight;
-pub mod issue;
-pub mod json;
-pub mod patch;
-pub mod upload_pack;
-
-use std::ffi::OsString;
-use std::process;
-
-pub use radicle_term::*;
-
-use radicle::profile::{Home, Profile};
-
-use crate::terminal;
-
-/// Context passed to all commands.
-pub trait Context {
-    /// Return the currently active profile, or an error if no profile is active.
-    fn profile(&self) -> Result<Profile, anyhow::Error>;
-    /// Return the Radicle home.
-    fn home(&self) -> Result<Home, std::io::Error>;
-}
-
-impl Context for Profile {
-    fn profile(&self) -> Result<Profile, anyhow::Error> {
-        Ok(self.clone())
-    }
-
-    fn home(&self) -> Result<Home, std::io::Error> {
-        Ok(self.home.clone())
-    }
-}
-
-/// A command that can be run.
-pub trait Command<A: Args, C: Context> {
-    /// Run the command, given arguments and a context.
-    fn run(self, args: A, context: C) -> anyhow::Result<()>;
-}
-
-impl<F, A: Args, C: Context> Command<A, C> for F
-where
-    F: FnOnce(A, C) -> anyhow::Result<()>,
-{
-    fn run(self, args: A, context: C) -> anyhow::Result<()> {
-        self(args, context)
-    }
-}
-
-pub fn run_command<A, C>(help: Help, cmd: C) -> !
-where
-    A: Args,
-    C: Command<A, DefaultContext>,
-{
-    let args = std::env::args_os().skip(1).collect();
-
-    run_command_args(help, cmd, args)
-}
-
-pub fn run_command_args<A, C>(help: Help, cmd: C, args: Vec<OsString>) -> !
-where
-    A: Args,
-    C: Command<A, DefaultContext>,
-{
-    use io as term;
-
-    let options = match A::from_args(args) {
-        Ok((opts, unparsed)) => {
-            if let Err(err) = args::finish(unparsed) {
-                term::error(err);
-                process::exit(1);
-            }
-            opts
-        }
-        Err(err) => {
-            let hint = match err.downcast_ref::<Error>() {
-                Some(Error::Help) => {
-                    help.print();
-                    process::exit(0);
-                }
-                // Print the manual, or the regular help if there's an error.
-                Some(Error::HelpManual { name }) => {
-                    let Ok(status) = term::manual(name) else {
-                        help.print();
-                        process::exit(0);
-                    };
-                    if !status.success() {
-                        help.print();
-                        process::exit(0);
-                    }
-                    process::exit(status.code().unwrap_or(0));
-                }
-                Some(Error::Usage) => {
-                    term::usage(help.name, help.usage);
-                    process::exit(1);
-                }
-                Some(Error::WithHint { hint, .. }) => Some(hint),
-                None => None,
-            };
-            io::error(format!("rad {}: {err}", help.name));
-
-            if let Some(hint) = hint {
-                io::hint(hint);
-            }
-            process::exit(1);
-        }
-    };
-
-    match cmd.run(options, DefaultContext) {
-        Ok(()) => process::exit(0),
-        Err(err) => {
-            terminal::fail(help.name, &err);
-            process::exit(1);
-        }
-    }
-}
-
-/// Gets the default profile. Fails if there is no profile.
-pub struct DefaultContext;
-
-impl Context for DefaultContext {
-    fn home(&self) -> Result<Home, std::io::Error> {
-        radicle::profile::home()
-    }
-
-    fn profile(&self) -> Result<Profile, anyhow::Error> {
-        match Profile::load() {
-            Ok(profile) => Ok(profile),
-            Err(radicle::profile::Error::NotFound(path)) => Err(args::Error::WithHint {
-                err: anyhow::anyhow!("Radicle profile not found in '{}'.", path.display()),
-                hint: "To setup your radicle profile, run `rad auth`.",
-            }
-            .into()),
-            Err(radicle::profile::Error::Config(e)) => Err(e.into()),
-            Err(e) => Err(anyhow::anyhow!("Could not load radicle profile: {e}")),
-        }
-    }
-}
-
-pub fn fail(_name: &str, error: &anyhow::Error) {
-    let err = error.to_string();
-    let err = err.trim_end();
-
-    for line in err.lines() {
-        io::error(line);
-    }
-
-    // Catch common node errors, and offer a hint.
-    if let Some(e) = error.downcast_ref::<radicle::node::Error>() {
-        if e.is_connection_err() {
-            io::hint("to start your node, run `rad node start`.");
-        }
-    }
-    if let Some(Error::WithHint { hint, .. }) = error.downcast_ref::<Error>() {
-        io::hint(hint);
-    }
-}
diff --git a/radicle-cli/src/terminal/args.rs b/radicle-cli/src/terminal/args.rs
deleted file mode 100644
index 9215bacd7..000000000
--- a/radicle-cli/src/terminal/args.rs
+++ /dev/null
@@ -1,208 +0,0 @@
-use std::ffi::OsString;
-use std::net::SocketAddr;
-use std::str::FromStr;
-use std::time;
-
-use anyhow::anyhow;
-
-use radicle::cob::{self, issue, patch};
-use radicle::crypto;
-use radicle::git::{Oid, RefString};
-use radicle::node::{Address, Alias};
-use radicle::prelude::{Did, NodeId, RepoId};
-
-use crate::git::Rev;
-use crate::terminal as term;
-
-#[derive(thiserror::Error, Debug)]
-pub enum Error {
-    /// If this error is returned from argument parsing, help is displayed.
-    #[error("help invoked")]
-    Help,
-    /// If this error is returned from argument parsing, the manual page is displayed.
-    #[error("help manual invoked")]
-    HelpManual { name: &'static str },
-    /// If this error is returned from argument parsing, usage is displayed.
-    #[error("usage invoked")]
-    Usage,
-    /// An error with a hint.
-    #[error("{err}")]
-    WithHint {
-        err: anyhow::Error,
-        hint: &'static str,
-    },
-}
-
-pub struct Help {
-    pub name: &'static str,
-    pub description: &'static str,
-    pub version: &'static str,
-    pub usage: &'static str,
-}
-
-impl Help {
-    /// Print help to stdout.
-    pub fn print(&self) {
-        term::help(self.name, self.version, self.description, self.usage);
-    }
-}
-
-pub trait Args: Sized {
-    fn from_env() -> anyhow::Result<Self> {
-        let args: Vec<_> = std::env::args_os().skip(1).collect();
-
-        match Self::from_args(args) {
-            Ok((opts, unparsed)) => {
-                self::finish(unparsed)?;
-
-                Ok(opts)
-            }
-            Err(err) => Err(err),
-        }
-    }
-
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)>;
-}
-
-pub fn parse_value<T: FromStr>(flag: &str, value: OsString) -> anyhow::Result<T>
-where
-    <T as FromStr>::Err: std::error::Error,
-{
-    value
-        .into_string()
-        .map_err(|_| anyhow!("the value specified for '--{}' is not valid UTF-8", flag))?
-        .parse()
-        .map_err(|e| anyhow!("invalid value specified for '--{}' ({})", flag, e))
-}
-
-pub fn format(arg: lexopt::Arg) -> OsString {
-    match arg {
-        lexopt::Arg::Long(flag) => format!("--{flag}").into(),
-        lexopt::Arg::Short(flag) => format!("-{flag}").into(),
-        lexopt::Arg::Value(val) => val,
-    }
-}
-
-pub fn finish(unparsed: Vec<OsString>) -> anyhow::Result<()> {
-    if let Some(arg) = unparsed.first() {
-        return Err(anyhow::anyhow!(
-            "unexpected argument `{}`",
-            arg.to_string_lossy()
-        ));
-    }
-    Ok(())
-}
-
-pub fn refstring(flag: &str, value: OsString) -> anyhow::Result<RefString> {
-    RefString::try_from(
-        value
-            .into_string()
-            .map_err(|_| anyhow!("the value specified for '--{}' is not valid UTF-8", flag))?,
-    )
-    .map_err(|_| {
-        anyhow!(
-            "the value specified for '--{}' is not a valid ref string",
-            flag
-        )
-    })
-}
-
-pub fn did(val: &OsString) -> anyhow::Result<Did> {
-    let val = val.to_string_lossy();
-    let Ok(peer) = Did::from_str(&val) else {
-        if crypto::PublicKey::from_str(&val).is_ok() {
-            return Err(anyhow!("expected DID, did you mean 'did:key:{val}'?"));
-        } else {
-            return Err(anyhow!("invalid DID '{}', expected 'did:key'", val));
-        }
-    };
-    Ok(peer)
-}
-
-pub fn nid(val: &OsString) -> anyhow::Result<NodeId> {
-    let val = val.to_string_lossy();
-    NodeId::from_str(&val).map_err(|_| anyhow!("invalid Node ID '{}'", val))
-}
-
-pub fn rid(val: &OsString) -> anyhow::Result<RepoId> {
-    let val = val.to_string_lossy();
-    RepoId::from_str(&val).map_err(|_| anyhow!("invalid Repository ID '{}'", val))
-}
-
-pub fn pubkey(val: &OsString) -> anyhow::Result<NodeId> {
-    let Ok(did) = did(val) else {
-        let nid = nid(val)?;
-        return Ok(nid);
-    };
-    Ok(did.as_key().to_owned())
-}
-
-pub fn socket_addr(val: &OsString) -> anyhow::Result<SocketAddr> {
-    let val = val.to_string_lossy();
-    SocketAddr::from_str(&val).map_err(|_| anyhow!("invalid socket address '{}'", val))
-}
-
-pub fn addr(val: &OsString) -> anyhow::Result<Address> {
-    let val = val.to_string_lossy();
-    Address::from_str(&val).map_err(|_| anyhow!("invalid address '{}'", val))
-}
-
-pub fn number(val: &OsString) -> anyhow::Result<usize> {
-    let val = val.to_string_lossy();
-    usize::from_str(&val).map_err(|_| anyhow!("invalid number '{}'", val))
-}
-
-pub fn seconds(val: &OsString) -> anyhow::Result<time::Duration> {
-    let val = val.to_string_lossy();
-    let secs = u64::from_str(&val).map_err(|_| anyhow!("invalid number of seconds '{}'", val))?;
-
-    Ok(time::Duration::from_secs(secs))
-}
-
-pub fn milliseconds(val: &OsString) -> anyhow::Result<time::Duration> {
-    let val = val.to_string_lossy();
-    let secs =
-        u64::from_str(&val).map_err(|_| anyhow!("invalid number of milliseconds '{}'", val))?;
-
-    Ok(time::Duration::from_millis(secs))
-}
-
-pub fn string(val: &OsString) -> String {
-    val.to_string_lossy().to_string()
-}
-
-pub fn rev(val: &OsString) -> anyhow::Result<Rev> {
-    let s = val.to_str().ok_or(anyhow!("invalid git rev {val:?}"))?;
-    Ok(Rev::from(s.to_owned()))
-}
-
-pub fn oid(val: &OsString) -> anyhow::Result<Oid> {
-    let s = string(val);
-    let o = radicle::git::Oid::from_str(&s).map_err(|_| anyhow!("invalid git oid '{s}'"))?;
-
-    Ok(o)
-}
-
-pub fn alias(val: &OsString) -> anyhow::Result<Alias> {
-    let val = val.as_os_str();
-    let val = val
-        .to_str()
-        .ok_or_else(|| anyhow!("alias must be valid UTF-8"))?;
-
-    Alias::from_str(val).map_err(|e| e.into())
-}
-
-pub fn issue(val: &OsString) -> anyhow::Result<issue::IssueId> {
-    let val = val.to_string_lossy();
-    issue::IssueId::from_str(&val).map_err(|_| anyhow!("invalid Issue ID '{}'", val))
-}
-
-pub fn patch(val: &OsString) -> anyhow::Result<patch::PatchId> {
-    let val = val.to_string_lossy();
-    patch::PatchId::from_str(&val).map_err(|_| anyhow!("invalid Patch ID '{}'", val))
-}
-
-pub fn cob(val: &OsString) -> anyhow::Result<cob::ObjectId> {
-    let val = val.to_string_lossy();
-    cob::ObjectId::from_str(&val).map_err(|_| anyhow!("invalid Object ID '{}'", val))
-}
diff --git a/radicle-cli/src/terminal/comment.rs b/radicle-cli/src/terminal/comment.rs
deleted file mode 100644
index 1383b9bc5..000000000
--- a/radicle-cli/src/terminal/comment.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-use radicle::cob::thread::{Comment, CommentId};
-use radicle::Profile;
-
-use crate::terminal as term;
-use crate::terminal::format::Author;
-
-/// Return a comment header as a [`term::Element`].
-pub fn header<T>(
-    id: &CommentId,
-    comment: &Comment<T>,
-    profile: &Profile,
-) -> term::hstack::HStack<'static> {
-    let author = comment.author();
-    let author = Author::new(&author, profile);
-    let (alias, nid) = author.labels();
-
-    term::hstack::HStack::default()
-        .child(term::Line::spaced([
-            alias,
-            nid,
-            term::format::timestamp(comment.timestamp()).dim().into(),
-        ]))
-        .child(term::Line::new(term::Label::space()))
-        .child(term::Line::spaced([term::format::oid(*id)
-            .fg(term::Color::Cyan)
-            .into()]))
-}
-
-/// Return a full comment widget as a [`term::Element`].
-pub fn widget<'a, T>(id: &CommentId, comment: &Comment<T>, profile: &Profile) -> term::VStack<'a> {
-    term::vstack::bordered(header(id, comment, profile))
-        .child(term::textarea(comment.body()).wrap(60))
-}
diff --git a/radicle-cli/src/terminal/format.rs b/radicle-cli/src/terminal/format.rs
deleted file mode 100644
index a8bf16905..000000000
--- a/radicle-cli/src/terminal/format.rs
+++ /dev/null
@@ -1,387 +0,0 @@
-use std::fmt;
-
-use localtime::LocalTime;
-
-pub use radicle_term::format::*;
-pub use radicle_term::{style, Paint};
-
-use radicle::cob::ObjectId;
-use radicle::identity::Visibility;
-use radicle::node::policy::Policy;
-use radicle::node::{Alias, AliasStore, NodeId};
-use radicle::prelude::Did;
-use radicle::profile::{env, Profile};
-use radicle::storage::RefUpdate;
-use radicle_term::element::Line;
-
-use crate::terminal as term;
-
-/// Format a node id to be more compact.
-pub fn node(node: &NodeId) -> Paint<String> {
-    let node = node.to_human();
-    let start = node.chars().take(7).collect::<String>();
-    let end = node.chars().skip(node.len() - 7).collect::<String>();
-
-    Paint::new(format!("{start}…{end}"))
-}
-
-/// Format a git Oid.
-pub fn oid(oid: impl Into<radicle::git::Oid>) -> Paint<String> {
-    Paint::new(format!("{:.7}", oid.into()))
-}
-
-/// Wrap parenthesis around styled input, eg. `"input"` -> `"(input)"`.
-pub fn parens<D: fmt::Display>(input: Paint<D>) -> Paint<String> {
-    Paint::new(format!("({})", input.item)).with_style(input.style)
-}
-
-/// Wrap spaces around styled input, eg. `"input"` -> `" input "`.
-pub fn spaced<D: fmt::Display>(input: Paint<D>) -> Paint<String> {
-    Paint::new(format!(" {} ", input.item)).with_style(input.style)
-}
-
-/// Format a command suggestion, eg. `rad init`.
-pub fn command<D: fmt::Display>(cmd: D) -> Paint<String> {
-    primary(format!("`{cmd}`"))
-}
-
-/// Format a COB id.
-pub fn cob(id: &ObjectId) -> Paint<String> {
-    Paint::new(format!("{:.7}", id.to_string()))
-}
-
-/// Format a DID.
-pub fn did(did: &Did) -> Paint<String> {
-    let nid = did.as_key().to_human();
-    Paint::new(format!("{}…{}", &nid[..7], &nid[nid.len() - 7..]))
-}
-
-/// Format a Visibility.
-pub fn visibility(v: &Visibility) -> Paint<&str> {
-    match v {
-        Visibility::Public => term::format::positive("public"),
-        Visibility::Private { .. } => term::format::yellow("private"),
-    }
-}
-
-/// Format a policy.
-pub fn policy(p: &Policy) -> Paint<String> {
-    match p {
-        Policy::Allow => term::format::positive(p.to_string()),
-        Policy::Block => term::format::negative(p.to_string()),
-    }
-}
-
-/// Format a timestamp.
-pub fn timestamp(time: impl Into<LocalTime>) -> Paint<String> {
-    let time = time.into();
-    let now = env::local_time();
-    let duration = now - time;
-    let fmt = timeago::Formatter::new();
-
-    Paint::new(fmt.convert(duration.into()))
-}
-
-pub fn bytes(size: usize) -> Paint<String> {
-    const KB: usize = 1024;
-    const MB: usize = 1024usize.pow(2);
-    const GB: usize = 1024usize.pow(3);
-    let size = if size < KB {
-        format!("{size} B")
-    } else if size < MB {
-        format!("{} KiB", size / KB)
-    } else if size < GB {
-        format!("{} MiB", size / MB)
-    } else {
-        format!("{} GiB", size / GB)
-    };
-    Paint::new(size)
-}
-
-/// Format a ref update.
-pub fn ref_update(update: &RefUpdate) -> Paint<&'static str> {
-    match update {
-        RefUpdate::Updated { .. } => term::format::tertiary("updated"),
-        RefUpdate::Created { .. } => term::format::positive("created"),
-        RefUpdate::Deleted { .. } => term::format::negative("deleted"),
-        RefUpdate::Skipped { .. } => term::format::dim("skipped"),
-    }
-}
-
-/// Identity formatter that takes a profile and displays it as
-/// `<node-id> (<username>)` depending on the configuration.
-pub struct Identity<'a> {
-    profile: &'a Profile,
-    /// If true, node id is printed in its compact form.
-    short: bool,
-    /// If true, node id and username are printed using the terminal's
-    /// styled formatters.
-    styled: bool,
-}
-
-impl<'a> Identity<'a> {
-    pub fn new(profile: &'a Profile) -> Self {
-        Self {
-            profile,
-            short: false,
-            styled: false,
-        }
-    }
-
-    pub fn short(mut self) -> Self {
-        self.short = true;
-        self
-    }
-
-    pub fn styled(mut self) -> Self {
-        self.styled = true;
-        self
-    }
-}
-
-impl<'a> fmt::Display for Identity<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let nid = self.profile.id();
-        let alias = self.profile.aliases().alias(nid);
-        let node_id = match self.short {
-            true => self::node(nid).to_string(),
-            false => nid.to_human(),
-        };
-
-        if self.styled {
-            write!(f, "{}", term::format::highlight(node_id))?;
-            if let Some(a) = alias {
-                write!(f, " {}", term::format::parens(term::format::dim(a)))?;
-            }
-        } else {
-            write!(f, "{node_id}")?;
-            if let Some(a) = alias {
-                write!(f, " ({a})")?;
-            }
-        }
-        Ok(())
-    }
-}
-
-/// This enum renders (nid, alias) in terminal depending on user variant.
-pub struct Author<'a> {
-    nid: &'a NodeId,
-    alias: Option<Alias>,
-    you: bool,
-}
-
-impl<'a> Author<'a> {
-    pub fn new(nid: &'a NodeId, profile: &Profile) -> Author<'a> {
-        let alias = profile.alias(nid);
-
-        Self {
-            nid,
-            alias,
-            you: nid == profile.id(),
-        }
-    }
-
-    pub fn alias(&self) -> Option<term::Label> {
-        self.alias.as_ref().map(|a| a.to_string().into())
-    }
-
-    pub fn you(&self) -> Option<term::Label> {
-        if self.you {
-            Some(term::format::primary("(you)").dim().italic().into())
-        } else {
-            None
-        }
-    }
-
-    /// Get the labels of the `Author`. The labels can take the following forms:
-    ///
-    ///   * `(<alias>, (you))` -- the `Author` is the local peer and has an alias
-    ///   * `(<did>, (you))` -- the `Author` is the local peer and has no alias
-    ///   * `(<alias>, <did>)` -- the `Author` is another peer and has an alias
-    ///   * `(<blank>, <did>)` -- the `Author` is another peer and has no alias
-    pub fn labels(self) -> (term::Label, term::Label) {
-        let alias = match self.alias.as_ref() {
-            Some(alias) => term::format::primary(alias).into(),
-            None if self.you => term::format::primary(term::format::node(self.nid))
-                .dim()
-                .into(),
-            None => term::Label::blank(),
-        };
-        let author = self.you().unwrap_or_else(|| {
-            term::format::primary(term::format::node(self.nid))
-                .dim()
-                .into()
-        });
-        (alias, author)
-    }
-
-    pub fn line(self) -> Line {
-        let (alias, author) = self.labels();
-        Line::spaced([alias, author])
-    }
-}
-
-/// HTML-related formatting.
-pub mod html {
-    /// Comment a string with HTML comments.
-    pub fn commented(s: &str) -> String {
-        format!("<!--\n{s}\n-->")
-    }
-
-    /// Remove html style comments from a string.
-    ///
-    /// The HTML comments must start at the beginning of a line and stop at the end.
-    pub fn strip_comments(s: &str) -> String {
-        let ends_with_newline = s.ends_with('\n');
-        let mut is_comment = false;
-        let mut w = String::new();
-
-        for line in s.lines() {
-            if is_comment {
-                if line.ends_with("-->") {
-                    is_comment = false;
-                }
-                continue;
-            } else if line.starts_with("<!--") {
-                is_comment = true;
-                continue;
-            }
-
-            w.push_str(line);
-            w.push('\n');
-        }
-        if !ends_with_newline {
-            w.pop();
-        }
-
-        w.to_string()
-    }
-}
-
-/// Issue formatting
-pub mod issue {
-    use super::*;
-    use radicle::issue::{CloseReason, State};
-
-    /// Format issue state.
-    pub fn state(s: &State) -> term::Paint<String> {
-        match s {
-            State::Open => term::format::positive(s.to_string()),
-            State::Closed {
-                reason: CloseReason::Other,
-            } => term::format::negative(s.to_string()),
-            State::Closed {
-                reason: CloseReason::Solved,
-            } => term::format::secondary(s.to_string()),
-        }
-    }
-}
-
-/// Patch formatting
-pub mod patch {
-    use super::*;
-    use radicle::patch::{State, Verdict};
-
-    pub fn verdict(v: Option<Verdict>) -> term::Paint<String> {
-        match v {
-            Some(Verdict::Accept) => term::format::positive("✔".to_string()),
-            Some(Verdict::Reject) => term::format::negative("✗".to_string()),
-            None => term::format::dim("-".to_string()),
-        }
-    }
-
-    /// Format patch state.
-    pub fn state(s: &State) -> term::Paint<String> {
-        match s {
-            State::Draft { .. } => term::format::dim(s.to_string()),
-            State::Open { .. } => term::format::positive(s.to_string()),
-            State::Archived => term::format::yellow(s.to_string()),
-            State::Merged { .. } => term::format::secondary(s.to_string()),
-        }
-    }
-}
-
-/// Identity formatting
-pub mod identity {
-    use super::*;
-    use radicle::cob::identity::State;
-
-    /// Format identity revision state.
-    pub fn state(s: &State) -> term::Paint<String> {
-        match s {
-            State::Active { .. } => term::format::tertiary(s.to_string()),
-            State::Accepted { .. } => term::format::positive(s.to_string()),
-            State::Rejected { .. } => term::format::negative(s.to_string()),
-            State::Stale { .. } => term::format::dim(s.to_string()),
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use html::strip_comments;
-
-    #[test]
-    fn test_strip_comments() {
-        let test = "\
-        commit 2\n\
-        \n\
-        <!--\n\
-        Please enter a comment for your patch update. Leaving this\n\
-        blank is also okay.\n\
-        -->";
-        let exp = "\
-        commit 2\n\
-        ";
-
-        let res = strip_comments(test);
-        assert_eq!(exp, res);
-
-        let test = "\
-        commit 2\n\
-        -->";
-        let exp = "\
-        commit 2\n\
-        -->";
-
-        let res = strip_comments(test);
-        assert_eq!(exp, res);
-
-        let test = "\
-        <!--\n\
-        commit 2\n\
-        ";
-        let exp = "";
-
-        let res = strip_comments(test);
-        assert_eq!(exp, res);
-
-        let test = "\
-        commit 2\n\
-        \n\
-        <!--\n\
-        <!--\n\
-        Please enter a comment for your patch update. Leaving this\n\
-        blank is also okay.\n\
-        -->\n\
-        -->";
-        let exp = "\
-        commit 2\n\
-        \n\
-        -->";
-
-        let res = strip_comments(test);
-        assert_eq!(exp, res);
-    }
-
-    #[test]
-    fn test_bytes() {
-        assert_eq!(bytes(1023).to_string(), "1023 B");
-        assert_eq!(bytes(1024).to_string(), "1 KiB");
-        assert_eq!(bytes(1024 * 9).to_string(), "9 KiB");
-        assert_eq!(bytes(1024usize.pow(2)).to_string(), "1 MiB");
-        assert_eq!(bytes(1024usize.pow(2) * 56).to_string(), "56 MiB");
-        assert_eq!(bytes(1024usize.pow(3) * 1024).to_string(), "1024 GiB");
-    }
-}
diff --git a/radicle-cli/src/terminal/highlight.rs b/radicle-cli/src/terminal/highlight.rs
deleted file mode 100644
index 1c49506d2..000000000
--- a/radicle-cli/src/terminal/highlight.rs
+++ /dev/null
@@ -1,341 +0,0 @@
-use std::{collections::HashMap, path::Path};
-
-use radicle_term as term;
-use tree_sitter_highlight as ts;
-
-/// Highlight groups enabled.
-const HIGHLIGHTS: &[&str] = &[
-    "attribute",
-    "constant",
-    "constant.builtin",
-    "comment",
-    "constructor",
-    "function.builtin",
-    "function",
-    "integer_literal",
-    "float.literal",
-    "keyword",
-    "label",
-    "number",
-    "operator",
-    "property",
-    "punctuation",
-    "punctuation.bracket",
-    "punctuation.delimiter",
-    "punctuation.special",
-    "string",
-    "string.special",
-    "tag",
-    "type",
-    "type.builtin",
-    "variable",
-    "variable.builtin",
-    "variable.parameter",
-    "text.literal",
-    "text.title",
-];
-
-/// Syntax highlighter based on `tree-sitter`.
-#[derive(Default)]
-pub struct Highlighter {
-    configs: HashMap<&'static str, ts::HighlightConfiguration>,
-}
-
-/// Syntax theme.
-pub struct Theme {
-    color: fn(&'static str) -> Option<term::Color>,
-}
-
-impl Default for Theme {
-    fn default() -> Self {
-        let color = if term::Paint::truecolor() {
-            term::colors::rgb::theme
-        } else {
-            term::colors::fixed::theme
-        };
-        Self { color }
-    }
-}
-
-impl Theme {
-    /// Get the named color.
-    pub fn color(&self, color: &'static str) -> term::Color {
-        if let Some(c) = (self.color)(color) {
-            c
-        } else {
-            term::Color::Unset
-        }
-    }
-
-    /// Return the color of a syntax group.
-    pub fn highlight(&self, group: &'static str) -> Option<term::Color> {
-        let color = match group {
-            "keyword" => self.color("red"),
-            "comment" => self.color("grey"),
-            "constant" => self.color("orange"),
-            "number" => self.color("blue"),
-            "string" => self.color("teal"),
-            "string.special" => self.color("green"),
-            "function" => self.color("purple"),
-            "operator" => self.color("blue"),
-            // Eg. `true` and `false` in rust.
-            "constant.builtin" => self.color("blue"),
-            "type.builtin" => self.color("teal"),
-            "punctuation.bracket" | "punctuation.delimiter" => term::Color::default(),
-            // Eg. the '#' in Markdown titles.
-            "punctuation.special" => self.color("dim"),
-            // Eg. Markdown code blocks.
-            "text.literal" => self.color("blue"),
-            "text.title" => self.color("orange"),
-            "variable.builtin" => term::Color::default(),
-            "property" => self.color("blue"),
-            // Eg. `#[derive(Debug)]` in rust
-            "attribute" => self.color("blue"),
-            "label" => self.color("green"),
-            // `Option`
-            "type" => self.color("grey.light"),
-            "variable.parameter" => term::Color::default(),
-            "constructor" => self.color("orange"),
-
-            _ => return None,
-        };
-        Some(color)
-    }
-}
-
-/// Syntax highlighted file builder.
-#[derive(Default)]
-struct Builder {
-    /// Output lines.
-    lines: Vec<term::Line>,
-    /// Current output line.
-    line: Vec<term::Label>,
-    /// Current label.
-    label: Vec<u8>,
-    /// Current stack of styles.
-    styles: Vec<term::Style>,
-}
-
-impl Builder {
-    /// Run the builder to completion.
-    fn run(
-        mut self,
-        highlights: impl Iterator<Item = Result<ts::HighlightEvent, ts::Error>>,
-        code: &[u8],
-        theme: &Theme,
-    ) -> Result<Vec<term::Line>, ts::Error> {
-        for event in highlights {
-            match event? {
-                ts::HighlightEvent::Source { start, end } => {
-                    for (i, byte) in code.iter().enumerate().skip(start).take(end - start) {
-                        if *byte == b'\n' {
-                            self.advance();
-                            // Start on new line.
-                            self.lines.push(term::Line::from(self.line.clone()));
-                            self.line.clear();
-                        } else if i == code.len() - 1 {
-                            // File has no `\n` at the end.
-                            self.label.push(*byte);
-                            self.advance();
-                            self.lines.push(term::Line::from(self.line.clone()));
-                        } else {
-                            // Add to existing label.
-                            self.label.push(*byte);
-                        }
-                    }
-                }
-                ts::HighlightEvent::HighlightStart(h) => {
-                    let name = HIGHLIGHTS[h.0];
-                    let style =
-                        term::Style::default().fg(theme.highlight(name).unwrap_or_default());
-
-                    self.advance();
-                    self.styles.push(style);
-                }
-                ts::HighlightEvent::HighlightEnd => {
-                    self.advance();
-                    self.styles.pop();
-                }
-            }
-        }
-        Ok(self.lines)
-    }
-
-    /// Advance the state by pushing the current label onto the current line,
-    /// using the current styling.
-    fn advance(&mut self) {
-        if !self.label.is_empty() {
-            // Take the top-level style when there are more than one.
-            let style = self.styles.first().cloned().unwrap_or_default();
-            self.line
-                .push(term::Label::new(String::from_utf8_lossy(&self.label).as_ref()).style(style));
-            self.label.clear();
-        }
-    }
-}
-
-impl Highlighter {
-    /// Highlight a source code file.
-    pub fn highlight(&mut self, path: &Path, code: &[u8]) -> Result<Vec<term::Line>, ts::Error> {
-        let theme = Theme::default();
-        let mut highlighter = ts::Highlighter::new();
-        let Some(config) = self.detect(path, code) else {
-            let Ok(code) = std::str::from_utf8(code) else {
-                return Err(ts::Error::Unknown);
-            };
-            return Ok(code.lines().map(term::Line::new).collect());
-        };
-        config.configure(HIGHLIGHTS);
-
-        let highlights = highlighter.highlight(config, code, None, |_| {
-            // Language injection callback.
-            None
-        })?;
-
-        Builder::default().run(highlights, code, &theme)
-    }
-
-    /// Detect language.
-    fn detect(&mut self, path: &Path, _code: &[u8]) -> Option<&mut ts::HighlightConfiguration> {
-        match path.extension().and_then(|e| e.to_str()) {
-            Some("rs") => self.config("rust"),
-            Some("ts" | "js") => self.config("typescript"),
-            Some("json") => self.config("json"),
-            Some("sh" | "bash") => self.config("shell"),
-            Some("md" | "markdown") => self.config("markdown"),
-            Some("go") => self.config("go"),
-            Some("c") => self.config("c"),
-            Some("py") => self.config("python"),
-            Some("rb") => self.config("ruby"),
-            Some("tsx") => self.config("tsx"),
-            Some("html") | Some("htm") | Some("xml") => self.config("html"),
-            Some("css") => self.config("css"),
-            Some("toml") => self.config("toml"),
-            _ => None,
-        }
-    }
-
-    /// Get a language configuration.
-    fn config(&mut self, language: &'static str) -> Option<&mut ts::HighlightConfiguration> {
-        match language {
-            "rust" => Some(self.configs.entry(language).or_insert_with(|| {
-                ts::HighlightConfiguration::new(
-                    tree_sitter_rust::language(),
-                    tree_sitter_rust::HIGHLIGHT_QUERY,
-                    tree_sitter_rust::INJECTIONS_QUERY,
-                    "",
-                )
-                .expect("Highlighter::config: highlight configuration must be valid")
-            })),
-            "json" => Some(self.configs.entry(language).or_insert_with(|| {
-                ts::HighlightConfiguration::new(
-                    tree_sitter_json::language(),
-                    tree_sitter_json::HIGHLIGHT_QUERY,
-                    "",
-                    "",
-                )
-                .expect("Highlighter::config: highlight configuration must be valid")
-            })),
-            "typescript" => Some(self.configs.entry(language).or_insert_with(|| {
-                ts::HighlightConfiguration::new(
-                    tree_sitter_typescript::language_typescript(),
-                    tree_sitter_typescript::HIGHLIGHT_QUERY,
-                    "",
-                    tree_sitter_typescript::LOCALS_QUERY,
-                )
-                .expect("Highlighter::config: highlight configuration must be valid")
-            })),
-            "markdown" => Some(self.configs.entry(language).or_insert_with(|| {
-                ts::HighlightConfiguration::new(
-                    tree_sitter_md::language(),
-                    tree_sitter_md::HIGHLIGHT_QUERY_BLOCK,
-                    tree_sitter_md::INJECTION_QUERY_BLOCK,
-                    "",
-                )
-                .expect("Highlighter::config: highlight configuration must be valid")
-            })),
-            "css" => Some(self.configs.entry(language).or_insert_with(|| {
-                ts::HighlightConfiguration::new(
-                    tree_sitter_css::language(),
-                    tree_sitter_css::HIGHLIGHTS_QUERY,
-                    "",
-                    "",
-                )
-                .expect("Highlighter::config: highlight configuration must be valid")
-            })),
-            "go" => Some(self.configs.entry(language).or_insert_with(|| {
-                ts::HighlightConfiguration::new(
-                    tree_sitter_go::language(),
-                    tree_sitter_go::HIGHLIGHT_QUERY,
-                    "",
-                    "",
-                )
-                .expect("Highlighter::config: highlight configuration must be valid")
-            })),
-            "shell" => Some(self.configs.entry(language).or_insert_with(|| {
-                ts::HighlightConfiguration::new(
-                    tree_sitter_bash::language(),
-                    tree_sitter_bash::HIGHLIGHT_QUERY,
-                    "",
-                    "",
-                )
-                .expect("Highlighter::config: highlight configuration must be valid")
-            })),
-            "c" => Some(self.configs.entry(language).or_insert_with(|| {
-                ts::HighlightConfiguration::new(
-                    tree_sitter_c::language(),
-                    tree_sitter_c::HIGHLIGHT_QUERY,
-                    "",
-                    "",
-                )
-                .expect("Highlighter::config: highlight configuration must be valid")
-            })),
-            "python" => Some(self.configs.entry(language).or_insert_with(|| {
-                ts::HighlightConfiguration::new(
-                    tree_sitter_python::language(),
-                    tree_sitter_python::HIGHLIGHT_QUERY,
-                    "",
-                    "",
-                )
-                .expect("Highlighter::config: highlight configuration must be valid")
-            })),
-            "ruby" => Some(self.configs.entry(language).or_insert_with(|| {
-                ts::HighlightConfiguration::new(
-                    tree_sitter_ruby::language(),
-                    tree_sitter_ruby::HIGHLIGHT_QUERY,
-                    "",
-                    tree_sitter_ruby::LOCALS_QUERY,
-                )
-                .expect("Highlighter::config: highlight configuration must be valid")
-            })),
-            "tsx" => Some(self.configs.entry(language).or_insert_with(|| {
-                ts::HighlightConfiguration::new(
-                    tree_sitter_typescript::language_tsx(),
-                    tree_sitter_typescript::HIGHLIGHT_QUERY,
-                    "",
-                    tree_sitter_typescript::LOCALS_QUERY,
-                )
-                .expect("Highlighter::config: highlight configuration must be valid")
-            })),
-            "html" => Some(self.configs.entry(language).or_insert_with(|| {
-                ts::HighlightConfiguration::new(
-                    tree_sitter_html::language(),
-                    tree_sitter_html::HIGHLIGHTS_QUERY,
-                    tree_sitter_html::INJECTIONS_QUERY,
-                    "",
-                )
-                .expect("Highlighter::config: highlight configuration must be valid")
-            })),
-            "toml" => Some(self.configs.entry(language).or_insert_with(|| {
-                ts::HighlightConfiguration::new(
-                    tree_sitter_toml::language(),
-                    tree_sitter_toml::HIGHLIGHT_QUERY,
-                    "",
-                    "",
-                )
-                .expect("Highlighter::config: highlight configuration must be valid")
-            })),
-            _ => None,
-        }
-    }
-}
diff --git a/radicle-cli/src/terminal/io.rs b/radicle-cli/src/terminal/io.rs
deleted file mode 100644
index 9dce14971..000000000
--- a/radicle-cli/src/terminal/io.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use radicle::cob::issue::Issue;
-use radicle::cob::thread::{Comment, CommentId};
-use radicle::crypto::ssh::keystore::MemorySigner;
-use radicle::crypto::{ssh::Keystore, Signer};
-use radicle::profile::env::RAD_PASSPHRASE;
-use radicle::profile::Profile;
-
-pub use radicle_term::io::*;
-pub use radicle_term::spinner;
-
-use inquire::validator;
-
-/// Validates secret key passphrases.
-#[derive(Clone)]
-pub struct PassphraseValidator {
-    keystore: Keystore,
-}
-
-impl PassphraseValidator {
-    /// Create a new validator.
-    pub fn new(keystore: Keystore) -> Self {
-        Self { keystore }
-    }
-}
-
-impl inquire::validator::StringValidator for PassphraseValidator {
-    fn validate(
-        &self,
-        input: &str,
-    ) -> Result<validator::Validation, inquire::error::CustomUserError> {
-        let passphrase = Passphrase::from(input.to_owned());
-        if self.keystore.is_valid_passphrase(&passphrase)? {
-            Ok(validator::Validation::Valid)
-        } else {
-            Ok(validator::Validation::Invalid(
-                validator::ErrorMessage::from("Invalid passphrase, please try again"),
-            ))
-        }
-    }
-}
-
-/// Get the signer. First we try getting it from ssh-agent, otherwise we prompt the user,
-/// if we're connected to a TTY.
-pub fn signer(profile: &Profile) -> anyhow::Result<Box<dyn Signer>> {
-    if let Ok(signer) = profile.signer() {
-        return Ok(signer);
-    }
-    let validator = PassphraseValidator::new(profile.keystore.clone());
-    let passphrase = match passphrase(validator) {
-        Ok(p) => p,
-        Err(inquire::InquireError::NotTTY) => {
-            return Err(anyhow::anyhow!(
-                "running in non-interactive mode, please set `{RAD_PASSPHRASE}` to unseal your key",
-            ));
-        }
-        Err(e) => return Err(e.into()),
-    };
-    let spinner = spinner("Unsealing key...");
-    let signer = MemorySigner::load(&profile.keystore, Some(passphrase))?;
-
-    spinner.finish();
-
-    Ok(signer.boxed())
-}
-
-pub fn comment_select(issue: &Issue) -> Option<(&CommentId, &Comment)> {
-    let comments = issue.comments().collect::<Vec<_>>();
-    let selection = Select::new(
-        "Which comment do you want to react to?",
-        (0..comments.len()).collect(),
-    )
-    .with_render_config(*CONFIG)
-    .with_formatter(&|i| comments[i.index].1.body().to_owned())
-    .prompt()
-    .ok()?;
-
-    comments.get(selection).copied()
-}
diff --git a/radicle-cli/src/terminal/issue.rs b/radicle-cli/src/terminal/issue.rs
deleted file mode 100644
index 518608ad2..000000000
--- a/radicle-cli/src/terminal/issue.rs
+++ /dev/null
@@ -1,131 +0,0 @@
-use std::io;
-
-use radicle_term::table::TableOptions;
-use radicle_term::{Table, VStack};
-
-use radicle::cob;
-use radicle::cob::issue;
-use radicle::cob::issue::CloseReason;
-use radicle::Profile;
-
-use crate::terminal as term;
-use crate::terminal::format::Author;
-use crate::terminal::Element;
-
-pub const OPEN_MSG: &str = r#"
-<!--
-Please enter an issue title and description.
-
-The first line is the issue title. The issue description
-follows, and must be separated by a blank line, just
-like a commit message. Markdown is supported in the title
-and description.
--->
-"#;
-
-/// Display format.
-#[derive(Default, Debug, PartialEq, Eq)]
-pub enum Format {
-    #[default]
-    Full,
-    Header,
-}
-
-pub fn get_title_description(
-    title: Option<String>,
-    description: Option<String>,
-) -> io::Result<Option<(String, String)>> {
-    term::patch::Message::edit_title_description(title, description, OPEN_MSG)
-}
-
-pub fn show(
-    issue: &issue::Issue,
-    id: &cob::ObjectId,
-    format: Format,
-    profile: &Profile,
-) -> anyhow::Result<()> {
-    let labels: Vec<String> = issue.labels().cloned().map(|t| t.into()).collect();
-    let assignees: Vec<String> = issue
-        .assignees()
-        .map(|a| term::format::did(a).to_string())
-        .collect();
-    let author = issue.author();
-    let did = author.id();
-    let author = Author::new(did, profile);
-
-    let mut attrs = Table::<2, term::Line>::new(TableOptions {
-        spacing: 2,
-        ..TableOptions::default()
-    });
-
-    attrs.push([
-        term::format::tertiary("Title".to_owned()).into(),
-        term::format::bold(issue.title().to_owned()).into(),
-    ]);
-
-    attrs.push([
-        term::format::tertiary("Issue".to_owned()).into(),
-        term::format::bold(id.to_string()).into(),
-    ]);
-
-    attrs.push([
-        term::format::tertiary("Author".to_owned()).into(),
-        author.line(),
-    ]);
-
-    if !labels.is_empty() {
-        attrs.push([
-            term::format::tertiary("Labels".to_owned()).into(),
-            term::format::secondary(labels.join(", ")).into(),
-        ]);
-    }
-
-    if !assignees.is_empty() {
-        attrs.push([
-            term::format::tertiary("Assignees".to_owned()).into(),
-            term::format::dim(assignees.join(", ")).into(),
-        ]);
-    }
-
-    attrs.push([
-        term::format::tertiary("Status".to_owned()).into(),
-        match issue.state() {
-            issue::State::Open => term::format::positive("open".to_owned()).into(),
-            issue::State::Closed {
-                reason: CloseReason::Solved,
-            } => term::Line::spaced([
-                term::format::negative("closed").into(),
-                term::format::negative("(solved)").italic().dim().into(),
-            ]),
-            issue::State::Closed {
-                reason: CloseReason::Other,
-            } => term::Line::spaced([term::format::negative("closed").into()]),
-        },
-    ]);
-
-    let description = issue.description();
-    let mut widget = VStack::default()
-        .border(Some(term::colors::FAINT))
-        .child(attrs)
-        .children(if !description.is_empty() {
-            vec![
-                term::Label::blank().boxed(),
-                term::textarea(description.trim()).wrap(60).boxed(),
-            ]
-        } else {
-            vec![]
-        });
-
-    if format == Format::Full {
-        for (id, comment) in issue.replies() {
-            let hstack = term::comment::header(id, comment, profile);
-
-            widget = widget.divider();
-            widget.push(hstack);
-            widget.push(term::textarea(comment.body()).wrap(60));
-        }
-    }
-    widget.print();
-
-    Ok(())
-}
diff --git a/radicle-cli/src/terminal/json.rs b/radicle-cli/src/terminal/json.rs
deleted file mode 100644
index bd8bd4cfb..000000000
--- a/radicle-cli/src/terminal/json.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use std::path::Path;
-
-use crate::terminal as term;
-
-/// Pretty-print a JSON value with syntax highlighting.
-pub fn to_pretty(value: &impl serde::Serialize, path: &Path) -> anyhow::Result<Vec<term::Line>> {
-    let json = serde_json::to_string_pretty(&value)?;
-    let mut highlighter = term::highlight::Highlighter::default();
-    let highlighted = highlighter.highlight(path, json.as_bytes())?;
-
-    Ok(highlighted)
-}
diff --git a/radicle-cli/src/terminal/patch.rs b/radicle-cli/src/terminal/patch.rs
deleted file mode 100644
index cb2efa24b..000000000
--- a/radicle-cli/src/terminal/patch.rs
+++ /dev/null
@@ -1,664 +0,0 @@
-mod common;
-mod timeline;
-
-use std::fmt;
-use std::fmt::Write;
-use std::io;
-use std::io::IsTerminal as _;
-
-use thiserror::Error;
-
-use radicle::cob;
-use radicle::cob::patch;
-use radicle::git;
-use radicle::patch::{Patch, PatchId};
-use radicle::prelude::Profile;
-use radicle::storage::git::Repository;
-use radicle::storage::WriteRepository as _;
-
-use crate::terminal as term;
-use crate::terminal::Element;
-
-pub use common::*;
-
-#[derive(Debug, Error)]
-pub enum Error {
-    #[error(transparent)]
-    Fmt(#[from] fmt::Error),
-    #[error("git: {0}")]
-    Git(#[from] git::raw::Error),
-    #[error("i/o error: {0}")]
-    Io(#[from] io::Error),
-    #[error("invalid utf-8 string")]
-    InvalidUtf8,
-}
-
-/// The user supplied `Patch` description.
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
-pub enum Message {
-    /// Prompt user to write comment in editor.
-    #[default]
-    Edit,
-    /// Don't leave a comment.
-    Blank,
-    /// Use the following string as comment.
-    Text(String),
-}
-
-impl Message {
-    /// Get the `Message` as a string according to the method.
-    pub fn get(self, help: &str) -> std::io::Result<String> {
-        let comment = match self {
-            Message::Edit => {
-                if io::stderr().is_terminal() {
-                    term::Editor::new().extension("markdown").edit(help)?
-                } else {
-                    Some(help.to_owned())
-                }
-            }
-            Message::Blank => None,
-            Message::Text(c) => Some(c),
-        };
-        let comment = comment.unwrap_or_default();
-        let comment = term::format::html::strip_comments(&comment);
-        let comment = comment.trim();
-
-        Ok(comment.to_owned())
-    }
-
-    /// Open the editor with the given title and description (if any).
-    /// Returns the edited title and description, or nothing if it couldn't be parsed.
-    pub fn edit_title_description(
-        title: Option<String>,
-        description: Option<String>,
-        help: &str,
-    ) -> std::io::Result<Option<(String, String)>> {
-        let mut placeholder = String::new();
-
-        if let Some(title) = title {
-            placeholder.push_str(title.trim());
-            placeholder.push('\n');
-        }
-        if let Some(description) = description {
-            placeholder.push('\n');
-            placeholder.push_str(description.trim());
-            placeholder.push('\n');
-        }
-        placeholder.push_str(help);
-
-        let output = Self::Edit.get(&placeholder)?;
-        let (title, description) = match output.split_once("\n\n") {
-            Some((x, y)) => (x, y),
-            None => (output.as_str(), ""),
-        };
-        let (title, description) = (title.trim(), description.trim());
-
-        if title.is_empty() | title.contains('\n') {
-            return Ok(None);
-        }
-        Ok(Some((title.to_owned(), description.to_owned())))
-    }
-
-    pub fn append(&mut self, arg: &str) {
-        if let Message::Text(v) = self {
-            v.extend(["\n\n", arg]);
-        } else {
-            *self = Message::Text(arg.into());
-        };
-    }
-}
-
-pub const PATCH_MSG: &str = r#"
-<!--
-Please enter a patch message for your changes. An empty
-message aborts the patch proposal.
-
-The first line is the patch title. The patch description
-follows, and must be separated with a blank line, just
-like a commit message. Markdown is supported in the title
-and description.
--->
-"#;
-
-const REVISION_MSG: &str = r#"
-<!--
-Please enter a comment for your patch update. Leaving this
-blank is also okay.
--->
-"#;
-
-/// Combine the title and description fields to display to the user.
-#[inline]
-pub fn message(title: &str, description: &str) -> String {
-    format!("{title}\n\n{description}").trim().to_string()
-}
-
-/// Create a helpful default `Patch` message out of one or more commit messages.
-fn message_from_commits(name: &str, commits: Vec<git::raw::Commit>) -> Result<String, Error> {
-    let mut commits = commits.into_iter().rev();
-    let count = commits.len();
-    let Some(commit) = commits.next() else {
-        return Ok(String::default());
-    };
-    let commit_msg = commit.message().ok_or(Error::InvalidUtf8)?.to_string();
-
-    if count == 1 {
-        return Ok(commit_msg);
-    }
-
-    // Many commits
-    let mut msg = String::new();
-    writeln!(&mut msg, "<!--")?;
-    writeln!(
-        &mut msg,
-        "This {name} is the combination of {count} commits.",
-    )?;
-    writeln!(&mut msg, "This is the first commit message:")?;
-    writeln!(&mut msg, "-->")?;
-    writeln!(&mut msg)?;
-    writeln!(&mut msg, "{}", commit_msg.trim_end())?;
-    writeln!(&mut msg)?;
-
-    for (i, commit) in commits.enumerate() {
-        let commit_msg = commit.message().ok_or(Error::InvalidUtf8)?.trim_end();
-        let commit_num = i + 2;
-
-        writeln!(&mut msg, "<!--")?;
-        writeln!(&mut msg, "This is commit message #{commit_num}:")?;
-        writeln!(&mut msg, "-->")?;
-        writeln!(&mut msg)?;
-        writeln!(&mut msg, "{commit_msg}")?;
-        writeln!(&mut msg)?;
-    }
-
-    Ok(msg)
-}
-
-/// Return commits between the merge base and a head.
-pub fn patch_commits<'a>(
-    repo: &'a git::raw::Repository,
-    base: &git::Oid,
-    head: &git::Oid,
-) -> Result<Vec<git::raw::Commit<'a>>, git::raw::Error> {
-    let mut commits = Vec::new();
-    let mut revwalk = repo.revwalk()?;
-    revwalk.push_range(&format!("{base}..{head}"))?;
-
-    for rev in revwalk {
-        let commit = repo.find_commit(rev?)?;
-        commits.push(commit);
-    }
-    Ok(commits)
-}
-
-/// The message shown in the editor when creating a `Patch`.
-fn create_display_message(
-    repo: &git::raw::Repository,
-    base: &git::Oid,
-    head: &git::Oid,
-) -> Result<String, Error> {
-    let commits = patch_commits(repo, base, head)?;
-    if commits.is_empty() {
-        return Ok(PATCH_MSG.trim_start().to_string());
-    }
-
-    let summary = message_from_commits("patch", commits)?;
-    let summary = summary.trim();
-
-    Ok(format!("{summary}\n{PATCH_MSG}"))
-}
-
-/// Get the Patch title and description from the command line arguments, or request it from the
-/// user.
-///
-/// The user can bail out if an empty title is entered.
-pub fn get_create_message(
-    message: term::patch::Message,
-    repo: &git::raw::Repository,
-    base: &git::Oid,
-    head: &git::Oid,
-) -> Result<(String, String), Error> {
-    let display_msg = create_display_message(repo, base, head)?;
-    let message = message.get(&display_msg)?;
-
-    let (title, description) = message.split_once('\n').unwrap_or((&message, ""));
-    let (title, description) = (title.trim().to_string(), description.trim().to_string());
-
-    if title.is_empty() {
-        return Err(io::Error::new(
-            io::ErrorKind::InvalidInput,
-            "a patch title must be provided",
-        )
-        .into());
-    }
-
-    Ok((title, description))
-}
-
-/// The message shown in the editor when editing a `Patch`.
-fn edit_display_message(title: &str, description: &str) -> String {
-    format!("{}\n\n{}\n{PATCH_MSG}", title, description)
-        .trim_start()
-        .to_string()
-}
-
-/// Get a patch edit message.
-pub fn get_edit_message(
-    patch_message: term::patch::Message,
-    patch: &cob::patch::Patch,
-) -> io::Result<(String, String)> {
-    let display_msg = edit_display_message(patch.title(), patch.description());
-    let patch_message = patch_message.get(&display_msg)?;
-    let patch_message = patch_message.replace(PATCH_MSG.trim(), ""); // Delete help message.
-
-    let (title, description) = patch_message
-        .split_once('\n')
-        .unwrap_or((&patch_message, ""));
-    let (title, description) = (title.trim().to_string(), description.trim().to_string());
-
-    if title.is_empty() {
-        return Err(io::Error::new(
-            io::ErrorKind::InvalidInput,
-            "a patch title must be provided",
-        ));
-    }
-
-    Ok((title, description))
-}
-
-/// The message shown in the editor when updating a `Patch`.
-fn update_display_message(
-    repo: &git::raw::Repository,
-    last_rev_head: &git::Oid,
-    head: &git::Oid,
-) -> Result<String, Error> {
-    if !repo.graph_descendant_of(**head, **last_rev_head)? {
-        return Ok(REVISION_MSG.trim_start().to_string());
-    }
-
-    let commits = patch_commits(repo, last_rev_head, head)?;
-    if commits.is_empty() {
-        return Ok(REVISION_MSG.trim_start().to_string());
-    }
-
-    let summary = message_from_commits("patch", commits)?;
-    let summary = summary.trim();
-
-    Ok(format!("{summary}\n{REVISION_MSG}"))
-}
-
-/// Get a patch update message.
-pub fn get_update_message(
-    message: term::patch::Message,
-    repo: &git::raw::Repository,
-    latest: &patch::Revision,
-    head: &git::Oid,
-) -> Result<String, Error> {
-    let display_msg = update_display_message(repo, &latest.head(), head)?;
-    let message = message.get(&display_msg)?;
-    let message = message.trim();
-
-    Ok(message.to_owned())
-}
-
-/// List the given commits in a table.
-pub fn list_commits(commits: &[git::raw::Commit]) -> anyhow::Result<()> {
-    let mut table = term::Table::default();
-
-    for commit in commits {
-        let message = commit
-            .summary_bytes()
-            .unwrap_or_else(|| commit.message_bytes());
-        table.push([
-            term::format::secondary(term::format::oid(commit.id()).into()),
-            term::format::italic(String::from_utf8_lossy(message).to_string()),
-        ]);
-    }
-    table.print();
-
-    Ok(())
-}
-
-/// Print commits ahead and behind.
-pub fn print_commits_ahead_behind(
-    repo: &git::raw::Repository,
-    left: git::raw::Oid,
-    right: git::raw::Oid,
-) -> anyhow::Result<()> {
-    let (ahead, behind) = repo.graph_ahead_behind(left, right)?;
-
-    term::info!(
-        "{} commit(s) ahead, {} commit(s) behind",
-        term::format::positive(ahead),
-        if behind > 0 {
-            term::format::negative(behind)
-        } else {
-            term::format::dim(behind)
-        }
-    );
-    Ok(())
-}
-
-pub fn show(
-    patch: &Patch,
-    id: &PatchId,
-    verbose: bool,
-    stored: &Repository,
-    workdir: Option<&git::raw::Repository>,
-    profile: &Profile,
-) -> anyhow::Result<()> {
-    let (_, revision) = patch.latest();
-    let state = patch.state();
-    let branches = if let Some(wd) = workdir {
-        common::branches(&revision.head(), wd)?
-    } else {
-        vec![]
-    };
-    let ahead_behind = common::ahead_behind(
-        stored.raw(),
-        *revision.head(),
-        *patch.target().head(stored)?,
-    )?;
-    let author = patch.author();
-    let author = term::format::Author::new(author.id(), profile);
-    let labels = patch.labels().map(|l| l.to_string()).collect::<Vec<_>>();
-
-    let mut attrs = term::Table::<2, term::Line>::new(term::TableOptions {
-        spacing: 2,
-        ..term::TableOptions::default()
-    });
-    attrs.push([
-        term::format::tertiary("Title".to_owned()).into(),
-        term::format::bold(patch.title().to_owned()).into(),
-    ]);
-    attrs.push([
-        term::format::tertiary("Patch".to_owned()).into(),
-        term::format::default(id.to_string()).into(),
-    ]);
-    attrs.push([
-        term::format::tertiary("Author".to_owned()).into(),
-        author.line(),
-    ]);
-    if !labels.is_empty() {
-        attrs.push([
-            term::format::tertiary("Labels".to_owned()).into(),
-            term::format::secondary(labels.join(", ")).into(),
-        ]);
-    }
-    attrs.push([
-        term::format::tertiary("Head".to_owned()).into(),
-        term::format::secondary(revision.head().to_string()).into(),
-    ]);
-    if verbose {
-        attrs.push([
-            term::format::tertiary("Base".to_owned()).into(),
-            term::format::secondary(revision.base().to_string()).into(),
-        ]);
-    }
-    if !branches.is_empty() {
-        attrs.push([
-            term::format::tertiary("Branches".to_owned()).into(),
-            term::format::yellow(branches.join(", ")).into(),
-        ]);
-    }
-    attrs.push([
-        term::format::tertiary("Commits".to_owned()).into(),
-        ahead_behind,
-    ]);
-    attrs.push([
-        term::format::tertiary("Status".to_owned()).into(),
-        match state {
-            patch::State::Open { .. } => term::format::positive(state.to_string()),
-            patch::State::Draft => term::format::dim(state.to_string()),
-            patch::State::Archived => term::format::yellow(state.to_string()),
-            patch::State::Merged { .. } => term::format::primary(state.to_string()),
-        }
-        .into(),
-    ]);
-
-    let commits = patch_commit_lines(patch, stored)?;
-    let description = patch.description().trim();
-    let mut widget = term::VStack::default()
-        .border(Some(term::colors::FAINT))
-        .child(attrs)
-        .children(if !description.is_empty() {
-            vec![
-                term::Label::blank().boxed(),
-                term::textarea(description).boxed(),
-            ]
-        } else {
-            vec![]
-        })
-        .divider()
-        .children(commits.into_iter().map(|l| l.boxed()))
-        .divider();
-
-    for line in timeline::timeline(profile, patch) {
-        widget.push(line);
-    }
-
-    if verbose {
-        for (id, comment) in revision.replies() {
-            let hstack = term::comment::header(id, comment, profile);
-
-            widget = widget.divider();
-            widget.push(hstack);
-            widget.push(term::textarea(comment.body()).wrap(60));
-        }
-    }
-    widget.print();
-
-    Ok(())
-}
-
-fn patch_commit_lines(
-    patch: &patch::Patch,
-    stored: &Repository,
-) -> anyhow::Result<Vec<term::Line>> {
-    let (from, to) = patch.range()?;
-    let mut lines = Vec::new();
-
-    for commit in patch_commits(stored.raw(), &from, &to)? {
-        lines.push(term::Line::spaced([
-            term::label(term::format::secondary::<String>(
-                term::format::oid(commit.id()).into(),
-            )),
-            term::label(term::format::default(
-                commit.summary().unwrap_or_default().to_owned(),
-            )),
-        ]));
-    }
-    Ok(lines)
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use radicle::git::refname;
-    use radicle::test::fixtures;
-    use std::path;
-
-    fn commit(
-        repo: &git::raw::Repository,
-        branch: &git::RefStr,
-        parent: &git::Oid,
-        msg: &str,
-    ) -> git::Oid {
-        let sig = git::raw::Signature::new(
-            "anonymous",
-            "anonymous@radicle.xyz",
-            &git::raw::Time::new(0, 0),
-        )
-        .unwrap();
-        let head = repo.find_commit(**parent).unwrap();
-        let tree =
-            git::write_tree(path::Path::new("README"), "Hello World!\n".as_bytes(), repo).unwrap();
-
-        let branch = git::refs::branch(branch);
-        let commit = git::commit(repo, &head, &branch, msg, &sig, &tree).unwrap();
-
-        commit.id().into()
-    }
-
-    #[test]
-    fn test_create_display_message() {
-        let tmpdir = tempfile::tempdir().unwrap();
-        let (repo, commit_0) = fixtures::repository(&tmpdir);
-        let commit_0 = commit_0.into();
-        let commit_1 = commit(
-            &repo,
-            &refname!("feature"),
-            &commit_0,
-            "Commit 1\n\nDescription\n",
-        );
-        let commit_2 = commit(
-            &repo,
-            &refname!("feature"),
-            &commit_1,
-            "Commit 2\n\nDescription\n",
-        );
-
-        let res = create_display_message(&repo, &commit_0, &commit_0).unwrap();
-        assert_eq!(
-            "\
-            <!--\n\
-            Please enter a patch message for your changes. An empty\n\
-            message aborts the patch proposal.\n\
-            \n\
-            The first line is the patch title. The patch description\n\
-            follows, and must be separated with a blank line, just\n\
-            like a commit message. Markdown is supported in the title\n\
-            and description.\n\
-            -->\n\
-            ",
-            res
-        );
-
-        let res = create_display_message(&repo, &commit_0, &commit_1).unwrap();
-        assert_eq!(
-            "\
-            Commit 1\n\
-            \n\
-            Description\n\
-            \n\
-            <!--\n\
-            Please enter a patch message for your changes. An empty\n\
-            message aborts the patch proposal.\n\
-            \n\
-            The first line is the patch title. The patch description\n\
-            follows, and must be separated with a blank line, just\n\
-            like a commit message. Markdown is supported in the title\n\
-            and description.\n\
-            -->\n\
-            ",
-            res
-        );
-
-        let res = create_display_message(&repo, &commit_0, &commit_2).unwrap();
-        assert_eq!(
-            "\
-            <!--\n\
-            This patch is the combination of 2 commits.\n\
-            This is the first commit message:\n\
-            -->\n\
-            \n\
-            Commit 1\n\
-            \n\
-            Description\n\
-            \n\
-            <!--\n\
-            This is commit message #2:\n\
-            -->\n\
-            \n\
-            Commit 2\n\
-            \n\
-            Description\n\
-            \n\
-            <!--\n\
-            Please enter a patch message for your changes. An empty\n\
-            message aborts the patch proposal.\n\
-            \n\
-            The first line is the patch title. The patch description\n\
-            follows, and must be separated with a blank line, just\n\
-            like a commit message. Markdown is supported in the title\n\
-            and description.\n\
-            -->\n\
-            ",
-            res
-        );
-    }
-
-    #[test]
-    fn test_edit_display_message() {
-        let res = edit_display_message("title", "The patch description.");
-        assert_eq!(
-            "\
-            title\n\
-            \n\
-            The patch description.\n\
-            \n\
-            <!--\n\
-            Please enter a patch message for your changes. An empty\n\
-            message aborts the patch proposal.\n\
-            \n\
-            The first line is the patch title. The patch description\n\
-            follows, and must be separated with a blank line, just\n\
-            like a commit message. Markdown is supported in the title\n\
-            and description.\n\
-            -->\n\
-            ",
-            res
-        );
-    }
-
-    #[test]
-    fn test_update_display_message() {
-        let tmpdir = tempfile::tempdir().unwrap();
-        let (repo, commit_0) = fixtures::repository(&tmpdir);
-        let commit_0 = commit_0.into();
-
-        let commit_1 = commit(&repo, &refname!("feature"), &commit_0, "commit 1\n");
-        let commit_2 = commit(&repo, &refname!("feature"), &commit_1, "commit 2\n");
-        let commit_squashed = commit(
-            &repo,
-            &refname!("squashed-feature"),
-            &commit_0,
-            "commit squashed",
-        );
-
-        let res = update_display_message(&repo, &commit_1, &commit_1).unwrap();
-        assert_eq!(
-            "\
-            <!--\n\
-            Please enter a comment for your patch update. Leaving this\n\
-            blank is also okay.\n\
-            -->\n\
-            ",
-            res
-        );
-
-        let res = update_display_message(&repo, &commit_1, &commit_2).unwrap();
-        assert_eq!(
-            "\
-            commit 2\n\
-            \n\
-            <!--\n\
-            Please enter a comment for your patch update. Leaving this\n\
-            blank is also okay.\n\
-            -->\n\
-            ",
-            res
-        );
-
-        let res = update_display_message(&repo, &commit_1, &commit_squashed).unwrap();
-        assert_eq!(
-            "\
-            <!--\n\
-            Please enter a comment for your patch update. Leaving this\n\
-            blank is also okay.\n\
-            -->\n\
-            ",
-            res
-        );
-    }
-}
diff --git a/radicle-cli/src/terminal/patch/common.rs b/radicle-cli/src/terminal/patch/common.rs
deleted file mode 100644
index 35e1dcf38..000000000
--- a/radicle-cli/src/terminal/patch/common.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-use anyhow::anyhow;
-
-use radicle::git;
-use radicle::git::raw::Oid;
-use radicle::prelude::*;
-use radicle::storage::git::Repository;
-
-use crate::terminal as term;
-
-/// Give the oid of the branch or an appropriate error.
-#[inline]
-pub fn branch_oid(branch: &git::raw::Branch) -> anyhow::Result<git::Oid> {
-    let oid = branch
-        .get()
-        .target()
-        .ok_or(anyhow!("invalid HEAD ref; aborting"))?;
-    Ok(oid.into())
-}
-
-#[inline]
-fn get_branch(git_ref: git::Qualified) -> git::RefString {
-    let (_, _, head, tail) = git_ref.non_empty_components();
-    std::iter::once(head).chain(tail).collect()
-}
-
-/// Determine the merge target for this patch. This can be any followed remote's "default" branch,
-/// as well as your own (eg. `rad/master`).
-pub fn get_merge_target(
-    storage: &Repository,
-    head_branch: &git::raw::Branch,
-) -> anyhow::Result<(git::RefString, git::Oid)> {
-    let (qualified_ref, target_oid) = storage.canonical_head()?;
-    let head_oid = branch_oid(head_branch)?;
-    let merge_base = storage.raw().merge_base(*head_oid, *target_oid)?;
-
-    if head_oid == merge_base.into() {
-        anyhow::bail!("commits are already included in the target branch; nothing to do");
-    }
-
-    Ok((get_branch(qualified_ref), (*target_oid).into()))
-}
-
-/// Get the diff stats between two commits.
-/// Should match the default output of `git diff <old> <new> --stat` exactly.
-pub fn diff_stats(
-    repo: &git::raw::Repository,
-    old: &Oid,
-    new: &Oid,
-) -> Result<git::raw::DiffStats, git::raw::Error> {
-    let old = repo.find_commit(*old)?;
-    let new = repo.find_commit(*new)?;
-    let old_tree = old.tree()?;
-    let new_tree = new.tree()?;
-    let mut diff = repo.diff_tree_to_tree(Some(&old_tree), Some(&new_tree), None)?;
-    let mut find_opts = git::raw::DiffFindOptions::new();
-
-    diff.find_similar(Some(&mut find_opts))?;
-    diff.stats()
-}
-
-/// Create a human friendly message about git's sync status.
-pub fn ahead_behind(
-    repo: &git::raw::Repository,
-    revision_oid: Oid,
-    head_oid: Oid,
-) -> anyhow::Result<term::Line> {
-    let (a, b) = repo.graph_ahead_behind(revision_oid, head_oid)?;
-    if a == 0 && b == 0 {
-        return Ok(term::Line::new(term::format::dim("up to date")));
-    }
-
-    let ahead = term::format::positive(a);
-    let behind = term::format::negative(b);
-
-    Ok(term::Line::default()
-        .item("ahead ")
-        .item(ahead)
-        .item(", behind ")
-        .item(behind))
-}
-
-/// Get the branches that point to a commit.
-pub fn branches(target: &Oid, repo: &git::raw::Repository) -> anyhow::Result<Vec<String>> {
-    let mut branches: Vec<String> = vec![];
-
-    for r in repo.references()?.flatten() {
-        if !r.is_branch() {
-            continue;
-        }
-        if let (Some(oid), Some(name)) = (&r.target(), &r.shorthand()) {
-            if oid == target {
-                branches.push(name.to_string());
-            };
-        };
-    }
-    Ok(branches)
-}
-
-#[inline]
-pub fn try_branch(reference: git::raw::Reference<'_>) -> anyhow::Result<git::raw::Branch> {
-    let branch = if reference.is_branch() {
-        git::raw::Branch::wrap(reference)
-    } else {
-        anyhow::bail!("cannot create patch from detached head; aborting")
-    };
-    Ok(branch)
-}
diff --git a/radicle-cli/src/terminal/patch/timeline.rs b/radicle-cli/src/terminal/patch/timeline.rs
deleted file mode 100644
index 70931b160..000000000
--- a/radicle-cli/src/terminal/patch/timeline.rs
+++ /dev/null
@@ -1,328 +0,0 @@
-use std::iter;
-
-use radicle::cob;
-use radicle::cob::patch::{Patch, Verdict};
-use radicle::git;
-use radicle::patch::{Merge, Review, Revision, RevisionId};
-use radicle::profile::Profile;
-
-use crate::terminal as term;
-use crate::terminal::format::Author;
-
-pub fn timeline<'a>(
-    profile: &'a Profile,
-    patch: &'a Patch,
-) -> impl Iterator<Item = term::Line> + 'a {
-    Timeline::build(profile, patch).into_lines(profile)
-}
-
-/// The timeline of a [`Patch`].
-///
-/// A `Patch` will always have opened with a root revision and may
-/// have a series of revisions that update the patch.
-///
-/// The function, [`timeline`], builds a `Timeline` and converts it
-/// into a series of [`term::Line`]s.
-struct Timeline<'a> {
-    opened: Opened<'a>,
-    revisions: Vec<RevisionEntry<'a>>,
-}
-
-impl<'a> Timeline<'a> {
-    fn build(profile: &Profile, patch: &'a Patch) -> Self {
-        let opened = Opened::from_patch(patch, profile);
-        let mut revisions = patch
-            .revisions()
-            .skip(1) // skip the root revision since it's handled in `Opened::from_patch`
-            .map(|(id, revision)| {
-                (
-                    revision.timestamp(),
-                    RevisionEntry::from_revision(patch, id, revision, profile),
-                )
-            })
-            .collect::<Vec<_>>();
-        revisions.sort_by_key(|(t, _)| *t);
-        Timeline {
-            opened,
-            revisions: revisions.into_iter().map(|(_, e)| e).collect(),
-        }
-    }
-
-    fn into_lines(self, profile: &'a Profile) -> impl Iterator<Item = term::Line> + 'a {
-        self.opened.into_lines(profile).chain(
-            self.revisions
-                .into_iter()
-                .flat_map(|r| r.into_lines(profile)),
-        )
-    }
-}
-
-/// The root `Revision` of the `Patch`.
-struct Opened<'a> {
-    /// The `Author` of the patch.
-    author: Author<'a>,
-    /// When the patch was created.
-    timestamp: cob::Timestamp,
-    /// The commit head of the `Revision`.
-    head: git::Oid,
-    /// Any updates performed on the root `Revision`.
-    updates: Vec<Update<'a>>,
-}
-
-impl<'a> Opened<'a> {
-    fn from_patch(patch: &'a Patch, profile: &Profile) -> Self {
-        let (root, revision) = patch.root();
-        let mut updates = Vec::new();
-        updates.extend(revision.reviews().map(|(_, review)| {
-            (
-                review.timestamp(),
-                Update::Reviewed {
-                    review: review.clone(),
-                },
-            )
-        }));
-        updates.extend(patch.merges().filter_map(|(nid, merge)| {
-            if merge.revision == root {
-                Some((
-                    merge.timestamp,
-                    Update::Merged {
-                        author: Author::new(nid, profile),
-                        merge: merge.clone(),
-                    },
-                ))
-            } else {
-                None
-            }
-        }));
-        updates.sort_by_key(|(t, _)| *t);
-        Opened {
-            author: Author::new(&patch.author().id, profile),
-            timestamp: patch.timestamp(),
-            head: revision.head(),
-            updates: updates.into_iter().map(|(_, up)| up).collect(),
-        }
-    }
-
-    fn into_lines(self, profile: &'a Profile) -> impl Iterator<Item = term::Line> + 'a {
-        iter::once(
-            term::Line::spaced([
-                term::format::positive("●").into(),
-                term::format::default("opened by").into(),
-            ])
-            .space()
-            .extend(self.author.line())
-            .space()
-            .extend(term::Line::spaced([
-                term::format::parens(term::format::secondary(term::format::oid(self.head))).into(),
-                term::format::dim(term::format::timestamp(self.timestamp)).into(),
-            ])),
-        )
-        .chain(self.updates.into_iter().map(|up| {
-            term::Line::spaced([term::Label::space(), term::Label::from("└─ ")])
-                .extend(up.into_line(profile))
-        }))
-    }
-}
-
-/// A revision entry in the [`Timeline`].
-enum RevisionEntry<'a> {
-    /// An `Updated` entry means that the original author of the
-    /// `Patch` created a new revision.
-    Updated {
-        /// When the `Revision` was created.
-        timestamp: cob::Timestamp,
-        /// The id of the `Revision`.
-        id: RevisionId,
-        /// The commit head of the `Revision`.
-        head: git::Oid,
-        /// All [`Update`]s that occurred on the `Revision`.
-        updates: Vec<Update<'a>>,
-    },
-    /// A `Revised` entry means that an author other than the original
-    /// author of the `Patch` created a new revision.
-    Revised {
-        /// The `Author` that created the `Revision` (that is not the
-        /// `Patch` author).
-        author: Author<'a>,
-        /// When the `Revision` was created.
-        timestamp: cob::Timestamp,
-        /// The id of the `Revision`.
-        id: RevisionId,
-        /// The commit head of the `Revision`.
-        head: git::Oid,
-        /// All [`Update`]s that occurred on the `Revision`.
-        updates: Vec<Update<'a>>,
-    },
-}
-
-impl<'a> RevisionEntry<'a> {
-    fn from_revision(
-        patch: &'a Patch,
-        id: RevisionId,
-        revision: &'a Revision,
-        profile: &Profile,
-    ) -> Self {
-        let mut updates = Vec::new();
-        updates.extend(revision.reviews().map(|(_, review)| {
-            (
-                review.timestamp(),
-                Update::Reviewed {
-                    review: review.clone(),
-                },
-            )
-        }));
-        updates.extend(patch.merges().filter_map(|(nid, merge)| {
-            if merge.revision == id {
-                Some((
-                    merge.timestamp,
-                    Update::Merged {
-                        author: Author::new(nid, profile),
-                        merge: merge.clone(),
-                    },
-                ))
-            } else {
-                None
-            }
-        }));
-        updates.sort_by_key(|(t, _)| *t);
-
-        if revision.author() == patch.author() {
-            RevisionEntry::Updated {
-                timestamp: revision.timestamp(),
-                id,
-                head: revision.head(),
-                updates: updates.into_iter().map(|(_, up)| up).collect(),
-            }
-        } else {
-            RevisionEntry::Revised {
-                author: Author::new(&revision.author().id, profile),
-                timestamp: revision.timestamp(),
-                id,
-                head: revision.head(),
-                updates: updates.into_iter().map(|(_, up)| up).collect(),
-            }
-        }
-    }
-
-    fn into_lines(self, profile: &'a Profile) -> Vec<term::Line> {
-        match self {
-            RevisionEntry::Updated {
-                timestamp,
-                id,
-                head,
-                updates,
-            } => Self::updated(profile, timestamp, id, head, updates).collect(),
-            RevisionEntry::Revised {
-                author,
-                timestamp,
-                id,
-                head,
-                updates,
-            } => Self::revised(profile, author, timestamp, id, head, updates).collect(),
-        }
-    }
-
-    fn updated(
-        profile: &'a Profile,
-        timestamp: cob::Timestamp,
-        id: RevisionId,
-        head: git::Oid,
-        updates: Vec<Update<'a>>,
-    ) -> impl Iterator<Item = term::Line> + 'a {
-        iter::once(term::Line::spaced([
-            term::format::tertiary("↑").into(),
-            term::format::default("updated to").into(),
-            term::format::dim(id).into(),
-            term::format::parens(term::format::secondary(term::format::oid(head))).into(),
-            term::format::dim(term::format::timestamp(timestamp)).into(),
-        ]))
-        .chain(updates.into_iter().map(|up| {
-            term::Line::spaced([term::Label::space(), term::Label::from("└─ ")])
-                .extend(up.into_line(profile))
-        }))
-    }
-
-    fn revised(
-        profile: &'a Profile,
-        author: Author<'a>,
-        timestamp: cob::Timestamp,
-        id: RevisionId,
-        head: git::Oid,
-        updates: Vec<Update<'a>>,
-    ) -> impl Iterator<Item = term::Line> + 'a {
-        let (alias, nid) = author.labels();
-        iter::once(term::Line::spaced([
-            term::format::tertiary("*").into(),
-            term::format::default("revised by").into(),
-            alias,
-            nid,
-            term::format::default("in").into(),
-            term::format::dim(term::format::oid(id)).into(),
-            term::format::parens(term::format::secondary(term::format::oid(head))).into(),
-            term::format::dim(term::format::timestamp(timestamp)).into(),
-        ]))
-        .chain(updates.into_iter().map(|up| {
-            term::Line::spaced([term::Label::space(), term::Label::from("└─ ")])
-                .extend(up.into_line(profile))
-        }))
-    }
-}
-
-/// An update in the [`Patch`]'s timeline.
-enum Update<'a> {
-    /// A revision of the patch was reviewed.
-    Reviewed { review: Review },
-    /// A revision of the patch was merged.
-    Merged { author: Author<'a>, merge: Merge },
-}
-
-impl<'a> Update<'a> {
-    fn timestamp(&self) -> cob::Timestamp {
-        match self {
-            Update::Reviewed { review } => review.timestamp(),
-            Update::Merged { merge, .. } => merge.timestamp,
-        }
-    }
-
-    fn into_line(self, profile: &Profile) -> term::Line {
-        let timestamp = self.timestamp();
-        let mut line = match self {
-            Update::Reviewed { review } => {
-                let verdict = review.verdict();
-                let verdict_symbol = match verdict {
-                    Some(Verdict::Accept) => term::format::positive("✓"),
-                    Some(Verdict::Reject) => term::format::negative("✗"),
-                    None => term::format::dim("⋄"),
-                };
-                let verdict_verb = match verdict {
-                    Some(Verdict::Accept) => term::format::default("accepted"),
-                    Some(Verdict::Reject) => term::format::default("rejected"),
-                    None => term::format::default("reviewed"),
-                };
-                term::Line::spaced([
-                    verdict_symbol.into(),
-                    verdict_verb.into(),
-                    term::format::default("by").into(),
-                ])
-                .space()
-                .extend(Author::new(&review.author().id.into(), profile).line())
-            }
-            Update::Merged { author, merge } => {
-                let (alias, nid) = author.labels();
-                term::Line::spaced([
-                    term::format::primary("✓").bold().into(),
-                    term::format::default("merged by").into(),
-                    alias,
-                    nid,
-                    term::format::default("at revision").into(),
-                    term::format::dim(term::format::oid(merge.revision)).into(),
-                    term::format::parens(term::format::secondary(term::format::oid(merge.commit)))
-                        .into(),
-                ])
-            }
-        };
-        line.push(term::Label::space());
-        line.push(term::format::dim(term::format::timestamp(timestamp)));
-        line
-    }
-}
diff --git a/radicle-cli/src/terminal/upload_pack.rs b/radicle-cli/src/terminal/upload_pack.rs
deleted file mode 100644
index 6e3db7bff..000000000
--- a/radicle-cli/src/terminal/upload_pack.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use std::collections::BTreeSet;
-use std::time::Instant;
-
-use crate::terminal::format;
-use radicle::node::NodeId;
-
-/// Keeps track of upload-pack progress for displaying to the terminal.
-pub struct UploadPack {
-    /// Keep track of which remotes are being uploaded to, removing any that
-    /// have completed.
-    remotes: BTreeSet<NodeId>,
-    /// Keep track of how long we've been transmitting for to calculate
-    /// throughput.
-    timer: Instant,
-}
-
-impl Default for UploadPack {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl UploadPack {
-    /// Construct an empty set of spinners.
-    pub fn new() -> Self {
-        Self {
-            remotes: BTreeSet::new(),
-            timer: Instant::now(),
-        }
-    }
-
-    /// Display the number of peers, the total transmitted bytes, and the
-    /// throughput.
-    pub fn transmitted(&mut self, remote: NodeId, transmitted: usize) -> String {
-        self.remotes.insert(remote);
-        let throughput = transmitted as f64 / self.timer.elapsed().as_secs_f64();
-        let throughput = format::bytes(throughput.floor() as usize);
-        let n = self.remotes.len();
-        let transmitted = format::bytes(transmitted);
-        format!("Uploading to {n} peer(s) ({transmitted} | {throughput:.2}/s)")
-    }
-
-    /// Display which remote has completed upload-pack and how many are
-    /// remaining.
-    pub fn done(&mut self, remote: &NodeId) -> String {
-        self.remotes.remove(remote);
-        let n = self.remotes.len();
-        format!("Uploaded to {remote}, {n} peer(s) remaining..")
-    }
-}
diff --git a/radicle-cli/tests/commands.rs b/radicle-cli/tests/commands.rs
deleted file mode 100644
index 864106c53..000000000
--- a/radicle-cli/tests/commands.rs
+++ /dev/null
@@ -1,3022 +0,0 @@
-use std::path::Path;
-use std::str::FromStr;
-use std::{net, thread, time};
-
-use radicle::git;
-use radicle::node;
-use radicle::node::address::Store as _;
-use radicle::node::config::seeds::{RADICLE_COMMUNITY_NODE, RADICLE_TEAM_NODE};
-use radicle::node::config::DefaultSeedingPolicy;
-use radicle::node::routing::Store as _;
-use radicle::node::Handle as _;
-use radicle::node::UserAgent;
-use radicle::node::{Address, Alias, DEFAULT_TIMEOUT};
-use radicle::prelude::{NodeId, RepoId};
-use radicle::profile;
-use radicle::profile::{env, Home};
-use radicle::storage::{ReadStorage, RefUpdate, RemoteRepository};
-use radicle::test::fixtures;
-
-use radicle_cli_test::TestFormula;
-use radicle_node::service::policy::Scope;
-use radicle_node::service::Event;
-use radicle_node::test::environment::{Config, Environment, Node};
-#[allow(unused_imports)]
-use radicle_node::test::logger;
-use radicle_node::PROTOCOL_VERSION;
-
-/// Seed used in tests.
-const RAD_SEED: &str = "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff";
-
-mod config {
-    use super::*;
-    use radicle::node::config::{Config, Limits, Network, RateLimit, RateLimits};
-    use radicle::profile;
-
-    /// Configuration for a test seed node.
-    ///
-    /// It sets the `RateLimit::capacity` to `usize::MAX` ensuring
-    /// that there are no rate limits for test nodes, since they all
-    /// operate on the same IP address. This prevents any announcement
-    /// messages from being dropped.
-    pub fn seed(alias: &'static str) -> Config {
-        Config {
-            network: Network::Test,
-            relay: node::config::Relay::Always,
-            limits: Limits {
-                rate: RateLimits {
-                    inbound: RateLimit {
-                        fill_rate: 1.0,
-                        capacity: usize::MAX,
-                    },
-                    outbound: RateLimit {
-                        fill_rate: 1.0,
-                        capacity: usize::MAX,
-                    },
-                },
-                ..Limits::default()
-            },
-            external_addresses: vec![node::Address::from_str(&format!(
-                "{alias}.radicle.example:8776"
-            ))
-            .unwrap()],
-            ..node(alias)
-        }
-    }
-
-    /// Relay node config.
-    pub fn relay(alias: &'static str) -> Config {
-        Config {
-            relay: node::config::Relay::Always,
-            ..node(alias)
-        }
-    }
-
-    /// Test node config.
-    pub fn node(alias: &'static str) -> Config {
-        Config::test(Alias::new(alias))
-    }
-
-    /// Test profile config.
-    pub fn profile(alias: &'static str) -> profile::Config {
-        Environment::config(Alias::new(alias))
-    }
-}
-
-/// Run a CLI test file.
-fn test<'a>(
-    test: impl AsRef<Path>,
-    cwd: impl AsRef<Path>,
-    home: Option<&Home>,
-    envs: impl IntoIterator<Item = (&'a str, &'a str)>,
-) -> Result<(), Box<dyn std::error::Error>> {
-    let tmp = tempfile::tempdir().unwrap();
-    let home = if let Some(home) = home {
-        home.path().to_path_buf()
-    } else {
-        tmp.path().to_path_buf()
-    };
-
-    formula(cwd.as_ref(), test)?
-        .env("RAD_HOME", home.to_string_lossy())
-        .envs(envs)
-        .run()?;
-
-    Ok(())
-}
-
-fn formula(root: &Path, test: impl AsRef<Path>) -> Result<TestFormula, Box<dyn std::error::Error>> {
-    let mut formula = TestFormula::new(root.to_path_buf());
-    let base = Path::new(env!("CARGO_MANIFEST_DIR"));
-
-    formula
-        .env("GIT_AUTHOR_DATE", "1671125284")
-        .env("GIT_AUTHOR_EMAIL", "radicle@localhost")
-        .env("GIT_AUTHOR_NAME", "radicle")
-        .env("GIT_COMMITTER_DATE", "1671125284")
-        .env("GIT_COMMITTER_EMAIL", "radicle@localhost")
-        .env("GIT_COMMITTER_NAME", "radicle")
-        .env("EDITOR", "true")
-        .env("TZ", "UTC")
-        .env("LANG", "C")
-        .env("USER", "alice")
-        .env(env::RAD_PASSPHRASE, "radicle")
-        .env(env::RAD_KEYGEN_SEED, RAD_SEED)
-        .env(env::RAD_RNG_SEED, "0")
-        .env(env::RAD_LOCAL_TIME, "1671125284")
-        .envs(git::env::GIT_DEFAULT_CONFIG)
-        .build(&[
-            ("radicle-remote-helper", "git-remote-rad"),
-            ("radicle-cli", "rad"),
-        ])
-        .file(base.join(test))?;
-
-    Ok(formula)
-}
-
-#[test]
-fn rad_auth() {
-    test("examples/rad-auth.md", Path::new("."), None, []).unwrap();
-}
-
-#[test]
-fn rad_auth_errors() {
-    test("examples/rad-auth-errors.md", Path::new("."), None, []).unwrap();
-}
-
-#[test]
-fn rad_issue() {
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let home = &profile.home;
-    let working = environment.tmp().join("working");
-
-    // Setup a test repository.
-    fixtures::repository(&working);
-
-    test("examples/rad-init.md", &working, Some(home), []).unwrap();
-    test("examples/rad-issue.md", &working, Some(home), []).unwrap();
-}
-
-#[test]
-fn rad_cob_log() {
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let home = &profile.home;
-    let working = environment.tmp().join("working");
-
-    // Setup a test repository.
-    fixtures::repository(&working);
-
-    test("examples/rad-init.md", &working, Some(home), []).unwrap();
-    test("examples/rad-cob-log.md", &working, Some(home), []).unwrap();
-}
-
-#[test]
-fn rad_cob_show() {
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let home = &profile.home;
-    let working = environment.tmp().join("working");
-
-    // Setup a test repository.
-    fixtures::repository(&working);
-
-    test("examples/rad-init.md", &working, Some(home), []).unwrap();
-    test("examples/rad-cob-show.md", &working, Some(home), []).unwrap();
-}
-
-#[test]
-fn rad_init() {
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let working = tempfile::tempdir().unwrap();
-
-    // Setup a test repository.
-    fixtures::repository(working.path());
-
-    test(
-        "examples/rad-init.md",
-        working.path(),
-        Some(&profile.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_init_existing() {
-    let mut environment = Environment::new();
-    let mut profile = environment.node(config::node("alice"));
-    let working = tempfile::tempdir().unwrap();
-    let rid = profile.project("heartwood", "Radicle Heartwood Protocol & Stack");
-
-    test(
-        "examples/rad-init-existing.md",
-        working.path(),
-        Some(&profile.home),
-        [(
-            "URL",
-            git::url::File::new(profile.storage.path())
-                .rid(rid)
-                .to_string()
-                .as_str(),
-        )],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_init_no_seed() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let working = environment.tmp().join("working");
-
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init-no-seed.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_init_with_existing_remote() {
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let working = tempfile::tempdir().unwrap();
-
-    // Setup a test repository.
-    fixtures::repository(working.path());
-
-    test(
-        "examples/rad-init-with-existing-remote.md",
-        working.path(),
-        Some(&profile.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_init_no_git() {
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let working = tempfile::tempdir().unwrap();
-
-    test(
-        "examples/rad-init-no-git.md",
-        working.path(),
-        Some(&profile.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_inspect() {
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let working = tempfile::tempdir().unwrap();
-
-    // Setup a test repository.
-    fixtures::repository(working.path());
-
-    test(
-        "examples/rad-init.md",
-        working.path(),
-        Some(&profile.home),
-        [],
-    )
-    .unwrap();
-
-    test(
-        "examples/rad-inspect.md",
-        working.path(),
-        Some(&profile.home),
-        [],
-    )
-    .unwrap();
-
-    test("examples/rad-inspect-noauth.md", working.path(), None, []).unwrap();
-}
-
-#[test]
-fn rad_config() {
-    let mut environment = Environment::new();
-    let alias = Alias::new("alice");
-    let profile = environment.profile(profile::Config {
-        preferred_seeds: vec![RADICLE_COMMUNITY_NODE.clone(), RADICLE_TEAM_NODE.clone()],
-        ..profile::Config::new(alias)
-    });
-    let working = tempfile::tempdir().unwrap();
-
-    test(
-        "examples/rad-config.md",
-        working.path(),
-        Some(&profile.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_checkout() {
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let working = tempfile::tempdir().unwrap();
-    let copy = tempfile::tempdir().unwrap();
-
-    // Setup a test repository.
-    fixtures::repository(working.path());
-
-    test(
-        "examples/rad-init.md",
-        working.path(),
-        Some(&profile.home),
-        [],
-    )
-    .unwrap();
-
-    test(
-        "examples/rad-checkout.md",
-        copy.path(),
-        Some(&profile.home),
-        [],
-    )
-    .unwrap();
-
-    if cfg!(target_os = "linux") {
-        test(
-            "examples/rad-checkout-repo-config-linux.md",
-            copy.path(),
-            Some(&profile.home),
-            [],
-        )
-        .unwrap();
-    } else if cfg!(target_os = "macos") {
-        test(
-            "examples/rad-checkout-repo-config-macos.md",
-            copy.path(),
-            Some(&profile.home),
-            [],
-        )
-        .unwrap();
-    }
-}
-
-#[test]
-fn rad_id() {
-    let mut environment = Environment::new();
-    let alice = environment.node(config::node("alice"));
-    let bob = environment.node(config::node("bob"));
-    let working = tempfile::tempdir().unwrap();
-    let working = working.path();
-    let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
-
-    // Setup a test repository.
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let mut alice = alice.spawn();
-    let bob = bob.spawn();
-
-    alice.handle.seed(acme, Scope::All).unwrap();
-    alice.connect(&bob).converge([&bob]);
-
-    let events = alice.handle.events();
-    bob.fork(acme, bob.home.path()).unwrap();
-    bob.announce(acme, 2, bob.home.path()).unwrap();
-    alice.has_remote_of(&acme, &bob.id);
-
-    // Alice must have Bob to try add them as a delegate
-    events
-        .wait(
-            |e| matches!(e, Event::RefsFetched { .. }).then_some(()),
-            time::Duration::from_secs(6),
-        )
-        .unwrap();
-
-    test(
-        "examples/rad-id.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_id_threshold() {
-    let mut environment = Environment::new();
-    let alice = environment.node(config::node("alice"));
-    let bob = environment.node(config::node("bob"));
-    let seed = environment.node(config::node("seed"));
-    let working = tempfile::tempdir().unwrap();
-    let working = working.path();
-    let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
-
-    // Setup a test repository.
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let mut alice = alice.spawn();
-    let mut seed = seed.spawn();
-    let mut bob = bob.spawn();
-
-    seed.handle.seed(acme, Scope::All).unwrap();
-    alice.handle.seed(acme, Scope::Followed).unwrap();
-    alice
-        .handle
-        .follow(seed.id, Some(Alias::new("seed")))
-        .unwrap();
-
-    alice.connect(&seed);
-    bob.connect(&seed).connect(&alice);
-    alice.routes_to(&[(acme, seed.id)]);
-    seed.handle.fetch(acme, alice.id, DEFAULT_TIMEOUT).unwrap();
-
-    formula(&environment.tmp(), "examples/rad-id-threshold.md")
-        .unwrap()
-        .home(
-            "alice",
-            working.join("alice"),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            working.join("bob"),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .home(
-            "seed",
-            working.join("seed"),
-            [("RAD_HOME", seed.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-fn rad_id_threshold_soft_fork() {
-    let mut environment = Environment::new();
-    let alice = environment.node(config::node("alice"));
-    let bob = environment.node(config::node("bob"));
-    let working = tempfile::tempdir().unwrap();
-    let working = working.path();
-    let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
-
-    // Setup a test repository.
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    let events = bob.handle.events();
-    bob.handle.seed(acme, Scope::All).unwrap();
-    alice.connect(&bob).converge([&bob]);
-
-    events
-        .wait(
-            |e| matches!(e, Event::RefsFetched { .. }).then_some(()),
-            time::Duration::from_secs(6),
-        )
-        .unwrap();
-
-    formula(&environment.tmp(), "examples/rad-id-threshold-soft-fork.md")
-        .unwrap()
-        .home(
-            "alice",
-            working.join("alice"),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            working.join("bob"),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-fn rad_id_update_delete_field() {
-    let mut environment = Environment::new();
-    let alice = environment.node(config::node("alice"));
-    let working = tempfile::tempdir().unwrap();
-    let working = working.path();
-
-    // Setup a test repository.
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    test(
-        "examples/rad-id-update-delete-field.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_id_multi_delegate() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let eve = environment.node(Config::test(Alias::new("eve")));
-    let working = tempfile::tempdir().unwrap();
-    let working = working.path();
-    let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
-
-    // Setup a test repository.
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-    let mut eve = eve.spawn();
-
-    alice.handle.seed(acme, Scope::All).unwrap();
-    bob.handle.follow(eve.id, None).unwrap();
-    alice.connect(&bob).converge([&bob]);
-    eve.connect(&alice).converge([&alice]);
-
-    bob.fork(acme, working.join("bob")).unwrap();
-    bob.has_remote_of(&acme, &alice.id);
-    alice.has_remote_of(&acme, &bob.id);
-
-    eve.fork(acme, working.join("eve")).unwrap();
-    eve.has_remote_of(&acme, &bob.id);
-    alice.has_remote_of(&acme, &eve.id);
-    alice.is_synced_with(&acme, &eve.id);
-    alice.is_synced_with(&acme, &bob.id);
-
-    // TODO: Have formula with two connected nodes and a tracked project.
-
-    formula(&environment.tmp(), "examples/rad-id-multi-delegate.md")
-        .unwrap()
-        .home(
-            "alice",
-            working.join("alice"),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            working.join("bob"),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-#[ignore = "slow"]
-fn rad_id_collaboration() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let eve = environment.node(Config::test(Alias::new("eve")));
-    let seed = environment.node(config::seed("seed"));
-    let distrustful = environment.node(config::seed("distrustful"));
-    let working = tempfile::tempdir().unwrap();
-    let working = working.path();
-    let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
-
-    // Setup a test repository.
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-    let mut eve = eve.spawn();
-    let mut seed = seed.spawn();
-    let mut distrustful = distrustful.spawn();
-
-    // Alice sets up the seed and follows Bob and Eve via the CLI
-    alice.handle.seed(acme, Scope::Followed).unwrap();
-    alice
-        .handle
-        .follow(seed.id, Some(Alias::new("seed")))
-        .unwrap();
-
-    // The seed is trustful and will fetch from anyone
-    seed.handle.seed(acme, Scope::All).unwrap();
-
-    // The distrustful seed will only interact with Alice and Bob
-    distrustful.handle.seed(acme, Scope::Followed).unwrap();
-    distrustful.handle.follow(alice.id, None).unwrap();
-    distrustful.handle.follow(bob.id, None).unwrap();
-
-    alice
-        .connect(&seed)
-        .connect(&distrustful)
-        .converge([&seed, &distrustful]);
-    bob.connect(&seed)
-        .connect(&distrustful)
-        .converge([&seed, &distrustful]);
-    eve.connect(&seed)
-        .connect(&distrustful)
-        .converge([&seed, &distrustful]);
-
-    seed.handle.fetch(acme, alice.id, DEFAULT_TIMEOUT).unwrap();
-    distrustful
-        .handle
-        .fetch(acme, alice.id, DEFAULT_TIMEOUT)
-        .unwrap();
-
-    formula(&environment.tmp(), "examples/rad-id-collaboration.md")
-        .unwrap()
-        .home(
-            "alice",
-            working.join("alice"),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            working.join("bob"),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .home(
-            "eve",
-            working.join("eve"),
-            [("RAD_HOME", eve.home.path().display())],
-        )
-        .run()
-        .unwrap();
-
-    // Ensure the seeds have fetched all nodes.
-    let repo = seed.storage.repository(acme).unwrap();
-    let mut remotes = repo
-        .remote_ids()
-        .unwrap()
-        .collect::<Result<Vec<_>, _>>()
-        .unwrap();
-    let mut expected = vec![alice.id, bob.id, eve.id];
-    remotes.sort();
-    expected.sort();
-    assert_eq!(remotes, expected);
-
-    let repo = distrustful.storage.repository(acme).unwrap();
-    let mut remotes = repo
-        .remote_ids()
-        .unwrap()
-        .collect::<Result<Vec<_>, _>>()
-        .unwrap();
-    let mut expected = vec![alice.id, bob.id, eve.id];
-    remotes.sort();
-    expected.sort();
-    assert_eq!(remotes, expected);
-}
-
-#[test]
-fn rad_id_conflict() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let working = tempfile::tempdir().unwrap();
-    let working = working.path();
-    let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
-
-    // Setup a test repository.
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let mut alice = alice.spawn();
-    let bob = bob.spawn();
-
-    alice.connect(&bob).converge([&bob]);
-
-    bob.fork(acme, working.join("bob")).unwrap();
-    bob.announce(acme, 2, bob.home.path()).unwrap();
-    alice.has_remote_of(&acme, &bob.id);
-
-    formula(&environment.tmp(), "examples/rad-id-conflict.md")
-        .unwrap()
-        .home(
-            "alice",
-            working.join("alice"),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            working.join("bob"),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-fn rad_id_unknown_field() {
-    let mut environment = Environment::new();
-    let alice = environment.node(config::node("alice"));
-    let working = tempfile::tempdir().unwrap();
-    let working = working.path();
-
-    // Setup a test repository.
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let alice = alice.spawn();
-
-    test(
-        "examples/rad-id-unknown-field.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_id_private() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let working = environment.tmp().join("working");
-
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init-private.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-    test(
-        "examples/rad-id-private.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_node_connect() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let working = tempfile::tempdir().unwrap();
-    let alice = alice.spawn();
-    let bob = bob.spawn();
-
-    alice
-        .rad(
-            "node",
-            &["connect", format!("{}@{}", bob.id, bob.addr).as_str()],
-            working.path(),
-        )
-        .unwrap();
-
-    let sessions = alice.handle.sessions().unwrap();
-    let session = sessions.first().unwrap();
-
-    assert_eq!(session.nid, bob.id);
-    assert_eq!(session.addr, bob.addr.into());
-    assert!(session.state.is_connected());
-}
-
-#[test]
-fn rad_node() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config {
-        external_addresses: vec![
-            Address::from(net::SocketAddr::from(([41, 12, 98, 112], 8776))),
-            Address::from_str("seed.cloudhead.io:8776").unwrap(),
-        ],
-        seeding_policy: DefaultSeedingPolicy::Block,
-        ..Config::test(Alias::new("alice"))
-    });
-    let working = tempfile::tempdir().unwrap();
-    let alice = alice.spawn();
-
-    fixtures::repository(working.path().join("alice"));
-
-    test(
-        "examples/rad-init-sync-not-connected.md",
-        working.path().join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    test(
-        "examples/rad-node.md",
-        working.path().join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_patch() {
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let working = tempfile::tempdir().unwrap();
-    let home = &profile.home;
-
-    // Setup a test repository.
-    fixtures::repository(working.path());
-
-    test("examples/rad-init.md", working.path(), Some(home), []).unwrap();
-    test("examples/rad-issue.md", working.path(), Some(home), []).unwrap();
-    test("examples/rad-patch.md", working.path(), Some(home), []).unwrap();
-}
-
-#[test]
-fn rad_patch_diff() {
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let working = tempfile::tempdir().unwrap();
-    let home = &profile.home;
-
-    // Setup a test repository.
-    fixtures::repository(working.path());
-
-    test("examples/rad-init.md", working.path(), Some(home), []).unwrap();
-    test("examples/rad-patch-diff.md", working.path(), Some(home), []).unwrap();
-}
-
-#[test]
-fn rad_patch_edit() {
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let working = tempfile::tempdir().unwrap();
-    let home = &profile.home;
-
-    // Setup a test repository.
-    fixtures::repository(working.path());
-
-    test("examples/rad-init.md", working.path(), Some(home), []).unwrap();
-    test("examples/rad-patch-edit.md", working.path(), Some(home), []).unwrap();
-}
-
-#[test]
-fn rad_patch_checkout() {
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let working = tempfile::tempdir().unwrap();
-    let home = &profile.home;
-
-    // Setup a test repository.
-    fixtures::repository(working.path());
-
-    test("examples/rad-init.md", working.path(), Some(home), []).unwrap();
-    test(
-        "examples/rad-patch-checkout.md",
-        working.path(),
-        Some(home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_patch_checkout_revision() {
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let working = tempfile::tempdir().unwrap();
-    let home = &profile.home;
-
-    // Setup a test repository.
-    fixtures::repository(working.path());
-
-    test("examples/rad-init.md", working.path(), Some(home), []).unwrap();
-    test(
-        "examples/rad-patch-checkout.md",
-        working.path(),
-        Some(home),
-        [],
-    )
-    .unwrap();
-    test(
-        "examples/rad-patch-checkout-revision.md",
-        working.path(),
-        Some(home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_patch_checkout_force() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let working = environment.tmp().join("working");
-    let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
-
-    // Setup a test repository.
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    bob.handle.seed(acme, Scope::All).unwrap();
-    alice.connect(&bob).converge([&bob]);
-
-    test(
-        "examples/rad-clone.md",
-        working.join("bob"),
-        Some(&bob.home),
-        [],
-    )
-    .unwrap();
-
-    formula(&environment.tmp(), "examples/rad-patch-checkout-force.md")
-        .unwrap()
-        .home(
-            "alice",
-            working.join("alice"),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            working.join("bob"),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-fn rad_patch_update() {
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let working = tempfile::tempdir().unwrap();
-    let home = &profile.home;
-
-    // Setup a test repository.
-    fixtures::repository(working.path());
-
-    test("examples/rad-init.md", working.path(), Some(home), []).unwrap();
-    test(
-        "examples/rad-patch-update.md",
-        working.path(),
-        Some(home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-#[cfg(not(target_os = "macos"))]
-fn rad_patch_ahead_behind() {
-    use std::fs;
-
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let working = tempfile::tempdir().unwrap();
-    let home = &profile.home;
-
-    // Setup a test repository.
-    fixtures::repository(working.path());
-
-    fs::write(working.path().join("CONTRIBUTORS"), "Alice Jones\n").unwrap();
-
-    test("examples/rad-init.md", working.path(), Some(home), []).unwrap();
-    test(
-        "examples/rad-patch-ahead-behind.md",
-        working.path(),
-        Some(home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_patch_change_base() {
-    logger::init(log::Level::Debug);
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let working = tempfile::tempdir().unwrap();
-    let home = &profile.home;
-
-    // Setup a test repository.
-    fixtures::repository(working.path());
-
-    test("examples/rad-init.md", working.path(), Some(home), []).unwrap();
-    test(
-        "examples/rad-patch-change-base.md",
-        working.path(),
-        Some(home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_patch_draft() {
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let working = tempfile::tempdir().unwrap();
-    let home = &profile.home;
-
-    // Setup a test repository.
-    fixtures::repository(working.path());
-
-    test("examples/rad-init.md", working.path(), Some(home), []).unwrap();
-    test(
-        "examples/rad-patch-draft.md",
-        working.path(),
-        Some(home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_patch_via_push() {
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let working = tempfile::tempdir().unwrap();
-    let home = &profile.home;
-
-    // Setup a test repository.
-    fixtures::repository(working.path());
-
-    test("examples/rad-init.md", working.path(), Some(home), []).unwrap();
-    test(
-        "examples/rad-patch-via-push.md",
-        working.path(),
-        Some(home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_patch_detached_head() {
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let working = tempfile::tempdir().unwrap();
-    let home = &profile.home;
-
-    // Setup a test repository.
-    fixtures::repository(working.path());
-
-    test("examples/rad-init.md", working.path(), Some(home), []).unwrap();
-    test(
-        "examples/rad-patch-detached-head.md",
-        working.path(),
-        Some(home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_patch_merge_draft() {
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let working = tempfile::tempdir().unwrap();
-    let home = &profile.home;
-
-    // Setup a test repository.
-    fixtures::repository(working.path());
-
-    test("examples/rad-init.md", working.path(), Some(home), []).unwrap();
-    test(
-        "examples/rad-patch-merge-draft.md",
-        working.path(),
-        Some(home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_patch_revert_merge() {
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let working = tempfile::tempdir().unwrap();
-    let home = &profile.home;
-
-    // Setup a test repository.
-    fixtures::repository(working.path());
-
-    test("examples/rad-init.md", working.path(), Some(home), []).unwrap();
-    test(
-        "examples/rad-patch-revert-merge.md",
-        working.path(),
-        Some(home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-#[cfg(not(target_os = "macos"))]
-fn rad_review_by_hunk() {
-    let mut environment = Environment::new();
-    let profile = environment.profile(config::profile("alice"));
-    let working = tempfile::tempdir().unwrap();
-    let home = &profile.home;
-
-    // Setup a test repository.
-    fixtures::repository(working.path());
-
-    test("examples/rad-init.md", working.path(), Some(home), []).unwrap();
-    test(
-        "examples/rad-review-by-hunk.md",
-        working.path(),
-        Some(home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_patch_delete() {
-    let mut environment = Environment::new();
-    let alice = environment.node(config::relay("alice"));
-    let bob = environment.node(config::relay("bob"));
-    let seed = environment.node(config::relay("seed"));
-    let working = environment.tmp().join("working");
-    let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
-
-    // Setup a test repository.
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-    let mut seed = seed.spawn();
-
-    bob.handle.seed(acme, Scope::All).unwrap();
-    seed.handle.seed(acme, Scope::All).unwrap();
-    alice.connect(&bob).connect(&seed).converge([&bob, &seed]);
-    bob.routes_to(&[(acme, seed.id)]);
-
-    test(
-        "examples/rad-clone.md",
-        working.join("bob"),
-        Some(&bob.home),
-        [],
-    )
-    .unwrap();
-
-    formula(&environment.tmp(), "examples/rad-patch-delete.md")
-        .unwrap()
-        .home(
-            "alice",
-            working.join("alice"),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            working.join("bob"),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .home(
-            "seed",
-            working.join("seed"),
-            [("RAD_HOME", seed.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-fn rad_clean() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let eve = environment.node(Config::test(Alias::new("eve")));
-    let working = environment.tmp().join("working");
-
-    // Setup a test project.
-    let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
-    fixtures::repository(working.join("acme"));
-    test(
-        "examples/rad-init.md",
-        working.join("acme"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-    let mut eve = eve.spawn();
-    alice.handle.seed(acme, Scope::All).unwrap();
-    eve.handle.seed(acme, Scope::Followed).unwrap();
-
-    bob.connect(&alice).converge([&alice]);
-    eve.connect(&alice).converge([&alice]);
-
-    eve.handle.fetch(acme, alice.id, DEFAULT_TIMEOUT).unwrap();
-
-    bob.fork(acme, bob.home.path()).unwrap();
-    bob.announce(acme, 1, bob.home.path()).unwrap();
-    bob.has_remote_of(&acme, &alice.id);
-    alice.has_remote_of(&acme, &bob.id);
-    eve.has_remote_of(&acme, &alice.id);
-
-    formula(&environment.tmp(), "examples/rad-clean.md")
-        .unwrap()
-        .home(
-            "alice",
-            working.join("acme"),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            working.join("bob"),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .home(
-            "eve",
-            working.join("eve"),
-            [("RAD_HOME", eve.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-fn rad_seed_and_follow() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let working = tempfile::tempdir().unwrap();
-    let alice = alice.spawn();
-
-    test(
-        "examples/rad-seed-and-follow.md",
-        working.path(),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_unseed() {
-    let mut environment = Environment::new();
-    let mut alice = environment.node(Config::test(Alias::new("alice")));
-    let working = tempfile::tempdir().unwrap();
-
-    // Setup a test project.
-    alice.project("heartwood", "Radicle Heartwood Protocol & Stack");
-    let alice = alice.spawn();
-
-    test("examples/rad-unseed.md", working, Some(&alice.home), []).unwrap();
-}
-
-#[test]
-fn rad_block() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config {
-        seeding_policy: DefaultSeedingPolicy::permissive(),
-        ..Config::test(Alias::new("alice"))
-    });
-    let working = tempfile::tempdir().unwrap();
-
-    test("examples/rad-block.md", working, Some(&alice.home), []).unwrap();
-}
-
-#[test]
-fn rad_clone() {
-    let mut environment = Environment::new();
-    let mut alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let working = environment.tmp().join("working");
-
-    // Setup a test project.
-    let acme = alice.project("heartwood", "Radicle Heartwood Protocol & Stack");
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-    // Prevent Alice from fetching Bob's fork, as we're not testing that and it may cause errors.
-    alice.handle.seed(acme, Scope::Followed).unwrap();
-
-    bob.connect(&alice).converge([&alice]);
-
-    test("examples/rad-clone.md", working, Some(&bob.home), []).unwrap();
-}
-
-#[test]
-fn rad_clone_directory() {
-    let mut environment = Environment::new();
-    let mut alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let working = environment.tmp().join("working");
-
-    // Setup a test project.
-    let acme = alice.project("heartwood", "Radicle Heartwood Protocol & Stack");
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-    // Prevent Alice from fetching Bob's fork, as we're not testing that and it may cause errors.
-    alice.handle.seed(acme, Scope::Followed).unwrap();
-
-    bob.connect(&alice).converge([&alice]);
-
-    test(
-        "examples/rad-clone-directory.md",
-        working,
-        Some(&bob.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_clone_all() {
-    let mut environment = Environment::new();
-    let mut alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let eve = environment.node(Config::test(Alias::new("eve")));
-    let working = environment.tmp().join("working");
-
-    // Setup a test project.
-    let acme = alice.project("heartwood", "Radicle Heartwood Protocol & Stack");
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-    let mut eve = eve.spawn();
-
-    alice.handle.seed(acme, Scope::All).unwrap();
-    bob.connect(&alice).converge([&alice]);
-    eve.connect(&alice).converge([&alice]);
-
-    // Fork and sync repo.
-    bob.fork(acme, bob.home.path()).unwrap();
-    bob.announce(acme, 2, bob.home.path()).unwrap();
-    bob.has_remote_of(&acme, &alice.id);
-    alice.has_remote_of(&acme, &bob.id);
-
-    test(
-        "examples/rad-clone-all.md",
-        working.join("eve"),
-        Some(&eve.home),
-        [],
-    )
-    .unwrap();
-    eve.has_remote_of(&acme, &bob.id);
-}
-
-#[test]
-fn rad_clone_partial_fail() {
-    let mut environment = Environment::new();
-    let mut alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let mut eve = environment.node(Config::test(Alias::new("eve")));
-    let working = environment.tmp().join("working");
-    let carol = NodeId::from_str("z6MksFqXN3Yhqk8pTJdUGLwBTkRfQvwZXPqR2qMEhbS9wzpT").unwrap();
-
-    logger::init(log::Level::Debug);
-
-    // Setup a test project.
-    let acme = alice.project("heartwood", "Radicle Heartwood Protocol & Stack");
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    // Make Even think she knows about a seed called "carol" that has the repo.
-    eve.db
-        .addresses_mut()
-        .insert(
-            &carol,
-            PROTOCOL_VERSION,
-            node::Features::SEED,
-            &Alias::new("carol"),
-            0,
-            &UserAgent::default(),
-            localtime::LocalTime::now().into(),
-            [node::KnownAddress::new(
-                // Eve will fail to connect to this address.
-                node::Address::from(net::SocketAddr::from(([0, 0, 0, 0], 19873))),
-                node::address::Source::Imported,
-            )],
-        )
-        .unwrap();
-    eve.db
-        .routing_mut()
-        .add_inventory([&acme], carol, localtime::LocalTime::now().into())
-        .unwrap();
-    eve.config.peers = node::config::PeerConfig::Static;
-
-    let mut eve = eve.spawn();
-
-    alice.handle.seed(acme, Scope::All).unwrap();
-    bob.handle.seed(acme, Scope::All).unwrap();
-
-    bob.connect(&alice).converge([&alice]);
-    eve.connect(&alice);
-    eve.connect(&bob);
-    eve.routes_to(&[(acme, carol), (acme, bob.id), (acme, alice.id)]);
-    bob.storage.repository(acme).unwrap().remove().unwrap(); // Cause the fetch from Bob to fail.
-    bob.storage.lock_repository(acme).ok(); // Prevent repo from being re-fetched.
-
-    test(
-        "examples/rad-clone-partial-fail.md",
-        working.join("eve"),
-        Some(&eve.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_clone_connect() {
-    let mut environment = Environment::new();
-    let working = environment.tmp().join("working");
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let mut eve = environment.node(Config::test(Alias::new("eve")));
-    let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
-    let ua = UserAgent::default();
-    let now = localtime::LocalTime::now().into();
-
-    fixtures::repository(working.join("acme"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("acme"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    // Let Eve know about Alice and Bob having the repo.
-    eve.db
-        .addresses_mut()
-        .insert(
-            &alice.id,
-            PROTOCOL_VERSION,
-            node::Features::SEED,
-            &Alias::new("alice"),
-            0,
-            &ua,
-            now,
-            [node::KnownAddress::new(
-                node::Address::from(alice.addr),
-                node::address::Source::Imported,
-            )],
-        )
-        .unwrap();
-    eve.db
-        .addresses_mut()
-        .insert(
-            &bob.id,
-            PROTOCOL_VERSION,
-            node::Features::SEED,
-            &Alias::new("bob"),
-            0,
-            &ua,
-            now,
-            [node::KnownAddress::new(
-                node::Address::from(bob.addr),
-                node::address::Source::Imported,
-            )],
-        )
-        .unwrap();
-    eve.db
-        .routing_mut()
-        .add_inventory([&acme], alice.id, now)
-        .unwrap();
-    eve.db
-        .routing_mut()
-        .add_inventory([&acme], bob.id, now)
-        .unwrap();
-    eve.config.peers = node::config::PeerConfig::Static;
-
-    let eve = eve.spawn();
-
-    alice.handle.seed(acme, Scope::Followed).unwrap();
-    bob.handle.seed(acme, Scope::Followed).unwrap();
-    alice.connect(&bob);
-    bob.routes_to(&[(acme, alice.id)]);
-    eve.routes_to(&[(acme, alice.id), (acme, bob.id)]);
-    alice.routes_to(&[(acme, alice.id), (acme, bob.id)]);
-
-    test(
-        "examples/rad-clone-connect.md",
-        working.join("acme"),
-        Some(&eve.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_sync_without_node() {
-    let mut environment = Environment::new();
-    let alice = environment.node(config::seed("alice"));
-    let bob = environment.node(config::seed("bob"));
-    let mut eve = environment.node(config::seed("eve"));
-
-    let rid = RepoId::from_urn("rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5").unwrap();
-    eve.policies.seed(&rid, Scope::All).unwrap();
-
-    formula(&environment.tmp(), "examples/rad-sync-without-node.md")
-        .unwrap()
-        .home(
-            "alice",
-            alice.home.path(),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            bob.home.path(),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .home(
-            "eve",
-            eve.home.path(),
-            [("RAD_HOME", eve.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-fn rad_self() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config {
-        external_addresses: vec!["seed.alice.acme:8776".parse().unwrap()],
-        ..Config::test(Alias::new("alice"))
-    });
-    let working = environment.tmp().join("working");
-
-    test("examples/rad-self.md", working, Some(&alice.home), []).unwrap();
-}
-
-#[test]
-fn rad_clone_unknown() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let working = environment.tmp().join("working");
-
-    let alice = alice.spawn();
-
-    test(
-        "examples/rad-clone-unknown.md",
-        working,
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_init_sync_not_connected() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let working = tempfile::tempdir().unwrap();
-    let alice = alice.spawn();
-
-    fixtures::repository(working.path().join("alice"));
-
-    test(
-        "examples/rad-init-sync-not-connected.md",
-        working.path().join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_init_sync_preferred() {
-    let mut environment = Environment::new();
-    let mut alice = environment
-        .node(Config {
-            seeding_policy: DefaultSeedingPolicy::permissive(),
-            ..Config::test(Alias::new("alice"))
-        })
-        .spawn();
-
-    let bob = environment.profile(profile::Config {
-        preferred_seeds: vec![alice.address()],
-        ..config::profile("bob")
-    });
-    let mut bob = Node::new(bob).spawn();
-    let working = environment.tmp().join("working");
-
-    bob.connect(&alice);
-    alice.handle.follow(bob.id, None).unwrap();
-
-    fixtures::repository(working.join("bob"));
-
-    // Bob initializes a repo after her node has started, and after bob has connected to it.
-    test(
-        "examples/rad-init-sync-preferred.md",
-        working.join("bob"),
-        Some(&bob.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_init_sync_timeout() {
-    let mut environment = Environment::new();
-    let mut alice = environment
-        .node(Config {
-            seeding_policy: DefaultSeedingPolicy::Block,
-            ..Config::test(Alias::new("alice"))
-        })
-        .spawn();
-
-    let bob = environment.profile(profile::Config {
-        preferred_seeds: vec![alice.address()],
-        ..config::profile("bob")
-    });
-    let mut bob = Node::new(bob).spawn();
-    let working = environment.tmp().join("working");
-
-    bob.connect(&alice);
-    alice.handle.follow(bob.id, None).unwrap();
-
-    fixtures::repository(working.join("bob"));
-
-    // Bob initializes a repo after her node has started, and after bob has connected to it.
-    test(
-        "examples/rad-init-sync-timeout.md",
-        working.join("bob"),
-        Some(&bob.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_init_sync_and_clone() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let working = environment.tmp().join("working");
-
-    let alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    bob.connect(&alice);
-
-    fixtures::repository(working.join("alice"));
-
-    // Alice initializes a repo after her node has started, and after bob has connected to it.
-    test(
-        "examples/rad-init-sync.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    // Wait for bob to get any updates to the routing table.
-    bob.converge([&alice]);
-
-    test(
-        "examples/rad-clone.md",
-        working.join("bob"),
-        Some(&bob.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_fetch() {
-    let mut environment = Environment::new();
-    let working = environment.tmp().join("working");
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-
-    let mut alice = alice.spawn();
-    let bob = bob.spawn();
-
-    alice.connect(&bob);
-    fixtures::repository(working.join("alice"));
-
-    // Alice initializes a repo after her node has started, and after bob has connected to it.
-    test(
-        "examples/rad-init-sync.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    // Wait for bob to get any updates to the routing table.
-    bob.converge([&alice]);
-
-    test(
-        "examples/rad-fetch.md",
-        working.join("bob"),
-        Some(&bob.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_fork() {
-    let mut environment = Environment::new();
-    let working = environment.tmp().join("working");
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-
-    let mut alice = alice.spawn();
-    let bob = bob.spawn();
-
-    alice.connect(&bob);
-    fixtures::repository(working.join("alice"));
-
-    // Alice initializes a repo after her node has started, and after bob has connected to it.
-    test(
-        "examples/rad-init-sync.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    // Wait for bob to get any updates to the routing table.
-    bob.converge([&alice]);
-
-    test(
-        "examples/rad-fetch.md",
-        working.join("bob"),
-        Some(&bob.home),
-        [],
-    )
-    .unwrap();
-    test(
-        "examples/rad-fork.md",
-        working.join("bob"),
-        Some(&bob.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_diff() {
-    let working = tempfile::tempdir().unwrap();
-
-    fixtures::repository(&working);
-
-    test("examples/rad-diff.md", working, None, []).unwrap();
-}
-
-#[test]
-// User tries to clone; no seeds are available, but user has the repo locally.
-fn test_clone_without_seeds() {
-    let mut environment = Environment::new();
-    let mut alice = environment.node(Config::test(Alias::new("alice")));
-    let working = environment.tmp().join("working");
-    let rid = alice.project("heartwood", "Radicle Heartwood Protocol & Stack");
-    let mut alice = alice.spawn();
-    let seeds = alice.handle.seeds(rid).unwrap();
-    let connected = seeds.connected().collect::<Vec<_>>();
-
-    assert!(connected.is_empty());
-
-    alice
-        .rad("clone", &[rid.to_string().as_str()], working.as_path())
-        .unwrap();
-
-    alice
-        .rad("inspect", &[], working.join("heartwood").as_path())
-        .unwrap();
-}
-
-#[test]
-fn test_cob_replication() {
-    let mut environment = Environment::new();
-    let working = tempfile::tempdir().unwrap();
-    let mut alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-
-    let rid = alice.project("heartwood", "");
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-    let events = alice.handle.events();
-
-    alice.handle.follow(bob.id, None).unwrap();
-    alice.connect(&bob);
-
-    bob.routes_to(&[(rid, alice.id)]);
-    bob.fork(rid, working.path()).unwrap();
-
-    // Wait for Alice to fetch the clone refs.
-    events
-        .wait(
-            |e| {
-                matches!(
-                    e,
-                    Event::RefsFetched { updated, .. }
-                    if updated.iter().any(|u| matches!(u, RefUpdate::Created { .. }))
-                )
-                .then_some(())
-            },
-            time::Duration::from_secs(6),
-        )
-        .unwrap();
-
-    let bob_repo = bob.storage.repository(rid).unwrap();
-    let mut bob_issues = radicle::cob::issue::Issues::open(&bob_repo).unwrap();
-    let mut bob_cache = radicle::cob::cache::InMemory::default();
-    let issue = bob_issues
-        .create(
-            "Something's fishy",
-            "I don't know what it is",
-            &[],
-            &[],
-            [],
-            &mut bob_cache,
-            &bob.signer,
-        )
-        .unwrap();
-    log::debug!(target: "test", "Issue {} created", issue.id());
-
-    // Make sure that Bob's issue refs announcement has a different timestamp than his fork's
-    // announcement, otherwise Alice will consider it stale.
-    thread::sleep(time::Duration::from_millis(3));
-
-    bob.handle.announce_refs(rid).unwrap();
-
-    // Wait for Alice to fetch the issue refs.
-    events
-        .iter()
-        .find(|e| matches!(e, Event::RefsFetched { .. }))
-        .unwrap();
-
-    let alice_repo = alice.storage.repository(rid).unwrap();
-    let alice_issues = radicle::cob::issue::Issues::open(&alice_repo).unwrap();
-    let alice_issue = alice_issues.get(issue.id()).unwrap().unwrap();
-
-    assert_eq!(alice_issue.title(), "Something's fishy");
-}
-
-#[test]
-fn test_cob_deletion() {
-    let mut environment = Environment::new();
-    let working = tempfile::tempdir().unwrap();
-    let mut alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-
-    let rid = alice.project("heartwood", "");
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    alice.handle.seed(rid, Scope::All).unwrap();
-    bob.handle.seed(rid, Scope::All).unwrap();
-    alice.connect(&bob);
-    bob.routes_to(&[(rid, alice.id)]);
-
-    let alice_repo = alice.storage.repository(rid).unwrap();
-    let mut alice_issues = radicle::cob::issue::Cache::no_cache(&alice_repo).unwrap();
-    let issue = alice_issues
-        .create(
-            "Something's fishy",
-            "I don't know what it is",
-            &[],
-            &[],
-            [],
-            &alice.signer,
-        )
-        .unwrap();
-    let issue_id = issue.id();
-    log::debug!(target: "test", "Issue {} created", issue_id);
-
-    bob.rad("clone", &[rid.to_string().as_str()], working.path())
-        .unwrap();
-
-    let bob_repo = bob.storage.repository(rid).unwrap();
-    let bob_issues = radicle::cob::issue::Issues::open(&bob_repo).unwrap();
-    assert!(bob_issues.get(issue_id).unwrap().is_some());
-
-    let mut alice_issues = radicle::cob::issue::Cache::no_cache(&alice_repo).unwrap();
-    alice_issues.remove(issue_id, &alice.signer).unwrap();
-
-    log::debug!(target: "test", "Removing issue..");
-
-    radicle::assert_matches!(
-        bob.handle.fetch(rid, alice.id, DEFAULT_TIMEOUT).unwrap(),
-        radicle::node::FetchResult::Success { .. }
-    );
-    let bob_repo = bob.storage.repository(rid).unwrap();
-    let bob_issues = radicle::cob::issue::Issues::open(&bob_repo).unwrap();
-    assert!(bob_issues.get(issue_id).unwrap().is_none());
-}
-
-#[test]
-fn rad_sync() {
-    let mut environment = Environment::new();
-    let working = environment.tmp().join("working");
-    let alice = environment.node(config::seed("alice"));
-    let bob = environment.node(config::seed("bob"));
-    let eve = environment.node(config::seed("eve"));
-    let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
-
-    fixtures::repository(working.join("acme"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("acme"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-    let mut eve = eve.spawn();
-
-    bob.handle.seed(acme, Scope::All).unwrap();
-    eve.handle.seed(acme, Scope::All).unwrap();
-
-    alice.connect(&bob);
-    eve.connect(&alice);
-
-    bob.routes_to(&[(acme, alice.id)]);
-    eve.routes_to(&[(acme, alice.id)]);
-    alice.routes_to(&[(acme, alice.id), (acme, eve.id), (acme, bob.id)]);
-    alice.is_synced_with(&acme, &eve.id);
-    alice.is_synced_with(&acme, &bob.id);
-
-    test(
-        "examples/rad-sync.md",
-        working.join("acme"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-//
-//     alice -- seed -- bob
-//
-fn test_replication_via_seed() {
-    let mut environment = Environment::new();
-    let alice = environment.node(config::relay("alice"));
-    let bob = environment.node(config::relay("bob"));
-    let seed = environment.node(Config {
-        seeding_policy: DefaultSeedingPolicy::permissive(),
-        ..config::relay("seed")
-    });
-    let working = environment.tmp().join("working");
-    let rid = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-    let seed = seed.spawn();
-
-    alice.connect(&seed);
-    bob.connect(&seed);
-
-    // Enough time for the next inventory from Seed to not be considered stale by Bob.
-    thread::sleep(time::Duration::from_millis(3));
-
-    alice.routes_to(&[]);
-    seed.routes_to(&[]);
-    bob.routes_to(&[]);
-
-    // Initialize a repo as Alice.
-    fixtures::repository(working.join("alice"));
-    alice
-        .rad(
-            "init",
-            &[
-                "--name",
-                "heartwood",
-                "--description",
-                "Radicle Heartwood Protocol & Stack",
-                "--default-branch",
-                "master",
-                "--public",
-            ],
-            working.join("alice"),
-        )
-        .unwrap();
-
-    alice
-        .rad("follow", &[&bob.id.to_human()], working.join("alice"))
-        .unwrap();
-
-    alice.routes_to(&[(rid, alice.id), (rid, seed.id)]);
-    seed.routes_to(&[(rid, alice.id), (rid, seed.id)]);
-    bob.routes_to(&[(rid, alice.id), (rid, seed.id)]);
-
-    let seed_events = seed.handle.events();
-    let alice_events = alice.handle.events();
-
-    bob.fork(rid, working.join("bob")).unwrap();
-
-    alice.routes_to(&[(rid, alice.id), (rid, seed.id), (rid, bob.id)]);
-    seed.routes_to(&[(rid, alice.id), (rid, seed.id), (rid, bob.id)]);
-    bob.routes_to(&[(rid, alice.id), (rid, seed.id), (rid, bob.id)]);
-
-    seed_events.iter().any(|e| {
-        matches!(
-            e, Event::RefsFetched { updated, remote, .. }
-            if remote == bob.id && updated.iter().any(|u| u.is_created())
-        )
-    });
-    alice_events.iter().any(|e| {
-        matches!(
-            e, Event::RefsFetched { updated, remote, .. }
-            if remote == seed.id && updated.iter().any(|u| u.is_created())
-        )
-    });
-
-    seed.storage
-        .repository(rid)
-        .unwrap()
-        .remote(&bob.id)
-        .unwrap();
-
-    // Seed should send Bob's ref announcement to Alice, after the fetch.
-    alice
-        .storage
-        .repository(rid)
-        .unwrap()
-        .remote(&bob.id)
-        .unwrap();
-}
-
-#[test]
-fn rad_remote() {
-    let mut environment = Environment::new();
-    let alice = environment.node(config::relay("alice"));
-    let bob = environment.node(config::relay("bob"));
-    let eve = environment.node(config::relay("eve"));
-    let working = environment.tmp().join("working");
-    let home = alice.home.clone();
-    let rid = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
-    // Setup a test repository.
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&home),
-        [],
-    )
-    .unwrap();
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-    let mut eve = eve.spawn();
-    alice
-        .handle
-        .follow(bob.id, Some(Alias::new("bob")))
-        .unwrap();
-
-    bob.connect(&alice);
-    bob.routes_to(&[(rid, alice.id)]);
-    bob.fork(rid, bob.home.path()).unwrap();
-    bob.announce(rid, 2, bob.home.path()).unwrap();
-    alice.has_remote_of(&rid, &bob.id);
-
-    eve.connect(&bob);
-    eve.routes_to(&[(rid, alice.id)]);
-    eve.fork(rid, eve.home.path()).unwrap();
-    eve.announce(rid, 2, eve.home.path()).unwrap();
-    alice.has_remote_of(&rid, &eve.id);
-
-    test(
-        "examples/rad-remote.md",
-        working.join("alice"),
-        Some(&home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_merge_via_push() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let working = environment.tmp().join("working");
-
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let alice = alice.spawn();
-
-    test(
-        "examples/rad-merge-via-push.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_merge_after_update() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let working = environment.tmp().join("working");
-
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let alice = alice.spawn();
-
-    test(
-        "examples/rad-merge-after-update.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_merge_no_ff() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let working = environment.tmp().join("working");
-
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    test(
-        "examples/rad-merge-no-ff.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_patch_pull_update() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let working = environment.tmp().join("working");
-
-    fixtures::repository(working.join("alice"));
-
-    let alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    bob.connect(&alice).converge([&alice]);
-
-    formula(&environment.tmp(), "examples/rad-patch-pull-update.md")
-        .unwrap()
-        .home(
-            "alice",
-            working.join("alice"),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            bob.home.path(),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-fn rad_patch_open_explore() {
-    logger::init(log::Level::Debug);
-
-    let mut environment = Environment::new();
-    let seed = environment
-        .node(Config {
-            seeding_policy: DefaultSeedingPolicy::permissive(),
-            ..config::seed("seed")
-        })
-        .spawn();
-
-    let bob = environment.profile(profile::Config {
-        preferred_seeds: vec![seed.address()],
-        ..config::profile("bob")
-    });
-    let mut bob = Node::new(bob).spawn();
-    let working = environment.tmp().join("working");
-
-    fixtures::repository(&working);
-
-    bob.connect(&seed);
-    bob.init("heartwood", "", &working).unwrap();
-    bob.converge([&seed]);
-
-    test(
-        "examples/rad-patch-open-explore.md",
-        &working,
-        Some(&bob.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_init_private() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let working = environment.tmp().join("working");
-
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init-private.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_init_private_no_seed() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let working = environment.tmp().join("working");
-
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init-private-no-seed.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn rad_init_private_seed() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let working = environment.tmp().join("working");
-
-    fixtures::repository(working.join("alice"));
-
-    let alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    test(
-        "examples/rad-init-private.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    bob.connect(&alice).converge([&alice]);
-
-    formula(&environment.tmp(), "examples/rad-init-private-seed.md")
-        .unwrap()
-        .home(
-            "alice",
-            working.join("alice"),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            bob.home.path(),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-fn rad_init_private_clone() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let working = environment.tmp().join("working");
-
-    fixtures::repository(working.join("alice"));
-
-    let alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    test(
-        "examples/rad-init-private.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    bob.connect(&alice).converge([&alice]);
-
-    formula(&environment.tmp(), "examples/rad-init-private-clone.md")
-        .unwrap()
-        .home(
-            "alice",
-            working.join("alice"),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            bob.home.path(),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-fn rad_init_private_clone_seed() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let working = environment.tmp().join("working");
-
-    fixtures::repository(working.join("alice"));
-
-    let alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    test(
-        "examples/rad-init-private.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    bob.connect(&alice).converge([&alice]);
-
-    formula(
-        &environment.tmp(),
-        "examples/rad-init-private-clone-seed.md",
-    )
-    .unwrap()
-    .home(
-        "alice",
-        working.join("alice"),
-        [("RAD_HOME", alice.home.path().display())],
-    )
-    .home(
-        "bob",
-        bob.home.path(),
-        [("RAD_HOME", bob.home.path().display())],
-    )
-    .run()
-    .unwrap();
-}
-
-#[test]
-fn rad_publish() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let working = environment.tmp().join("working");
-
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init-private.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    test(
-        "examples/rad-publish.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn framework_home() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-
-    formula(&environment.tmp(), "examples/framework/home.md")
-        .unwrap()
-        .home(
-            "alice",
-            alice.home.path(),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            bob.home.path(),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-fn git_push_diverge() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let working = environment.tmp().join("working");
-    let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
-
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    bob.connect(&alice).converge([&alice]);
-    bob.fork(acme, working.join("bob")).unwrap();
-    alice.has_remote_of(&acme, &bob.id);
-
-    formula(&environment.tmp(), "examples/git/git-push-diverge.md")
-        .unwrap()
-        .home(
-            "alice",
-            working.join("alice"),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            working.join("bob").join("heartwood"),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-fn git_push_converge() {
-    use std::fs;
-
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let eve = environment.node(Config::test(Alias::new("eve")));
-    let working = environment.tmp().join("working");
-    let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
-
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let alice = alice.spawn();
-    let mut bob = bob.spawn();
-    let mut eve = eve.spawn();
-
-    bob.connect(&alice).connect(&eve).converge([&alice]);
-    eve.connect(&alice).converge([&alice]);
-    bob.fork(acme, working.join("bob")).unwrap();
-    eve.fork(acme, working.join("eve")).unwrap();
-    alice.has_remote_of(&acme, &bob.id);
-    alice.has_remote_of(&acme, &eve.id);
-
-    fs::write(
-        working.join("bob").join("heartwood").join("README"),
-        "Hello\n",
-    )
-    .unwrap();
-    fs::write(
-        working.join("eve").join("heartwood").join("README"),
-        "Hello, world!\n",
-    )
-    .unwrap();
-
-    formula(&environment.tmp(), "examples/git/git-push-converge.md")
-        .unwrap()
-        .home(
-            "alice",
-            working.join("alice"),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            working.join("bob").join("heartwood"),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .home(
-            "eve",
-            working.join("eve").join("heartwood"),
-            [("RAD_HOME", eve.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-fn git_push_amend() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let working = environment.tmp().join("working");
-    let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
-
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    bob.connect(&alice).converge([&alice]);
-    bob.fork(acme, working.join("bob")).unwrap();
-    alice.has_remote_of(&acme, &bob.id);
-
-    formula(&environment.tmp(), "examples/git/git-push-amend.md")
-        .unwrap()
-        .home(
-            "alice",
-            working.join("alice"),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            working.join("bob").join("heartwood"),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-fn git_push_rollback() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let working = environment.tmp().join("working");
-    let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
-
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    bob.connect(&alice).converge([&alice]);
-    bob.fork(acme, working.join("bob")).unwrap();
-    alice.has_remote_of(&acme, &bob.id);
-
-    formula(&environment.tmp(), "examples/git/git-push-rollback.md")
-        .unwrap()
-        .home(
-            "alice",
-            working.join("alice"),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            working.join("bob").join("heartwood"),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-fn rad_push_and_pull_patches() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let working = environment.tmp().join("working");
-    let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
-
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    bob.connect(&alice).converge([&alice]);
-    bob.fork(acme, working.join("bob")).unwrap();
-    alice.has_remote_of(&acme, &bob.id);
-
-    formula(&environment.tmp(), "examples/rad-push-and-pull-patches.md")
-        .unwrap()
-        .home(
-            "alice",
-            working.join("alice"),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            working.join("bob").join("heartwood"),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-fn rad_patch_fetch_1() {
-    let mut environment = Environment::new();
-    let mut alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let working = environment.tmp().join("working");
-    let (repo, _) = fixtures::repository(working.join("alice"));
-    let rid = alice.project_from("heartwood", "Radicle Heartwood Protocol & Stack", &repo);
-
-    let alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    bob.connect(&alice).converge([&alice]);
-    bob.clone(rid, working.join("bob")).unwrap();
-
-    formula(&environment.tmp(), "examples/rad-patch-fetch-1.md")
-        .unwrap()
-        .home(
-            "alice",
-            working.join("alice"),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            working.join("bob").join("heartwood"),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-fn rad_watch() {
-    let mut environment = Environment::new();
-    let mut alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let working = environment.tmp().join("working");
-    let (repo, _) = fixtures::repository(working.join("alice"));
-    let rid = alice.project_from("heartwood", "Radicle Heartwood Protocol & Stack", &repo);
-
-    let alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    bob.connect(&alice).converge([&alice]);
-    bob.clone(rid, working.join("bob")).unwrap();
-
-    formula(&environment.tmp(), "examples/rad-watch.md")
-        .unwrap()
-        .home(
-            "alice",
-            working.join("alice"),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            working.join("bob").join("heartwood"),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-fn rad_inbox() {
-    let mut environment = Environment::new();
-    let mut alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let working = environment.tmp().join("working");
-    let (repo1, _) = fixtures::repository(working.join("alice").join("heartwood"));
-    let (repo2, _) = fixtures::repository(working.join("alice").join("radicle-git"));
-    let rid1 = alice.project_from("heartwood", "Radicle Heartwood Protocol & Stack", &repo1);
-    let rid2 = alice.project_from("radicle-git", "Radicle Git", &repo2);
-
-    let alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    bob.connect(&alice).converge([&alice]);
-    bob.clone(rid1, working.join("bob")).unwrap();
-    bob.clone(rid2, working.join("bob")).unwrap();
-
-    formula(&environment.tmp(), "examples/rad-inbox.md")
-        .unwrap()
-        .home(
-            "alice",
-            working.join("alice"),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            working.join("bob"),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-fn rad_patch_fetch_2() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let working = environment.tmp().join("working");
-
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    test(
-        "examples/rad-patch-fetch-2.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn git_push_and_fetch() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let working = environment.tmp().join("working");
-
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    bob.connect(&alice).converge([&alice]);
-
-    test(
-        "examples/rad-clone.md",
-        working.join("bob"),
-        Some(&bob.home),
-        [],
-    )
-    .unwrap();
-    test(
-        "examples/git/git-push.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-    test(
-        "examples/git/git-fetch.md",
-        working.join("bob"),
-        Some(&bob.home),
-        [],
-    )
-    .unwrap();
-    test(
-        "examples/git/git-push-delete.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-}
-
-#[test]
-fn git_tag() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let working = environment.tmp().join("working");
-
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/rad-init.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    bob.connect(&alice).converge([&alice]);
-
-    test(
-        "examples/rad-clone.md",
-        working.join("bob"),
-        Some(&bob.home),
-        [],
-    )
-    .unwrap();
-    formula(&environment.tmp(), "examples/git/git-tag.md")
-        .unwrap()
-        .home(
-            "alice",
-            working.join("alice"),
-            [("RAD_HOME", alice.home.path().display())],
-        )
-        .home(
-            "bob",
-            working.join("bob"),
-            [("RAD_HOME", bob.home.path().display())],
-        )
-        .run()
-        .unwrap();
-}
-
-#[test]
-fn rad_workflow() {
-    let mut environment = Environment::new();
-    let alice = environment.node(Config::test(Alias::new("alice")));
-    let bob = environment.node(Config::test(Alias::new("bob")));
-    let working = environment.tmp().join("working");
-
-    fixtures::repository(working.join("alice"));
-
-    test(
-        "examples/workflow/1-new-project.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    let alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    bob.connect(&alice).converge([&alice]);
-
-    test(
-        "examples/workflow/2-cloning.md",
-        working.join("bob"),
-        Some(&bob.home),
-        [],
-    )
-    .unwrap();
-
-    test(
-        "examples/workflow/3-issues.md",
-        working.join("bob").join("heartwood"),
-        Some(&bob.home),
-        [],
-    )
-    .unwrap();
-
-    test(
-        "examples/workflow/4-patching-contributor.md",
-        working.join("bob").join("heartwood"),
-        Some(&bob.home),
-        [],
-    )
-    .unwrap();
-
-    test(
-        "examples/workflow/5-patching-maintainer.md",
-        working.join("alice"),
-        Some(&alice.home),
-        [],
-    )
-    .unwrap();
-
-    test(
-        "examples/workflow/6-pulling-contributor.md",
-        working.join("bob").join("heartwood"),
-        Some(&bob.home),
-        [],
-    )
-    .unwrap();
-}
diff --git a/radicle-cli/tests/data/ddiff_hunk.diff b/radicle-cli/tests/data/ddiff_hunk.diff
deleted file mode 100644
index f30ded2f6..000000000
--- a/radicle-cli/tests/data/ddiff_hunk.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-@@ -30,8 +31,6 @@
-  hears
-  vacationing
- +
--+imprisoning
--+absinthe
--+shack
--+exhale
--+perfected
-++planet
-++elapse
-++caters
diff --git a/radicle-cli/tests/data/diff.diff b/radicle-cli/tests/data/diff.diff
deleted file mode 100644
index 72d46db59..000000000
--- a/radicle-cli/tests/data/diff.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/README.md b/README.md
-index 18fb832..ce60f40 100644
---- a/README.md
-+++ b/README.md
-@@ -4,8 +4,8 @@ componentwise
- reusing
- simplest
- crag
--offended
- omitting
-+offended
- grinders
- cutting
- proverb
-@@ -21,8 +21,8 @@ alliterative
- stays
- mahogany
- whole
--snowflake
- ellipses
-+snowflake
- yearning
- inciting
- permeating
-@@ -30,3 +30,9 @@ bereaved
- eventfully
- hears
- vacationing
-+
-+imprisoning
-+absinthe
-+shack
-+exhale
-+perfected
diff --git a/radicle-cli/tests/data/diff_body.diff b/radicle-cli/tests/data/diff_body.diff
deleted file mode 100644
index eae56eb7e..000000000
--- a/radicle-cli/tests/data/diff_body.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-@@ -4,8 +4,8 @@ componentwise
- reusing
- simplest
- crag
--offended
- omitting
-+offended
- grinders
- cutting
- proverb
-@@ -21,8 +21,8 @@ alliterative
- stays
- mahogany
- whole
--snowflake
- ellipses
-+snowflake
- yearning
- inciting
- permeating
-@@ -30,3 +30,9 @@ bereaved
- eventfully
- hears
- vacationing
-+
-+imprisoning
-+absinthe
-+shack
-+exhale
-+perfected
diff --git a/radicle-cob/Cargo.toml b/radicle-cob/Cargo.toml
deleted file mode 100644
index 6293e44bb..000000000
--- a/radicle-cob/Cargo.toml
+++ /dev/null
@@ -1,56 +0,0 @@
-[package]
-name = "radicle-cob"
-description = "Radicle Collaborative Objects library"
-homepage = "https://radicle.xyz"
-repository = "https://app.radicle.xyz/seeds/seed.radicle.xyz/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5"
-version = "0.12.0"
-authors = [
-  "Alex Good <alex@memoryandthought.me>",
-  "Fintan Halpenny <fintan.halpenny@gmail.com>",
-]
-edition = "2021"
-license = "MIT OR Apache-2.0"
-keywords = ["radicle", "cob", "cobs"]
-
-[features]
-default = []
-# Only used for testing. Ensures that commit ids are stable.
-stable-commit-ids = []
-
-[dependencies]
-fastrand = { version = "2.0.0" }
-log = { version = "0.4.17" }
-nonempty = { version = "0.9.0", features = ["serialize"] }
-once_cell = { version = "1.13" }
-radicle-git-ext = { version = "0.8.0", features = ["serde"] }
-serde_json = { version = "1.0" }
-thiserror = { version = "1.0" }
-
-[dependencies.git2]
-version = "0.19.0"
-default-features = false
-features = ["vendored-libgit2"]
-
-[dependencies.radicle-crypto]
-path = "../radicle-crypto"
-version = "0"
-features = ["ssh"]
-
-[dependencies.radicle-dag]
-path = "../radicle-dag"
-version = "0"
-
-[dependencies.serde]
-version = "1.0"
-features = ["derive"]
-
-[dev-dependencies]
-fastrand = { version = "2.0.0", default-features = false }
-tempfile = { version = "3" }
-qcheck = { version = "1", default-features = false }
-qcheck-macros = { version = "1", default-features = false }
-
-[dev-dependencies.radicle-crypto]
-path = "../radicle-crypto"
-version = "0"
-features = ["test"]
diff --git a/radicle-cob/src/backend.rs b/radicle-cob/src/backend.rs
deleted file mode 100644
index 8baeba422..000000000
--- a/radicle-cob/src/backend.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright © 2022 The Radicle Link Contributors
-
-pub mod git;
diff --git a/radicle-cob/src/backend/git.rs b/radicle-cob/src/backend/git.rs
deleted file mode 100644
index d9bd98c9e..000000000
--- a/radicle-cob/src/backend/git.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright © 2022 The Radicle Team
-
-pub mod change;
-
-/// Environment variable to set to overwrite the commit date for both the author and the committer.
-///
-/// The format must be a unix timestamp.
-pub const GIT_COMMITTER_DATE: &str = "GIT_COMMITTER_DATE";
diff --git a/radicle-cob/src/backend/git/change.rs b/radicle-cob/src/backend/git/change.rs
deleted file mode 100644
index 7efcaab20..000000000
--- a/radicle-cob/src/backend/git/change.rs
+++ /dev/null
@@ -1,387 +0,0 @@
-// Copyright © 2022 The Radicle Link Contributors
-
-use std::collections::BTreeMap;
-use std::convert::TryFrom;
-use std::path::PathBuf;
-
-use git_ext::author::Author;
-use git_ext::commit::{headers::Headers, Commit};
-use git_ext::Oid;
-use nonempty::NonEmpty;
-use once_cell::sync::Lazy;
-use radicle_git_ext::commit::trailers::OwnedTrailer;
-
-use crate::change::store::Version;
-use crate::signatures;
-use crate::trailers::CommitTrailer;
-use crate::{
-    change,
-    change::{store, Contents, Entry, Timestamp},
-    signatures::{ExtendedSignature, Signatures},
-    trailers, Embed,
-};
-
-/// Name of the COB manifest file.
-pub const MANIFEST_BLOB_NAME: &str = "manifest";
-/// Path under which COB embeds are kept.
-pub static EMBEDS_PATH: Lazy<PathBuf> = Lazy::new(|| PathBuf::from("embeds"));
-
-pub mod error {
-    use std::str::Utf8Error;
-    use std::string::FromUtf8Error;
-
-    use git_ext::commit;
-    use git_ext::Oid;
-    use thiserror::Error;
-
-    use crate::signatures::error::Signatures;
-
-    #[derive(Debug, Error)]
-    pub enum Create {
-        #[error(transparent)]
-        WriteCommit(#[from] commit::error::Write),
-        #[error(transparent)]
-        FromUtf8(#[from] FromUtf8Error),
-        #[error(transparent)]
-        Git(#[from] git2::Error),
-        #[error(transparent)]
-        Signer(#[from] Box<dyn std::error::Error + Send + Sync + 'static>),
-        #[error(transparent)]
-        Signatures(#[from] Signatures),
-        #[error(transparent)]
-        Utf8(#[from] Utf8Error),
-    }
-
-    #[derive(Debug, Error)]
-    pub enum Load {
-        #[error(transparent)]
-        Read(#[from] commit::error::Read),
-        #[error(transparent)]
-        Signatures(#[from] Signatures),
-        #[error(transparent)]
-        Git(#[from] git2::Error),
-        #[error("a 'manifest' file was expected be found in '{0}'")]
-        NoManifest(Oid),
-        #[error("the 'manifest' found at '{0}' was not a blob")]
-        ManifestIsNotBlob(Oid),
-        #[error("the 'manifest' found at '{id}' was invalid: {err}")]
-        InvalidManifest {
-            id: Oid,
-            #[source]
-            err: serde_json::Error,
-        },
-        #[error("a 'change' file was expected be found in '{0}'")]
-        NoChange(Oid),
-        #[error("the 'change' found at '{0}' was not a blob")]
-        ChangeNotBlob(Oid),
-        #[error("the 'change' found at '{0}' was not signed")]
-        ChangeNotSigned(Oid),
-        #[error("the 'change' found at '{0}' has more than one signature")]
-        TooManySignatures(Oid),
-        #[error("the 'change' found at '{0}' has more than one resource trailer")]
-        TooManyResources(Oid),
-        #[error(transparent)]
-        ResourceTrailer(#[from] super::trailers::error::InvalidResourceTrailer),
-        #[error("non utf-8 characters in commit message")]
-        Utf8(#[from] FromUtf8Error),
-    }
-}
-
-impl change::Storage for git2::Repository {
-    type StoreError = error::Create;
-    type LoadError = error::Load;
-
-    type ObjectId = Oid;
-    type Parent = Oid;
-    type Signatures = ExtendedSignature;
-
-    fn store<Signer>(
-        &self,
-        resource: Option<Self::Parent>,
-        mut related: Vec<Self::Parent>,
-        signer: &Signer,
-        spec: store::Template<Self::ObjectId>,
-    ) -> Result<Entry, Self::StoreError>
-    where
-        Signer: crypto::Signer,
-    {
-        let change::Template {
-            type_name,
-            tips,
-            message,
-            embeds,
-            contents,
-        } = spec;
-        let manifest = store::Manifest::new(type_name, Version::default());
-        let revision = write_manifest(self, &manifest, embeds, &contents)?;
-        let tree = self.find_tree(revision)?;
-        let signature = {
-            let sig = signer.sign(revision.as_bytes());
-            let key = signer.public_key();
-            ExtendedSignature::new(*key, sig)
-        };
-
-        // Make sure there are no duplicates in the related list.
-        related.sort();
-        related.dedup();
-
-        let (id, timestamp) = write_commit(
-            self,
-            resource.map(|o| *o),
-            // Commit to tips, extra parents and resource.
-            tips.iter()
-                .cloned()
-                .chain(related.clone())
-                .chain(resource)
-                .map(git2::Oid::from),
-            message,
-            signature.clone(),
-            related
-                .iter()
-                .map(|p| trailers::CommitTrailer::Related(**p).into()),
-            tree,
-        )?;
-
-        Ok(Entry {
-            id,
-            revision: revision.into(),
-            signature,
-            resource,
-            parents: tips,
-            related,
-            manifest,
-            contents,
-            timestamp,
-        })
-    }
-
-    fn parents_of(&self, id: &Oid) -> Result<Vec<Oid>, Self::LoadError> {
-        Ok(self
-            .find_commit(**id)?
-            .parent_ids()
-            .map(Oid::from)
-            .collect::<Vec<_>>())
-    }
-
-    fn load(&self, id: Self::ObjectId) -> Result<Entry, Self::LoadError> {
-        let commit = Commit::read(self, id.into())?;
-        let timestamp = git2::Time::from(commit.committer().time).seconds() as u64;
-        let trailers = parse_trailers(commit.trailers())?;
-        let (resources, related): (Vec<_>, Vec<_>) = trailers.iter().partition(|t| match t {
-            CommitTrailer::Resource(_) => true,
-            CommitTrailer::Related(_) => false,
-        });
-        let mut resources = resources
-            .into_iter()
-            .map(|r| r.oid().into())
-            .collect::<Vec<_>>();
-        let related = related
-            .into_iter()
-            .map(|r| r.oid().into())
-            .collect::<Vec<_>>();
-        let parents = commit
-            .parents()
-            .map(Oid::from)
-            .filter(|p| !resources.contains(p) && !related.contains(p))
-            .collect();
-        let mut signatures = Signatures::try_from(&commit)?
-            .into_iter()
-            .collect::<Vec<_>>();
-        let Some((key, sig)) = signatures.pop() else {
-            return Err(error::Load::ChangeNotSigned(id));
-        };
-        if !signatures.is_empty() {
-            return Err(error::Load::TooManySignatures(id));
-        }
-        if resources.len() > 1 {
-            return Err(error::Load::TooManyResources(id));
-        };
-
-        let tree = self.find_tree(*commit.tree())?;
-        let manifest = load_manifest(self, &tree)?;
-        let contents = load_contents(self, &tree)?;
-
-        Ok(Entry {
-            id,
-            revision: tree.id().into(),
-            signature: ExtendedSignature::new(key, sig),
-            resource: resources.pop(),
-            related,
-            parents,
-            manifest,
-            contents,
-            timestamp,
-        })
-    }
-}
-
-fn parse_trailers<'a>(
-    trailers: impl Iterator<Item = &'a OwnedTrailer>,
-) -> Result<Vec<trailers::CommitTrailer>, error::Load> {
-    let mut parsed = Vec::new();
-    for trailer in trailers {
-        match trailers::CommitTrailer::try_from(trailer) {
-            Err(trailers::error::InvalidResourceTrailer::WrongToken) => {
-                continue;
-            }
-            Err(err) => return Err(err.into()),
-            Ok(t) => parsed.push(t),
-        }
-    }
-    Ok(parsed)
-}
-
-fn load_manifest(
-    repo: &git2::Repository,
-    tree: &git2::Tree,
-) -> Result<store::Manifest, error::Load> {
-    let manifest_tree_entry = tree
-        .get_name(MANIFEST_BLOB_NAME)
-        .ok_or_else(|| error::Load::NoManifest(tree.id().into()))?;
-    let manifest_object = manifest_tree_entry.to_object(repo)?;
-    let manifest_blob = manifest_object
-        .as_blob()
-        .ok_or_else(|| error::Load::ManifestIsNotBlob(tree.id().into()))?;
-
-    serde_json::from_slice(manifest_blob.content()).map_err(|err| error::Load::InvalidManifest {
-        id: tree.id().into(),
-        err,
-    })
-}
-
-fn load_contents(repo: &git2::Repository, tree: &git2::Tree) -> Result<Contents, error::Load> {
-    let ops = tree
-        .iter()
-        .filter_map(|entry| {
-            entry.kind().and_then(|kind| match kind {
-                git2::ObjectType::Blob => {
-                    let name = entry.name()?.parse::<i8>().ok()?;
-                    let blob = entry
-                        .to_object(repo)
-                        .and_then(|object| object.peel_to_blob())
-                        .map(|blob| blob.content().to_owned())
-                        .map(|b| (name, b));
-
-                    Some(blob)
-                }
-                _ => None,
-            })
-        })
-        .collect::<Result<BTreeMap<_, _>, _>>()?;
-
-    NonEmpty::collect(ops.into_values()).ok_or_else(|| error::Load::NoChange(tree.id().into()))
-}
-
-fn write_commit(
-    repo: &git2::Repository,
-    resource: Option<git2::Oid>,
-    parents: impl IntoIterator<Item = git2::Oid>,
-    message: String,
-    signature: ExtendedSignature,
-    trailers: impl IntoIterator<Item = OwnedTrailer>,
-    tree: git2::Tree,
-) -> Result<(Oid, Timestamp), error::Create> {
-    let trailers: Vec<OwnedTrailer> = trailers
-        .into_iter()
-        .chain(resource.map(|r| trailers::CommitTrailer::Resource(r).into()))
-        .collect();
-    let author = repo.signature()?;
-    #[allow(unused_variables)]
-    let timestamp = author.when().seconds();
-
-    let mut headers = Headers::new();
-    headers.push(
-        "gpgsig",
-        signature
-            .to_pem()
-            .map_err(signatures::error::Signatures::from)?
-            .as_str(),
-    );
-    let author = Author::try_from(&author)?;
-
-    #[cfg(feature = "stable-commit-ids")]
-    // Ensures the commit id doesn't change on every run.
-    let (author, timestamp) = (
-        Author {
-            time: git_ext::author::Time::new(1514817556, 0),
-            ..author
-        },
-        1514817556,
-    );
-    let (author, timestamp) = if let Ok(s) = std::env::var(crate::git::GIT_COMMITTER_DATE) {
-        let Ok(timestamp) = s.trim().parse::<i64>() else {
-            panic!(
-                "Invalid timestamp value {s:?} for `{}`",
-                crate::git::GIT_COMMITTER_DATE
-            );
-        };
-        let author = Author {
-            time: git_ext::author::Time::new(timestamp, 0),
-            ..author
-        };
-        (author, timestamp)
-    } else {
-        (author, timestamp)
-    };
-
-    let oid = Commit::new(
-        tree.id(),
-        parents,
-        author.clone(),
-        author,
-        headers,
-        message,
-        trailers,
-    )
-    .write(repo)?;
-
-    Ok((Oid::from(oid), timestamp as u64))
-}
-
-fn write_manifest(
-    repo: &git2::Repository,
-    manifest: &store::Manifest,
-    embeds: Vec<Embed>,
-    contents: &NonEmpty<Vec<u8>>,
-) -> Result<git2::Oid, git2::Error> {
-    let mut root = repo.treebuilder(None)?;
-
-    // Insert manifest file into tree.
-    {
-        // SAFETY: we're serializing to an in memory buffer so the only source of
-        // errors here is a programming error, which we can't recover from.
-        #[allow(clippy::unwrap_used)]
-        let manifest = serde_json::to_vec(manifest).unwrap();
-        let manifest_oid = repo.blob(&manifest)?;
-
-        root.insert(
-            MANIFEST_BLOB_NAME,
-            manifest_oid,
-            git2::FileMode::Blob.into(),
-        )?;
-    }
-
-    // Insert each COB entry.
-    for (ix, op) in contents.iter().enumerate() {
-        let oid = repo.blob(op.as_ref())?;
-        root.insert(ix.to_string(), oid, git2::FileMode::Blob.into())?;
-    }
-
-    // Insert each embed in a tree at `/embeds`.
-    if !embeds.is_empty() {
-        let mut embeds_tree = repo.treebuilder(None)?;
-
-        for embed in embeds {
-            let oid = repo.blob(&embed.content)?;
-            let path = PathBuf::from(embed.name);
-
-            embeds_tree.insert(path, oid, git2::FileMode::Blob.into())?;
-        }
-        let oid = embeds_tree.write()?;
-
-        root.insert(&*EMBEDS_PATH, oid, git2::FileMode::Tree.into())?;
-    }
-    let oid = root.write()?;
-
-    Ok(oid)
-}
diff --git a/radicle-cob/src/change.rs b/radicle-cob/src/change.rs
deleted file mode 100644
index 8458064da..000000000
--- a/radicle-cob/src/change.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright © 2021 The Radicle Link Contributors
-
-use git_ext::Oid;
-
-pub mod store;
-pub use store::{Contents, EntryId, Storage, Template, Timestamp};
-
-use crate::signatures::ExtendedSignature;
-
-/// A single change in the change graph.
-pub type Entry = store::Entry<Oid, Oid, ExtendedSignature>;
diff --git a/radicle-cob/src/change/store.rs b/radicle-cob/src/change/store.rs
deleted file mode 100644
index a5f71ad5e..000000000
--- a/radicle-cob/src/change/store.rs
+++ /dev/null
@@ -1,217 +0,0 @@
-// Copyright © 2022 The Radicle Link Contributors
-
-use std::{error::Error, fmt, num::NonZeroUsize};
-
-use nonempty::NonEmpty;
-use radicle_git_ext::Oid;
-use serde::{Deserialize, Serialize};
-
-use crate::{signatures, TypeName};
-
-/// Change entry storage.
-pub trait Storage {
-    type StoreError: Error + Send + Sync + 'static;
-    type LoadError: Error + Send + Sync + 'static;
-
-    type ObjectId;
-    type Parent;
-    type Signatures;
-
-    /// Store a new change entry.
-    #[allow(clippy::type_complexity)]
-    fn store<G>(
-        &self,
-        resource: Option<Self::Parent>,
-        related: Vec<Self::Parent>,
-        signer: &G,
-        template: Template<Self::ObjectId>,
-    ) -> Result<Entry<Self::Parent, Self::ObjectId, Self::Signatures>, Self::StoreError>
-    where
-        G: crypto::Signer;
-
-    /// Load a change entry.
-    #[allow(clippy::type_complexity)]
-    fn load(
-        &self,
-        id: Self::ObjectId,
-    ) -> Result<Entry<Self::Parent, Self::ObjectId, Self::Signatures>, Self::LoadError>;
-
-    /// Returns the parents of the object with the specified ID.
-    fn parents_of(&self, id: &Oid) -> Result<Vec<Oid>, Self::LoadError>;
-}
-
-/// Change template, used to create a new change.
-pub struct Template<Id> {
-    pub type_name: TypeName,
-    pub tips: Vec<Id>,
-    pub message: String,
-    pub embeds: Vec<Embed>,
-    pub contents: NonEmpty<Vec<u8>>,
-}
-
-/// Entry contents.
-/// This is the change payload.
-pub type Contents = NonEmpty<Vec<u8>>;
-
-/// Local time in seconds since epoch.
-pub type Timestamp = u64;
-
-/// A unique identifier for a history entry.
-pub type EntryId = Oid;
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct Entry<Resource, Id, Signature> {
-    /// The content address of the entry itself.
-    pub id: Id,
-    /// The content address of the tree of the entry.
-    pub revision: Id,
-    /// The cryptographic signature(s) and their public keys of the
-    /// authors.
-    pub signature: Signature,
-    /// The parent resource that this change lives under. For example,
-    /// this change could be for a patch of a project.
-    pub resource: Option<Resource>,
-    /// Parent changes.
-    pub parents: Vec<Resource>,
-    /// Other parents this change depends on.
-    pub related: Vec<Resource>,
-    /// The manifest describing the type of object as well as the type
-    /// of history for this entry.
-    pub manifest: Manifest,
-    /// The contents that describe entry.
-    pub contents: Contents,
-    /// Timestamp of change.
-    pub timestamp: Timestamp,
-}
-
-impl<Resource, Id, S> fmt::Display for Entry<Resource, Id, S>
-where
-    Id: fmt::Display,
-{
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "Entry {{ id: {} }}", self.id)
-    }
-}
-
-impl<Resource, Id, Signatures> Entry<Resource, Id, Signatures> {
-    pub fn id(&self) -> &Id {
-        &self.id
-    }
-
-    pub fn type_name(&self) -> &TypeName {
-        &self.manifest.type_name
-    }
-
-    pub fn contents(&self) -> &Contents {
-        &self.contents
-    }
-
-    pub fn resource(&self) -> Option<&Resource> {
-        self.resource.as_ref()
-    }
-}
-
-impl<R, Id> Entry<R, Id, signatures::Signatures>
-where
-    Id: AsRef<[u8]>,
-{
-    pub fn valid_signatures(&self) -> bool {
-        self.signature
-            .iter()
-            .all(|(key, sig)| key.verify(self.revision.as_ref(), sig).is_ok())
-    }
-}
-
-impl<R, Id> Entry<R, Id, signatures::ExtendedSignature>
-where
-    Id: AsRef<[u8]>,
-{
-    pub fn valid_signatures(&self) -> bool {
-        self.signature.verify(self.revision.as_ref())
-    }
-
-    pub fn author(&self) -> &crypto::PublicKey {
-        &self.signature.key
-    }
-}
-
-#[derive(Clone, Debug, Hash, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Manifest {
-    /// The name given to the type of collaborative object.
-    #[serde(alias = "typename")] // Deprecated name for compatibility reasons.
-    pub type_name: TypeName,
-    /// Version number.
-    #[serde(default)]
-    pub version: Version,
-}
-
-impl Manifest {
-    /// Create a new manifest.
-    pub fn new(type_name: TypeName, version: Version) -> Self {
-        Self { type_name, version }
-    }
-}
-
-/// COB version.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub struct Version(NonZeroUsize);
-
-impl Default for Version {
-    fn default() -> Self {
-        Version(NonZeroUsize::MIN)
-    }
-}
-
-impl From<Version> for usize {
-    fn from(value: Version) -> Self {
-        value.0.into()
-    }
-}
-
-impl From<NonZeroUsize> for Version {
-    fn from(value: NonZeroUsize) -> Self {
-        Self(value)
-    }
-}
-
-impl Version {
-    pub fn new(version: usize) -> Option<Self> {
-        NonZeroUsize::new(version).map(Self)
-    }
-}
-
-/// Embedded object.
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Embed<T = Vec<u8>> {
-    /// File name.
-    pub name: String,
-    /// File content or content hash.
-    pub content: T,
-}
-
-impl Embed<Vec<u8>> {
-    /// Get the object id of the embedded content.
-    pub fn oid(&self) -> Oid {
-        // SAFETY: This should not fail since we are using a valid object type.
-        git2::Oid::hash_object(git2::ObjectType::Blob, &self.content)
-            .expect("Embed::oid: invalid object")
-            .into()
-    }
-
-    /// Return an embed where the content is replaced by a content hash.
-    pub fn hashed<T: From<Oid>>(&self) -> Embed<T> {
-        Embed {
-            name: self.name.clone(),
-            content: T::from(self.oid()),
-        }
-    }
-}
-
-impl Embed<Oid> {
-    /// Get the object id of the embedded content.
-    pub fn oid(&self) -> Oid {
-        self.content
-    }
-}
diff --git a/radicle-cob/src/change_graph.rs b/radicle-cob/src/change_graph.rs
deleted file mode 100644
index a1fd62afa..000000000
--- a/radicle-cob/src/change_graph.rs
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright © 2021 The Radicle Link Contributors
-
-use std::collections::BTreeSet;
-use std::ops::ControlFlow;
-
-use git_ext::Oid;
-use radicle_dag::Dag;
-
-use crate::{
-    change, object, object::collaboration::Evaluate, signatures::ExtendedSignature,
-    CollaborativeObject, Entry, EntryId, History, ObjectId, TypeName,
-};
-
-#[derive(Debug, thiserror::Error)]
-pub enum EvaluateError {
-    #[error("unable to initialize object: {0}")]
-    Init(Box<dyn std::error::Error + Sync + Send + 'static>),
-    #[error("invalid signature for entry '{0}'")]
-    Signature(EntryId),
-    #[error("root entry '{0}' missing from graph")]
-    MissingRoot(EntryId),
-}
-
-/// The graph of changes for a particular collaborative object
-pub(super) struct ChangeGraph {
-    object_id: ObjectId,
-    graph: Dag<Oid, Entry>,
-}
-
-impl ChangeGraph {
-    /// Load the change graph from the underlying git store by walking
-    /// backwards from references to the object
-    pub(crate) fn load<'a, S>(
-        storage: &S,
-        tip_refs: impl Iterator<Item = &'a object::Reference> + 'a,
-        typename: &TypeName,
-        oid: &ObjectId,
-    ) -> Option<ChangeGraph>
-    where
-        S: change::Storage<ObjectId = Oid, Parent = Oid, Signatures = ExtendedSignature>,
-    {
-        log::debug!(target: "cob", "Loading object of type {typename} at {oid}");
-
-        let mut builder = GraphBuilder::default();
-        let mut edges_to_process: Vec<(Oid, Oid)> = Vec::new();
-
-        // Populate the initial set of edges_to_process from the refs we have
-        for reference in tip_refs {
-            log::trace!(target: "cob", "Loading object from reference '{}'", reference.name);
-
-            match storage.load(reference.target.id) {
-                Ok(change) => {
-                    let new_edges = builder.add_change(reference.target.id, change);
-                    edges_to_process.extend(new_edges);
-                }
-                Err(e) => {
-                    log::warn!(
-                        target: "cob",
-                        "Unable to load change from reference {}->{}: {e}",
-                        reference.name,
-                        reference.target.id,
-                    );
-                }
-            }
-        }
-
-        // Process edges until we have no more to process
-        while let Some((parent_commit_id, child_commit_id)) = edges_to_process.pop() {
-            log::trace!(
-                target: "cob",
-                "Loading change parent='{}', child='{}'",
-                parent_commit_id,
-                child_commit_id
-            );
-            match storage.load(parent_commit_id) {
-                Ok(change) => {
-                    let new_edges = builder.add_change(parent_commit_id, change);
-                    edges_to_process.extend(new_edges);
-                    builder.add_edge(child_commit_id, parent_commit_id);
-                }
-                Err(e) => {
-                    log::warn!(
-                        target: "cob",
-                        "Unable to load change tree from commit {}: {e}",
-                        parent_commit_id,
-                    );
-                }
-            }
-        }
-        builder.build(*oid)
-    }
-
-    /// Given a graph evaluate it to produce a collaborative object. This will
-    /// filter out branches of the graph which do not have valid signatures.
-    pub(crate) fn evaluate<S, T: Evaluate<S>>(
-        mut self,
-        store: &S,
-    ) -> Result<CollaborativeObject<T>, EvaluateError> {
-        let root = *self.object_id;
-        let root = self
-            .graph
-            .get(&root)
-            .ok_or(EvaluateError::MissingRoot(root))?;
-
-        if !root.valid_signatures() {
-            return Err(EvaluateError::Signature(root.id));
-        }
-        // Evaluate the root separately, since we can't have a COB without a valid root.
-        // Then, traverse the graph starting from the root's dependents.
-        let mut object =
-            T::init(&root.value, store).map_err(|e| EvaluateError::Init(Box::new(e)))?;
-        let children = Vec::from_iter(root.dependents.iter().cloned());
-        let manifest = root.manifest.clone();
-        let root = root.id;
-
-        self.graph.prune(&children, |_, entry, siblings| {
-            // Check the entry signatures are valid.
-            if !entry.valid_signatures() {
-                return ControlFlow::Break(());
-            }
-            // Apply the entry to the state, and if there's an error, prune that branch.
-            if object
-                .apply(entry, siblings.map(|(k, n)| (k, &n.value)), store)
-                .is_err()
-            {
-                return ControlFlow::Break(());
-            }
-            ControlFlow::Continue(())
-        });
-
-        Ok(CollaborativeObject {
-            manifest,
-            object,
-            history: History::new(root, self.graph),
-            id: self.object_id,
-        })
-    }
-
-    /// Get the tips of the collaborative object
-    pub(crate) fn tips(&self) -> BTreeSet<Oid> {
-        self.graph.tips().map(|(_, change)| *change.id()).collect()
-    }
-
-    pub(crate) fn number_of_nodes(&self) -> usize {
-        self.graph.len()
-    }
-}
-
-struct GraphBuilder {
-    graph: Dag<Oid, Entry>,
-}
-
-impl Default for GraphBuilder {
-    fn default() -> Self {
-        GraphBuilder { graph: Dag::new() }
-    }
-}
-
-impl GraphBuilder {
-    /// Add a change to the graph which we are building up, returning any edges
-    /// corresponding to the parents of this node in the change graph
-    fn add_change(&mut self, commit_id: Oid, change: Entry) -> Vec<(Oid, Oid)> {
-        let resource = change.resource().copied();
-        let parents = change.parents.clone();
-
-        if !self.graph.contains(&commit_id) {
-            self.graph.node(commit_id, change);
-        }
-
-        parents
-            .into_iter()
-            .filter_map(move |parent| {
-                debug_assert_ne!(Some(parent), resource);
-
-                if !self.graph.has_dependency(&commit_id, &parent) {
-                    Some((parent, commit_id))
-                } else {
-                    None
-                }
-            })
-            .collect()
-    }
-
-    fn add_edge(&mut self, child: Oid, parent: Oid) {
-        self.graph.dependency(child, parent);
-    }
-
-    fn build(self, object_id: ObjectId) -> Option<ChangeGraph> {
-        if self.graph.roots().next().is_some() {
-            Some(ChangeGraph {
-                object_id,
-                graph: self.graph,
-            })
-        } else {
-            None
-        }
-    }
-}
diff --git a/radicle-cob/src/history.rs b/radicle-cob/src/history.rs
deleted file mode 100644
index cfcc37483..000000000
--- a/radicle-cob/src/history.rs
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright © 2021 The Radicle Link Contributors
-#![allow(clippy::too_many_arguments)]
-use std::{cmp::Ordering, collections::BTreeSet, ops::ControlFlow};
-
-use git_ext::Oid;
-use radicle_dag::Dag;
-
-pub use crate::change::{Contents, Entry, EntryId, Timestamp};
-
-/// The DAG of changes making up the history of a collaborative object.
-#[derive(Clone, Debug)]
-pub struct History {
-    graph: Dag<EntryId, Entry>,
-    root: EntryId,
-}
-
-impl PartialEq for History {
-    fn eq(&self, other: &Self) -> bool {
-        self.tips() == other.tips()
-    }
-}
-
-impl Eq for History {}
-
-impl History {
-    /// Create a new history from a DAG. Panics if the root is not part of the graph.
-    pub fn new(root: EntryId, graph: Dag<EntryId, Entry>) -> Self {
-        assert!(
-            graph.contains(&root),
-            "History::new: root must be present in graph"
-        );
-        Self { root, graph }
-    }
-
-    /// Create a new history from a root entry.
-    pub fn new_from_root(root: Entry) -> Self {
-        let id = *root.id();
-
-        Self::new(id, Dag::root(id, root))
-    }
-
-    /// Get all the tips of the graph.
-    pub fn tips(&self) -> BTreeSet<Oid> {
-        self.graph.tips().map(|(_, entry)| *entry.id()).collect()
-    }
-
-    /// A topological (parents before children) traversal of the dependency
-    /// graph of this history. This is analagous to
-    /// [`std::iter::Iterator::fold`] in that it folds every change into an
-    /// accumulator value of type `A`. However, unlike `fold` the function `f`
-    /// may prune branches from the dependency graph by returning
-    /// `ControlFlow::Break`.
-    pub fn traverse<F, A>(&self, init: A, roots: &[EntryId], mut f: F) -> A
-    where
-        F: for<'r> FnMut(A, &'r EntryId, &'r Entry) -> ControlFlow<A, A>,
-    {
-        self.graph.fold(roots, init, |acc, k, v| f(acc, k, v))
-    }
-
-    /// Return a topologically-sorted list of history entries.
-    pub fn sorted<F>(&self, compare: F) -> impl Iterator<Item = &Entry>
-    where
-        F: FnMut(&EntryId, &EntryId) -> Ordering,
-    {
-        self.graph
-            .sorted_by(compare)
-            .into_iter()
-            .filter_map(|k| self.graph.get(&k))
-            .map(|node| &node.value)
-    }
-
-    /// Extend this history with a new entry.
-    pub fn extend(&mut self, change: Entry) {
-        let tips = self.tips();
-        let id = *change.id();
-
-        self.graph.node(id, change);
-
-        for tip in tips {
-            self.graph.dependency(id, (*tip).into());
-        }
-    }
-
-    /// Merge two histories.
-    pub fn merge(&mut self, other: Self) {
-        self.graph.merge(other.graph);
-    }
-
-    /// Get the number of history entries.
-    pub fn len(&self) -> usize {
-        self.graph.len()
-    }
-
-    /// Check if the graph is empty.
-    pub fn is_empty(&self) -> bool {
-        self.graph.is_empty()
-    }
-
-    /// Get the underlying graph
-    pub fn graph(&self) -> &Dag<EntryId, Entry> {
-        &self.graph
-    }
-
-    /// Get the root entry.
-    pub fn root(&self) -> &Entry {
-        // SAFETY: We don't allow construction of histories without a root.
-        self.graph
-            .get(&self.root)
-            .expect("History::root: the root entry must be present in the graph")
-    }
-
-    /// Get the children of the given entry.
-    pub fn children_of(&self, id: &EntryId) -> Vec<EntryId> {
-        self.graph
-            .get(id)
-            .map(|n| n.dependents.iter().cloned().collect())
-            .unwrap_or_default()
-    }
-}
diff --git a/radicle-cob/src/lib.rs b/radicle-cob/src/lib.rs
deleted file mode 100644
index 198b0977e..000000000
--- a/radicle-cob/src/lib.rs
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright © 2021 The Radicle Link Contributors
-
-#![warn(clippy::unwrap_used)]
-//! # Collaborative Objects
-//!
-//! Collaborative objects are graphs of CRDTs.
-//!
-//! ## Basic Types
-//!
-//! The basic types that are found in `radicle-cob` are:
-//!   * [`CollaborativeObject`] -- the computed object itself.
-//!   * [`ObjectId`] -- the content-address for a single collaborative object.
-//!   * [`TypeName`] -- the name for a collection of collaborative objects.
-//!   * [`History`] -- the traversable history of the changes made to
-//!     a single collaborative object.
-//!
-//! ## CRU Interface (No Delete)
-//!
-//! The main entry for manipulating [`CollaborativeObject`]s is by
-//! using the CRU like functions:
-//!   * [`create`]
-//!   * [`get`]
-//!   * [`list`]
-//!   * [`update`]
-//!
-//! ## Storage
-//!
-//! The storing of collaborative objects is based on a git
-//! backend. The previously mentioned functions all accept a [`Store`]
-//! as parameter. The `Store` itself is an accumulation of different
-//! storage capabilities:
-//!   * [`object::Storage`]
-//!   * [`change::Storage`] -- **Note**: there is already an
-//!     implementation for this for [`git2::Repository`] for convenience.
-//!
-//! ## Resource
-//!
-//! The [`create`] and [`update`] functions take a `Resource`. It
-//! represents the type of resource the collaborative objects are
-//! relating to, for example a software project.
-//!
-//! ## History Traversal
-//!
-//! The [`History`] of a [`CollaborativeObject`] -- accessed via
-//! [`CollaborativeObject::history`] -- has a method
-//! [`History::traverse`] which provides a way of inspecting each
-//! [`Entry`] and building up a final value.
-//!
-//! This traversal is also the point at which the [`Entry::author`]
-//! and [`Entry::resource`] can be retrieved to apply any kind of
-//! filtering logic. For example, a specific `author`'s change may be
-//! egregious, spouting terrible libel about Radicle. It is at this
-//! point that the `actor`'s change can be filtered out from the
-//! final product of the traversal.
-
-#[cfg(test)]
-extern crate qcheck;
-#[cfg(test)]
-#[macro_use(quickcheck)]
-extern crate qcheck_macros;
-
-extern crate radicle_crypto as crypto;
-extern crate radicle_git_ext as git_ext;
-
-mod backend;
-pub use backend::git;
-
-mod change_graph;
-mod trailers;
-
-pub mod change;
-pub use change::store::{Contents, Embed, EntryId, Manifest, Version};
-pub use change::Entry;
-
-pub mod history;
-pub use history::History;
-
-pub mod signatures;
-use signatures::ExtendedSignature;
-
-pub mod type_name;
-pub use type_name::TypeName;
-
-pub mod object;
-pub use object::{
-    create, get, info, list, remove, update, CollaborativeObject, Create, Evaluate, ObjectId,
-    Update, Updated,
-};
-
-#[cfg(test)]
-#[allow(clippy::unwrap_used)]
-mod test;
-
-#[cfg(test)]
-#[allow(clippy::unwrap_used)]
-mod tests;
-
-/// The `Store` is an aggregation of the different types of storage
-/// traits required for editing [`CollaborativeObject`]s.
-///
-/// The backing store being used is expected to be a `git` backend.
-///
-/// To get started using this trait, you must implement the following
-/// for the specific `git` storage:
-///
-///   * [`object::Storage`]
-///
-/// **Note**: [`change::Storage`] is already implemented for
-/// [`git2::Repository`]. It is expected that the underlying storage
-/// for `object::Storage` will also be `git2::Repository`, but if not
-/// please open an issue to change the definition of `Store` :)
-pub trait Store
-where
-    Self: object::Storage
-        + change::Storage<
-            StoreError = git::change::error::Create,
-            LoadError = git::change::error::Load,
-            ObjectId = git_ext::Oid,
-            Parent = git_ext::Oid,
-            Signatures = ExtendedSignature,
-        >,
-{
-}
diff --git a/radicle-cob/src/object.rs b/radicle-cob/src/object.rs
deleted file mode 100644
index 699913387..000000000
--- a/radicle-cob/src/object.rs
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright © 2022 The Radicle Link Contributors
-
-use std::{convert::TryFrom as _, fmt, ops::Deref, str::FromStr};
-
-use git_ext::ref_format::{Component, RefString};
-use git_ext::Oid;
-use serde::{Deserialize, Serialize};
-use thiserror::Error;
-
-pub mod collaboration;
-pub use collaboration::{
-    create, get, info, list, parse_refstr, remove, update, CollaborativeObject, Create, Evaluate,
-    Update, Updated,
-};
-
-pub mod storage;
-pub use storage::{Commit, Objects, Reference, Storage};
-
-#[derive(Debug, Error)]
-pub enum ParseObjectId {
-    #[error(transparent)]
-    Git(#[from] git2::Error),
-}
-
-/// The id of an object
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct ObjectId(Oid);
-
-impl FromStr for ObjectId {
-    type Err = ParseObjectId;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let oid = Oid::from_str(s)?;
-        Ok(ObjectId(oid))
-    }
-}
-
-impl From<Oid> for ObjectId {
-    fn from(oid: Oid) -> Self {
-        ObjectId(oid)
-    }
-}
-
-impl From<&Oid> for ObjectId {
-    fn from(oid: &Oid) -> Self {
-        (*oid).into()
-    }
-}
-
-impl From<git2::Oid> for ObjectId {
-    fn from(oid: git2::Oid) -> Self {
-        Oid::from(oid).into()
-    }
-}
-
-impl From<&git2::Oid> for ObjectId {
-    fn from(oid: &git2::Oid) -> Self {
-        ObjectId(Oid::from(*oid))
-    }
-}
-
-impl Deref for ObjectId {
-    type Target = Oid;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl fmt::Display for ObjectId {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl Serialize for ObjectId {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        serializer.serialize_bytes(self.0.as_bytes())
-    }
-}
-
-impl<'de> Deserialize<'de> for ObjectId {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        let raw = <&[u8]>::deserialize(deserializer)?;
-        let oid = Oid::try_from(raw).map_err(serde::de::Error::custom)?;
-        Ok(ObjectId(oid))
-    }
-}
-
-impl From<&ObjectId> for Component<'_> {
-    fn from(id: &ObjectId) -> Self {
-        let refstr = RefString::from(*id);
-
-        Component::from_refstr(refstr)
-            .expect("collaborative object id's are valid refname components")
-    }
-}
-
-impl From<ObjectId> for RefString {
-    fn from(id: ObjectId) -> Self {
-        RefString::try_from(id.0.to_string())
-            .expect("collaborative object id's are valid ref strings")
-    }
-}
diff --git a/radicle-cob/src/object/collaboration.rs b/radicle-cob/src/object/collaboration.rs
deleted file mode 100644
index 97e6a7517..000000000
--- a/radicle-cob/src/object/collaboration.rs
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright © 2022 The Radicle Link Contributors
-use std::convert::Infallible;
-use std::fmt::Debug;
-
-use git_ext::Oid;
-use nonempty::NonEmpty;
-
-use crate::change::store::{Manifest, Version};
-use crate::{change, Entry, History, ObjectId, TypeName};
-
-pub mod error;
-
-mod create;
-pub use create::{create, Create};
-
-mod get;
-pub use get::get;
-
-pub mod info;
-
-mod list;
-pub use list::list;
-
-mod remove;
-pub use remove::remove;
-
-mod update;
-pub use update::{update, Update, Updated};
-
-/// A collaborative object
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct CollaborativeObject<T> {
-    /// The manifest of this object
-    pub manifest: Manifest,
-    /// The materialized object resulting from traversing the history.
-    pub object: T,
-    /// The history DAG.
-    pub history: History,
-    /// The id of the object
-    pub id: ObjectId,
-}
-
-impl<T> CollaborativeObject<T> {
-    pub fn object(&self) -> &T {
-        &self.object
-    }
-
-    pub fn history(&self) -> &History {
-        &self.history
-    }
-
-    pub fn id(&self) -> &ObjectId {
-        &self.id
-    }
-
-    pub fn typename(&self) -> &TypeName {
-        &self.manifest.type_name
-    }
-
-    pub fn manifest(&self) -> &Manifest {
-        &self.manifest
-    }
-}
-
-/// An object that can be built by evaluating a history.
-pub trait Evaluate<R>: Sized + Debug + 'static {
-    type Error: std::error::Error + Send + Sync + 'static;
-
-    /// Initialize the object with the first (root) history entry.
-    fn init(entry: &Entry, store: &R) -> Result<Self, Self::Error>;
-
-    /// Apply a history entry to the evaluated state.
-    fn apply<'a, I: Iterator<Item = (&'a Oid, &'a Entry)>>(
-        &mut self,
-        entry: &Entry,
-        concurrent: I,
-        store: &R,
-    ) -> Result<(), Self::Error>;
-}
-
-impl<R> Evaluate<R> for NonEmpty<Entry> {
-    type Error = Infallible;
-
-    fn init(entry: &Entry, _store: &R) -> Result<Self, Self::Error> {
-        Ok(Self::new(entry.clone()))
-    }
-
-    fn apply<'a, I: Iterator<Item = (&'a Oid, &'a Entry)>>(
-        &mut self,
-        entry: &Entry,
-        _concurrent: I,
-        _store: &R,
-    ) -> Result<(), Self::Error> {
-        self.push(entry.clone());
-
-        Ok(())
-    }
-}
-
-/// Takes a `refname` and performs a best attempt to extract out the
-/// [`TypeName`] and [`ObjectId`] from it.
-///
-/// This assumes that the `refname` is in a
-/// [`git_ext::ref_format::Qualified`] format. If it has any
-/// `refs/namespaces`, they will be stripped to access the underlying
-/// [`git_ext::ref_format::Qualified`] format.
-///
-/// In the [`git_ext::ref_format::Qualified`] format it assumes that the
-/// reference name is of the form:
-///
-///   `refs/<category>/<typename>/<object_id>[/<rest>*]`
-///
-/// Note that their may be more components to the path after the
-/// [`ObjectId`] but they are ignored.
-///
-/// Also note that this will return `None` if:
-///
-///   * The `refname` is not [`git_ext::ref_format::Qualified`]
-///   * The parsing of the [`ObjectId`] fails
-///   * The parsing of the [`TypeName`] fails
-pub fn parse_refstr<R>(name: &R) -> Option<(TypeName, ObjectId)>
-where
-    R: AsRef<git_ext::ref_format::RefStr>,
-{
-    use git_ext::ref_format::Qualified;
-    let name = name.as_ref();
-    let refs_cobs = match name.to_namespaced() {
-        None => Qualified::from_refstr(name)?,
-        Some(ns) => ns.strip_namespace_recursive(),
-    };
-
-    let (_refs, _cobs, typename, mut object_id) = refs_cobs.non_empty_components();
-    let object = object_id
-        .next()
-        .and_then(|oid| oid.parse::<ObjectId>().ok())?;
-    let name = typename.parse::<TypeName>().ok()?;
-    Some((name, object))
-}
diff --git a/radicle-cob/src/object/collaboration/create.rs b/radicle-cob/src/object/collaboration/create.rs
deleted file mode 100644
index 43f50aaeb..000000000
--- a/radicle-cob/src/object/collaboration/create.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright © 2022 The Radicle Link Contributors
-
-use nonempty::NonEmpty;
-use radicle_crypto::PublicKey;
-
-use crate::Embed;
-use crate::Evaluate;
-use crate::Store;
-
-use super::*;
-
-/// The metadata required for creating a new [`CollaborativeObject`].
-pub struct Create {
-    /// The CRDT history to initialize this object with.
-    pub contents: NonEmpty<Vec<u8>>,
-    /// The typename for this object.
-    pub type_name: TypeName,
-    /// The message to add when creating this object.
-    pub message: String,
-    /// Embedded content.
-    pub embeds: Vec<Embed>,
-    /// COB version.
-    pub version: Version,
-}
-
-impl Create {
-    fn template(self) -> change::Template<git_ext::Oid> {
-        change::Template {
-            type_name: self.type_name,
-            tips: Vec::new(),
-            message: self.message,
-            embeds: self.embeds,
-            contents: self.contents,
-        }
-    }
-}
-
-/// Create a new [`CollaborativeObject`].
-///
-/// The `storage` is the backing storage for storing
-/// [`crate::Entry`]s at content-addressable locations. Please see
-/// [`Store`] for further information.
-///
-/// The `signer` is expected to be a cryptographic signing key. This
-/// ensures that the objects origin is cryptographically verifiable.
-///
-/// The `resource` is the parent of this object, for example a
-/// software project. Its content-address is stored in the object's
-/// history.
-///
-/// The `identifier` is a unqiue id that is passed through to the
-/// [`crate::object::Storage`].
-///
-/// The `args` are the metadata for this [`CollaborativeObject`]. See
-/// [`Create`] for further information.
-pub fn create<T, S, G>(
-    storage: &S,
-    signer: &G,
-    resource: Option<Oid>,
-    related: Vec<Oid>,
-    identifier: &PublicKey,
-    args: Create,
-) -> Result<CollaborativeObject<T>, error::Create>
-where
-    T: Evaluate<S>,
-    S: Store,
-    G: crypto::Signer,
-{
-    let type_name = args.type_name.clone();
-    let version = args.version;
-    let init_change = storage
-        .store(resource, related, signer, args.template())
-        .map_err(error::Create::from)?;
-    let object_id = init_change.id().into();
-    let object = T::init(&init_change, storage).map_err(error::Create::evaluate)?;
-
-    storage
-        .update(identifier, &type_name, &object_id, &object_id)
-        .map_err(|err| error::Create::Refs { err: Box::new(err) })?;
-
-    let history = History::new_from_root(init_change);
-
-    Ok(CollaborativeObject {
-        manifest: Manifest::new(type_name, version),
-        history,
-        object,
-        id: object_id,
-    })
-}
diff --git a/radicle-cob/src/object/collaboration/error.rs b/radicle-cob/src/object/collaboration/error.rs
deleted file mode 100644
index d123bd7cb..000000000
--- a/radicle-cob/src/object/collaboration/error.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright © 2022 The Radicle Link Contributors
-
-use thiserror::Error;
-
-use crate::git;
-
-#[derive(Debug, Error)]
-pub enum Create {
-    #[error(transparent)]
-    Evaluate(Box<dyn std::error::Error + Send + Sync + 'static>),
-    #[error(transparent)]
-    CreateChange(#[from] git::change::error::Create),
-    #[error("failed to updated references for during object creation")]
-    Refs {
-        #[source]
-        err: Box<dyn std::error::Error + Send + Sync + 'static>,
-    },
-    #[error(transparent)]
-    Io(#[from] std::io::Error),
-    #[error("signer must belong to the author")]
-    SignerIsNotAuthor,
-}
-
-impl Create {
-    pub(crate) fn evaluate(err: impl std::error::Error + Send + Sync + 'static) -> Self {
-        Self::Evaluate(Box::new(err))
-    }
-}
-
-#[derive(Debug, Error)]
-#[error("failed to remove object: {err}")]
-pub struct Remove {
-    #[source]
-    pub(crate) err: Box<dyn std::error::Error + Send + Sync + 'static>,
-}
-
-#[derive(Debug, Error)]
-pub enum Retrieve {
-    #[error(transparent)]
-    Evaluate(Box<dyn std::error::Error + Send + Sync + 'static>),
-    #[error(transparent)]
-    Git(#[from] git2::Error),
-    #[error("failed to get references during object retrieval")]
-    Refs {
-        #[source]
-        err: Box<dyn std::error::Error + Send + Sync + 'static>,
-    },
-    #[error(transparent)]
-    Io(#[from] std::io::Error),
-}
-
-impl Retrieve {
-    pub(crate) fn evaluate(err: impl std::error::Error + Send + Sync + 'static) -> Self {
-        Self::Evaluate(Box::new(err))
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum Update {
-    #[error(transparent)]
-    Evaluate(Box<dyn std::error::Error + Send + Sync + 'static>),
-    #[error("no object found")]
-    NoSuchObject,
-    #[error(transparent)]
-    CreateChange(#[from] git::change::error::Create),
-    #[error("failed to get references during object update")]
-    Refs {
-        #[source]
-        err: Box<dyn std::error::Error + Send + Sync + 'static>,
-    },
-    #[error(transparent)]
-    Git(#[from] git2::Error),
-    #[error(transparent)]
-    Io(#[from] std::io::Error),
-    #[error("signer must belong to the author")]
-    SignerIsNotAuthor,
-}
-
-impl Update {
-    pub(crate) fn evaluate(err: impl std::error::Error + Send + Sync + 'static) -> Self {
-        Self::Evaluate(Box::new(err))
-    }
-}
diff --git a/radicle-cob/src/object/collaboration/get.rs b/radicle-cob/src/object/collaboration/get.rs
deleted file mode 100644
index 281f86c99..000000000
--- a/radicle-cob/src/object/collaboration/get.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright © 2022 The Radicle Link Contributors
-
-use crate::{change_graph::ChangeGraph, CollaborativeObject, Evaluate, ObjectId, Store, TypeName};
-
-use super::error;
-
-/// Get a [`CollaborativeObject`], if it exists.
-///
-/// The `storage` is the backing storage for storing
-/// [`crate::Entry`]s at content-addressable locations. Please see
-/// [`Store`] for further information.
-///
-/// The `typename` is the type of object to be found, while the
-/// `object_id` is the identifier for the particular object under that
-/// type.
-pub fn get<T, S>(
-    storage: &S,
-    typename: &TypeName,
-    oid: &ObjectId,
-) -> Result<Option<CollaborativeObject<T>>, error::Retrieve>
-where
-    T: Evaluate<S>,
-    S: Store,
-{
-    let tip_refs = storage
-        .objects(typename, oid)
-        .map_err(|err| error::Retrieve::Refs { err: Box::new(err) })?;
-
-    ChangeGraph::load(storage, tip_refs.iter(), typename, oid)
-        .map(|graph| graph.evaluate(storage).map_err(error::Retrieve::evaluate))
-        .transpose()
-}
diff --git a/radicle-cob/src/object/collaboration/info.rs b/radicle-cob/src/object/collaboration/info.rs
deleted file mode 100644
index 5e885c9f8..000000000
--- a/radicle-cob/src/object/collaboration/info.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright © 2022 The Radicle Link Contributors
-
-//! [`ChangeGraphInfo`] provides a useful debugging structure for
-//! representing a single [`crate::CollaborativeObject`]'s underlying
-//! change graph.
-
-use std::collections::BTreeSet;
-
-use git_ext::Oid;
-
-use crate::{change_graph::ChangeGraph, ObjectId, Store, TypeName};
-
-use super::error;
-
-/// Additional information about the change graph of an object
-pub struct ChangeGraphInfo {
-    /// The ID of the object
-    pub object_id: ObjectId,
-    /// The number of nodes in the change graph of the object
-    pub number_of_nodes: usize,
-    /// The "tips" of the change graph, i.e the object IDs pointed to by
-    /// references to the object
-    pub tips: BTreeSet<Oid>,
-}
-
-/// Retrieve additional information about the change graph of an object. This
-/// is mostly useful for debugging and testing
-///
-/// The `storage` is the backing storage for storing
-/// [`crate::Entry`]s at content-addressable locations. Please see
-/// [`Store`] for further information.
-///
-/// The `typename` is the type of object to be found, while the `oid`
-/// is the identifier for the particular object under that type.
-pub fn changegraph<S>(
-    storage: &S,
-    typename: &TypeName,
-    oid: &ObjectId,
-) -> Result<Option<ChangeGraphInfo>, error::Retrieve>
-where
-    S: Store,
-{
-    let tip_refs = storage
-        .objects(typename, oid)
-        .map_err(|err| error::Retrieve::Refs { err: Box::new(err) })?;
-    Ok(
-        ChangeGraph::load(storage, tip_refs.iter(), typename, oid).map(|graph| ChangeGraphInfo {
-            object_id: *oid,
-            number_of_nodes: graph.number_of_nodes(),
-            tips: graph.tips(),
-        }),
-    )
-}
diff --git a/radicle-cob/src/object/collaboration/list.rs b/radicle-cob/src/object/collaboration/list.rs
deleted file mode 100644
index 5f3a0ccae..000000000
--- a/radicle-cob/src/object/collaboration/list.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright © 2022 The Radicle Link Contributors
-
-use crate::{change_graph::ChangeGraph, CollaborativeObject, Evaluate, Store, TypeName};
-
-use super::error;
-
-/// List a set of [`CollaborativeObject`].
-///
-/// The `storage` is the backing storage for storing
-/// [`crate::Entry`]s at content-addressable locations. Please see
-/// [`Store`] for further information.
-///
-/// The `typename` is the type of objects to be listed.
-pub fn list<T, S>(
-    storage: &S,
-    typename: &TypeName,
-) -> Result<Vec<CollaborativeObject<T>>, error::Retrieve>
-where
-    T: Evaluate<S>,
-    S: Store,
-{
-    let references = storage
-        .types(typename)
-        .map_err(|err| error::Retrieve::Refs { err: Box::new(err) })?;
-    log::trace!(target: "cob", "Loaded {} references", references.len());
-    let mut result = Vec::new();
-    for (oid, tip_refs) in references {
-        log::trace!(target: "cob", "Loading object '{oid}'");
-        let loaded = ChangeGraph::load(storage, tip_refs.iter(), typename, &oid)
-            .map(|graph| graph.evaluate(storage).map_err(error::Retrieve::evaluate));
-
-        match loaded {
-            Some(Ok(obj)) => {
-                log::trace!(target: "cob", "Object '{oid}' found");
-                result.push(obj);
-            }
-            Some(Err(e)) => {
-                log::trace!(target: "cob", "Object '{oid}' failed to load: {e}")
-            }
-            None => {
-                log::trace!(target: "cob", "Object '{oid}' not found");
-            }
-        }
-    }
-    Ok(result)
-}
diff --git a/radicle-cob/src/object/collaboration/remove.rs b/radicle-cob/src/object/collaboration/remove.rs
deleted file mode 100644
index 9bcbde694..000000000
--- a/radicle-cob/src/object/collaboration/remove.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright © 2022 The Radicle Link Contributors
-
-use radicle_crypto::PublicKey;
-
-use crate::{ObjectId, Store, TypeName};
-
-use super::error;
-
-/// Remove a [`crate::CollaborativeObject`].
-///
-/// The `storage` is the backing storage for storing
-/// [`crate::Entry`]s at content-addressable locations. Please see
-/// [`Store`] for further information.
-///
-/// The `typename` is the type of object to be found, while the
-/// `object_id` is the identifier for the particular object under that
-/// type.
-pub fn remove<S>(
-    storage: &S,
-    identifier: &PublicKey,
-    typename: &TypeName,
-    oid: &ObjectId,
-) -> Result<(), error::Remove>
-where
-    S: Store,
-{
-    storage
-        .remove(identifier, typename, oid)
-        .map_err(|e| error::Remove { err: e.into() })?;
-
-    Ok(())
-}
diff --git a/radicle-cob/src/object/collaboration/update.rs b/radicle-cob/src/object/collaboration/update.rs
deleted file mode 100644
index 7de291c42..000000000
--- a/radicle-cob/src/object/collaboration/update.rs
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright © 2022 The Radicle Link Contributors
-use std::iter;
-
-use git_ext::Oid;
-use nonempty::NonEmpty;
-use radicle_crypto::PublicKey;
-
-use crate::{
-    change, change_graph::ChangeGraph, history::EntryId, CollaborativeObject, Embed, Evaluate,
-    ObjectId, Store, TypeName,
-};
-
-use super::error;
-
-/// Result of an `update` operation.
-#[derive(Debug)]
-pub struct Updated<T> {
-    /// The new head commit of the DAG.
-    pub head: Oid,
-    /// The newly updated collaborative object.
-    pub object: CollaborativeObject<T>,
-    /// Entry parents.
-    pub parents: Vec<EntryId>,
-}
-
-/// The data required to update an object
-pub struct Update {
-    /// The CRDT changes to add to the object.
-    pub changes: NonEmpty<Vec<u8>>,
-    /// The object ID of the object to be updated.
-    pub object_id: ObjectId,
-    /// The typename of the object to be updated.
-    pub type_name: TypeName,
-    /// The message to add when updating this object.
-    pub message: String,
-    /// Embedded files.
-    pub embeds: Vec<Embed>,
-}
-
-/// Update an existing [`CollaborativeObject`].
-///
-/// The `storage` is the backing storage for storing
-/// [`crate::Entry`]s at content-addressable locations. Please see
-/// [`Store`] for further information.
-///
-/// The `signer` is expected to be a cryptographic signing key. This
-/// ensures that the objects origin is cryptographically verifiable.
-///
-/// The `resource` is the resource this change lives under, eg. a project.
-///
-/// The `parents` are other the parents of this object, for example a
-/// code commit.
-///
-/// The `identifier` is a unqiue id that is passed through to the
-/// [`crate::object::Storage`].
-///
-/// The `args` are the metadata for this [`CollaborativeObject`]
-/// udpate. See [`Update`] for further information.
-pub fn update<T, S, G>(
-    storage: &S,
-    signer: &G,
-    resource: Option<Oid>,
-    related: Vec<Oid>,
-    identifier: &PublicKey,
-    args: Update,
-) -> Result<Updated<T>, error::Update>
-where
-    T: Evaluate<S>,
-    S: Store,
-    G: crypto::Signer,
-{
-    let Update {
-        type_name: ref typename,
-        object_id,
-        embeds,
-        changes,
-        message,
-    } = args;
-
-    let existing_refs = storage
-        .objects(typename, &object_id)
-        .map_err(|err| error::Update::Refs { err: Box::new(err) })?;
-
-    let graph = ChangeGraph::load(storage, existing_refs.iter(), typename, &object_id)
-        .ok_or(error::Update::NoSuchObject)?;
-    let mut object: CollaborativeObject<T> =
-        graph.evaluate(storage).map_err(error::Update::evaluate)?;
-
-    // Create a commit for this change, but don't update any references yet.
-    let entry = storage.store(
-        resource,
-        related,
-        signer,
-        change::Template {
-            tips: object.history.tips().into_iter().collect(),
-            embeds,
-            contents: changes,
-            type_name: typename.clone(),
-            message,
-        },
-    )?;
-    let head = entry.id;
-    let parents = entry.parents.to_vec();
-
-    // Try to apply this change to our object. This prevents storing invalid updates.
-    // Note that if this returns with an error, we are left with an unreachable
-    // commit object created above. This is fine, as it will eventually get
-    // garbage-collected by Git.
-    object
-        .object
-        .apply(&entry, iter::empty(), storage)
-        .map_err(error::Update::evaluate)?;
-    object.history.extend(entry);
-
-    // Here we actually update the references to point to the new update.
-    storage
-        .update(identifier, typename, &object_id, &head)
-        .map_err(|err| error::Update::Refs { err: Box::new(err) })?;
-
-    Ok(Updated {
-        object,
-        head,
-        parents,
-    })
-}
diff --git a/radicle-cob/src/object/storage.rs b/radicle-cob/src/object/storage.rs
deleted file mode 100644
index c8a11928f..000000000
--- a/radicle-cob/src/object/storage.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright © 2021 The Radicle Link Contributors
-
-use std::{collections::BTreeMap, error::Error};
-
-use git_ext::ref_format::RefString;
-use git_ext::Oid;
-use radicle_crypto::PublicKey;
-
-use crate::change::EntryId;
-use crate::{ObjectId, TypeName};
-
-/// The [`Reference`]s that refer to the commits that make up a
-/// [`crate::CollaborativeObject`].
-#[derive(Clone, Debug, Default)]
-pub struct Objects(Vec<Reference>);
-
-impl Objects {
-    pub fn new(reference: Reference) -> Self {
-        Self(vec![reference])
-    }
-
-    pub fn push(&mut self, reference: Reference) {
-        self.0.push(reference)
-    }
-
-    /// Return an iterator over the `local` and `remotes` of the given
-    /// [`Objects`].
-    pub fn iter(&self) -> impl Iterator<Item = &Reference> {
-        self.0.iter()
-    }
-}
-
-impl From<Vec<Reference>> for Objects {
-    fn from(refs: Vec<Reference>) -> Self {
-        Objects(refs)
-    }
-}
-
-/// A [`Reference`] that must directly point to the [`Commit`] for a
-/// [`crate::CollaborativeObject`].
-#[derive(Clone, Debug)]
-pub struct Reference {
-    /// The `name` of the reference.
-    pub name: RefString,
-    /// The [`Commit`] that this reference points to.
-    pub target: Commit,
-}
-
-/// A [`Commit`] that holds the data for a given [`crate::CollaborativeObject`].
-#[derive(Clone, Debug)]
-pub struct Commit {
-    /// The content identifier of the commit.
-    pub id: Oid,
-}
-
-pub trait Storage {
-    type ObjectsError: Error + Send + Sync + 'static;
-    type TypesError: Error + Send + Sync + 'static;
-    type UpdateError: Error + Send + Sync + 'static;
-    type RemoveError: Error + Send + Sync + 'static;
-
-    /// Get all references which point to a head of the change graph for a
-    /// particular object
-    fn objects(
-        &self,
-        typename: &TypeName,
-        object_id: &ObjectId,
-    ) -> Result<Objects, Self::ObjectsError>;
-
-    /// Get all references to objects of a given type within a particular
-    /// identity
-    fn types(&self, typename: &TypeName) -> Result<BTreeMap<ObjectId, Objects>, Self::TypesError>;
-
-    /// Update a ref to a particular collaborative object
-    fn update(
-        &self,
-        identifier: &PublicKey,
-        typename: &TypeName,
-        object_id: &ObjectId,
-        entry: &EntryId,
-    ) -> Result<(), Self::UpdateError>;
-
-    /// Remove a ref to a particular collaborative object
-    fn remove(
-        &self,
-        identifier: &PublicKey,
-        typename: &TypeName,
-        object_id: &ObjectId,
-    ) -> Result<(), Self::RemoveError>;
-}
-
-pub mod convert {
-    use std::str;
-
-    use git_ext::ref_format::RefString;
-    use thiserror::Error;
-
-    use super::{Commit, Reference};
-
-    #[derive(Debug, Error)]
-    pub enum Error {
-        #[error("the reference '{name}' does not point to a commit object")]
-        NotCommit {
-            name: RefString,
-            #[source]
-            err: git2::Error,
-        },
-        #[error(transparent)]
-        Ref(#[from] git_ext::ref_format::Error),
-        #[error(transparent)]
-        Utf8(#[from] str::Utf8Error),
-    }
-
-    impl<'a> TryFrom<git2::Reference<'a>> for Reference {
-        type Error = Error;
-
-        fn try_from(value: git2::Reference<'a>) -> Result<Self, Self::Error> {
-            let name = RefString::try_from(str::from_utf8(value.name_bytes())?)?;
-            let target = Commit::from(value.peel_to_commit().map_err(|err| Error::NotCommit {
-                name: name.clone(),
-                err,
-            })?);
-            Ok(Self { name, target })
-        }
-    }
-
-    impl<'a> From<git2::Commit<'a>> for Commit {
-        fn from(commit: git2::Commit<'a>) -> Self {
-            Commit {
-                id: commit.id().into(),
-            }
-        }
-    }
-}
diff --git a/radicle-cob/src/sign.rs b/radicle-cob/src/sign.rs
deleted file mode 100644
index c8d7aea48..000000000
--- a/radicle-cob/src/sign.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright © 2022 The Radicle Link Contributors
-
-pub mod signatures;
-pub use signatures::{Signature, Signatures};
diff --git a/radicle-cob/src/signatures.rs b/radicle-cob/src/signatures.rs
deleted file mode 100644
index 967eb1e70..000000000
--- a/radicle-cob/src/signatures.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright © 2019-2020 The Radicle Foundation <hello@radicle.foundation>
-
-use std::{
-    collections::BTreeMap,
-    convert::TryFrom,
-    iter::FromIterator,
-    ops::{Deref, DerefMut},
-};
-
-use crypto::{ssh, PublicKey};
-use git_ext::commit::{
-    headers::Signature::{Pgp, Ssh},
-    Commit,
-};
-
-pub use ssh::ExtendedSignature;
-pub mod error;
-
-// FIXME(kim): This should really be a HashMap with a no-op Hasher -- PublicKey
-// collisions are catastrophic
-#[derive(Clone, Debug, Eq, PartialEq, serde::Serialize, serde::Deserialize)]
-pub struct Signatures(BTreeMap<PublicKey, crypto::Signature>);
-
-impl Deref for Signatures {
-    type Target = BTreeMap<PublicKey, crypto::Signature>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for Signatures {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-impl From<ExtendedSignature> for Signatures {
-    fn from(ExtendedSignature { key, sig }: ExtendedSignature) -> Self {
-        let mut map = BTreeMap::new();
-        map.insert(key, sig);
-        map.into()
-    }
-}
-
-impl From<BTreeMap<PublicKey, crypto::Signature>> for Signatures {
-    fn from(map: BTreeMap<PublicKey, crypto::Signature>) -> Self {
-        Self(map)
-    }
-}
-
-impl From<Signatures> for BTreeMap<PublicKey, crypto::Signature> {
-    fn from(s: Signatures) -> Self {
-        s.0
-    }
-}
-
-impl TryFrom<&Commit> for Signatures {
-    type Error = error::Signatures;
-
-    fn try_from(value: &Commit) -> Result<Self, Self::Error> {
-        value
-            .signatures()
-            .filter_map(|signature| {
-                match signature {
-                    // Skip PGP signatures
-                    Pgp(_) => None,
-                    Ssh(pem) => Some(
-                        ExtendedSignature::from_pem(pem.as_bytes())
-                            .map_err(error::Signatures::from),
-                    ),
-                }
-            })
-            .map(|r| r.map(|es| (es.key, es.sig)))
-            .collect::<Result<_, _>>()
-    }
-}
-
-impl FromIterator<(PublicKey, crypto::Signature)> for Signatures {
-    fn from_iter<T>(iter: T) -> Self
-    where
-        T: IntoIterator<Item = (PublicKey, crypto::Signature)>,
-    {
-        Self(BTreeMap::from_iter(iter))
-    }
-}
-
-impl IntoIterator for Signatures {
-    type Item = (PublicKey, crypto::Signature);
-    type IntoIter = <BTreeMap<PublicKey, crypto::Signature> as IntoIterator>::IntoIter;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.0.into_iter()
-    }
-}
-
-impl Extend<ExtendedSignature> for Signatures {
-    fn extend<T>(&mut self, iter: T)
-    where
-        T: IntoIterator<Item = ExtendedSignature>,
-    {
-        for ExtendedSignature { key, sig } in iter {
-            self.insert(key, sig);
-        }
-    }
-}
-
-impl Extend<(PublicKey, crypto::Signature)> for Signatures {
-    fn extend<T>(&mut self, iter: T)
-    where
-        T: IntoIterator<Item = (PublicKey, crypto::Signature)>,
-    {
-        for (key, sig) in iter {
-            self.insert(key, sig);
-        }
-    }
-}
diff --git a/radicle-cob/src/signatures/error.rs b/radicle-cob/src/signatures/error.rs
deleted file mode 100644
index 45e5cacca..000000000
--- a/radicle-cob/src/signatures/error.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright © 2019-2020 The Radicle Foundation <hello@radicle.foundation>
-
-use radicle_crypto::ssh::ExtendedSignatureError;
-use thiserror::Error;
-
-#[derive(Debug, Error)]
-#[non_exhaustive]
-pub enum Signature {
-    #[error("missing {0}")]
-    Missing(&'static str),
-
-    #[error(transparent)]
-    Serde(#[from] serde::de::value::Error),
-}
-
-#[derive(Debug, Error)]
-#[non_exhaustive]
-pub enum Signatures {
-    #[error(transparent)]
-    ExtendedSignature(#[from] ExtendedSignatureError),
-
-    #[error(transparent)]
-    Signature(#[from] Signature),
-}
diff --git a/radicle-cob/src/test.rs b/radicle-cob/src/test.rs
deleted file mode 100644
index 2c1164d3c..000000000
--- a/radicle-cob/src/test.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-pub mod identity;
-pub use identity::{Person, Project, RemoteProject};
-
-pub mod storage;
-pub use storage::Storage;
-
-pub mod arbitrary;
diff --git a/radicle-cob/src/test/arbitrary.rs b/radicle-cob/src/test/arbitrary.rs
deleted file mode 100644
index 123166a9a..000000000
--- a/radicle-cob/src/test/arbitrary.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use std::{iter, marker::PhantomData};
-
-use qcheck::Arbitrary;
-
-use crate::{ObjectId, TypeName};
-
-#[derive(Clone, Debug)]
-pub struct Invalid<T> {
-    pub value: String,
-    _marker: PhantomData<T>,
-}
-
-impl Arbitrary for TypeName {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let mut rng = fastrand::Rng::with_seed(u64::arbitrary(g));
-        let mut name: Vec<String> = Vec::new();
-        for _ in 0..rng.usize(1..5) {
-            let len = rng.usize(1..16);
-            name.push(iter::repeat_with(|| rng.alphanumeric()).take(len).collect());
-        }
-        name.join(".")
-            .parse::<TypeName>()
-            .expect("TypeName is valid")
-    }
-}
-
-impl Arbitrary for ObjectId {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let mut rng = fastrand::Rng::with_seed(u64::arbitrary(g));
-        let bytes = iter::repeat_with(|| rng.u8(..))
-            .take(20)
-            .collect::<Vec<_>>();
-        Self::from(git_ext::Oid::try_from(bytes.as_slice()).unwrap())
-    }
-}
-
-impl Arbitrary for Invalid<ObjectId> {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let mut rng = fastrand::Rng::with_seed(u64::arbitrary(g));
-        let len = rng.usize(21..50);
-        let value = iter::repeat_with(|| rng.alphanumeric()).take(len).collect();
-        Invalid {
-            value,
-            _marker: PhantomData,
-        }
-    }
-}
diff --git a/radicle-cob/src/test/identity.rs b/radicle-cob/src/test/identity.rs
deleted file mode 100644
index 6ce679bdc..000000000
--- a/radicle-cob/src/test/identity.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-pub mod project;
-pub use project::{Project, RemoteProject};
-
-pub mod person;
-pub use person::Person;
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct Urn {
-    pub name: Name,
-    pub remote: Option<Name>,
-}
-
-impl Urn {
-    pub fn to_path(&self) -> String {
-        match &self.remote {
-            Some(remote) => format!("{}/{}", self.name.as_str(), remote.as_str()),
-            None => self.name.0.to_string(),
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
-pub struct Name(String);
-
-impl Name {
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
-}
diff --git a/radicle-cob/src/test/identity/person.rs b/radicle-cob/src/test/identity/person.rs
deleted file mode 100644
index 2ec89c02c..000000000
--- a/radicle-cob/src/test/identity/person.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-use git_ext::Oid;
-use serde::{Deserialize, Serialize};
-
-use crate::test::storage::{self, Storage};
-
-use super::Name;
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct Person {
-    pub payload: Payload,
-    pub content_id: Oid,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct Payload {
-    name: Name,
-    key: crypto::PublicKey,
-}
-
-impl Person {
-    pub fn new(
-        repo: &Storage,
-        name: &str,
-        key: crypto::PublicKey,
-    ) -> Result<Self, storage::error::Identity> {
-        let repo = repo.as_raw();
-        let refname = format!("refs/rad/identities/{name}");
-        let payload = Payload {
-            name: Name(name.to_owned()),
-            key,
-        };
-        let blob = serde_json::to_vec(&payload)?;
-        let oid = repo.blob(&blob)?;
-        let mut tree = repo.treebuilder(None)?;
-        tree.insert("identity", oid, git2::FileMode::Blob.into())?;
-        let oid = tree.write()?;
-        let tree = repo.find_tree(oid)?;
-        let signature = git2::Signature::now(name, name)?;
-        let content_id = repo
-            .commit(
-                Some(&refname),
-                &signature,
-                &signature,
-                "persisted identity",
-                &tree,
-                &[],
-            )?
-            .into();
-        Ok(Self {
-            payload,
-            content_id,
-        })
-    }
-
-    pub fn name(&self) -> &Name {
-        &self.payload.name
-    }
-}
diff --git a/radicle-cob/src/test/identity/project.rs b/radicle-cob/src/test/identity/project.rs
deleted file mode 100644
index 1b813ee0a..000000000
--- a/radicle-cob/src/test/identity/project.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-use std::collections::BTreeSet;
-
-use git_ext::Oid;
-use serde::{Deserialize, Serialize};
-
-use crate::test;
-use crate::test::storage::{self, Storage};
-
-use super::{Name, Urn};
-
-pub struct RemoteProject {
-    pub project: Project,
-    pub person: test::Person,
-}
-
-impl RemoteProject {
-    pub fn identifier(&self) -> Urn {
-        Urn {
-            name: self.project.name().clone(),
-            remote: Some(self.person.name().clone()),
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct Project {
-    pub payload: Payload,
-    pub content_id: Oid,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct Payload {
-    name: Name,
-    delegates: BTreeSet<crypto::PublicKey>,
-}
-
-impl Project {
-    pub fn new(
-        repo: &Storage,
-        name: &str,
-        delegate: crypto::PublicKey,
-    ) -> Result<Self, storage::error::Identity> {
-        let repo = repo.as_raw();
-        let refname = format!("refs/rad/identities/{name}");
-        let payload = Payload {
-            name: Name(name.to_owned()),
-            delegates: Some(delegate).into_iter().collect(),
-        };
-        let blob = serde_json::to_vec(&payload)?;
-        let oid = repo.blob(&blob)?;
-        let mut tree = repo.treebuilder(None)?;
-        tree.insert("identity", oid, git2::FileMode::Blob.into())?;
-        let oid = tree.write()?;
-        let tree = repo.find_tree(oid)?;
-        let signature = git2::Signature::now(name, name)?;
-        let content_id = repo
-            .commit(
-                Some(&refname),
-                &signature,
-                &signature,
-                "persisted identity",
-                &tree,
-                &[],
-            )?
-            .into();
-        Ok(Self {
-            payload,
-            content_id,
-        })
-    }
-
-    pub fn name(&self) -> &Name {
-        &self.payload.name
-    }
-}
diff --git a/radicle-cob/src/test/storage.rs b/radicle-cob/src/test/storage.rs
deleted file mode 100644
index a5f56fb34..000000000
--- a/radicle-cob/src/test/storage.rs
+++ /dev/null
@@ -1,173 +0,0 @@
-use std::{collections::BTreeMap, convert::TryFrom as _};
-
-use radicle_crypto::PublicKey;
-use tempfile::TempDir;
-
-use crate::{
-    change,
-    object::{self, Reference},
-    ObjectId, Store,
-};
-
-pub mod error {
-    use thiserror::Error;
-
-    use crate::object::storage::convert;
-
-    #[derive(Debug, Error)]
-    pub enum Identity {
-        #[error(transparent)]
-        Json(#[from] serde_json::Error),
-        #[error(transparent)]
-        Git(#[from] git2::Error),
-    }
-
-    #[derive(Debug, Error)]
-    pub enum Objects {
-        #[error(transparent)]
-        Conversion(#[from] convert::Error),
-        #[error(transparent)]
-        Git(#[from] git2::Error),
-        #[error(transparent)]
-        Format(#[from] git_ext::ref_format::Error),
-    }
-}
-
-pub struct Storage {
-    raw: git2::Repository,
-    _temp: TempDir,
-}
-
-impl Storage {
-    pub fn new() -> Self {
-        let temp = tempfile::tempdir().unwrap();
-        let raw = git2::Repository::init(temp.path()).unwrap();
-        let mut config = raw.config().unwrap();
-        config.set_str("user.name", "Terry Pratchett").unwrap();
-        config
-            .set_str("user.email", "http://www.gnuterrypratchett.com")
-            .unwrap();
-        Self { raw, _temp: temp }
-    }
-
-    pub fn as_raw(&self) -> &git2::Repository {
-        &self.raw
-    }
-}
-
-impl Store for Storage {}
-
-impl change::Storage for Storage {
-    type StoreError = <git2::Repository as change::Storage>::StoreError;
-    type LoadError = <git2::Repository as change::Storage>::LoadError;
-
-    type ObjectId = <git2::Repository as change::Storage>::ObjectId;
-    type Parent = <git2::Repository as change::Storage>::Parent;
-    type Signatures = <git2::Repository as change::Storage>::Signatures;
-
-    fn store<Signer>(
-        &self,
-        authority: Option<Self::Parent>,
-        parents: Vec<Self::Parent>,
-        signer: &Signer,
-        spec: change::Template<Self::ObjectId>,
-    ) -> Result<
-        change::store::Entry<Self::Parent, Self::ObjectId, Self::Signatures>,
-        Self::StoreError,
-    >
-    where
-        Signer: crypto::Signer,
-    {
-        self.as_raw().store(authority, parents, signer, spec)
-    }
-
-    fn load(
-        &self,
-        id: Self::ObjectId,
-    ) -> Result<change::store::Entry<Self::Parent, Self::ObjectId, Self::Signatures>, Self::LoadError>
-    {
-        self.as_raw().load(id)
-    }
-
-    fn parents_of(&self, id: &git_ext::Oid) -> Result<Vec<git_ext::Oid>, Self::LoadError> {
-        Ok(self
-            .as_raw()
-            .find_commit(**id)?
-            .parent_ids()
-            .map(git_ext::Oid::from)
-            .collect::<Vec<_>>())
-    }
-}
-
-impl object::Storage for Storage {
-    type ObjectsError = error::Objects;
-    type TypesError = error::Objects;
-    type UpdateError = git2::Error;
-    type RemoveError = git2::Error;
-
-    fn objects(
-        &self,
-        typename: &crate::TypeName,
-        object_id: &ObjectId,
-    ) -> Result<object::Objects, Self::ObjectsError> {
-        let glob = format!("refs/rad/*/cobs/{typename}/{object_id}");
-        let remotes = self
-            .raw
-            .references_glob(&glob)?
-            .map(|r| {
-                r.map_err(error::Objects::from)
-                    .and_then(|r| Reference::try_from(r).map_err(error::Objects::from))
-            })
-            .collect::<Result<Vec<_>, _>>()?;
-        Ok(remotes.into())
-    }
-
-    fn types(
-        &self,
-        typename: &crate::TypeName,
-    ) -> Result<BTreeMap<ObjectId, object::Objects>, Self::TypesError> {
-        let mut objects = BTreeMap::new();
-        for r in self.raw.references_glob("refs/rad/*")? {
-            let r = r?;
-            let name = r.name().unwrap();
-            println!("NAME: {name}");
-            let oid = r
-                .target()
-                .map(ObjectId::from)
-                .expect("BUG: the cob references should be direct");
-            if name.contains(typename.as_str()) {
-                let reference = Reference::try_from(r)?;
-                objects
-                    .entry(oid)
-                    .and_modify(|objs: &mut object::Objects| objs.push(reference.clone()))
-                    .or_insert_with(|| object::Objects::new(reference));
-            }
-        }
-        Ok(objects)
-    }
-
-    fn update(
-        &self,
-        identifier: &PublicKey,
-        typename: &crate::TypeName,
-        object_id: &ObjectId,
-        entry: &change::EntryId,
-    ) -> Result<(), Self::UpdateError> {
-        let name = format!("refs/rad/{}/cobs/{}/{}", identifier, typename, object_id);
-        self.raw
-            .reference(&name, (*entry).into(), true, "new change")?;
-        Ok(())
-    }
-
-    fn remove(
-        &self,
-        identifier: &PublicKey,
-        typename: &crate::TypeName,
-        object_id: &ObjectId,
-    ) -> Result<(), Self::RemoveError> {
-        let name = format!("refs/rad/{}/cobs/{}/{}", identifier, typename, object_id);
-        self.raw.find_reference(&name)?.delete()?;
-
-        Ok(())
-    }
-}
diff --git a/radicle-cob/src/tests.rs b/radicle-cob/src/tests.rs
deleted file mode 100644
index 63dd33129..000000000
--- a/radicle-cob/src/tests.rs
+++ /dev/null
@@ -1,328 +0,0 @@
-use std::ops::ControlFlow;
-
-use crypto::test::signer::MockSigner;
-use crypto::{PublicKey, Signer};
-use git_ext::ref_format::{refname, Component, RefString};
-use nonempty::{nonempty, NonEmpty};
-use qcheck::Arbitrary;
-
-use crate::{
-    create, get, list, object, test::arbitrary::Invalid, update, Create, Entry, ObjectId, TypeName,
-    Update, Updated, Version,
-};
-
-use super::test;
-
-#[test]
-fn roundtrip() {
-    let storage = test::Storage::new();
-    let signer = gen::<MockSigner>(1);
-    let terry = test::Person::new(&storage, "terry", *signer.public_key()).unwrap();
-    let proj = test::Project::new(&storage, "discworld", *signer.public_key()).unwrap();
-    let proj = test::RemoteProject {
-        project: proj,
-        person: terry,
-    };
-    let typename = "xyz.rad.issue".parse::<TypeName>().unwrap();
-    let cob = create::<NonEmpty<Entry>, _, _>(
-        &storage,
-        &signer,
-        Some(proj.project.content_id),
-        vec![],
-        signer.public_key(),
-        Create {
-            contents: nonempty!(Vec::new()),
-            type_name: typename.clone(),
-            message: "creating xyz.rad.issue".to_string(),
-            embeds: vec![],
-            version: Version::default(),
-        },
-    )
-    .unwrap();
-
-    let expected = get(&storage, &typename, cob.id())
-        .unwrap()
-        .expect("BUG: cob was missing");
-
-    assert_eq!(cob, expected);
-}
-
-#[test]
-fn list_cobs() {
-    let storage = test::Storage::new();
-    let signer = gen::<MockSigner>(1);
-    let terry = test::Person::new(&storage, "terry", *signer.public_key()).unwrap();
-    let proj = test::Project::new(&storage, "discworld", *signer.public_key()).unwrap();
-    let proj = test::RemoteProject {
-        project: proj,
-        person: terry,
-    };
-    let typename = "xyz.rad.issue".parse::<TypeName>().unwrap();
-    let issue_1 = create::<NonEmpty<Entry>, _, _>(
-        &storage,
-        &signer,
-        Some(proj.project.content_id),
-        vec![],
-        signer.public_key(),
-        Create {
-            contents: nonempty!(b"issue 1".to_vec()),
-            type_name: typename.clone(),
-            message: "creating xyz.rad.issue".to_string(),
-            embeds: vec![],
-            version: Version::default(),
-        },
-    )
-    .unwrap();
-
-    let issue_2 = create(
-        &storage,
-        &signer,
-        Some(proj.project.content_id),
-        vec![],
-        signer.public_key(),
-        Create {
-            contents: nonempty!(b"issue 2".to_vec()),
-            type_name: typename.clone(),
-            message: "commenting xyz.rad.issue".to_string(),
-            embeds: vec![],
-            version: Version::default(),
-        },
-    )
-    .unwrap();
-
-    let mut expected = list(&storage, &typename).unwrap();
-    expected.sort_by(|x, y| x.id().cmp(y.id()));
-
-    let mut actual = vec![issue_1, issue_2];
-    actual.sort_by(|x, y| x.id().cmp(y.id()));
-
-    assert_eq!(actual, expected);
-}
-
-#[test]
-fn update_cob() {
-    let storage = test::Storage::new();
-    let signer = gen::<MockSigner>(1);
-    let terry = test::Person::new(&storage, "terry", *signer.public_key()).unwrap();
-    let proj = test::Project::new(&storage, "discworld", *signer.public_key()).unwrap();
-    let proj = test::RemoteProject {
-        project: proj,
-        person: terry,
-    };
-    let typename = "xyz.rad.issue".parse::<TypeName>().unwrap();
-    let cob = create::<NonEmpty<Entry>, _, _>(
-        &storage,
-        &signer,
-        Some(proj.project.content_id),
-        vec![],
-        signer.public_key(),
-        Create {
-            contents: nonempty!(Vec::new()),
-            type_name: typename.clone(),
-            message: "creating xyz.rad.issue".to_string(),
-            embeds: vec![],
-            version: Version::default(),
-        },
-    )
-    .unwrap();
-
-    let not_expected = get::<NonEmpty<Entry>, _>(&storage, &typename, cob.id())
-        .unwrap()
-        .expect("BUG: cob was missing");
-
-    let Updated { object, .. } = update(
-        &storage,
-        &signer,
-        Some(proj.project.content_id),
-        vec![],
-        signer.public_key(),
-        Update {
-            changes: nonempty!(b"issue 1".to_vec()),
-            object_id: *cob.id(),
-            type_name: typename.clone(),
-            embeds: vec![],
-            message: "commenting xyz.rad.issue".to_string(),
-        },
-    )
-    .unwrap();
-
-    let expected = get(&storage, &typename, object.id())
-        .unwrap()
-        .expect("BUG: cob was missing");
-
-    assert_ne!(object, not_expected);
-    assert_eq!(object, expected, "{object:#?} {expected:#?}");
-}
-
-#[test]
-fn traverse_cobs() {
-    let storage = test::Storage::new();
-    let neil_signer = gen::<MockSigner>(2);
-    let neil = test::Person::new(&storage, "gaiman", *neil_signer.public_key()).unwrap();
-    let terry_signer = gen::<MockSigner>(1);
-    let terry = test::Person::new(&storage, "pratchett", *terry_signer.public_key()).unwrap();
-    let proj = test::Project::new(&storage, "discworld", *terry_signer.public_key()).unwrap();
-    let terry_proj = test::RemoteProject {
-        project: proj.clone(),
-        person: terry,
-    };
-    let neil_proj = test::RemoteProject {
-        project: proj,
-        person: neil,
-    };
-    let typename = "xyz.rad.issue".parse::<TypeName>().unwrap();
-    let cob = create::<NonEmpty<Entry>, _, _>(
-        &storage,
-        &terry_signer,
-        Some(terry_proj.project.content_id),
-        vec![],
-        terry_signer.public_key(),
-        Create {
-            contents: nonempty!(b"issue 1".to_vec()),
-            type_name: typename.clone(),
-            message: "creating xyz.rad.issue".to_string(),
-            embeds: vec![],
-            version: Version::default(),
-        },
-    )
-    .unwrap();
-    copy_to(
-        storage.as_raw(),
-        terry_signer.public_key(),
-        &neil_proj,
-        &typename,
-        *cob.id(),
-    )
-    .unwrap();
-
-    let Updated { object, .. } = update::<NonEmpty<Entry>, _, _>(
-        &storage,
-        &neil_signer,
-        Some(neil_proj.project.content_id),
-        vec![],
-        neil_signer.public_key(),
-        Update {
-            changes: nonempty!(b"issue 2".to_vec()),
-            object_id: *cob.id(),
-            type_name: typename,
-            embeds: vec![],
-            message: "commenting on xyz.rad.issue".to_string(),
-        },
-    )
-    .unwrap();
-
-    let root = object.history.root().id;
-    // traverse over the history and filter by changes that were only authorized by terry
-    let contents = object
-        .history()
-        .traverse(Vec::new(), &[root], |mut acc, _, entry| {
-            if entry.author() == terry_signer.public_key() {
-                acc.push(entry.contents().head.clone());
-            }
-            ControlFlow::Continue(acc)
-        });
-
-    assert_eq!(contents, vec![b"issue 1".to_vec()]);
-
-    // traverse over the history and filter by changes that were only authorized by neil
-    let contents = object
-        .history()
-        .traverse(Vec::new(), &[root], |mut acc, _, entry| {
-            acc.push(entry.contents().head.clone());
-            ControlFlow::Continue(acc)
-        });
-
-    assert_eq!(contents, vec![b"issue 1".to_vec(), b"issue 2".to_vec()]);
-}
-
-#[quickcheck]
-fn parse_refstr(oid: ObjectId, typename: TypeName) {
-    let suffix = refname!("refs/cobs")
-        .and(Component::from(&typename))
-        .and(Component::from(&oid));
-
-    // refs/cobs/<typename>/<object_id> gives back the <typename> and <object_id>
-    assert_eq!(object::parse_refstr(&suffix), Some((typename.clone(), oid)));
-
-    // strips a single namespace
-    assert_eq!(
-        object::parse_refstr(&refname!("refs/namespaces/a").join(&suffix)),
-        Some((typename.clone(), oid))
-    );
-
-    // strips multiple namespaces
-    assert_eq!(
-        object::parse_refstr(&refname!("refs/namespaces/a/refs/namespaces/b").join(&suffix)),
-        Some((typename.clone(), oid))
-    );
-
-    // ignores the extra path
-    assert_eq!(
-        object::parse_refstr(
-            &refname!("refs/namespaces/a/refs/namespaces/b")
-                .join(suffix)
-                .and(refname!("more/paths"))
-        ),
-        Some((typename, oid))
-    );
-}
-
-/// Note: an invalid type name is also an invalid reference string, it
-/// cannot start or end with a '.', and cannot have '..'.
-#[quickcheck]
-fn invalid_parse_refstr(oid: Invalid<ObjectId>, typename: TypeName) {
-    let oid = RefString::try_from(oid.value).unwrap();
-    let typename = Component::from(&typename);
-    let suffix = refname!("refs/cobs").and(typename).and(oid);
-
-    // All parsing will fail because `oid` is not a valid ObjectId
-    assert_eq!(object::parse_refstr(&suffix), None);
-
-    assert_eq!(
-        object::parse_refstr(&refname!("refs/namespaces/a").join(&suffix)),
-        None
-    );
-
-    assert_eq!(
-        object::parse_refstr(&refname!("refs/namespaces/a/refs/namespaces/b").join(&suffix)),
-        None
-    );
-
-    assert_eq!(
-        object::parse_refstr(
-            &refname!("refs/namespaces/a/refs/namespaces/b")
-                .join(suffix)
-                .and(refname!("more/paths"))
-        ),
-        None
-    );
-}
-
-fn gen<T: Arbitrary>(size: usize) -> T {
-    let mut gen = qcheck::Gen::new(size);
-
-    T::arbitrary(&mut gen)
-}
-
-fn copy_to(
-    repo: &git2::Repository,
-    from: &PublicKey,
-    to: &test::RemoteProject,
-    typename: &TypeName,
-    object: ObjectId,
-) -> Result<(), git2::Error> {
-    let original = {
-        let name = format!("refs/rad/{}/cobs/{}/{}", from, typename, object);
-        let r = repo.find_reference(&name)?;
-        r.target().unwrap()
-    };
-
-    let name = format!(
-        "refs/rad/{}/cobs/{}/{}",
-        to.identifier().to_path(),
-        typename,
-        object
-    );
-    repo.reference(&name, original, false, "copying object reference")?;
-    Ok(())
-}
diff --git a/radicle-cob/src/trailers.rs b/radicle-cob/src/trailers.rs
deleted file mode 100644
index 2403a8b5a..000000000
--- a/radicle-cob/src/trailers.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright © 2019-2020 The Radicle Foundation <hello@radicle.foundation>
-
-use git_ext::commit::trailers::{OwnedTrailer, Token, Trailer};
-use std::ops::Deref as _;
-
-pub mod error {
-    use thiserror::Error;
-
-    #[derive(Debug, Error)]
-    pub enum InvalidResourceTrailer {
-        #[error("found wrong token for Rad-Resource tailer")]
-        WrongToken,
-        #[error("no value for Rad-Resource")]
-        NoValue,
-        #[error("invalid git OID")]
-        InvalidOid,
-    }
-}
-
-/// Commit trailer for COB commits.
-pub enum CommitTrailer {
-    /// Points to the owning resource.
-    Resource(git2::Oid),
-    /// Points to a related change.
-    Related(git2::Oid),
-}
-
-impl CommitTrailer {
-    pub fn oid(&self) -> git2::Oid {
-        match self {
-            Self::Resource(oid) => *oid,
-            Self::Related(oid) => *oid,
-        }
-    }
-}
-
-impl TryFrom<&Trailer<'_>> for CommitTrailer {
-    type Error = error::InvalidResourceTrailer;
-
-    fn try_from(Trailer { value, token }: &Trailer<'_>) -> Result<Self, Self::Error> {
-        let ext_oid =
-            git_ext::Oid::try_from(value.as_ref()).map_err(|_| Self::Error::InvalidOid)?;
-        if token.deref() == "Rad-Resource" {
-            Ok(CommitTrailer::Resource(ext_oid.into()))
-        } else if token.deref() == "Rad-Related" {
-            Ok(CommitTrailer::Related(ext_oid.into()))
-        } else {
-            Err(Self::Error::WrongToken)
-        }
-    }
-}
-
-impl TryFrom<&OwnedTrailer> for CommitTrailer {
-    type Error = error::InvalidResourceTrailer;
-
-    fn try_from(trailer: &OwnedTrailer) -> Result<Self, Self::Error> {
-        Self::try_from(&Trailer::from(trailer))
-    }
-}
-
-impl From<CommitTrailer> for Trailer<'_> {
-    fn from(t: CommitTrailer) -> Self {
-        match t {
-            #[allow(clippy::unwrap_used)]
-            CommitTrailer::Related(oid) => {
-                Trailer {
-                    // SAFETY: "Rad-Related" is a valid `Token`.
-                    token: Token::try_from("Rad-Related").unwrap(),
-                    value: oid.to_string().into(),
-                }
-            }
-            #[allow(clippy::unwrap_used)]
-            CommitTrailer::Resource(oid) => {
-                Trailer {
-                    // SAFETY: "Rad-Resource" is a valid `Token`.
-                    token: Token::try_from("Rad-Resource").unwrap(),
-                    value: oid.to_string().into(),
-                }
-            }
-        }
-    }
-}
-
-impl From<CommitTrailer> for OwnedTrailer {
-    fn from(containing: CommitTrailer) -> Self {
-        Trailer::from(containing).to_owned()
-    }
-}
diff --git a/radicle-cob/src/type_name.rs b/radicle-cob/src/type_name.rs
deleted file mode 100644
index 20a503145..000000000
--- a/radicle-cob/src/type_name.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright © 2022 The Radicle Link Contributors
-
-use std::{fmt, str::FromStr};
-
-use git_ext::ref_format::{Component, RefString};
-use serde::{Deserialize, Serialize};
-use thiserror::Error;
-
-/// The typename of an object. Valid typenames MUST be sequences of
-/// alphanumeric characters separated by a period. The name must start
-/// and end with an alphanumeric character
-///
-/// # Examples
-///
-/// * `abc.def`
-/// * `xyz.rad.issues`
-/// * `xyz.rad.patches.releases`
-#[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub struct TypeName(String);
-
-impl TypeName {
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
-}
-
-impl fmt::Display for TypeName {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str(self.0.as_str())
-    }
-}
-
-#[derive(Error, Debug)]
-#[error("the type name '{invalid}' is invalid")]
-pub struct TypeNameParse {
-    invalid: String,
-}
-
-impl FromStr for TypeName {
-    type Err = TypeNameParse;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let split = s.split('.');
-        for component in split {
-            if component.is_empty() {
-                return Err(TypeNameParse {
-                    invalid: s.to_string(),
-                });
-            }
-            if !component.chars().all(char::is_alphanumeric) {
-                return Err(TypeNameParse {
-                    invalid: s.to_string(),
-                });
-            }
-        }
-        Ok(TypeName(s.to_string()))
-    }
-}
-
-impl From<&TypeName> for Component<'_> {
-    fn from(name: &TypeName) -> Self {
-        let refstr = RefString::try_from(name.0.to_string())
-            .expect("collaborative object type names are valid ref strings");
-        Component::from_refstr(refstr)
-            .expect("collaborative object type names are valid refname components")
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use std::str::FromStr as _;
-
-    use super::TypeName;
-
-    #[test]
-    fn valid_typenames() {
-        assert!(TypeName::from_str("abc.def.ghi").is_ok());
-        assert!(TypeName::from_str("abc.123.ghi").is_ok());
-        assert!(TypeName::from_str("1bc.123.ghi").is_ok());
-        assert!(TypeName::from_str(".abc.123.ghi").is_err());
-        assert!(TypeName::from_str("abc.123.ghi.").is_err());
-    }
-}
diff --git a/radicle-crdt/Cargo.toml b/radicle-crdt/Cargo.toml
deleted file mode 100644
index 21d107b31..000000000
--- a/radicle-crdt/Cargo.toml
+++ /dev/null
@@ -1,27 +0,0 @@
-[package]
-name = "radicle-crdt"
-version = "0.1.0"
-license = "MIT OR Apache-2.0"
-edition = "2021"
-
-[features]
-test = ["fastrand", "qcheck"]
-
-[dependencies]
-fastrand = { version = "2.0.0", optional = true }
-num-traits = { version = "0.2.15", default-features = false, features = ["std"] }
-qcheck = { version = "1", optional = true }
-serde = { version = "1" }
-thiserror = { version = "1" }
-
-[dependencies.radicle-crypto]
-path = "../radicle-crypto"
-version = "0"
-features = []
-
-[dev-dependencies]
-fastrand = { version = "2.0.0" }
-qcheck = { version = "1" }
-qcheck-macros = { version = "1" }
-radicle-crypto = { path = "../radicle-crypto", features = ["test"] }
-tempfile = { version = "3" }
diff --git a/radicle-crdt/src/clock.rs b/radicle-crdt/src/clock.rs
deleted file mode 100644
index 7e5699a44..000000000
--- a/radicle-crdt/src/clock.rs
+++ /dev/null
@@ -1,155 +0,0 @@
-use std::fmt;
-use std::str::FromStr;
-use std::time::SystemTime;
-use std::time::UNIX_EPOCH;
-
-use num_traits::Bounded;
-use serde::{Deserialize, Serialize};
-use thiserror::Error;
-
-use crate::ord::Max;
-use crate::Semilattice as _;
-
-/// Lamport clock.
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
-#[serde(transparent)]
-pub struct Lamport {
-    counter: Max<u64>,
-}
-
-impl Lamport {
-    /// Return the clock value.
-    pub fn get(&self) -> u64 {
-        *self.counter.get()
-    }
-
-    /// The initial value of the clock.
-    pub fn initial() -> Self {
-        Self::default()
-    }
-
-    /// Increment clock and return new value.
-    /// Must be called before sending a message.
-    pub fn tick(&mut self) -> Self {
-        self.counter.incr();
-        *self
-    }
-
-    /// Merge clock with another clock, and increment value.
-    /// Must be called whenever a message is received.
-    pub fn merge(&mut self, other: Self) -> Self {
-        self.counter.merge(other.counter);
-        self.tick()
-    }
-
-    /// Reset clock to default state.
-    pub fn reset(&mut self) {
-        self.counter = Max::default();
-    }
-}
-
-impl fmt::Display for Lamport {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.get())
-    }
-}
-
-impl From<u64> for Lamport {
-    fn from(counter: u64) -> Self {
-        Self {
-            counter: Max::from(counter),
-        }
-    }
-}
-
-impl From<Lamport> for u64 {
-    fn from(arg: Lamport) -> Self {
-        arg.get()
-    }
-}
-
-/// Error decoding an operation from an entry.
-#[derive(Error, Debug)]
-pub enum LamportError {
-    #[error("invalid lamport clock value")]
-    Invalid,
-}
-
-impl FromStr for Lamport {
-    type Err = LamportError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Self::try_from(s)
-    }
-}
-
-impl TryFrom<&str> for Lamport {
-    type Error = LamportError;
-
-    fn try_from(s: &str) -> Result<Self, Self::Error> {
-        let v = s.parse::<u64>().map_err(|_| LamportError::Invalid)?;
-        Ok(v.into())
-    }
-}
-
-impl Bounded for Lamport {
-    fn min_value() -> Self {
-        Self::from(u64::MIN)
-    }
-
-    fn max_value() -> Self {
-        Self::from(u64::MAX)
-    }
-}
-
-/// Physical clock. Tracks real-time by the second.
-#[derive(Debug, Default, Copy, Clone, PartialOrd, PartialEq, Ord, Eq, Serialize, Deserialize)]
-#[serde(transparent)]
-pub struct Physical {
-    seconds: u64,
-}
-
-impl Physical {
-    pub fn new(seconds: u64) -> Self {
-        Self { seconds }
-    }
-
-    pub fn now() -> Self {
-        #[allow(clippy::unwrap_used)] // Safe because Unix was already invented!
-        let duration = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
-
-        Self {
-            seconds: duration.as_secs(),
-        }
-    }
-
-    pub fn as_secs(&self) -> u64 {
-        self.seconds
-    }
-}
-
-impl From<u64> for Physical {
-    fn from(seconds: u64) -> Self {
-        Self { seconds }
-    }
-}
-
-impl std::ops::Add<u64> for Physical {
-    type Output = Self;
-
-    fn add(self, rhs: u64) -> Self::Output {
-        Self {
-            seconds: self.seconds + rhs,
-        }
-    }
-}
-
-impl Bounded for Physical {
-    fn min_value() -> Self {
-        Self { seconds: u64::MIN }
-    }
-
-    fn max_value() -> Self {
-        Self { seconds: u64::MAX }
-    }
-}
diff --git a/radicle-crdt/src/gmap.rs b/radicle-crdt/src/gmap.rs
deleted file mode 100644
index 9377ec004..000000000
--- a/radicle-crdt/src/gmap.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-use std::collections::btree_map::{Entry, IntoIter, IntoKeys};
-use std::collections::BTreeMap;
-use std::ops::Deref;
-
-use crate::Semilattice;
-
-/// Grow-only map.
-///
-/// Conflicting elements are merged via the [`Semilattice`] instance.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct GMap<K, V> {
-    inner: BTreeMap<K, V>,
-}
-
-impl<K: Ord, V: Semilattice> GMap<K, V> {
-    pub fn singleton(key: K, value: V) -> Self {
-        Self {
-            inner: BTreeMap::from_iter([(key, value)]),
-        }
-    }
-
-    pub fn get_mut(&mut self, key: &K) -> Option<&mut V> {
-        self.inner.get_mut(key)
-    }
-
-    pub fn insert(&mut self, key: K, value: V) {
-        match self.inner.entry(key) {
-            Entry::Occupied(mut e) => {
-                e.get_mut().merge(value);
-            }
-            Entry::Vacant(e) => {
-                e.insert(value);
-            }
-        }
-    }
-}
-
-impl<K, V> GMap<K, V> {
-    pub fn into_keys(self) -> IntoKeys<K, V> {
-        self.inner.into_keys()
-    }
-}
-
-impl<K: Ord, V: Semilattice> FromIterator<(K, V)> for GMap<K, V> {
-    fn from_iter<I: IntoIterator<Item = (K, V)>>(iter: I) -> Self {
-        let mut map = GMap::default();
-        for (k, v) in iter.into_iter() {
-            map.insert(k, v);
-        }
-        map
-    }
-}
-
-impl<K: Ord, V: Semilattice> Extend<(K, V)> for GMap<K, V> {
-    fn extend<I: IntoIterator<Item = (K, V)>>(&mut self, iter: I) {
-        for (k, v) in iter.into_iter() {
-            self.insert(k, v);
-        }
-    }
-}
-
-impl<K, V> IntoIterator for GMap<K, V> {
-    type Item = (K, V);
-    type IntoIter = IntoIter<K, V>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.inner.into_iter()
-    }
-}
-
-impl<K, V> Default for GMap<K, V> {
-    fn default() -> Self {
-        Self {
-            inner: BTreeMap::default(),
-        }
-    }
-}
-
-impl<K: Ord, V: Semilattice> Semilattice for GMap<K, V> {
-    fn merge(&mut self, other: Self) {
-        for (k, v) in other.into_iter() {
-            self.insert(k, v);
-        }
-    }
-}
-
-impl<K, V> Deref for GMap<K, V> {
-    type Target = BTreeMap<K, V>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.inner
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use qcheck_macros::quickcheck;
-
-    use super::*;
-    use crate::ord::Max;
-
-    #[quickcheck]
-    fn prop_semilattice(
-        a: Vec<(u8, Max<u8>)>,
-        b: Vec<(u8, Max<u8>)>,
-        c: Vec<(u8, Max<u8>)>,
-        mix: Vec<(u8, Max<u8>)>,
-    ) {
-        let mut a = GMap::from_iter(a);
-        let mut b = GMap::from_iter(b);
-        let c = GMap::from_iter(c);
-
-        a.extend(mix.clone());
-        b.extend(mix);
-
-        crate::test::assert_laws(&a, &b, &c);
-    }
-}
diff --git a/radicle-crdt/src/gset.rs b/radicle-crdt/src/gset.rs
deleted file mode 100644
index 4a4c0975a..000000000
--- a/radicle-crdt/src/gset.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-use std::collections::btree_map::{IntoKeys, Keys};
-use std::ops::Deref;
-
-use crate::GMap;
-use crate::Semilattice;
-
-/// Grow-only set.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct GSet<K> {
-    inner: GMap<K, ()>,
-}
-
-impl<K: Ord> GSet<K> {
-    pub fn singleton(key: K) -> Self {
-        Self {
-            inner: GMap::from_iter([(key, ())]),
-        }
-    }
-
-    pub fn insert(&mut self, key: K) {
-        self.inner.insert(key, ());
-    }
-
-    pub fn iter(&self) -> Keys<'_, K, ()> {
-        self.inner.keys()
-    }
-}
-
-impl<K: Ord> FromIterator<K> for GSet<K> {
-    fn from_iter<I: IntoIterator<Item = K>>(iter: I) -> Self {
-        let mut map = GSet::default();
-        for k in iter.into_iter() {
-            map.insert(k);
-        }
-        map
-    }
-}
-
-impl<K: Ord> Extend<K> for GSet<K> {
-    fn extend<I: IntoIterator<Item = K>>(&mut self, iter: I) {
-        for k in iter.into_iter() {
-            self.insert(k);
-        }
-    }
-}
-
-impl<K> IntoIterator for GSet<K> {
-    type Item = K;
-    type IntoIter = IntoKeys<K, ()>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.inner.into_keys()
-    }
-}
-
-impl<K> Default for GSet<K> {
-    fn default() -> Self {
-        Self {
-            inner: GMap::default(),
-        }
-    }
-}
-
-impl<K: Ord> Semilattice for GSet<K> {
-    fn merge(&mut self, other: Self) {
-        for k in other.into_iter() {
-            self.insert(k);
-        }
-    }
-}
-
-impl<K> Deref for GSet<K> {
-    type Target = GMap<K, ()>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.inner
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use qcheck_macros::quickcheck;
-
-    use super::*;
-
-    #[quickcheck]
-    fn prop_semilattice(a: Vec<u8>, b: Vec<u8>, c: Vec<u8>, mix: Vec<u8>) {
-        let mut a = GSet::from_iter(a);
-        let mut b = GSet::from_iter(b);
-        let c = GSet::from_iter(c);
-
-        a.extend(mix.clone());
-        b.extend(mix);
-
-        crate::test::assert_laws(&a, &b, &c);
-    }
-}
diff --git a/radicle-crdt/src/immutable.rs b/radicle-crdt/src/immutable.rs
deleted file mode 100644
index 252b2a1be..000000000
--- a/radicle-crdt/src/immutable.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use crate::Semilattice;
-
-/// A [`Semilattice`] that panics when attempting to merge inequal elements.
-/// Use this for types that will never merge.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct Immutable<T>(pub T);
-
-impl<T> Immutable<T> {
-    /// Create a new immutable object.
-    pub fn new(inner: T) -> Self {
-        Self(inner)
-    }
-}
-
-impl<T> std::ops::Deref for Immutable<T> {
-    type Target = T;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl<T: PartialEq> Semilattice for Immutable<T> {
-    fn merge(&mut self, other: Self) {
-        if self.0 != other.0 {
-            panic!("Immutable::merge: Cannot merge inequal objects");
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    #[should_panic]
-    fn test_merge_inequal() {
-        let mut a = Immutable::new(0);
-        let b = Immutable::new(1);
-
-        a.merge(b);
-    }
-
-    #[test]
-    fn test_merge_equal() {
-        let mut a = Immutable::new(1);
-        let b = Immutable::new(1);
-
-        a.merge(b);
-        assert_eq!(a, b);
-    }
-}
diff --git a/radicle-crdt/src/lib.rs b/radicle-crdt/src/lib.rs
deleted file mode 100644
index b5d40df74..000000000
--- a/radicle-crdt/src/lib.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-#![allow(clippy::collapsible_if)]
-#![allow(clippy::bool_assert_comparison)]
-#![allow(clippy::collapsible_else_if)]
-#![allow(clippy::type_complexity)]
-pub mod clock;
-pub mod gmap;
-pub mod gset;
-pub mod immutable;
-pub mod lwwmap;
-pub mod lwwreg;
-pub mod lwwset;
-pub mod ord;
-pub mod redactable;
-
-#[cfg(any(test, feature = "test"))]
-pub mod test;
-
-////////////////////////////////////////////////////////////////////////////////
-
-pub use clock::Lamport;
-pub use gmap::GMap;
-pub use gset::GSet;
-pub use immutable::Immutable;
-pub use lwwmap::LWWMap;
-pub use lwwreg::LWWReg;
-pub use lwwset::LWWSet;
-pub use ord::{Max, Min};
-pub use redactable::Redactable;
-
-////////////////////////////////////////////////////////////////////////////////
-
-/// A join-semilattice.
-pub trait Semilattice: Sized {
-    /// Merge an other semilattice into this one.
-    ///
-    /// This operation should obbey the semilattice laws and should thus be idempotent,
-    /// associative and commutative.
-    fn merge(&mut self, other: Self);
-
-    /// Like [`Semilattice::merge`] but takes and returns a new semilattice.
-    fn join(mut self, other: Self) -> Self {
-        self.merge(other);
-        self
-    }
-}
-
-impl<T: Semilattice> Semilattice for Option<T> {
-    fn merge(&mut self, other: Self) {
-        match (self, other) {
-            (this @ None, other @ Some(_)) => {
-                *this = other;
-            }
-            (Some(ref mut a), Some(b)) => {
-                a.merge(b);
-            }
-            (Some(_), None) => {}
-            (None, None) => {}
-        }
-    }
-}
-
-impl Semilattice for () {
-    fn merge(&mut self, _other: Self) {}
-}
-
-impl Semilattice for bool {
-    fn merge(&mut self, other: Self) {
-        match (&self, other) {
-            (false, true) => *self = true,
-            (true, false) => *self = true,
-            (false, false) | (true, true) => {}
-        }
-    }
-}
-
-pub fn fold<S>(i: impl IntoIterator<Item = S>) -> S
-where
-    S: Semilattice + Default,
-{
-    i.into_iter().fold(S::default(), S::join)
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::{test, Max, Min, Semilattice};
-    use qcheck_macros::quickcheck;
-
-    #[quickcheck]
-    fn prop_option_laws(a: Max<u8>, b: Max<u8>, c: Max<u8>) {
-        test::assert_laws(&a, &b, &c);
-    }
-
-    #[quickcheck]
-    fn prop_bool_laws(a: bool, b: bool, c: bool) {
-        test::assert_laws(&a, &b, &c);
-    }
-
-    #[test]
-    fn test_bool() {
-        assert_eq!(false.join(false), false);
-        assert_eq!(true.join(true), true);
-        assert_eq!(true.join(false), true);
-        assert_eq!(false.join(true), true);
-    }
-
-    #[test]
-    fn test_option() {
-        assert_eq!(None::<()>.join(None), None);
-        assert_eq!(None::<()>.join(Some(())), Some(()));
-        assert_eq!(Some(()).join(None), Some(()));
-        assert_eq!(Some(()).join(Some(())), Some(()));
-        assert_eq!(
-            Some(Max::from(0)).join(Some(Max::from(1))),
-            Some(Max::from(1))
-        );
-        assert_eq!(
-            Some(Min::from(0)).join(Some(Min::from(1))),
-            Some(Min::from(0))
-        );
-    }
-}
diff --git a/radicle-crdt/src/lwwmap.rs b/radicle-crdt/src/lwwmap.rs
deleted file mode 100644
index 19a929290..000000000
--- a/radicle-crdt/src/lwwmap.rs
+++ /dev/null
@@ -1,187 +0,0 @@
-use crate::gmap::GMap;
-use crate::lwwreg::LWWReg;
-use crate::{clock, Semilattice};
-
-/// Last-Write-Wins Map.
-///
-/// In case a value is added and removed under a key at the same time,
-/// the "add" takes precedence over the "remove".
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct LWWMap<K, V, C = clock::Lamport> {
-    inner: GMap<K, LWWReg<Option<V>, C>>,
-}
-
-impl<K: Ord, V: Semilattice, C: PartialOrd + Ord> LWWMap<K, V, C> {
-    pub fn singleton(key: K, value: V, clock: C) -> Self {
-        Self {
-            inner: GMap::singleton(key, LWWReg::new(Some(value), clock)),
-        }
-    }
-
-    pub fn get(&self, key: &K) -> Option<&V> {
-        let Some(value) = self.inner.get(key) else {
-            // If the element was never added, return nothing.
-            return None;
-        };
-        value.get().as_ref()
-    }
-
-    pub fn insert(&mut self, key: K, value: V, clock: C) {
-        self.inner.insert(key, LWWReg::new(Some(value), clock));
-    }
-
-    pub fn remove(&mut self, key: K, clock: C) {
-        self.inner.insert(key, LWWReg::new(None, clock));
-    }
-
-    pub fn contains_key(&self, key: &K) -> bool {
-        let Some(value) = self.inner.get(key) else {
-            // If the element was never added, return false.
-            return false;
-        };
-        value.get().is_some()
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = (&K, &V)> {
-        self.inner
-            .iter()
-            .filter_map(|(k, v)| v.get().as_ref().map(|v| (k, v)))
-    }
-
-    pub fn len(&self) -> usize {
-        self.iter().count()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.iter().next().is_none()
-    }
-}
-
-impl<K, V, C> Default for LWWMap<K, V, C> {
-    fn default() -> Self {
-        Self {
-            inner: GMap::default(),
-        }
-    }
-}
-
-impl<K: Ord, V: Semilattice, C: Ord> FromIterator<(K, V, C)> for LWWMap<K, V, C> {
-    fn from_iter<I: IntoIterator<Item = (K, V, C)>>(iter: I) -> Self {
-        let mut map = LWWMap::default();
-        for (k, v, c) in iter.into_iter() {
-            map.insert(k, v, c);
-        }
-        map
-    }
-}
-
-impl<K: Ord, V: Semilattice, C: Ord> Extend<(K, V, C)> for LWWMap<K, V, C> {
-    fn extend<I: IntoIterator<Item = (K, V, C)>>(&mut self, iter: I) {
-        for (k, v, c) in iter.into_iter() {
-            self.insert(k, v, c);
-        }
-    }
-}
-
-impl<K, V, C> Semilattice for LWWMap<K, V, C>
-where
-    K: Ord,
-    V: Semilattice,
-    C: Ord,
-{
-    fn merge(&mut self, other: Self) {
-        self.inner.merge(other.inner);
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use qcheck_macros::quickcheck;
-
-    use super::*;
-    use crate::ord::Max;
-
-    #[quickcheck]
-    fn prop_semilattice(
-        a: Vec<(u8, Max<u8>, u16)>,
-        b: Vec<(u8, Max<u8>, u16)>,
-        c: Vec<(u8, Max<u8>, u16)>,
-        mix: Vec<(u8, Max<u8>, u16)>,
-    ) {
-        let mut a = LWWMap::from_iter(a);
-        let mut b = LWWMap::from_iter(b);
-        let c = LWWMap::from_iter(c);
-
-        a.extend(mix.clone());
-        b.extend(mix);
-
-        crate::test::assert_laws(&a, &b, &c);
-    }
-
-    #[test]
-    fn test_insert() {
-        let mut map = LWWMap::default();
-
-        map.insert('a', Max::from(1), 0);
-        map.insert('b', Max::from(2), 0);
-        map.insert('c', Max::from(3), 0);
-
-        assert_eq!(map.get(&'a'), Some(&Max::from(1)));
-        assert_eq!(map.get(&'b'), Some(&Max::from(2)));
-        assert_eq!(map.get(&'?'), None);
-
-        let values = map.iter().collect::<Vec<(&char, &Max<u8>)>>();
-        assert!(values.contains(&(&'a', &Max::from(1))));
-        assert!(values.contains(&(&'b', &Max::from(2))));
-        assert!(values.contains(&(&'c', &Max::from(3))));
-        assert_eq!(values.len(), 3);
-    }
-
-    #[test]
-    fn test_insert_remove() {
-        let mut map = LWWMap::default();
-
-        map.insert('a', Max::from("alice"), 1);
-        assert!(map.contains_key(&'a'));
-
-        map.remove('a', 0);
-        assert!(map.contains_key(&'a'));
-
-        map.remove('a', 1);
-        assert!(map.contains_key(&'a')); // Add takes precedence over remove.
-        assert!(map.iter().any(|(c, _)| *c == 'a'));
-
-        map.remove('a', 2);
-        assert!(!map.contains_key(&'a'));
-        assert!(!map.iter().any(|(c, _)| *c == 'a'));
-    }
-
-    #[test]
-    fn test_is_empty() {
-        let mut map = LWWMap::default();
-        assert!(map.is_empty());
-
-        map.insert('a', Max::from("alice"), 1);
-        assert!(!map.is_empty());
-
-        map.remove('a', 2);
-        assert!(map.is_empty());
-    }
-
-    #[test]
-    fn test_remove_insert() {
-        let mut map = LWWMap::default();
-
-        map.insert('a', Max::from("alice"), 1);
-        assert_eq!(map.get(&'a'), Some(&Max::from("alice")));
-
-        map.remove('a', 2);
-        assert!(!map.contains_key(&'a'));
-
-        map.insert('a', Max::from("alice"), 1);
-        assert!(!map.contains_key(&'a'));
-
-        map.insert('a', Max::from("amy"), 2);
-        assert_eq!(map.get(&'a'), Some(&Max::from("amy")));
-    }
-}
diff --git a/radicle-crdt/src/lwwreg.rs b/radicle-crdt/src/lwwreg.rs
deleted file mode 100644
index 9c88701fc..000000000
--- a/radicle-crdt/src/lwwreg.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-use num_traits::Bounded;
-
-use crate::clock;
-use crate::ord::Max;
-use crate::Semilattice;
-
-/// Last-Write-Wins Register.
-///
-/// In case of conflict, uses the [`Semilattice`] instance of `T` to merge.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct LWWReg<T, C = clock::Lamport> {
-    clock: Max<C>,
-    value: T,
-}
-
-impl<T: Semilattice, C: PartialOrd> LWWReg<T, C> {
-    pub fn initial(value: T) -> Self
-    where
-        C: Default,
-    {
-        Self {
-            clock: Max::from(C::default()),
-            value,
-        }
-    }
-
-    pub fn new(value: T, clock: C) -> Self {
-        Self {
-            clock: Max::from(clock),
-            value,
-        }
-    }
-
-    pub fn set(&mut self, value: impl Into<T>, clock: C) {
-        let clock = Max::from(clock);
-        let value = value.into();
-
-        if clock == self.clock {
-            self.value.merge(value);
-        } else if clock > self.clock {
-            self.clock.merge(clock);
-            self.value = value;
-        }
-    }
-
-    pub fn get(&self) -> &T {
-        &self.value
-    }
-
-    pub fn clock(&self) -> &Max<C> {
-        &self.clock
-    }
-
-    pub fn into_inner(self) -> (T, C) {
-        (self.value, self.clock.into_inner())
-    }
-}
-
-impl<T: Default, C: Default + Bounded> Default for LWWReg<T, C> {
-    fn default() -> Self {
-        Self {
-            clock: Max::default(),
-            value: T::default(),
-        }
-    }
-}
-
-impl<T, C> Semilattice for LWWReg<T, C>
-where
-    T: Semilattice,
-    C: PartialOrd,
-{
-    fn merge(&mut self, other: Self) {
-        self.set(other.value, other.clock.into_inner());
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use qcheck_macros::quickcheck;
-
-    use super::*;
-    use crate::Min;
-
-    #[quickcheck]
-    fn prop_semilattice(a: (Max<u8>, u16), b: (Max<u8>, u16), c: (Max<u8>, u16)) {
-        let a = LWWReg::new(a.0, a.1);
-        let b = LWWReg::new(b.0, b.1);
-        let c = LWWReg::new(c.0, c.1);
-
-        crate::test::assert_laws(&a, &b, &c);
-    }
-
-    #[test]
-    fn test_merge() {
-        let a = LWWReg::new(Max::from(0), 0);
-        let b = LWWReg::new(Max::from(1), 0);
-
-        assert_eq!(a.join(b).get(), &Max::from(1));
-
-        let a = LWWReg::new(Min::from(0), 0);
-        let b = LWWReg::new(Min::from(1), 0);
-
-        assert_eq!(a.join(b).get(), &Min::from(0));
-    }
-
-    #[test]
-    fn test_set_get() {
-        let mut reg = LWWReg::new(Max::from(42), 1);
-        assert_eq!(*reg.get(), Max::from(42));
-
-        reg.set(84, 0);
-        assert_eq!(*reg.get(), Max::from(42));
-
-        reg.set(84, 2);
-        assert_eq!(*reg.get(), Max::from(84));
-
-        // Smaller value, same clock: smaller value loses.
-        reg.set(42, 2);
-        assert_eq!(*reg.get(), Max::from(84));
-
-        // Bigger value, same clock: bigger value wins.
-        reg.set(168, 2);
-        assert_eq!(*reg.get(), Max::from(168));
-
-        // Smaller value, newer clock: smaller value wins.
-        reg.set(42, 3);
-        assert_eq!(*reg.get(), Max::from(42));
-
-        // Same value, newer clock: newer clock is set.
-        reg.set(42, 4);
-        assert_eq!(*reg.clock(), Max::from(4));
-    }
-}
diff --git a/radicle-crdt/src/lwwset.rs b/radicle-crdt/src/lwwset.rs
deleted file mode 100644
index 06a9b8831..000000000
--- a/radicle-crdt/src/lwwset.rs
+++ /dev/null
@@ -1,161 +0,0 @@
-use crate::clock;
-use crate::{lwwmap::LWWMap, Semilattice};
-
-/// Last-Write-Wins Set.
-///
-/// In case the same value is added and removed at the same time,
-/// the "add" takes precedence over the "remove".
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct LWWSet<T, C = clock::Lamport> {
-    inner: LWWMap<T, (), C>,
-}
-
-impl<T: Ord, C: Ord> LWWSet<T, C> {
-    pub fn singleton(value: T, clock: C) -> Self {
-        Self {
-            inner: LWWMap::from_iter([(value, (), clock)]),
-        }
-    }
-
-    pub fn insert(&mut self, value: T, clock: C) {
-        self.inner.insert(value, (), clock);
-    }
-
-    pub fn remove(&mut self, value: T, clock: C) {
-        self.inner.remove(value, clock);
-    }
-
-    pub fn contains(&self, value: &T) -> bool {
-        self.inner.contains_key(value)
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = &T> {
-        self.inner.iter().map(|(k, _)| k)
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.inner.is_empty()
-    }
-}
-
-impl<T, C> Default for LWWSet<T, C> {
-    fn default() -> Self {
-        Self {
-            inner: LWWMap::default(),
-        }
-    }
-}
-
-impl<T: Ord, C: Ord> FromIterator<(T, C)> for LWWSet<T, C> {
-    fn from_iter<I: IntoIterator<Item = (T, C)>>(iter: I) -> Self {
-        let mut set = LWWSet::default();
-        for (v, c) in iter.into_iter() {
-            set.insert(v, c);
-        }
-        set
-    }
-}
-
-impl<T: Ord, C: Ord> Extend<(T, C)> for LWWSet<T, C> {
-    fn extend<I: IntoIterator<Item = (T, C)>>(&mut self, iter: I) {
-        for (v, c) in iter.into_iter() {
-            self.insert(v, c);
-        }
-    }
-}
-
-impl<T, C> Semilattice for LWWSet<T, C>
-where
-    T: Ord,
-    C: Ord + Default,
-{
-    fn merge(&mut self, other: Self) {
-        self.inner.merge(other.inner);
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use qcheck_macros::quickcheck;
-
-    #[quickcheck]
-    fn prop_semilattice(
-        a: Vec<(u8, u16)>,
-        b: Vec<(u8, u16)>,
-        c: Vec<(u8, u16)>,
-        mix: Vec<(u8, u16)>,
-    ) {
-        let mut a = LWWSet::from_iter(a);
-        let mut b = LWWSet::from_iter(b);
-        let c = LWWSet::from_iter(c);
-
-        a.extend(mix.clone());
-        b.extend(mix);
-
-        crate::test::assert_laws(&a, &b, &c);
-    }
-
-    #[test]
-    fn test_insert() {
-        let mut set = LWWSet::default();
-
-        set.insert('a', 0);
-        set.insert('b', 0);
-        set.insert('c', 0);
-
-        assert!(set.contains(&'a'));
-        assert!(set.contains(&'b'));
-        assert!(!set.contains(&'?'));
-
-        let values = set.iter().cloned().collect::<Vec<_>>();
-        assert!(values.contains(&'a'));
-        assert!(values.contains(&'b'));
-        assert!(values.contains(&'c'));
-        assert_eq!(values.len(), 3);
-    }
-
-    #[test]
-    fn test_insert_remove() {
-        let mut set = LWWSet::default();
-
-        set.insert('a', 1);
-        assert!(set.contains(&'a'));
-
-        set.remove('a', 0);
-        assert!(set.contains(&'a'));
-
-        set.remove('a', 1);
-        assert!(set.contains(&'a')); // Add takes precedence over remove.
-        assert!(set.iter().any(|c| *c == 'a'));
-
-        set.remove('a', 2);
-        assert!(!set.contains(&'a'));
-        assert!(!set.iter().any(|c| *c == 'a'));
-
-        set.insert('b', 3);
-        set.remove('b', 3);
-        assert!(set.contains(&'b')); // Insert precedence.
-
-        set.remove('c', 3);
-        set.insert('c', 3);
-        assert!(set.contains(&'c')); // Insert precedence.
-    }
-
-    #[test]
-    fn test_remove_insert() {
-        let mut set = LWWSet::default();
-
-        set.insert('a', 1);
-        assert!(set.contains(&'a'));
-
-        set.remove('a', 2);
-        assert!(!set.contains(&'a'));
-
-        set.insert('a', 1);
-        assert!(!set.contains(&'a'));
-
-        set.insert('a', 2);
-        assert!(set.contains(&'a'));
-    }
-}
diff --git a/radicle-crdt/src/ord.rs b/radicle-crdt/src/ord.rs
deleted file mode 100644
index 056445a2b..000000000
--- a/radicle-crdt/src/ord.rs
+++ /dev/null
@@ -1,129 +0,0 @@
-use std::{cmp, ops};
-
-use num_traits::Bounded;
-use serde::{Deserialize, Serialize};
-
-use crate::Semilattice;
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
-#[serde(transparent)]
-pub struct Max<T>(T);
-
-impl<T> Max<T> {
-    pub fn get(&self) -> &T {
-        &self.0
-    }
-
-    pub fn into_inner(self) -> T {
-        self.0
-    }
-}
-
-impl<T: num_traits::SaturatingAdd + num_traits::One> Max<T> {
-    pub fn incr(&mut self) {
-        self.0 = self.0.saturating_add(&T::one());
-    }
-}
-
-impl<T> Default for Max<T>
-where
-    T: Bounded,
-{
-    fn default() -> Self {
-        Self(T::min_value())
-    }
-}
-
-impl<T> ops::Deref for Max<T> {
-    type Target = T;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl<T> From<T> for Max<T> {
-    fn from(t: T) -> Self {
-        Self(t)
-    }
-}
-
-impl<T: PartialOrd> Semilattice for Max<T> {
-    fn merge(&mut self, other: Self) {
-        if other.0 > self.0 {
-            self.0 = other.0;
-        }
-    }
-}
-
-impl<T: Bounded> Bounded for Max<T> {
-    fn min_value() -> Self {
-        Self::from(T::min_value())
-    }
-
-    fn max_value() -> Self {
-        Self::from(T::max_value())
-    }
-}
-
-#[allow(clippy::derive_ord_xor_partial_ord)]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Ord, Serialize, Deserialize)]
-#[serde(transparent)]
-pub struct Min<T>(pub T);
-
-impl<T> Default for Min<T>
-where
-    T: Bounded,
-{
-    fn default() -> Self {
-        Self(T::max_value())
-    }
-}
-
-impl<T> ops::Deref for Min<T> {
-    type Target = T;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl<T> From<T> for Min<T> {
-    fn from(t: T) -> Self {
-        Self(t)
-    }
-}
-
-impl<T> cmp::PartialOrd for Min<T>
-where
-    T: PartialOrd,
-{
-    fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
-        other.0.partial_cmp(&self.0)
-    }
-}
-
-impl<T: PartialOrd> Semilattice for Min<T> {
-    fn merge(&mut self, other: Self) {
-        if other.0 < self.0 {
-            self.0 = other.0;
-        }
-    }
-}
-
-#[cfg(any(test, feature = "test"))]
-mod arbitrary {
-    use super::*;
-
-    impl<T: qcheck::Arbitrary> qcheck::Arbitrary for Max<T> {
-        fn arbitrary(g: &mut qcheck::Gen) -> Self {
-            Self::from(T::arbitrary(g))
-        }
-    }
-
-    impl<T: qcheck::Arbitrary> qcheck::Arbitrary for Min<T> {
-        fn arbitrary(g: &mut qcheck::Gen) -> Self {
-            Self::from(T::arbitrary(g))
-        }
-    }
-}
diff --git a/radicle-crdt/src/redactable.rs b/radicle-crdt/src/redactable.rs
deleted file mode 100644
index 6061f49a6..000000000
--- a/radicle-crdt/src/redactable.rs
+++ /dev/null
@@ -1,111 +0,0 @@
-use crate::Semilattice;
-
-/// An object that can be either present or removed.
-///
-/// The "redacted" state is the top-most element and takes precedence
-/// over other states.
-///
-/// There is no `Default` instance, since this is not a "bounded" semilattice.
-///
-/// Nb. The merge rules are such that if two redactables with different
-/// values present are merged; the result is redacted. This is the preserve
-/// the semilattice laws.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum Redactable<T> {
-    /// When the object is present.
-    Present(T),
-    /// When the object has been removed.
-    Redacted,
-}
-
-impl<T> Redactable<T> {
-    pub fn get(&self) -> Option<&T> {
-        match self {
-            Self::Present(val) => Some(val),
-            Self::Redacted => None,
-        }
-    }
-
-    pub fn get_mut(&mut self) -> Option<&mut T> {
-        match self {
-            Self::Present(ref mut val) => Some(val),
-            Self::Redacted => None,
-        }
-    }
-}
-
-impl<T> From<Option<T>> for Redactable<T> {
-    fn from(option: Option<T>) -> Self {
-        match option {
-            Some(v) => Self::Present(v),
-            None => Self::Redacted,
-        }
-    }
-}
-
-impl<T> From<Redactable<T>> for Option<T> {
-    fn from(redactable: Redactable<T>) -> Self {
-        match redactable {
-            Redactable::Present(v) => Some(v),
-            Redactable::Redacted => None,
-        }
-    }
-}
-
-impl<'a, T> From<&'a Redactable<T>> for Option<&'a T> {
-    fn from(redactable: &'a Redactable<T>) -> Self {
-        redactable.get()
-    }
-}
-
-impl<T: PartialEq> Semilattice for Redactable<T> {
-    fn merge(&mut self, other: Self) {
-        match (&self, other) {
-            (Self::Redacted, _) => {}
-            (Self::Present(_), Self::Redacted) => {
-                *self = Self::Redacted;
-            }
-            (Self::Present(a), Self::Present(b)) => {
-                if a != &b {
-                    *self = Self::Redacted;
-                }
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use qcheck_macros::quickcheck;
-
-    use super::*;
-    use crate::test;
-
-    #[quickcheck]
-    fn prop_invariants(a: Option<u8>, b: Option<u8>, c: Option<u8>) {
-        let a = Redactable::from(a);
-        let b = Redactable::from(b);
-        let c = Redactable::from(c);
-
-        test::assert_laws(&a, &b, &c);
-    }
-
-    #[test]
-    fn test_redacted() {
-        let a = Redactable::Present(0);
-        let b = Redactable::Redacted;
-
-        assert_eq!(a.join(b), Redactable::Redacted);
-        assert_eq!(b.join(a), Redactable::Redacted);
-        assert_eq!(a.join(a), a);
-    }
-
-    #[test]
-    fn test_both_present() {
-        let a = Redactable::Present(0);
-        let b = Redactable::Present(1);
-
-        assert_eq!(a.join(b), Redactable::Redacted);
-        assert_eq!(a.join(b), b.join(a));
-    }
-}
diff --git a/radicle-crdt/src/test.rs b/radicle-crdt/src/test.rs
deleted file mode 100644
index 637a62963..000000000
--- a/radicle-crdt/src/test.rs
+++ /dev/null
@@ -1,111 +0,0 @@
-use std::fmt::Debug;
-use std::rc::Rc;
-
-use super::*;
-
-/// Generate test values following a weight distribution.
-pub struct WeightedGenerator<'a, T, C> {
-    cases: Vec<Rc<dyn Fn(&mut C, fastrand::Rng) -> Option<T> + 'a>>,
-    rng: fastrand::Rng,
-    ctx: C,
-}
-
-impl<'a, T, C> Iterator for WeightedGenerator<'a, T, C> {
-    type Item = T;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let cases = self.cases.len();
-
-        loop {
-            let r = self.rng.usize(0..cases);
-            let g = &self.cases[r];
-
-            if let Some(val) = g(&mut self.ctx, self.rng.clone()) {
-                return Some(val);
-            }
-        }
-    }
-}
-
-impl<'a, T, C: Default> WeightedGenerator<'a, T, C> {
-    /// Create a new distribution.
-    pub fn new(rng: fastrand::Rng) -> Self {
-        Self {
-            cases: Vec::new(),
-            rng,
-            ctx: C::default(),
-        }
-    }
-
-    /// Add a new variant with a given weight and generator function.
-    pub fn variant(
-        mut self,
-        weight: usize,
-        generator: impl Fn(&mut C, fastrand::Rng) -> Option<T> + 'a,
-    ) -> Self {
-        let gen = Rc::new(generator);
-        for _ in 0..weight {
-            self.cases.push(gen.clone());
-        }
-        self
-    }
-}
-
-/// Assert semilattice ACI laws.
-pub fn assert_laws<S: Debug + Semilattice + PartialEq + Clone>(a: &S, b: &S, c: &S) {
-    assert_associative(a, b, c);
-    assert_commutative(a, b);
-    assert_commutative(b, c);
-    assert_idempotent(a);
-    assert_idempotent(b);
-    assert_idempotent(c);
-}
-
-pub fn assert_associative<S: Debug + Semilattice + PartialEq + Clone>(a: &S, b: &S, c: &S) {
-    // (a ^ b) ^ c
-    let s1 = a.clone().join(b.clone()).join(c.clone());
-    // a ^ (b ^ c)
-    let s2 = a.clone().join(b.clone().join(c.clone()));
-    // (a ^ b) ^ c = a ^ (b ^ c)
-    assert_eq!(s1, s2, "associativity");
-}
-
-pub fn assert_commutative<S: Debug + Semilattice + PartialEq + Clone>(a: &S, b: &S) {
-    // a ^ b
-    let s1 = a.clone().join(b.clone());
-    // b ^ a
-    let s2 = b.clone().join(a.clone());
-    // a ^ b = b ^ a
-    assert_eq!(s1, s2, "commutativity");
-}
-
-pub fn assert_idempotent<S: Debug + Semilattice + PartialEq + Clone>(a: &S) {
-    // a ^ a
-    let s1 = a.clone().join(a.clone());
-    // a
-    let s2 = a.clone();
-    // a ^ a = a
-    assert_eq!(s1, s2, "idempotence");
-}
-
-#[test]
-fn test_generator() {
-    let rng = fastrand::Rng::with_seed(0);
-    let dist = WeightedGenerator::<char, ()>::new(rng)
-        .variant(1, |_, _| Some('a'))
-        .variant(2, |_, _| Some('b'))
-        .variant(4, |_, _| Some('c'))
-        .variant(8, |_, _| Some('d'));
-
-    let values = dist.take(1000).collect::<Vec<_>>();
-
-    let a = values.iter().filter(|c| **c == 'a').count();
-    let b = values.iter().filter(|c| **c == 'b').count();
-    let c = values.iter().filter(|c| **c == 'c').count();
-    let d = values.iter().filter(|c| **c == 'd').count();
-
-    assert_eq!(a, 63);
-    assert_eq!(b, 151);
-    assert_eq!(c, 255);
-    assert_eq!(d, 531);
-}
diff --git a/radicle-crypto/Cargo.toml b/radicle-crypto/Cargo.toml
deleted file mode 100644
index 4f7beb828..000000000
--- a/radicle-crypto/Cargo.toml
+++ /dev/null
@@ -1,55 +0,0 @@
-[package]
-name = "radicle-crypto"
-description = "Radicle cryptographic primitives"
-homepage = "https://radicle.xyz"
-repository = "https://app.radicle.xyz/seeds/seed.radicle.xyz/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5"
-license = "MIT OR Apache-2.0"
-version = "0.11.0"
-authors = [
-  "cloudhead <cloudhead@radicle.xyz>",
-  "Fintan Halpenny <fintan.halpenny@gmail.com>",
-]
-edition = "2021"
-
-[features]
-test = ["fastrand", "qcheck"]
-ssh = ["radicle-ssh", "ssh-key"]
-
-[dependencies]
-amplify = { version = "4.0.0" }
-cyphernet = { version = "0.5.0", optional = true, features = ["ed25519"] }
-fastrand = { version = "2.0.0", default-features = false, optional = true }
-multibase = { version = "0.9.1" }
-ec25519 = { version = "0.1.0", features = [] }
-serde = { version = "1", features = ["derive"] }
-sqlite = { version = "0.32.0", optional = true, features = ["bundled"] }
-thiserror = { version = "1" }
-zeroize = { version = "1.5.7" }
-
-[dependencies.radicle-git-ext]
-version = "0.8.0"
-default-features = false
-optional = true
-
-[dependencies.ssh-key]
-version = "0.6.3"
-default-features = false
-features = ["std", "encryption", "getrandom"]
-optional = true
-
-[dependencies.qcheck]
-version = "1"
-default-features = false
-optional = true
-
-[dependencies.radicle-ssh]
-path = "../radicle-ssh"
-version = "0"
-default-features = false
-optional = true
-
-[dev-dependencies]
-fastrand = { version = "2.0.0", default-features = false }
-qcheck-macros = { version = "1", default-features = false }
-qcheck = { version = "1", default-features = false }
-tempfile = { version = "3.3.0" }
diff --git a/radicle-crypto/src/lib.rs b/radicle-crypto/src/lib.rs
deleted file mode 100644
index bc2a0b512..000000000
--- a/radicle-crypto/src/lib.rs
+++ /dev/null
@@ -1,535 +0,0 @@
-use std::cmp::Ordering;
-use std::sync::Arc;
-use std::{fmt, ops::Deref, str::FromStr};
-
-use ec25519 as ed25519;
-use serde::{Deserialize, Serialize};
-use thiserror::Error;
-
-pub use ed25519::{edwards25519, Error, KeyPair, Seed};
-
-#[cfg(feature = "ssh")]
-pub mod ssh;
-#[cfg(any(test, feature = "test"))]
-pub mod test;
-
-/// Verified (used as type witness).
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize)]
-pub struct Verified;
-/// Unverified (used as type witness).
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub struct Unverified;
-
-/// Output of a Diffie-Hellman key exchange.
-pub type SharedSecret = [u8; 32];
-
-/// Error returned if signing fails, eg. due to an HSM or KMS.
-#[derive(Debug, Clone, Error)]
-#[error(transparent)]
-pub struct SignerError {
-    #[from]
-    source: Arc<dyn std::error::Error + Send + Sync>,
-}
-
-impl SignerError {
-    pub fn new(source: impl std::error::Error + Send + Sync + 'static) -> Self {
-        Self {
-            source: Arc::new(source),
-        }
-    }
-}
-
-pub trait Signer: Send + Sync {
-    /// Return this signer's public/verification key.
-    fn public_key(&self) -> &PublicKey;
-    /// Sign a message and return the signature.
-    fn sign(&self, msg: &[u8]) -> Signature;
-    /// Sign a message and return the signature, or fail if the signer was unable
-    /// to produce a signature.
-    fn try_sign(&self, msg: &[u8]) -> Result<Signature, SignerError>;
-}
-
-impl<T> Signer for Box<T>
-where
-    T: Signer + ?Sized,
-{
-    fn public_key(&self) -> &PublicKey {
-        self.deref().public_key()
-    }
-
-    fn sign(&self, msg: &[u8]) -> Signature {
-        self.deref().sign(msg)
-    }
-
-    fn try_sign(&self, msg: &[u8]) -> Result<Signature, SignerError> {
-        self.deref().try_sign(msg)
-    }
-}
-
-/// Cryptographic signature.
-#[derive(PartialEq, Eq, Hash, Copy, Clone, Serialize, Deserialize)]
-#[serde(into = "String", try_from = "String")]
-pub struct Signature(pub ed25519::Signature);
-
-impl AsRef<[u8]> for Signature {
-    fn as_ref(&self) -> &[u8] {
-        self.0.as_ref()
-    }
-}
-
-impl fmt::Display for Signature {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let base = multibase::Base::Base58Btc;
-        write!(f, "{}", multibase::encode(base, self.deref()))
-    }
-}
-
-impl fmt::Debug for Signature {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "Signature({self})")
-    }
-}
-
-#[derive(Error, Debug)]
-pub enum SignatureError {
-    #[error("invalid multibase string: {0}")]
-    Multibase(#[from] multibase::Error),
-    #[error("invalid signature: {0}")]
-    Invalid(#[from] ed25519::Error),
-}
-
-impl From<ed25519::Signature> for Signature {
-    fn from(other: ed25519::Signature) -> Self {
-        Self(other)
-    }
-}
-
-impl FromStr for Signature {
-    type Err = SignatureError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let (_, bytes) = multibase::decode(s)?;
-        let sig = ed25519::Signature::from_slice(bytes.as_slice())?;
-
-        Ok(Self(sig))
-    }
-}
-
-impl Deref for Signature {
-    type Target = ed25519::Signature;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl From<[u8; 64]> for Signature {
-    fn from(bytes: [u8; 64]) -> Self {
-        Self(ed25519::Signature::new(bytes))
-    }
-}
-
-impl TryFrom<&[u8]> for Signature {
-    type Error = ed25519::Error;
-
-    fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
-        ed25519::Signature::from_slice(bytes).map(Self)
-    }
-}
-
-impl From<Signature> for String {
-    fn from(s: Signature) -> Self {
-        s.to_string()
-    }
-}
-
-impl TryFrom<String> for Signature {
-    type Error = SignatureError;
-
-    fn try_from(s: String) -> Result<Self, Self::Error> {
-        Self::from_str(&s)
-    }
-}
-
-/// The public/verification key.
-#[derive(Hash, Serialize, Deserialize, PartialEq, Eq, Copy, Clone)]
-#[serde(into = "String", try_from = "String")]
-pub struct PublicKey(pub ed25519::PublicKey);
-
-#[cfg(feature = "cyphernet")]
-impl cyphernet::display::MultiDisplay<cyphernet::display::Encoding> for PublicKey {
-    type Display = String;
-
-    fn display_fmt(&self, _: &cyphernet::display::Encoding) -> Self::Display {
-        self.to_string()
-    }
-}
-
-#[cfg(feature = "ssh")]
-impl From<PublicKey> for ssh_key::PublicKey {
-    fn from(key: PublicKey) -> Self {
-        ssh_key::PublicKey::from(ssh_key::public::Ed25519PublicKey(**key))
-    }
-}
-
-#[cfg(feature = "cyphernet")]
-impl cyphernet::EcPk for PublicKey {
-    const COMPRESSED_LEN: usize = 32;
-    const CURVE_NAME: &'static str = "Edwards25519";
-
-    type Compressed = [u8; 32];
-
-    fn base_point() -> Self {
-        unimplemented!()
-    }
-
-    fn to_pk_compressed(&self) -> Self::Compressed {
-        *self.0.deref()
-    }
-
-    fn from_pk_compressed(pk: Self::Compressed) -> Result<Self, cyphernet::EcPkInvalid> {
-        Ok(PublicKey::from(pk))
-    }
-
-    fn from_pk_compressed_slice(slice: &[u8]) -> Result<Self, cyphernet::EcPkInvalid> {
-        ed25519::PublicKey::from_slice(slice)
-            .map_err(|_| cyphernet::EcPkInvalid::default())
-            .map(Self)
-    }
-}
-
-/// The private/signing key.
-#[derive(Clone, Debug, Eq, PartialEq, Hash)]
-pub struct SecretKey(ed25519::SecretKey);
-
-impl SecretKey {
-    /// Elliptic-curve Diffie-Hellman.
-    pub fn ecdh(&self, pk: &PublicKey) -> Result<[u8; 32], ed25519::Error> {
-        let scalar = self.seed().scalar();
-        let ge = edwards25519::GeP3::from_bytes_vartime(pk).ok_or(Error::InvalidPublicKey)?;
-
-        Ok(edwards25519::ge_scalarmult(&scalar, &ge).to_bytes())
-    }
-}
-
-impl PartialOrd for SecretKey {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for SecretKey {
-    fn cmp(&self, other: &Self) -> Ordering {
-        self.0.cmp(&other.0)
-    }
-}
-
-impl zeroize::Zeroize for SecretKey {
-    fn zeroize(&mut self) {
-        self.0.zeroize();
-    }
-}
-
-impl TryFrom<&[u8]> for SecretKey {
-    type Error = ed25519::Error;
-
-    fn try_from(bytes: &[u8]) -> Result<Self, ed25519::Error> {
-        ed25519::SecretKey::from_slice(bytes).map(Self)
-    }
-}
-
-impl AsRef<[u8]> for SecretKey {
-    fn as_ref(&self) -> &[u8] {
-        &*self.0
-    }
-}
-
-impl From<[u8; 64]> for SecretKey {
-    fn from(bytes: [u8; 64]) -> Self {
-        Self(ed25519::SecretKey::new(bytes))
-    }
-}
-
-impl From<ed25519::SecretKey> for SecretKey {
-    fn from(other: ed25519::SecretKey) -> Self {
-        Self(other)
-    }
-}
-
-impl From<SecretKey> for ed25519::SecretKey {
-    fn from(other: SecretKey) -> Self {
-        other.0
-    }
-}
-
-impl Deref for SecretKey {
-    type Target = ed25519::SecretKey;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-#[derive(Error, Debug)]
-pub enum PublicKeyError {
-    #[error("invalid length {0}")]
-    InvalidLength(usize),
-    #[error("invalid multibase string: {0}")]
-    Multibase(#[from] multibase::Error),
-    #[error("invalid multicodec prefix, expected {0:?}")]
-    Multicodec([u8; 2]),
-    #[error("invalid key: {0}")]
-    InvalidKey(#[from] ed25519::Error),
-}
-
-impl PartialOrd for PublicKey {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for PublicKey {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        self.0.as_ref().cmp(other.as_ref())
-    }
-}
-
-impl fmt::Display for PublicKey {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.to_human())
-    }
-}
-
-impl From<PublicKey> for String {
-    fn from(other: PublicKey) -> Self {
-        other.to_human()
-    }
-}
-
-impl fmt::Debug for PublicKey {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "PublicKey({self})")
-    }
-}
-
-impl From<ed25519::PublicKey> for PublicKey {
-    fn from(other: ed25519::PublicKey) -> Self {
-        Self(other)
-    }
-}
-
-impl From<[u8; 32]> for PublicKey {
-    fn from(other: [u8; 32]) -> Self {
-        Self(ed25519::PublicKey::new(other))
-    }
-}
-
-impl TryFrom<&[u8]> for PublicKey {
-    type Error = ed25519::Error;
-
-    fn try_from(other: &[u8]) -> Result<Self, Self::Error> {
-        ed25519::PublicKey::from_slice(other).map(Self)
-    }
-}
-
-impl PublicKey {
-    /// Multicodec key type for Ed25519 keys.
-    pub const MULTICODEC_TYPE: [u8; 2] = [0xED, 0x1];
-
-    /// Encode public key in human-readable format.
-    ///
-    /// `MULTIBASE(base58-btc, MULTICODEC(public-key-type, raw-public-key-bytes))`
-    ///
-    pub fn to_human(&self) -> String {
-        let mut buf = [0; 2 + ed25519::PublicKey::BYTES];
-        buf[..2].copy_from_slice(&Self::MULTICODEC_TYPE);
-        buf[2..].copy_from_slice(self.0.deref());
-
-        multibase::encode(multibase::Base::Base58Btc, buf)
-    }
-
-    #[cfg(feature = "radicle-git-ext")]
-    pub fn to_namespace(&self) -> radicle_git_ext::ref_format::RefString {
-        use radicle_git_ext::ref_format::{refname, Component};
-        refname!("refs/namespaces").join(Component::from(self))
-    }
-
-    #[cfg(feature = "radicle-git-ext")]
-    pub fn to_component(&self) -> radicle_git_ext::ref_format::Component {
-        radicle_git_ext::ref_format::Component::from(self)
-    }
-
-    #[cfg(feature = "radicle-git-ext")]
-    pub fn from_namespaced(
-        refstr: &radicle_git_ext::ref_format::Namespaced,
-    ) -> Result<Self, PublicKeyError> {
-        let name = refstr.namespace().into_inner();
-
-        Self::from_str(name.deref().as_str())
-    }
-}
-
-impl FromStr for PublicKey {
-    type Err = PublicKeyError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let (_, bytes) = multibase::decode(s)?;
-
-        if let Some(bytes) = bytes.strip_prefix(&Self::MULTICODEC_TYPE) {
-            let key = ed25519::PublicKey::from_slice(bytes)?;
-
-            Ok(Self(key))
-        } else {
-            Err(PublicKeyError::Multicodec(Self::MULTICODEC_TYPE))
-        }
-    }
-}
-
-impl TryFrom<String> for PublicKey {
-    type Error = PublicKeyError;
-
-    fn try_from(value: String) -> Result<Self, Self::Error> {
-        Self::from_str(&value)
-    }
-}
-
-impl Deref for PublicKey {
-    type Target = ed25519::PublicKey;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-#[cfg(feature = "radicle-git-ext")]
-impl<'a> From<&PublicKey> for radicle_git_ext::ref_format::Component<'a> {
-    fn from(id: &PublicKey) -> Self {
-        use radicle_git_ext::ref_format::{Component, RefString};
-        let refstr =
-            RefString::try_from(id.to_string()).expect("encoded public keys are valid ref strings");
-        Component::from_refstr(refstr).expect("encoded public keys are valid refname components")
-    }
-}
-
-#[cfg(feature = "sqlite")]
-impl From<&PublicKey> for sqlite::Value {
-    fn from(pk: &PublicKey) -> Self {
-        sqlite::Value::String(pk.to_human())
-    }
-}
-
-#[cfg(feature = "sqlite")]
-impl TryFrom<&sqlite::Value> for PublicKey {
-    type Error = sqlite::Error;
-
-    fn try_from(value: &sqlite::Value) -> Result<Self, Self::Error> {
-        match value {
-            sqlite::Value::String(s) => Self::from_str(s).map_err(|e| sqlite::Error {
-                code: None,
-                message: Some(e.to_string()),
-            }),
-            _ => Err(sqlite::Error {
-                code: None,
-                message: Some("sql: invalid type for public key".to_owned()),
-            }),
-        }
-    }
-}
-
-#[cfg(feature = "sqlite")]
-impl sqlite::BindableWithIndex for &PublicKey {
-    fn bind<I: sqlite::ParameterIndex>(
-        self,
-        stmt: &mut sqlite::Statement<'_>,
-        i: I,
-    ) -> sqlite::Result<()> {
-        sqlite::Value::from(self).bind(stmt, i)
-    }
-}
-
-#[cfg(feature = "sqlite")]
-impl From<&Signature> for sqlite::Value {
-    fn from(sig: &Signature) -> Self {
-        sqlite::Value::Binary(sig.to_vec())
-    }
-}
-
-#[cfg(feature = "sqlite")]
-impl TryFrom<&sqlite::Value> for Signature {
-    type Error = sqlite::Error;
-
-    fn try_from(value: &sqlite::Value) -> Result<Self, Self::Error> {
-        match value {
-            sqlite::Value::Binary(s) => ed25519::Signature::from_slice(s)
-                .map_err(|e| sqlite::Error {
-                    code: None,
-                    message: Some(e.to_string()),
-                })
-                .map(Self),
-            _ => Err(sqlite::Error {
-                code: None,
-                message: Some("sql: invalid column type for signature".to_owned()),
-            }),
-        }
-    }
-}
-
-#[cfg(feature = "sqlite")]
-impl sqlite::BindableWithIndex for &Signature {
-    fn bind<I: sqlite::ParameterIndex>(
-        self,
-        stmt: &mut sqlite::Statement<'_>,
-        i: I,
-    ) -> sqlite::Result<()> {
-        sqlite::Value::from(self).bind(stmt, i)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::KeyPair;
-    use crate::{PublicKey, SecretKey};
-    use qcheck_macros::quickcheck;
-    use std::str::FromStr;
-
-    #[test]
-    fn test_e25519_dh() {
-        let kp_a = KeyPair::generate();
-        let kp_b = KeyPair::generate();
-
-        let output_a = SecretKey::from(kp_b.sk).ecdh(&kp_a.pk.into()).unwrap();
-        let output_b = SecretKey::from(kp_a.sk).ecdh(&kp_b.pk.into()).unwrap();
-
-        assert_eq!(output_a, output_b);
-    }
-
-    #[quickcheck]
-    fn prop_encode_decode(input: PublicKey) {
-        let encoded = input.to_string();
-        let decoded = PublicKey::from_str(&encoded).unwrap();
-
-        assert_eq!(input, decoded);
-    }
-
-    #[test]
-    fn test_encode_decode() {
-        let input = "z6MkhaXgBZDvotDkL5257faiztiGiC2QtKLGpbnnEGta2doK";
-        let key = PublicKey::from_str(input).unwrap();
-
-        assert_eq!(key.to_string(), input);
-    }
-
-    #[quickcheck]
-    fn prop_key_equality(a: PublicKey, b: PublicKey) {
-        use std::collections::HashSet;
-
-        assert_ne!(a, b);
-
-        let mut hm = HashSet::new();
-
-        assert!(hm.insert(a));
-        assert!(hm.insert(b));
-        assert!(!hm.insert(a));
-        assert!(!hm.insert(b));
-    }
-}
diff --git a/radicle-crypto/src/ssh.rs b/radicle-crypto/src/ssh.rs
deleted file mode 100644
index 1f7e7e54d..000000000
--- a/radicle-crypto/src/ssh.rs
+++ /dev/null
@@ -1,341 +0,0 @@
-pub mod agent;
-pub mod keystore;
-
-use std::io;
-
-use thiserror::Error;
-
-use radicle_ssh::encoding;
-use radicle_ssh::encoding::Encodable;
-use radicle_ssh::encoding::Encoding;
-use radicle_ssh::encoding::Reader;
-
-use crate as crypto;
-use crate::PublicKey;
-
-pub use keystore::{Keystore, Passphrase};
-
-#[derive(Debug, Error)]
-pub enum ExtendedSignatureError {
-    #[error(transparent)]
-    Ssh(#[from] ssh_key::Error),
-    #[error(transparent)]
-    Crypto(#[from] crypto::Error),
-    #[error("unsupported signature algorithm")]
-    UnsupportedAlgorithm,
-}
-
-/// Signature with public key, used for SSH signing.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct ExtendedSignature {
-    pub key: crypto::PublicKey,
-    pub sig: crypto::Signature,
-}
-
-impl ExtendedSignature {
-    /// Create a new extended signature.
-    pub fn new(public_key: crypto::PublicKey, signature: crypto::Signature) -> Self {
-        Self {
-            key: public_key,
-            sig: signature,
-        }
-    }
-
-    /// Convert to OpenSSH standard PEM format.
-    pub fn to_pem(&self) -> Result<String, ExtendedSignatureError> {
-        ssh_key::SshSig::new(
-            ssh_key::public::KeyData::from(ssh_key::public::Ed25519PublicKey(**self.key)),
-            String::from("radicle"),
-            ssh_key::HashAlg::Sha256,
-            ssh_key::Signature::new(ssh_key::Algorithm::Ed25519, **self.sig)?,
-        )?
-        .to_pem(ssh_key::LineEnding::default())
-        .map_err(ExtendedSignatureError::from)
-    }
-
-    /// Create from OpenSSH PEM format.
-    pub fn from_pem(pem: impl AsRef<[u8]>) -> Result<Self, ExtendedSignatureError> {
-        let sig = ssh_key::SshSig::from_pem(pem)?;
-
-        Ok(Self {
-            key: crypto::PublicKey::from(
-                sig.public_key()
-                    .ed25519()
-                    .ok_or(ExtendedSignatureError::UnsupportedAlgorithm)?
-                    .0,
-            ),
-            sig: crypto::Signature::try_from(sig.signature().as_bytes())?,
-        })
-    }
-
-    /// Verify the signature for a given payload.
-    pub fn verify(&self, payload: &[u8]) -> bool {
-        self.key.verify(payload, &self.sig).is_ok()
-    }
-}
-
-pub mod fmt {
-    use crate::PublicKey;
-
-    /// Get the SSH long key from a public key.
-    /// This is the output of `ssh-add -L`.
-    pub fn key(key: &PublicKey) -> String {
-        ssh_key::PublicKey::from(*key).to_string()
-    }
-
-    /// Get the SSH key fingerprint from a public key.
-    /// This is the output of `ssh-add -l`.
-    pub fn fingerprint(key: &PublicKey) -> String {
-        ssh_key::PublicKey::from(*key)
-            .fingerprint(Default::default())
-            .to_string()
-    }
-
-    #[cfg(test)]
-    mod test {
-        use std::str::FromStr;
-
-        use super::*;
-        use crate::PublicKey;
-
-        #[test]
-        fn test_key() {
-            let pk =
-                PublicKey::from_str("z6MktWkM9vcfysWFq1c2aaLjJ6j4PYYg93TLPswR4qtuoAeT").unwrap();
-
-            assert_eq!(
-                key(&pk),
-                "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINDoXIrhcnRjnLGUXUFdxhkuy08lkTOwrj2IoGsEX6+Q"
-            );
-        }
-
-        #[test]
-        fn test_fingerprint() {
-            let pk =
-                PublicKey::from_str("z6MktWkM9vcfysWFq1c2aaLjJ6j4PYYg93TLPswR4qtuoAeT").unwrap();
-            assert_eq!(
-                fingerprint(&pk),
-                "SHA256:gE/Ty4fuXzww49lcnNe9/GI0L7xSEQdFp/v9tOjFwB4"
-            );
-        }
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum SignatureError {
-    #[error(transparent)]
-    Invalid(#[from] crypto::Error),
-    #[error(transparent)]
-    Encoding(#[from] encoding::Error),
-    #[error("unknown algorithm '{0}'")]
-    UnknownAlgorithm(String),
-}
-
-impl Encodable for crypto::Signature {
-    type Error = SignatureError;
-
-    fn read(r: &mut encoding::Cursor) -> Result<Self, Self::Error> {
-        let buf = r.read_string()?;
-        let mut inner_strs = buf.reader(0);
-
-        let sig_type = inner_strs.read_string()?;
-        if sig_type != b"ssh-ed25519" {
-            return Err(SignatureError::UnknownAlgorithm(
-                String::from_utf8_lossy(sig_type).to_string(),
-            ));
-        }
-        let sig = crypto::Signature::try_from(inner_strs.read_string()?)?;
-
-        Ok(sig)
-    }
-
-    fn write<E: Encoding>(&self, buf: &mut E) {
-        let mut inner_strs = Vec::new();
-        inner_strs.extend_ssh_string(b"ssh-ed25519");
-        inner_strs.extend_ssh_string(self.as_ref());
-        buf.extend_ssh_string(&inner_strs);
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum PublicKeyError {
-    #[error(transparent)]
-    Invalid(#[from] crypto::Error),
-    #[error(transparent)]
-    Encoding(#[from] encoding::Error),
-    #[error("unknown algorithm '{0}'")]
-    UnknownAlgorithm(String),
-}
-
-impl Encodable for PublicKey {
-    type Error = PublicKeyError;
-
-    fn read(r: &mut encoding::Cursor) -> Result<Self, Self::Error> {
-        match r.read_string()? {
-            b"ssh-ed25519" => {
-                let s = r.read_string()?;
-                let p = PublicKey::try_from(s)?;
-
-                Ok(p)
-            }
-            v => Err(PublicKeyError::UnknownAlgorithm(
-                String::from_utf8_lossy(v).to_string(),
-            )),
-        }
-    }
-
-    fn write<E: Encoding>(&self, w: &mut E) {
-        let mut str_w: Vec<u8> = Vec::<u8>::new();
-        str_w.extend_ssh_string(b"ssh-ed25519");
-        str_w.extend_ssh_string(&self[..]);
-        w.extend_ssh_string(&str_w)
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum SecretKeyError {
-    #[error(transparent)]
-    Encoding(#[from] encoding::Error),
-    #[error(transparent)]
-    Crypto(#[from] crypto::Error),
-    #[error(transparent)]
-    Io(#[from] io::Error),
-    #[error("unknown algorithm '{0}'")]
-    UnknownAlgorithm(String),
-    #[error("public key does not match secret key")]
-    Mismatch,
-}
-
-impl Encodable for crypto::SecretKey {
-    type Error = SecretKeyError;
-
-    fn read(r: &mut encoding::Cursor) -> Result<Self, Self::Error> {
-        match r.read_string()? {
-            b"ssh-ed25519" => {
-                let public = r.read_string()?;
-                let pair = r.read_string()?;
-                let _comment = r.read_string()?;
-                let key = crypto::SecretKey::try_from(pair)?;
-
-                if public != key.public_key().as_ref() {
-                    return Err(SecretKeyError::Mismatch);
-                }
-                Ok(key)
-            }
-            s => Err(SecretKeyError::UnknownAlgorithm(
-                String::from_utf8_lossy(s).to_string(),
-            )),
-        }
-    }
-
-    fn write<E: Encoding>(&self, buf: &mut E) {
-        let public = self.0.public_key();
-
-        buf.extend_ssh_string(b"ssh-ed25519");
-        buf.extend_ssh_string(public.as_ref());
-        buf.extend_ssh_string(self.0.as_ref());
-        buf.extend_ssh_string(b"radicle");
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use std::sync::{Arc, Mutex};
-
-    use qcheck_macros::quickcheck;
-
-    use crate as crypto;
-    use crate::{PublicKey, SecretKey};
-    use radicle_ssh::agent::client::{AgentClient, ClientStream, Error};
-    use radicle_ssh::encoding::*;
-
-    #[derive(Clone, Default)]
-    struct DummyStream {
-        incoming: Arc<Mutex<Vec<u8>>>,
-    }
-
-    impl ClientStream for DummyStream {
-        fn connect<P>(_path: P) -> Result<AgentClient<Self>, Error>
-        where
-            P: AsRef<std::path::Path> + Send,
-        {
-            panic!("This function should never be called!")
-        }
-
-        fn request(&mut self, buf: &[u8]) -> Result<Buffer, Error> {
-            *self.incoming.lock().unwrap() = buf.to_vec();
-
-            Ok(Buffer::default())
-        }
-    }
-
-    #[quickcheck]
-    fn prop_encode_decode_sk(input: [u8; 64]) {
-        let mut buf = Buffer::default();
-        let sk = crypto::SecretKey::from(input);
-        sk.write(&mut buf);
-
-        let mut cursor = buf.reader(0);
-        let output = SecretKey::read(&mut cursor).unwrap();
-
-        assert_eq!(sk, output);
-    }
-
-    #[test]
-    fn test_agent_encoding_remove() {
-        use std::str::FromStr;
-
-        let pk = PublicKey::from_str("z6MktWkM9vcfysWFq1c2aaLjJ6j4PYYg93TLPswR4qtuoAeT").unwrap();
-        let expected = [
-            0, 0, 0, 56, // Message length
-            18, // Message type (remove identity)
-            0, 0, 0, 51, // Key blob length
-            0, 0, 0, 11, // Key type length
-            115, 115, 104, 45, 101, 100, 50, 53, 53, 49, 57, // Key type
-            0, 0, 0, 32, // Key length
-            208, 232, 92, 138, 225, 114, 116, 99, 156, 177, 148, 93, 65, 93, 198, 25, 46, 203, 79,
-            37, 145, 51, 176, 174, 61, 136, 160, 107, 4, 95, 175, 144, // Key
-        ];
-
-        let stream = DummyStream::default();
-        let mut agent = AgentClient::connect(stream.clone());
-
-        agent.remove_identity(&pk).unwrap();
-
-        assert_eq!(
-            stream.incoming.lock().unwrap().as_slice(),
-            expected.as_slice()
-        );
-    }
-
-    #[test]
-    fn test_agent_encoding_sign() {
-        use std::str::FromStr;
-
-        let pk = PublicKey::from_str("z6MktWkM9vcfysWFq1c2aaLjJ6j4PYYg93TLPswR4qtuoAeT").unwrap();
-        let expected = [
-            0, 0, 0, 73, // Message length
-            13, // Message type (sign request)
-            0, 0, 0, 51, // Key blob length
-            0, 0, 0, 11, // Key type length
-            115, 115, 104, 45, 101, 100, 50, 53, 53, 49, 57, // Key type
-            0, 0, 0, 32, // Public key
-            208, 232, 92, 138, 225, 114, 116, 99, 156, 177, 148, 93, 65, 93, 198, 25, 46, 203, 79,
-            37, 145, 51, 176, 174, 61, 136, 160, 107, 4, 95, 175, 144, // Key
-            0, 0, 0, 9, // Length of data to sign
-            1, 2, 3, 4, 5, 6, 7, 8, 9, // Data to sign
-            0, 0, 0, 0, // Signature flags
-        ];
-
-        let stream = DummyStream::default();
-        let mut agent = AgentClient::connect(stream.clone());
-        let data: Vec<u8> = vec![1, 2, 3, 4, 5, 6, 7, 8, 9];
-
-        agent.sign(&pk, &data).ok();
-
-        assert_eq!(
-            stream.incoming.lock().unwrap().as_slice(),
-            expected.as_slice()
-        );
-    }
-}
diff --git a/radicle-crypto/src/ssh/agent.rs b/radicle-crypto/src/ssh/agent.rs
deleted file mode 100644
index 6f3d9854c..000000000
--- a/radicle-crypto/src/ssh/agent.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-use std::ops::{Deref, DerefMut};
-use std::sync::Mutex;
-
-pub use radicle_ssh::agent::client::AgentClient;
-pub use radicle_ssh::agent::client::Error;
-pub use radicle_ssh::{self as ssh, agent::client::ClientStream};
-
-use crate::{PublicKey, SecretKey, Signature, Signer, SignerError};
-
-#[cfg(not(unix))]
-pub use std::net::TcpStream as Stream;
-#[cfg(unix)]
-pub use std::os::unix::net::UnixStream as Stream;
-
-pub struct Agent {
-    client: AgentClient<Stream>,
-}
-
-impl Agent {
-    /// Connect to a running SSH agent.
-    pub fn connect() -> Result<Self, ssh::agent::client::Error> {
-        Stream::connect_env().map(|client| Self { client })
-    }
-
-    /// Register a key with the agent.
-    pub fn register(&mut self, key: &SecretKey) -> Result<(), ssh::Error> {
-        self.client.add_identity(key, &[])
-    }
-
-    /// Get a signer from this agent, given the public key.
-    pub fn signer(self, key: PublicKey) -> AgentSigner {
-        AgentSigner::new(self, key)
-    }
-}
-
-impl Deref for Agent {
-    type Target = AgentClient<Stream>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.client
-    }
-}
-
-impl DerefMut for Agent {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.client
-    }
-}
-
-/// A [`Signer`] that uses `ssh-agent`.
-pub struct AgentSigner {
-    agent: Mutex<Agent>,
-    public: PublicKey,
-}
-
-impl AgentSigner {
-    pub fn new(agent: Agent, public: PublicKey) -> Self {
-        let agent = Mutex::new(agent);
-
-        Self { agent, public }
-    }
-
-    pub fn is_ready(&self) -> Result<bool, Error> {
-        let ids = self.agent.lock().unwrap().request_identities()?;
-
-        Ok(ids.contains(&self.public))
-    }
-
-    /// Box this signer into a [`Signer`].
-    pub fn boxed(self) -> Box<dyn Signer> {
-        Box::new(self)
-    }
-}
-
-impl Signer for AgentSigner {
-    fn public_key(&self) -> &PublicKey {
-        &self.public
-    }
-
-    fn sign(&self, msg: &[u8]) -> Signature {
-        self.try_sign(msg).unwrap()
-    }
-
-    fn try_sign(&self, msg: &[u8]) -> Result<Signature, SignerError> {
-        let sig = self
-            .agent
-            .lock()
-            // We'll take our chances here; the worse that can happen is the agent returns an error.
-            .unwrap_or_else(|e| e.into_inner())
-            .sign(&self.public, msg)
-            .map_err(SignerError::new)?;
-
-        Ok(Signature::from(sig))
-    }
-}
diff --git a/radicle-crypto/src/ssh/keystore.rs b/radicle-crypto/src/ssh/keystore.rs
deleted file mode 100644
index d7dfdd869..000000000
--- a/radicle-crypto/src/ssh/keystore.rs
+++ /dev/null
@@ -1,343 +0,0 @@
-use std::ops::Deref;
-use std::os::unix::fs::DirBuilderExt;
-use std::path::{Path, PathBuf};
-use std::{fs, io};
-
-#[cfg(feature = "cyphernet")]
-use cyphernet::{EcSk, EcSkInvalid, Ecdh};
-use thiserror::Error;
-use zeroize::Zeroizing;
-
-use crate::{KeyPair, PublicKey, SecretKey, Signature, Signer, SignerError};
-
-/// A secret key passphrase.
-pub type Passphrase = Zeroizing<String>;
-
-#[derive(Debug, Error)]
-pub enum Error {
-    #[error(transparent)]
-    Io(#[from] io::Error),
-    #[error("ssh keygen: {0}")]
-    Ssh(#[from] ssh_key::Error),
-    #[error("invalid key type, expected ed25519 key")]
-    InvalidKeyType,
-    #[error("keystore already initialized")]
-    AlreadyInitialized,
-    #[error("keystore is encrypted; a passphrase is required")]
-    PassphraseMissing,
-}
-
-impl Error {
-    /// Check if it's a decryption error.
-    pub fn is_crypto_err(&self) -> bool {
-        matches!(self, Self::Ssh(ssh_key::Error::Crypto))
-    }
-}
-
-/// Stores keys on disk, in OpenSSH format.
-#[derive(Debug, Clone)]
-pub struct Keystore {
-    path: PathBuf,
-}
-
-impl Keystore {
-    /// Create a new keystore pointing to the given path. Use [`Keystore::init`] to initialize.
-    pub fn new<P: AsRef<Path>>(path: &P) -> Self {
-        Self {
-            path: path.as_ref().to_path_buf(),
-        }
-    }
-
-    /// Get the path to the keystore.
-    pub fn path(&self) -> &Path {
-        self.path.as_path()
-    }
-
-    /// Initialize a keystore by generating a key pair and storing the secret and public key
-    /// at the given path.
-    ///
-    /// The `comment` is associated with the private key.
-    /// The `passphrase` is used to encrypt the private key.
-    /// The `seed` is used to derive the private key and should almost always be generated.
-    ///
-    /// If `passphrase` is `None`, the key is not encrypted.
-    pub fn init(
-        &self,
-        comment: &str,
-        passphrase: Option<Passphrase>,
-        seed: ec25519::Seed,
-    ) -> Result<PublicKey, Error> {
-        self.store(KeyPair::from_seed(seed), comment, passphrase)
-    }
-
-    /// Store a keypair on disk. Returns an error if the key already exists.
-    pub fn store(
-        &self,
-        keypair: KeyPair,
-        comment: &str,
-        passphrase: Option<Passphrase>,
-    ) -> Result<PublicKey, Error> {
-        let ssh_pair = ssh_key::private::Ed25519Keypair::from_bytes(&keypair)?;
-        let ssh_pair = ssh_key::private::KeypairData::Ed25519(ssh_pair);
-        let secret = ssh_key::PrivateKey::new(ssh_pair, comment)?;
-        let secret = if let Some(p) = passphrase {
-            secret.encrypt(&mut ssh_key::rand_core::OsRng, p)?
-        } else {
-            secret
-        };
-        let public = secret.public_key();
-        let path = self.path.join("radicle");
-
-        if path.exists() {
-            return Err(Error::AlreadyInitialized);
-        }
-
-        fs::DirBuilder::new()
-            .recursive(true)
-            .mode(0o700)
-            .create(&self.path)?;
-
-        secret.write_openssh_file(&path, ssh_key::LineEnding::default())?;
-        public.write_openssh_file(&path.with_extension("pub"))?;
-
-        Ok(keypair.pk.into())
-    }
-
-    /// Load the public key from the store. Returns `None` if it wasn't found.
-    pub fn public_key(&self) -> Result<Option<PublicKey>, Error> {
-        let path = self.path.join("radicle.pub");
-        if !path.exists() {
-            return Ok(None);
-        }
-
-        let public = ssh_key::PublicKey::read_openssh_file(&path)?;
-        match public.try_into() {
-            Ok(public) => Ok(Some(public)),
-            _ => Err(Error::InvalidKeyType),
-        }
-    }
-
-    /// Load the secret key from the store, decrypting it with the given passphrase.
-    /// Returns `None` if it wasn't found.
-    pub fn secret_key(
-        &self,
-        passphrase: Option<Passphrase>,
-    ) -> Result<Option<Zeroizing<SecretKey>>, Error> {
-        let path = self.path.join("radicle");
-        if !path.exists() {
-            return Ok(None);
-        }
-
-        let secret = ssh_key::PrivateKey::read_openssh_file(&path)?;
-        let secret = if let Some(p) = passphrase {
-            secret.decrypt(p)?
-        } else if secret.is_encrypted() {
-            return Err(Error::PassphraseMissing);
-        } else {
-            secret
-        };
-        match secret.key_data() {
-            ssh_key::private::KeypairData::Ed25519(pair) => {
-                Ok(Some(SecretKey::from(pair.to_bytes()).into()))
-            }
-            _ => Err(Error::InvalidKeyType),
-        }
-    }
-
-    /// Check that the passphrase is valid.
-    pub fn is_valid_passphrase(&self, passphrase: &Passphrase) -> Result<bool, Error> {
-        let path = self.path.join("radicle");
-        if !path.exists() {
-            return Err(Error::Io(io::ErrorKind::NotFound.into()));
-        }
-
-        let secret = ssh_key::PrivateKey::read_openssh_file(&path)?;
-        let valid = secret.decrypt(passphrase).is_ok();
-
-        Ok(valid)
-    }
-
-    /// Check whether the secret key is encrypted.
-    pub fn is_encrypted(&self) -> Result<bool, Error> {
-        let path = self.path.join("radicle");
-        let secret = ssh_key::PrivateKey::read_openssh_file(&path)?;
-
-        Ok(secret.is_encrypted())
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum MemorySignerError {
-    #[error(transparent)]
-    Keystore(#[from] Error),
-    #[error("key not found in '{0}'")]
-    NotFound(PathBuf),
-    #[error("invalid passphrase")]
-    InvalidPassphrase,
-}
-
-/// An in-memory signer that keeps its secret key internally
-/// so that signing never fails.
-///
-/// Can be created from a [`Keystore`] with the [`MemorySigner::load`] function.
-#[derive(Debug, PartialEq, Eq, Clone)]
-pub struct MemorySigner {
-    public: PublicKey,
-    secret: Zeroizing<SecretKey>,
-}
-
-impl Signer for MemorySigner {
-    fn public_key(&self) -> &PublicKey {
-        &self.public
-    }
-
-    fn sign(&self, msg: &[u8]) -> Signature {
-        Signature(self.secret.deref().deref().sign(msg, None))
-    }
-
-    fn try_sign(&self, msg: &[u8]) -> Result<Signature, SignerError> {
-        Ok(Signer::sign(self, msg))
-    }
-}
-
-#[cfg(feature = "cyphernet")]
-impl EcSk for MemorySigner {
-    type Pk = PublicKey;
-
-    fn generate_keypair() -> (Self, Self::Pk)
-    where
-        Self: Sized,
-    {
-        let ms = Self::gen();
-        let pk = ms.public;
-
-        (ms, pk)
-    }
-
-    fn to_pk(&self) -> Result<Self::Pk, EcSkInvalid> {
-        Ok(self.public)
-    }
-}
-
-#[cfg(feature = "cyphernet")]
-impl Ecdh for MemorySigner {
-    type SharedSecret = [u8; 32];
-
-    fn ecdh(&self, pk: &Self::Pk) -> Result<Self::SharedSecret, cyphernet::EcdhError> {
-        self.secret.ecdh(pk).map_err(cyphernet::EcdhError::from)
-    }
-}
-
-impl MemorySigner {
-    /// Load this signer from a keystore, given a secret key passphrase.
-    pub fn load(
-        keystore: &Keystore,
-        passphrase: Option<Passphrase>,
-    ) -> Result<Self, MemorySignerError> {
-        let public = keystore
-            .public_key()?
-            .ok_or_else(|| MemorySignerError::NotFound(keystore.path().to_path_buf()))?;
-        let secret = keystore
-            .secret_key(passphrase)
-            .map_err(|e| {
-                if e.is_crypto_err() {
-                    MemorySignerError::InvalidPassphrase
-                } else {
-                    e.into()
-                }
-            })?
-            .ok_or_else(|| MemorySignerError::NotFound(keystore.path().to_path_buf()))?;
-
-        Ok(Self { public, secret })
-    }
-
-    /// Box this signer into a trait object.
-    pub fn boxed(self) -> Box<dyn Signer> {
-        Box::new(self)
-    }
-
-    /// Generate a new memory signer.
-    pub fn gen() -> Self {
-        let keypair = KeyPair::generate();
-        let sk = keypair.sk;
-
-        Self {
-            public: sk.public_key().into(),
-            secret: Zeroizing::new(sk.into()),
-        }
-    }
-}
-
-impl TryFrom<ssh_key::PublicKey> for PublicKey {
-    type Error = Error;
-
-    fn try_from(public: ssh_key::PublicKey) -> Result<Self, Self::Error> {
-        match public.key_data() {
-            ssh_key::public::KeyData::Ed25519(ssh_key::public::Ed25519PublicKey(data)) => {
-                Ok(Self::from(*data))
-            }
-            _ => Err(Error::InvalidKeyType),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_init_passphrase() {
-        let tmp = tempfile::tempdir().unwrap();
-        let store = Keystore::new(&tmp.path());
-
-        let public = store
-            .init(
-                "test",
-                Some("hunter".to_owned().into()),
-                ec25519::Seed::default(),
-            )
-            .unwrap();
-        assert_eq!(public, store.public_key().unwrap().unwrap());
-        assert!(store.is_encrypted().unwrap());
-
-        let secret = store
-            .secret_key(Some("hunter".to_owned().into()))
-            .unwrap()
-            .unwrap();
-        assert_eq!(PublicKey::from(secret.public_key()), public);
-
-        store
-            .secret_key(Some("blunder".to_owned().into()))
-            .unwrap_err(); // Wrong passphrase.
-    }
-
-    #[test]
-    fn test_init_no_passphrase() {
-        let tmp = tempfile::tempdir().unwrap();
-        let store = Keystore::new(&tmp.path());
-
-        let public = store.init("test", None, ec25519::Seed::default()).unwrap();
-        assert_eq!(public, store.public_key().unwrap().unwrap());
-        assert!(!store.is_encrypted().unwrap());
-
-        let secret = store.secret_key(None).unwrap().unwrap();
-        assert_eq!(PublicKey::from(secret.public_key()), public);
-    }
-
-    #[test]
-    fn test_signer() {
-        let tmp = tempfile::tempdir().unwrap();
-        let store = Keystore::new(&tmp.path());
-
-        let public = store
-            .init(
-                "test",
-                Some("hunter".to_owned().into()),
-                ec25519::Seed::default(),
-            )
-            .unwrap();
-        let signer = MemorySigner::load(&store, Some("hunter".to_owned().into())).unwrap();
-
-        assert_eq!(public, *signer.public_key());
-    }
-}
diff --git a/radicle-crypto/src/test.rs b/radicle-crypto/src/test.rs
deleted file mode 100644
index cadc1f12a..000000000
--- a/radicle-crypto/src/test.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod arbitrary;
-pub mod signer;
diff --git a/radicle-crypto/src/test/arbitrary.rs b/radicle-crypto/src/test/arbitrary.rs
deleted file mode 100644
index 452253ac6..000000000
--- a/radicle-crypto/src/test/arbitrary.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use qcheck::Arbitrary;
-
-use crate::{test::signer::MockSigner, KeyPair, PublicKey, SecretKey, Seed};
-
-impl Arbitrary for MockSigner {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let bytes: [u8; 32] = Arbitrary::arbitrary(g);
-        let seed = Seed::new(bytes);
-        let sk = KeyPair::from_seed(seed).sk;
-
-        MockSigner::from(SecretKey::from(sk))
-    }
-}
-
-impl Arbitrary for PublicKey {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let bytes: [u8; 32] = Arbitrary::arbitrary(g);
-        let seed = Seed::new(bytes);
-        let keypair = KeyPair::from_seed(seed);
-
-        PublicKey(keypair.pk)
-    }
-}
diff --git a/radicle-crypto/src/test/signer.rs b/radicle-crypto/src/test/signer.rs
deleted file mode 100644
index 997beb211..000000000
--- a/radicle-crypto/src/test/signer.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-use crate::{KeyPair, PublicKey, SecretKey, Seed, Signature, Signer, SignerError};
-
-#[derive(Debug, Clone)]
-pub struct MockSigner {
-    pk: PublicKey,
-    sk: SecretKey,
-}
-
-impl MockSigner {
-    pub fn new(rng: &mut fastrand::Rng) -> Self {
-        let mut seed: [u8; 32] = [0; 32];
-
-        for byte in &mut seed {
-            *byte = rng.u8(..);
-        }
-        Self::from_seed(seed)
-    }
-
-    pub fn from_seed(seed: [u8; 32]) -> Self {
-        let seed = Seed::new(seed);
-        let keypair = KeyPair::from_seed(seed);
-
-        Self::from(SecretKey::from(keypair.sk))
-    }
-}
-
-impl From<SecretKey> for MockSigner {
-    fn from(sk: SecretKey) -> Self {
-        let pk = sk.public_key().into();
-        Self { sk, pk }
-    }
-}
-
-impl Default for MockSigner {
-    fn default() -> Self {
-        let seed = Seed::generate();
-        let keypair = KeyPair::from_seed(seed);
-        let sk = keypair.sk;
-
-        Self {
-            pk: sk.public_key().into(),
-            sk: sk.into(),
-        }
-    }
-}
-
-impl PartialEq for MockSigner {
-    fn eq(&self, other: &Self) -> bool {
-        self.pk == other.pk
-    }
-}
-
-impl Eq for MockSigner {}
-
-impl std::hash::Hash for MockSigner {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.pk.hash(state)
-    }
-}
-
-impl Signer for MockSigner {
-    fn public_key(&self) -> &PublicKey {
-        &self.pk
-    }
-
-    fn sign(&self, msg: &[u8]) -> Signature {
-        self.sk.sign(msg, None).into()
-    }
-
-    fn try_sign(&self, msg: &[u8]) -> Result<Signature, SignerError> {
-        Ok(self.sign(msg))
-    }
-}
-
-#[cfg(feature = "cyphernet")]
-impl cyphernet::EcSk for MockSigner {
-    type Pk = PublicKey;
-
-    // TODO: Should be renamed to 'generate'.
-    fn generate_keypair() -> (Self, Self::Pk)
-    where
-        Self: Sized,
-    {
-        let kp = Self::default();
-        let pk = kp.pk;
-
-        (kp, pk)
-    }
-
-    fn to_pk(&self) -> Result<Self::Pk, cyphernet::EcSkInvalid> {
-        Ok(self.pk)
-    }
-}
-
-#[cfg(feature = "cyphernet")]
-impl cyphernet::Ecdh for MockSigner {
-    type SharedSecret = [u8; 32];
-
-    fn ecdh(&self, pk: &Self::Pk) -> Result<Self::SharedSecret, cyphernet::EcdhError> {
-        self.sk.ecdh(pk).map_err(|_| cyphernet::EcdhError::WeakPk)
-    }
-}
diff --git a/radicle-dag/Cargo.toml b/radicle-dag/Cargo.toml
deleted file mode 100644
index 0003c2be6..000000000
--- a/radicle-dag/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "radicle-dag"
-description = "Radicle DAG implementation"
-homepage = "https://radicle.xyz"
-repository = "https://app.radicle.xyz/seeds/seed.radicle.xyz/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5"
-license = "MIT OR Apache-2.0"
-authors = ["cloudhead <cloudhead@radicle.xyz>"]
-version = "0.9.0"
-edition = "2021"
-
-[dependencies]
-fastrand = { version = "2.0.0" }
diff --git a/radicle-dag/src/lib.rs b/radicle-dag/src/lib.rs
deleted file mode 100644
index 8c590bffd..000000000
--- a/radicle-dag/src/lib.rs
+++ /dev/null
@@ -1,918 +0,0 @@
-//! Directed-acyclic graph implementation.
-#![warn(missing_docs)]
-use std::{
-    borrow::Borrow,
-    cmp::Ordering,
-    collections::{BTreeMap, BTreeSet, VecDeque},
-    fmt,
-    fmt::Write,
-    ops::{ControlFlow, Deref, Index},
-};
-
-/// A node in the graph.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct Node<K, V> {
-    /// The node key.
-    pub key: K,
-    /// The node value, stored by the user.
-    pub value: V,
-    /// Nodes depended on.
-    pub dependencies: BTreeSet<K>,
-    /// Nodes depending on this node.
-    pub dependents: BTreeSet<K>,
-}
-
-impl<K, V> Node<K, V> {
-    fn new(key: K, value: V) -> Self {
-        Self {
-            key,
-            value,
-            dependencies: BTreeSet::new(),
-            dependents: BTreeSet::new(),
-        }
-    }
-}
-
-impl<K, V> Borrow<V> for &Node<K, V> {
-    fn borrow(&self) -> &V {
-        &self.value
-    }
-}
-
-impl<K, V> Deref for Node<K, V> {
-    type Target = V;
-
-    fn deref(&self) -> &Self::Target {
-        &self.value
-    }
-}
-
-/// A directed acyclic graph.
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
-pub struct Dag<K, V> {
-    graph: BTreeMap<K, Node<K, V>>,
-    tips: BTreeSet<K>,
-    roots: BTreeSet<K>,
-}
-
-impl<K: Ord + Copy, V> Dag<K, V> {
-    /// Create a new empty DAG.
-    pub fn new() -> Self {
-        Self {
-            graph: BTreeMap::new(),
-            tips: BTreeSet::new(),
-            roots: BTreeSet::new(),
-        }
-    }
-
-    /// Create a DAG with a root node.
-    pub fn root(key: K, value: V) -> Self {
-        Self {
-            graph: BTreeMap::from_iter([(key, Node::new(key, value))]),
-            tips: BTreeSet::from_iter([key]),
-            roots: BTreeSet::from_iter([key]),
-        }
-    }
-
-    /// Check whether there are any nodes in the graph.
-    pub fn is_empty(&self) -> bool {
-        self.graph.is_empty()
-    }
-
-    /// Return the number of nodes in the graph.
-    pub fn len(&self) -> usize {
-        self.graph.len()
-    }
-
-    /// Add a node to the graph.
-    pub fn node(&mut self, key: K, value: V) -> Option<Node<K, V>> {
-        self.tips.insert(key);
-        self.roots.insert(key);
-        self.graph.insert(
-            key,
-            Node {
-                key,
-                value,
-                dependencies: BTreeSet::new(),
-                dependents: BTreeSet::new(),
-            },
-        )
-    }
-
-    /// Add a dependency from one node to the other.
-    pub fn dependency(&mut self, from: K, to: K) {
-        if let Some(node) = self.graph.get_mut(&from) {
-            node.dependencies.insert(to);
-            self.roots.remove(&from);
-        }
-        if let Some(node) = self.graph.get_mut(&to) {
-            node.dependents.insert(from);
-            self.tips.remove(&to);
-        }
-    }
-
-    /// Check if the graph contains a node.
-    pub fn contains(&self, key: &K) -> bool {
-        self.graph.contains_key(key)
-    }
-
-    /// Get a node.
-    pub fn get(&self, key: &K) -> Option<&Node<K, V>> {
-        self.graph.get(key)
-    }
-
-    /// Check whether there is a dependency between two nodes.
-    pub fn has_dependency(&self, from: &K, to: &K) -> bool {
-        self.graph
-            .get(from)
-            .map(|n| n.dependencies.contains(to))
-            .unwrap_or_default()
-    }
-
-    /// Get the graph's root nodes, ie. nodes which don't depend on other nodes.
-    pub fn roots(&self) -> impl Iterator<Item = (&K, &Node<K, V>)> + '_ {
-        self.roots
-            .iter()
-            .filter_map(|k| self.graph.get(k).map(|n| (k, n)))
-    }
-
-    /// Get the graph's tip nodes, ie. nodes which aren't depended on by other nodes.
-    pub fn tips(&self) -> impl Iterator<Item = (&K, &Node<K, V>)> + '_ {
-        self.tips
-            .iter()
-            .filter_map(|k| self.graph.get(k).map(|n| (k, n)))
-    }
-
-    /// Merge a DAG into this one.
-    pub fn merge(&mut self, mut other: Self) {
-        let Some((root, _)) = other.roots().next() else {
-            return;
-        };
-        let mut visited = BTreeSet::new();
-        let mut queue = VecDeque::<K>::from([*root]);
-
-        while let Some(next) = queue.pop_front() {
-            if !visited.insert(next) {
-                continue;
-            }
-            if let Some(node) = other.graph.remove(&next) {
-                if !self.contains(&next) {
-                    self.node(next, node.value);
-                }
-                for k in &node.dependents {
-                    self.dependency(*k, next);
-                }
-                for k in &node.dependencies {
-                    self.dependency(next, *k);
-                }
-                queue.extend(node.dependents.iter());
-            }
-        }
-    }
-
-    /// Return a topological ordering of the graph's nodes.
-    pub fn sorted(&self) -> VecDeque<K> {
-        self.sorted_by(Ord::cmp)
-    }
-
-    /// Return a topological ordering of the graph's nodes.
-    /// Uses a comparison function to sort partially ordered nodes.
-    pub fn sorted_by<F>(&self, mut compare: F) -> VecDeque<K>
-    where
-        F: FnMut(&K, &K) -> Ordering,
-    {
-        let mut order = VecDeque::new(); // Stores the topological order.
-        let mut visited = BTreeSet::new(); // Nodes that have been visited.
-        let mut keys = self.graph.keys().collect::<Vec<_>>();
-
-        // The `visit` function builds the list in reverse order, so we counter-act
-        // that here.
-        keys.sort_by(|a, b| compare(a, b).reverse());
-
-        for node in keys {
-            self.visit(node, &mut visited, &mut order);
-        }
-        order
-    }
-
-    /// Fold over the graph in topological order, pruning branches along the way.
-    /// This is a depth-first traversal.
-    ///
-    /// To continue traversing a branch, return [`ControlFlow::Continue`] from the
-    /// filter function. To stop traversal of a branch and prune it,
-    /// return [`ControlFlow::Break`].
-    pub fn prune<F>(&mut self, roots: &[K], mut filter: F)
-    where
-        F: for<'r> FnMut(
-            &'r K,
-            &'r Node<K, V>,
-            Box<dyn Iterator<Item = (&'r K, &'r Node<K, V>)> + 'r>,
-        ) -> ControlFlow<()>,
-    {
-        let mut visited = BTreeSet::new();
-        let mut result = VecDeque::new();
-
-        for root in roots {
-            self.visit(root, &mut visited, &mut result);
-        }
-
-        for next in result {
-            if let Some(node) = self.graph.get(&next) {
-                let siblings = self
-                    .siblings_of(node)
-                    .filter_map(|k| self.graph.get(k))
-                    .map(|node| (&node.key, node));
-
-                match filter(&next, node, Box::new(siblings)) {
-                    ControlFlow::Continue(()) => {}
-                    ControlFlow::Break(()) => {
-                        // When pruning a node, we remove all transitive dependents on
-                        // that node.
-                        self.remove(&next);
-                    }
-                }
-            }
-        }
-    }
-
-    /// Fold over the graph in topological order, skipping certain branches.
-    /// This is a depth-first traversal.
-    ///
-    /// To continue traversing a branch, return [`ControlFlow::Continue`] from the
-    /// filter function. To stop traversal of a branch, return [`ControlFlow::Break`].
-    pub fn fold<A, F>(&self, roots: &[K], mut acc: A, mut filter: F) -> A
-    where
-        F: for<'r> FnMut(A, &'r K, &'r Node<K, V>) -> ControlFlow<A, A>,
-    {
-        let mut visited = BTreeSet::new();
-        let mut result = VecDeque::new();
-        let mut skip = BTreeSet::new();
-
-        assert!(
-            roots.windows(2).all(|w| w[0] < w[1]),
-            "The roots must be sorted in ascending order"
-        );
-
-        for root in roots.iter().rev() {
-            self.visit(root, &mut visited, &mut result);
-        }
-
-        for next in result {
-            if skip.contains(&next) {
-                continue;
-            }
-            if let Some(node) = self.graph.get(&next) {
-                match filter(acc, &next, node) {
-                    ControlFlow::Continue(a) => {
-                        acc = a;
-                    }
-                    ControlFlow::Break(a) => {
-                        // When filtering out a node, we filter out all transitive dependents on
-                        // that node by adding them to the already visited list.
-                        skip.extend(self.descendants_of(node));
-
-                        acc = a;
-                    }
-                }
-            }
-        }
-        acc
-    }
-
-    /// Remove a node from the graph, and all its dependents.
-    pub fn remove(&mut self, key: &K) -> Option<Node<K, V>> {
-        if let Some(node) = self.graph.remove(key) {
-            self.tips.remove(key);
-            self.roots.remove(key);
-
-            for k in &node.dependencies {
-                if let Some(dependency) = self.graph.get_mut(k) {
-                    dependency.dependents.remove(key);
-
-                    if dependency.dependents.is_empty() {
-                        self.tips.insert(*k);
-                    }
-                }
-            }
-            for k in &node.dependents {
-                self.remove(k);
-            }
-            Some(node)
-        } else {
-            None
-        }
-    }
-
-    fn descendants_of(&self, from: &Node<K, V>) -> Vec<K> {
-        let mut visited = BTreeSet::new();
-        let mut stack = VecDeque::new();
-        let mut nodes = Vec::new();
-
-        stack.extend(from.dependents.iter());
-
-        while let Some(key) = stack.pop_front() {
-            if let Some(node) = self.graph.get(&key) {
-                if visited.insert(key) {
-                    nodes.push(key);
-
-                    for &neighbour in &node.dependents {
-                        stack.push_back(neighbour);
-                    }
-                }
-            }
-        }
-        nodes
-    }
-
-    fn ancestors_of(&self, from: &Node<K, V>) -> Vec<K> {
-        let mut visited = BTreeSet::new();
-        let mut stack = VecDeque::new();
-        let mut nodes = Vec::new();
-
-        stack.extend(from.dependencies.iter());
-
-        while let Some(key) = stack.pop_front() {
-            if let Some(node) = self.graph.get(&key) {
-                if visited.insert(key) {
-                    nodes.push(key);
-
-                    for &neighbour in &node.dependencies {
-                        stack.push_back(neighbour);
-                    }
-                }
-            }
-        }
-        nodes
-    }
-
-    /// Get the nodes that are neither an ancestor nor a descendant of the given node.
-    fn siblings_of(&self, node: &Node<K, V>) -> impl Iterator<Item = &K> {
-        let ancestors = self.ancestors_of(node);
-        let descendants = self.descendants_of(node);
-        let key = node.key;
-
-        self.graph
-            .keys()
-            .filter(move |k| !ancestors.contains(k) && !descendants.contains(k) && **k != key)
-    }
-
-    /// Add nodes recursively to the topological order, starting from the given node.
-    fn visit(&self, key: &K, visited: &mut BTreeSet<K>, order: &mut VecDeque<K>) {
-        if visited.insert(*key) {
-            // Recursively visit all of the node's dependents.
-            if let Some(node) = self.graph.get(key) {
-                for dependent in node.dependents.iter().rev() {
-                    self.visit(dependent, visited, order);
-                }
-            }
-            // Add the node to the topological order.
-            order.push_front(*key);
-        }
-    }
-}
-
-impl<K: Ord + Copy + fmt::Display, V> Dag<K, V> {
-    /// Return the graph in "dot" format.
-    pub fn to_dot(&self) -> String {
-        let mut output = String::new();
-
-        writeln!(output, "digraph G {{").ok();
-        for (k, v) in self.graph.iter() {
-            for d in &v.dependencies {
-                writeln!(output, "\t\"{k}\" -> \"{d}\";").ok();
-            }
-        }
-        writeln!(output, "}}").ok();
-
-        output
-    }
-}
-
-impl<K: Ord + Copy + fmt::Debug, V> Index<&K> for Dag<K, V> {
-    type Output = Node<K, V>;
-
-    fn index(&self, key: &K) -> &Self::Output {
-        self.get(key)
-            .unwrap_or_else(|| panic!("Dag::index: node {key:?} not found in graph"))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_len() {
-        let mut dag = Dag::new();
-
-        dag.node(0, ());
-        dag.node(1, ());
-        dag.node(2, ());
-
-        assert_eq!(dag.len(), 3);
-    }
-
-    #[test]
-    fn test_is_empty() {
-        let mut dag = Dag::new();
-        assert!(dag.is_empty());
-
-        dag.node(0, ());
-        assert!(!dag.is_empty());
-    }
-
-    #[test]
-    fn test_dependencies() {
-        let mut dag = Dag::new();
-
-        dag.node(0, ());
-        dag.node(1, ());
-        dag.dependency(0, 1);
-
-        assert!(dag.has_dependency(&0, &1));
-        assert!(!dag.has_dependency(&1, &0));
-    }
-
-    #[test]
-    fn test_get() {
-        let mut dag = Dag::new();
-
-        dag.node(0, "rad");
-        dag.node(1, "dar");
-
-        assert_eq!(dag[&0].value, "rad");
-        assert_eq!(dag[&1].value, "dar");
-        assert!(dag.get(&2).is_none());
-    }
-
-    #[test]
-    fn test_cycle() {
-        let mut dag = Dag::new();
-
-        dag.node(0, ());
-        dag.node(1, ());
-
-        dag.dependency(0, 1);
-        dag.dependency(1, 0);
-
-        let mut sorted = dag.sorted();
-        let expected: &[&[i32]] = &[&[0, 1], &[1, 0]];
-
-        assert!(expected.contains(&&*sorted.make_contiguous()));
-    }
-
-    #[test]
-    fn test_merge_1() {
-        let mut a = Dag::new();
-        let mut b = Dag::new();
-        let mut c = Dag::new();
-
-        a.node(0, ());
-        a.node(1, ());
-        a.dependency(1, 0);
-
-        b.node(0, ());
-        b.node(2, ());
-        b.dependency(2, 0);
-
-        c.merge(a);
-        c.merge(b);
-
-        assert!(c.get(&0).is_some());
-        assert!(c.get(&1).is_some());
-        assert!(c.get(&2).is_some());
-        assert!(c.has_dependency(&1, &0));
-        assert!(c.has_dependency(&2, &0));
-    }
-
-    #[test]
-    fn test_merge_2() {
-        let mut a = Dag::new();
-        let mut b = Dag::new();
-
-        a.node(0, ());
-        a.node(1, ());
-        a.node(2, ());
-        a.dependency(1, 0);
-        a.dependency(2, 0);
-
-        b.node(0, ());
-        b.node(1, ());
-        b.node(2, ());
-        b.node(3, ());
-        b.node(4, ());
-        b.dependency(1, 0);
-        b.dependency(2, 0);
-        b.dependency(3, 0);
-        b.dependency(4, 2);
-
-        assert!(a.tips.contains(&2));
-
-        a.merge(b);
-
-        assert!(a.get(&0).is_some());
-        assert!(a.get(&1).is_some());
-        assert!(a.get(&2).is_some());
-        assert!(a.get(&3).is_some());
-        assert!(a.get(&4).is_some());
-        assert!(a.has_dependency(&4, &2));
-        assert!(a.get(&2).unwrap().dependents.contains(&4));
-        assert!(a.get(&0).unwrap().dependents.contains(&3));
-        assert!(a.tips.contains(&1));
-        assert!(!a.tips.contains(&2));
-        assert!(a.tips.contains(&3));
-        assert!(a.tips.contains(&4));
-        assert!(a.roots.contains(&0));
-    }
-
-    #[test]
-    fn test_diamond() {
-        let mut dag = Dag::new();
-
-        dag.node(0, ());
-        dag.node(1, ());
-        dag.node(2, ());
-        dag.node(3, ());
-
-        dag.dependency(1, 0);
-        dag.dependency(2, 0);
-        dag.dependency(3, 1);
-        dag.dependency(3, 2);
-
-        assert_eq!(dag.tips().map(|(k, _)| *k).collect::<Vec<_>>(), vec![3]);
-        assert_eq!(dag.roots().map(|(k, _)| *k).collect::<Vec<_>>(), vec![0]);
-
-        // All of the possible sort orders for the above graph.
-        let expected: &[&[i32]] = &[&[0, 1, 2, 3], &[0, 2, 1, 3]];
-        let mut actual = dag.sorted();
-
-        assert!(expected.contains(&&*actual.make_contiguous()), "{actual:?}");
-    }
-
-    #[test]
-    fn test_complex() {
-        let mut dag = Dag::new();
-
-        dag.node(0, ());
-        dag.node(1, ());
-        dag.node(2, ());
-        dag.node(3, ());
-        dag.node(4, ());
-        dag.node(5, ());
-
-        dag.dependency(3, 2);
-        dag.dependency(1, 3);
-        dag.dependency(2, 5);
-        dag.dependency(0, 5);
-        dag.dependency(0, 4);
-        dag.dependency(1, 4);
-
-        assert_eq!(
-            dag.tips().map(|(k, _)| *k).collect::<BTreeSet<_>>(),
-            BTreeSet::from_iter([1, 0])
-        );
-        assert_eq!(
-            dag.roots().map(|(k, _)| *k).collect::<BTreeSet<_>>(),
-            BTreeSet::from_iter([4, 5])
-        );
-
-        // All of the possible sort orders for the above graph.
-        let expected = &[
-            [4, 5, 0, 2, 3, 1],
-            [4, 5, 2, 0, 3, 1],
-            [4, 5, 2, 3, 0, 1],
-            [4, 5, 2, 3, 1, 0],
-            [5, 2, 3, 4, 0, 1],
-            [5, 2, 3, 4, 1, 0],
-            [5, 2, 4, 0, 3, 1],
-            [5, 2, 4, 3, 0, 1],
-            [5, 2, 4, 3, 1, 0],
-            [5, 4, 0, 2, 3, 1],
-            [5, 4, 2, 0, 3, 1],
-            [5, 4, 2, 3, 0, 1],
-            [5, 4, 2, 3, 1, 0],
-        ];
-        let mut sorts = BTreeSet::new();
-        let mut rng = fastrand::Rng::new();
-
-        while sorts.len() < expected.len() {
-            sorts.insert(
-                dag.sorted_by(|a, b| if rng.bool() { a.cmp(b) } else { b.cmp(a) })
-                    .make_contiguous()
-                    .to_vec(),
-            );
-        }
-        for e in expected {
-            assert!(sorts.remove(e.to_vec().as_slice()));
-        }
-        assert!(sorts.is_empty());
-    }
-
-    #[test]
-    fn test_fold_sorting_1() {
-        let mut dag = Dag::new();
-
-        dag.node("R", ());
-        dag.node("A1", ());
-        dag.node("A2", ());
-        dag.node("A3", ());
-        dag.node("B1", ());
-        dag.node("B2", ());
-        dag.node("B3", ());
-        dag.node("C1", ());
-
-        dag.dependency("A1", "R");
-        dag.dependency("A2", "R");
-        dag.dependency("A3", "R");
-
-        dag.dependency("B1", "A1");
-        dag.dependency("B2", "A1");
-        dag.dependency("B3", "A2");
-        dag.dependency("B3", "A3");
-
-        dag.dependency("C1", "B1");
-        dag.dependency("C1", "B2");
-        dag.dependency("C1", "B3");
-
-        let acc = dag.fold(&["R"], Vec::new(), |mut acc, key, _| {
-            acc.push(*key);
-            ControlFlow::Continue(acc)
-        });
-        assert_eq!(acc, vec!["R", "A1", "B1", "B2", "A2", "A3", "B3", "C1"]);
-    }
-
-    #[test]
-    fn test_fold_sorting_2() {
-        let mut dag = Dag::new();
-
-        dag.node("R", ());
-        dag.node("A1", ());
-        dag.node("A2", ());
-        dag.node("A3", ());
-        dag.node("B1", ());
-        dag.node("C1", ());
-        dag.node("C2", ());
-        dag.node("C3", ());
-
-        dag.dependency("A1", "R");
-        dag.dependency("A2", "A1");
-        dag.dependency("A3", "A2");
-
-        dag.dependency("B1", "R");
-
-        dag.dependency("C1", "B1");
-        dag.dependency("C1", "A3");
-        dag.dependency("C2", "B1");
-        dag.dependency("C2", "A3");
-        dag.dependency("C3", "B1");
-        dag.dependency("C3", "A3");
-
-        let acc = dag.fold(&["R"], Vec::new(), |mut acc, key, _| {
-            acc.push(*key);
-            ControlFlow::Continue(acc)
-        });
-
-        assert_eq!(acc, vec!["R", "A1", "A2", "A3", "B1", "C1", "C2", "C3"]);
-        assert_eq!(dag.sorted(), acc);
-    }
-
-    #[test]
-    fn test_fold_diamond() {
-        let mut dag = Dag::new();
-
-        dag.node("R", ());
-        dag.node("A1", ());
-        dag.node("A2", ());
-        dag.node("B", ());
-
-        dag.dependency("A1", "R");
-        dag.dependency("A2", "R");
-        dag.dependency("B", "A1");
-        dag.dependency("B", "A2");
-
-        let acc = dag.fold(&["R"], Vec::new(), |mut acc, key, _| {
-            acc.push(*key);
-            ControlFlow::Continue(acc)
-        });
-        assert_eq!(acc, vec!["R", "A1", "A2", "B"]);
-
-        let sorted = dag.sorted();
-        assert_eq!(sorted, acc);
-    }
-
-    #[test]
-    fn test_fold_multiple_roots() {
-        let mut dag = Dag::new();
-
-        dag.node("R", ());
-        dag.node("A1", ());
-        dag.node("A2", ());
-
-        dag.dependency("A1", "R");
-        dag.dependency("A2", "R");
-
-        let acc = dag.fold(&["A1", "A2"], Vec::new(), |mut acc, key, _| {
-            acc.push(*key);
-            ControlFlow::Continue(acc)
-        });
-        assert_eq!(acc, &["A1", "A2"]);
-    }
-
-    #[test]
-    fn test_fold_reject() {
-        let mut dag = Dag::new();
-
-        dag.node("R", ());
-        dag.node("A1", ());
-        dag.node("A2", ());
-        dag.node("B1", ());
-        dag.node("C1", ());
-        dag.node("D1", ());
-
-        dag.dependency("A1", "R");
-        dag.dependency("A2", "R");
-        dag.dependency("B1", "A1");
-        dag.dependency("C1", "B1");
-        dag.dependency("D1", "C1");
-        dag.dependency("D1", "A2");
-
-        let a1 = dag.get(&"A1").unwrap();
-        assert_eq!(dag.descendants_of(a1), vec!["B1", "C1", "D1"]);
-
-        let acc = dag.fold(&["R"], Vec::new(), |mut acc, key, _| {
-            if *key == "A1" {
-                ControlFlow::Break(acc)
-            } else {
-                acc.push(*key);
-                ControlFlow::Continue(acc)
-            }
-        });
-        assert_eq!(acc, vec!["R", "A2"]);
-
-        let acc = dag.fold(&["R"], Vec::new(), |mut acc, key, _| {
-            if *key == "A2" {
-                ControlFlow::Break(acc)
-            } else {
-                acc.push(*key);
-                ControlFlow::Continue(acc)
-            }
-        });
-        assert_eq!(acc, vec!["R", "A1", "B1", "C1"]);
-    }
-
-    #[test]
-    fn test_remove() {
-        let mut dag = Dag::new();
-
-        dag.node("R", ());
-        dag.node("A1", ());
-        dag.node("A2", ());
-        dag.node("A3", ());
-        dag.node("B1", ());
-        dag.node("C1", ());
-        dag.node("D1", ());
-
-        dag.dependency("A1", "R");
-        dag.dependency("A2", "R");
-        dag.dependency("A3", "A2");
-        dag.dependency("B1", "A1");
-        dag.dependency("B1", "A2");
-        dag.dependency("C1", "B1");
-        dag.dependency("C1", "A3");
-        dag.dependency("D1", "C1");
-        dag.dependency("D1", "A2");
-
-        dag.remove(&"C1");
-        assert!(dag.get(&"C1").is_none());
-        assert!(dag.get(&"D1").is_none());
-        assert!(!dag.tips.contains(&"D1"));
-        assert_eq!(dag.tips.iter().collect::<Vec<_>>(), vec![&"A3", &"B1"]);
-
-        dag.remove(&"A3");
-        assert_eq!(dag.tips.iter().collect::<Vec<_>>(), vec![&"B1"]);
-
-        dag.remove(&"A1");
-        assert!(dag.get(&"A1").is_none());
-        assert!(dag.get(&"B1").is_none());
-        assert!(dag.get(&"A2").is_some());
-        assert_eq!(dag.tips.iter().collect::<Vec<_>>(), vec![&"A2"]);
-
-        dag.remove(&"R");
-        assert!(dag.is_empty());
-        assert!(dag.tips.is_empty());
-        assert!(dag.roots.is_empty());
-    }
-
-    #[test]
-    fn test_prune_1() {
-        let mut dag = Dag::new();
-
-        dag.node("R", ());
-        dag.node("A1", ());
-        dag.node("A2", ());
-        dag.node("B1", ());
-        dag.node("C1", ());
-        dag.node("D1", ());
-
-        dag.dependency("A1", "R");
-        dag.dependency("A2", "R");
-        dag.dependency("B1", "A1");
-        dag.dependency("C1", "B1");
-        dag.dependency("D1", "C1");
-        dag.dependency("D1", "A2");
-
-        let a1 = dag.get(&"A1").unwrap();
-        assert_eq!(dag.descendants_of(a1), vec!["B1", "C1", "D1"]);
-
-        dag.prune(&["R"], |key, _, _| {
-            if key == &"B1" {
-                ControlFlow::Break(())
-            } else {
-                ControlFlow::Continue(())
-            }
-        });
-        assert_eq!(dag.sorted(), vec!["R", "A1", "A2"]);
-    }
-
-    #[test]
-    fn test_siblings() {
-        let mut dag = Dag::new();
-
-        dag.node("R", ());
-        dag.node("A1", ());
-        dag.node("A2", ());
-        dag.node("A3", ());
-        dag.node("A4", ());
-        dag.node("B1", ());
-        dag.node("C1", ());
-        dag.node("C2", ());
-        dag.node("C3", ());
-
-        dag.dependency("A1", "R");
-        dag.dependency("A2", "A1");
-        dag.dependency("A3", "A2");
-
-        dag.dependency("B1", "A2");
-
-        dag.dependency("C1", "R");
-        dag.dependency("C2", "C1");
-        dag.dependency("C3", "C2");
-
-        dag.dependency("A4", "B1");
-        dag.dependency("A4", "C3");
-        dag.dependency("A4", "A3");
-
-        let siblings: Vec<_> = dag.siblings_of(dag.get(&"A3").unwrap()).copied().collect();
-        assert_eq!(siblings, vec!["B1", "C1", "C2", "C3"]);
-
-        let siblings: Vec<_> = dag.siblings_of(dag.get(&"A4").unwrap()).copied().collect();
-        assert_eq!(siblings, Vec::<&str>::new());
-
-        let siblings: Vec<_> = dag.siblings_of(dag.get(&"C1").unwrap()).copied().collect();
-        assert_eq!(siblings, vec!["A1", "A2", "A3", "B1"]);
-
-        let siblings: Vec<_> = dag.siblings_of(dag.get(&"C2").unwrap()).copied().collect();
-        assert_eq!(siblings, vec!["A1", "A2", "A3", "B1"]);
-
-        let siblings: Vec<_> = dag.siblings_of(dag.get(&"B1").unwrap()).copied().collect();
-        assert_eq!(siblings, vec!["A3", "C1", "C2", "C3"]);
-
-        let siblings: Vec<_> = dag.siblings_of(dag.get(&"R").unwrap()).copied().collect();
-        assert_eq!(siblings, Vec::<&str>::new());
-    }
-
-    #[test]
-    fn test_prune_2() {
-        let mut dag = Dag::new();
-
-        dag.node("R", ());
-        dag.node("A1", ());
-        dag.node("A2", ());
-        dag.node("A3", ());
-        dag.node("B1", ());
-        dag.node("C1", ());
-        dag.node("C2", ());
-        dag.node("C3", ());
-
-        dag.dependency("A1", "R");
-        dag.dependency("A2", "A1");
-        dag.dependency("A3", "A2");
-
-        dag.dependency("B1", "R");
-
-        dag.dependency("C1", "B1");
-        dag.dependency("C1", "A3");
-        dag.dependency("C2", "B1");
-        dag.dependency("C2", "A3");
-        dag.dependency("C3", "B1");
-        dag.dependency("C3", "A3");
-
-        let mut order = VecDeque::new();
-
-        dag.prune(&["R"], |key, _, _| {
-            order.push_back(*key);
-            ControlFlow::Continue(())
-        });
-        assert_eq!(order, dag.sorted());
-    }
-}
diff --git a/radicle-fetch/Cargo.toml b/radicle-fetch/Cargo.toml
deleted file mode 100644
index 5382e995a..000000000
--- a/radicle-fetch/Cargo.toml
+++ /dev/null
@@ -1,27 +0,0 @@
-[package]
-name = "radicle-fetch"
-description = "Radicle fetch protocol"
-homepage = "https://radicle.xyz"
-license = "MIT OR Apache-2.0"
-version = "0.10.0"
-authors = ["Fintan Halpenny <fintan.halpenny@gmail.com>"]
-edition = "2021"
-
-[dependencies]
-bstr = { version = "1.3" }
-either = { version = "1.9.0" }
-gix-actor = { version = "0.31.1" }
-gix-features = { version = "0.38.1", features = ["progress"] }
-gix-hash = { version = "0.14.2" }
-gix-odb = { version = "0.61.0" }
-gix-pack = { version = "0.51.0" }
-gix-protocol = { version = "0.45", features = ["blocking-client"] }
-gix-transport = { version = "0.42", features = ["blocking-client"] }
-log = { version = "0.4.17", features = ["std"] }
-nonempty = { version = "0.9.0" }
-radicle-git-ext = { version = "0.8.0", features = ["bstr"] }
-thiserror = { version = "1" }
-
-[dependencies.radicle]
-path = "../radicle"
-version = "0"
diff --git a/radicle-fetch/src/git.rs b/radicle-fetch/src/git.rs
deleted file mode 100644
index 7b721b959..000000000
--- a/radicle-fetch/src/git.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-pub(crate) mod mem;
-pub(crate) mod packfile;
-pub(crate) mod repository;
-
-pub mod refs;
-
-pub(crate) mod oid {
-    //! Helper functions for converting to/from [`radicle::git::Oid`] and
-    //! [`ObjectId`].
-
-    use gix_hash::ObjectId;
-    use radicle::git::Oid;
-
-    /// Convert from an [`ObjectId`] to an [`Oid`].
-    pub fn to_oid(oid: ObjectId) -> Oid {
-        Oid::try_from(oid.as_bytes()).expect("invalid gix Oid")
-    }
-
-    /// Convert from an [`Oid`] to an [`ObjectId`].
-    pub fn to_object_id(oid: Oid) -> ObjectId {
-        ObjectId::from(gix_hash::oid::from_bytes_unchecked(oid.as_ref()))
-    }
-}
diff --git a/radicle-fetch/src/git/mem.rs b/radicle-fetch/src/git/mem.rs
deleted file mode 100644
index 598c93c31..000000000
--- a/radicle-fetch/src/git/mem.rs
+++ /dev/null
@@ -1,78 +0,0 @@
-use std::collections::HashMap;
-
-use radicle::git::{Component, Oid, Qualified, RefString};
-use radicle::prelude::PublicKey;
-
-use super::refs::{Applied, RefUpdate, Update};
-
-/// An in-memory reference store.
-///
-/// It provides the same functionality as the [`super::Refdb`], but is
-/// used to temporarily store reference names and objects.
-#[derive(Clone, Debug, Default)]
-pub struct Refdb(HashMap<Qualified<'static>, Oid>);
-
-impl Refdb {
-    pub fn refname_to_id<'a, N>(&self, refname: N) -> Option<Oid>
-    where
-        N: Into<Qualified<'a>>,
-    {
-        let name = refname.into();
-        self.0.get(&name).copied()
-    }
-
-    pub fn references_of<'a>(
-        &'a self,
-        remote: &'a PublicKey,
-    ) -> impl Iterator<Item = (RefString, Oid)> + 'a {
-        self.0.iter().filter_map(move |(refname, oid)| {
-            let ns = refname.to_namespaced()?;
-            (ns.namespace() == Component::from(remote))
-                .then(|| (ns.strip_namespace().to_ref_string(), *oid))
-        })
-    }
-
-    pub fn update<'a, I>(&mut self, updates: I) -> Applied<'a>
-    where
-        I: IntoIterator<Item = Update<'a>>,
-    {
-        updates
-            .into_iter()
-            .fold(Applied::default(), |mut ap, update| match update {
-                Update::Direct { name, target, .. } => {
-                    let name = name.into_qualified().into_owned();
-                    let prev = match self.0.insert(name.clone(), target) {
-                        Some(prev) => prev,
-                        None => radicle::git::raw::Oid::zero().into(),
-                    };
-                    ap.updated.push(RefUpdate::Updated {
-                        name: name.to_ref_string(),
-                        old: prev,
-                        new: target,
-                    });
-                    ap
-                }
-                Update::Prune { name, .. } => {
-                    let name = name.into_qualified().into_owned();
-                    if let Some((name, prev)) = self.0.remove_entry(&name) {
-                        ap.updated.push(RefUpdate::Deleted {
-                            name: name.to_ref_string(),
-                            oid: prev,
-                        })
-                    }
-                    ap
-                }
-            })
-    }
-
-    #[allow(dead_code)]
-    pub(crate) fn inspect(&self) {
-        if self.0.is_empty() {
-            println!("Refdb is empty!");
-        } else {
-            for (name, oid) in self.0.iter() {
-                println!("{name} -> {oid}");
-            }
-        }
-    }
-}
diff --git a/radicle-fetch/src/git/packfile.rs b/radicle-fetch/src/git/packfile.rs
deleted file mode 100644
index 1b7a6612b..000000000
--- a/radicle-fetch/src/git/packfile.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use std::fs;
-use std::path::{Path, PathBuf};
-
-/// The [`PathBuf`] which points to a `*.keep` file, which should correspond to
-/// a packfile.
-///
-/// Upon drop, it attempts to remove the [`PathBuf`] to release the lock on the
-/// packfile index, allowing it to be garbage collected.
-#[derive(Clone, Debug)]
-pub struct Keepfile {
-    path: PathBuf,
-}
-
-impl Keepfile {
-    pub fn new<P: AsRef<Path>>(path: P) -> Option<Self> {
-        let path = path.as_ref();
-        match path.extension() {
-            Some(ext) if ext == "keep" => Some(Self {
-                path: path.to_path_buf(),
-            }),
-            _ => None,
-        }
-    }
-}
-
-impl Drop for Keepfile {
-    fn drop(&mut self) {
-        if let Err(e) = fs::remove_file(&self.path) {
-            log::warn!(target: "fetch", "Failed to remove {:?}: {e}", self.path);
-        }
-    }
-}
diff --git a/radicle-fetch/src/git/refs.rs b/radicle-fetch/src/git/refs.rs
deleted file mode 100644
index ffa4d96da..000000000
--- a/radicle-fetch/src/git/refs.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-mod update;
-pub use update::{Applied, Policy, RefUpdate, Update, Updates};
diff --git a/radicle-fetch/src/git/refs/update.rs b/radicle-fetch/src/git/refs/update.rs
deleted file mode 100644
index 9bb58f857..000000000
--- a/radicle-fetch/src/git/refs/update.rs
+++ /dev/null
@@ -1,145 +0,0 @@
-//! The set of types that describe performing updates to a Git
-//! repository.
-//!
-//! An [`Update`] describes a single update that can made to a Git
-//! repository. **Note** that it currently does not support symbolic
-//! references.
-//!
-//! A group of `Update`s is described by [`Updates`] which groups
-//! those updates by each peer's namespace, i.e. their [`PublicKey`].
-//!
-//! When an `Update` is successful the corresponding [`Updated`] is
-//! expected to be produced.
-//!
-//! The final result of applying a set of [`Updates`] is captured in
-//! the [`Applied`] type, which contains any rejected, but non-fatal,
-//! [`Update`]s and successful [`Updated`] values.
-
-use std::collections::BTreeMap;
-
-use either::Either;
-use radicle::git::{Namespaced, Oid, Qualified};
-use radicle::prelude::PublicKey;
-
-pub use radicle::storage::RefUpdate;
-
-/// The set of applied changes from a reference store update.
-#[derive(Debug, Default)]
-pub struct Applied<'a> {
-    /// Set of rejected updates if they did not meet the update
-    /// requirements, e.g. concurrent change to previous object id,
-    /// broke fast-forward policy, etc.
-    pub rejected: Vec<Update<'a>>,
-    /// Set of successfully updated references.
-    pub updated: Vec<RefUpdate>,
-}
-
-impl<'a> Applied<'a> {
-    pub fn append(&mut self, other: &mut Self) {
-        self.rejected.append(&mut other.rejected);
-        self.updated.append(&mut other.updated);
-    }
-}
-
-/// A set of [`Update`]s that are grouped by which namespace they are
-/// affecting.
-#[derive(Clone, Default, Debug)]
-pub struct Updates<'a> {
-    pub tips: BTreeMap<PublicKey, Vec<Update<'a>>>,
-}
-
-impl<'a> Updates<'a> {
-    pub fn build(updates: impl IntoIterator<Item = (PublicKey, Update<'a>)>) -> Self {
-        let tips = updates.into_iter().fold(
-            BTreeMap::<_, Vec<Update<'a>>>::new(),
-            |mut tips, (remote, up)| {
-                tips.entry(remote)
-                    .and_modify(|ups| ups.push(up.clone()))
-                    .or_insert(vec![up]);
-                tips
-            },
-        );
-        Self { tips }
-    }
-
-    pub fn add(&mut self, remote: PublicKey, up: Update<'a>) {
-        self.tips
-            .entry(remote)
-            .and_modify(|ups| ups.push(up.clone()))
-            .or_insert(vec![up]);
-    }
-
-    pub fn append(&mut self, remote: PublicKey, mut new: Vec<Update<'a>>) {
-        self.tips
-            .entry(remote)
-            .and_modify(|ups| ups.append(&mut new))
-            .or_insert(new);
-    }
-}
-
-/// The policy to follow when an [`Update::Direct`] is not a
-/// fast-forward.
-#[derive(Clone, Copy, Debug)]
-pub enum Policy {
-    /// Abort the entire transaction.
-    Abort,
-    /// Reject this update, but continue the transaction.
-    Reject,
-    /// Allow the update.
-    Allow,
-}
-
-/// An update that can be applied to a Git repository.
-#[derive(Clone, Debug)]
-pub enum Update<'a> {
-    /// Update a direct reference, i.e. a reference that points to an
-    /// object.
-    Direct {
-        /// The name of the reference that is being updated.
-        name: Namespaced<'a>,
-        /// The resulting target of the reference that is being
-        /// updated.
-        target: Oid,
-        /// Policy to apply when an [`Update`] would not apply as a
-        /// fast-forward.
-        no_ff: Policy,
-    },
-    /// Delete a reference.
-    Prune {
-        /// The name of the reference that is being deleted.
-        name: Namespaced<'a>,
-        /// The previous value of the reference.
-        ///
-        /// It can either be a direct reference pointing to an
-        /// [`Oid`], or a symbolic reference pointing to a
-        /// [`Qualified`] reference name.
-        prev: Either<Oid, Qualified<'a>>,
-    },
-}
-
-impl<'a> Update<'a> {
-    pub fn refname(&self) -> &Namespaced<'a> {
-        match self {
-            Update::Direct { name, .. } => name,
-            Update::Prune { name, .. } => name,
-        }
-    }
-
-    pub fn into_owned<'b>(self) -> Update<'b> {
-        match self {
-            Self::Direct {
-                name,
-                target,
-                no_ff,
-            } => Update::Direct {
-                name: name.into_owned(),
-                target,
-                no_ff,
-            },
-            Self::Prune { name, prev } => Update::Prune {
-                name: name.into_owned(),
-                prev: prev.map_right(|q| q.into_owned()),
-            },
-        }
-    }
-}
diff --git a/radicle-fetch/src/git/repository.rs b/radicle-fetch/src/git/repository.rs
deleted file mode 100644
index 5d57ae225..000000000
--- a/radicle-fetch/src/git/repository.rs
+++ /dev/null
@@ -1,249 +0,0 @@
-pub mod error;
-
-use either::Either;
-use radicle::git::{self, Namespaced, Oid, Qualified};
-use radicle::storage::git::Repository;
-
-use super::refs::{Applied, Policy, RefUpdate, Update};
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum Ancestry {
-    Equal,
-    Ahead,
-    Behind,
-    Diverged,
-}
-
-pub enum Updated<'a> {
-    Accepted(RefUpdate),
-    Rejected(Update<'a>),
-}
-
-impl<'a> From<RefUpdate> for Updated<'a> {
-    fn from(up: RefUpdate) -> Self {
-        Updated::Accepted(up)
-    }
-}
-
-impl<'a> From<Update<'a>> for Updated<'a> {
-    fn from(up: Update<'a>) -> Self {
-        Updated::Rejected(up)
-    }
-}
-
-pub fn contains(repo: &Repository, oid: Oid) -> Result<bool, error::Contains> {
-    repo.backend
-        .odb()
-        .map(|odb| odb.exists(oid.into()))
-        .map_err(error::Contains)
-}
-
-/// Find the object identified by `oid` and peel it to its associated
-/// commit `Oid`.
-///
-/// # Errors
-///
-/// - The object was not found
-/// - The object does not peel to a commit
-/// - Attempting to find the object fails
-fn find_and_peel(repo: &Repository, oid: Oid) -> Result<Oid, error::Ancestry> {
-    match repo.backend.find_object(*oid, None) {
-        Ok(object) => Ok(object
-            .peel(git::raw::ObjectType::Commit)
-            .map_err(|err| error::Ancestry::Peel { oid, err })?
-            .id()
-            .into()),
-        Err(e) if git::is_not_found_err(&e) => Err(error::Ancestry::Missing { oid }),
-        Err(err) => Err(error::Ancestry::Object { oid, err }),
-    }
-}
-
-pub fn ancestry(repo: &Repository, old: Oid, new: Oid) -> Result<Ancestry, error::Ancestry> {
-    let old = find_and_peel(repo, old)?;
-    let new = find_and_peel(repo, new)?;
-
-    if old == new {
-        return Ok(Ancestry::Equal);
-    }
-
-    let (ahead, behind) = repo
-        .backend
-        .graph_ahead_behind(*new, *old)
-        .map_err(|err| error::Ancestry::Check { old, new, err })?;
-
-    if ahead > 0 && behind == 0 {
-        Ok(Ancestry::Ahead)
-    } else if ahead == 0 && behind > 0 {
-        Ok(Ancestry::Behind)
-    } else {
-        Ok(Ancestry::Diverged)
-    }
-}
-
-pub fn refname_to_id<'a, N>(repo: &Repository, refname: N) -> Result<Option<Oid>, error::Resolve>
-where
-    N: Into<Qualified<'a>>,
-{
-    use radicle::git::raw::ErrorCode::NotFound;
-
-    let refname = refname.into();
-    match repo.backend.refname_to_id(refname.as_ref()) {
-        Ok(oid) => Ok(Some(oid.into())),
-        Err(e) if matches!(e.code(), NotFound) => Ok(None),
-        Err(err) => Err(error::Resolve {
-            name: refname.to_owned(),
-            err,
-        }),
-    }
-}
-
-pub fn update<'a, I>(repo: &Repository, updates: I) -> Result<Applied<'a>, error::Update>
-where
-    I: IntoIterator<Item = Update<'a>>,
-{
-    let mut applied = Applied::default();
-    for up in updates.into_iter() {
-        match up {
-            Update::Direct {
-                name,
-                target,
-                no_ff,
-            } => match direct(repo, name, target, no_ff)? {
-                Updated::Rejected(r) => applied.rejected.push(r),
-                Updated::Accepted(u) => applied.updated.push(u),
-            },
-            Update::Prune { name, prev } => match prune(repo, name, prev)? {
-                Updated::Rejected(r) => applied.rejected.push(r),
-                Updated::Accepted(u) => applied.updated.push(u),
-            },
-        }
-    }
-
-    Ok(applied)
-}
-
-fn direct<'a>(
-    repo: &Repository,
-    name: Namespaced<'a>,
-    target: Oid,
-    no_ff: Policy,
-) -> Result<Updated<'a>, error::Update> {
-    let tip = refname_to_id(repo, name.clone())?;
-    match tip {
-        Some(prev) => {
-            let ancestry = ancestry(repo, prev, target)?;
-
-            match ancestry {
-                Ancestry::Equal => Ok(RefUpdate::Skipped {
-                    name: name.to_ref_string(),
-                    oid: target,
-                }
-                .into()),
-                Ancestry::Ahead => {
-                    // N.b. the update is a fast-forward so we can safely
-                    // pass `force: true`.
-                    repo.backend
-                        .reference(name.as_ref(), target.into(), true, "radicle: update")
-                        .map_err(|err| error::Update::Create {
-                            name: name.to_owned(),
-                            target,
-                            err,
-                        })?;
-                    Ok(RefUpdate::from(name.to_ref_string(), prev, target).into())
-                }
-                Ancestry::Behind | Ancestry::Diverged if matches!(no_ff, Policy::Allow) => {
-                    // N.b. the update is a non-fast-forward but
-                    // we allow it, so we pass `force: true`.
-                    repo.backend
-                        .reference(name.as_ref(), target.into(), true, "radicle: update")
-                        .map_err(|err| error::Update::Create {
-                            name: name.to_owned(),
-                            target,
-                            err,
-                        })?;
-                    Ok(RefUpdate::from(name.to_ref_string(), prev, target).into())
-                }
-                // N.b. if the target is behind, we simply reject the update
-                Ancestry::Behind => Ok(Update::Direct {
-                    name,
-                    target,
-                    no_ff,
-                }
-                .into()),
-                Ancestry::Diverged if matches!(no_ff, Policy::Reject) => Ok(Update::Direct {
-                    name,
-                    target,
-                    no_ff,
-                }
-                .into()),
-                Ancestry::Diverged => {
-                    return Err(error::Update::NonFF {
-                        name: name.to_owned(),
-                        new: target,
-                        cur: prev,
-                    })
-                }
-            }
-        }
-        None => {
-            // N.b. the reference didn't exist so we pass `force:
-            // false`.
-            repo.backend
-                .reference(name.as_ref(), target.into(), false, "radicle: create")
-                .map_err(|err| error::Update::Create {
-                    name: name.to_owned(),
-                    target,
-                    err,
-                })?;
-            Ok(RefUpdate::Created {
-                name: name.to_ref_string(),
-                oid: target,
-            }
-            .into())
-        }
-    }
-}
-
-fn prune<'a>(
-    repo: &Repository,
-    name: Namespaced<'a>,
-    prev: Either<Oid, Qualified<'a>>,
-) -> Result<Updated<'a>, error::Update> {
-    use radicle::git::raw::ObjectType;
-
-    match find(repo, &name)? {
-        Some(mut r) => {
-            // N.b. peel this reference to whatever object it points to,
-            // presumably a commit, and get its Oid
-            let prev = r
-                .peel(ObjectType::Any)
-                .map_err(error::Update::Peel)?
-                .id()
-                .into();
-            r.delete().map_err(|err| error::Update::Delete {
-                name: name.to_owned(),
-                err,
-            })?;
-            Ok(RefUpdate::Deleted {
-                name: name.to_ref_string(),
-                oid: prev,
-            }
-            .into())
-        }
-        None => Ok(Update::Prune { name, prev }.into()),
-    }
-}
-
-fn find<'a>(
-    repo: &'a Repository,
-    name: &Namespaced<'_>,
-) -> Result<Option<radicle::git::raw::Reference<'a>>, error::Update> {
-    match repo.backend.find_reference(name.as_ref()) {
-        Ok(r) => Ok(Some(r)),
-        Err(e) if matches!(e.code(), radicle::git::raw::ErrorCode::NotFound) => Ok(None),
-        Err(err) => Err(error::Update::Find {
-            name: name.clone().into_owned(),
-            err,
-        }),
-    }
-}
diff --git a/radicle-fetch/src/git/repository/error.rs b/radicle-fetch/src/git/repository/error.rs
deleted file mode 100644
index 6c2d546c7..000000000
--- a/radicle-fetch/src/git/repository/error.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use radicle::git::{ext, raw, Namespaced, Oid, Qualified};
-use thiserror::Error;
-
-#[derive(Debug, Error)]
-#[error("could not open Git ODB")]
-pub struct Contains(#[source] pub raw::Error);
-
-#[derive(Debug, Error)]
-pub enum Ancestry {
-    #[error("missing {oid} while checking ancestry")]
-    Missing { oid: Oid },
-    #[error("failed to check ancestry for {old} and {new}: {err}")]
-    Check {
-        old: Oid,
-        new: Oid,
-        #[source]
-        err: raw::Error,
-    },
-    #[error("failed to peel object to commit {oid}: {err}")]
-    Peel {
-        oid: Oid,
-        #[source]
-        err: raw::Error,
-    },
-    #[error("failed to find object {oid}: {err}")]
-    Object {
-        oid: Oid,
-        #[source]
-        err: raw::Error,
-    },
-}
-
-#[derive(Debug, Error)]
-#[error("failed to resolve {name} to its Oid")]
-pub struct Resolve {
-    pub name: Qualified<'static>,
-    #[source]
-    pub err: raw::Error,
-}
-
-#[derive(Debug, Error)]
-#[error("failed to scan for refs matching {pattern}")]
-pub struct Scan {
-    pub pattern: radicle::git::PatternString,
-    #[source]
-    pub err: ext::Error,
-}
-
-#[derive(Debug, Error)]
-pub enum Update {
-    #[error(transparent)]
-    Ancestry(#[from] Ancestry),
-    #[error("failed to create reference from {name} to {target}")]
-    Create {
-        name: Namespaced<'static>,
-        target: Oid,
-        #[source]
-        err: raw::Error,
-    },
-    #[error("failed to delete reference {name}")]
-    Delete {
-        name: Namespaced<'static>,
-        #[source]
-        err: raw::Error,
-    },
-    #[error("failed to find ref {name}")]
-    Find {
-        name: Namespaced<'static>,
-        #[source]
-        err: raw::Error,
-    },
-    #[error("non-fast-forward update of {name} (current: {cur}, new: {new})")]
-    NonFF {
-        name: Namespaced<'static>,
-        new: Oid,
-        cur: Oid,
-    },
-    #[error("failed to peel ref to object")]
-    Peel(#[source] raw::Error),
-    #[error(transparent)]
-    Resolve(#[from] Resolve),
-}
diff --git a/radicle-fetch/src/handle.rs b/radicle-fetch/src/handle.rs
deleted file mode 100644
index ebc86d818..000000000
--- a/radicle-fetch/src/handle.rs
+++ /dev/null
@@ -1,128 +0,0 @@
-use std::sync::atomic::{self, AtomicBool};
-use std::sync::Arc;
-
-use bstr::BString;
-use radicle::crypto::{PublicKey, Verified};
-use radicle::git::Oid;
-use radicle::identity::DocError;
-use radicle::prelude::Doc;
-use radicle::storage::git::Repository;
-use radicle::storage::ReadRepository;
-
-use crate::policy::{Allowed, BlockList};
-use crate::transport::{ConnectionStream, Transport};
-
-/// The handle used for pulling or cloning changes from a remote peer.
-pub struct Handle<S> {
-    pub(crate) local: PublicKey,
-    pub(crate) repo: Repository,
-    pub(crate) allowed: Allowed,
-    pub(crate) transport: Transport<S>,
-    /// The set of keys we will ignore when fetching from a
-    /// remote. This set can be constructed using the tracking
-    /// `config`'s blocked node entries.
-    ///
-    /// Note that it's important to ignore the local peer's
-    /// key in [`crate::pull`], however, we choose to allow the local
-    /// peer's key in [`crate::clone`].
-    pub(crate) blocked: BlockList,
-    // Signals to the pack writer to interrupt the process
-    pub(crate) interrupt: Arc<AtomicBool>,
-}
-
-impl<S> Handle<S> {
-    pub fn new(
-        local: PublicKey,
-        repo: Repository,
-        follow: Allowed,
-        blocked: BlockList,
-        connection: S,
-    ) -> Result<Self, error::Init>
-    where
-        S: ConnectionStream,
-    {
-        let git_dir = repo.backend.path().to_path_buf();
-        let transport = Transport::new(git_dir, BString::from(repo.id.canonical()), connection);
-
-        Ok(Self {
-            local,
-            repo,
-            allowed: follow,
-            transport,
-            blocked,
-            interrupt: Arc::new(AtomicBool::new(false)),
-        })
-    }
-
-    pub fn is_blocked(&self, key: &PublicKey) -> bool {
-        self.blocked.is_blocked(key)
-    }
-
-    pub fn repository(&self) -> &Repository {
-        &self.repo
-    }
-
-    pub fn repository_mut(&mut self) -> &mut Repository {
-        &mut self.repo
-    }
-
-    pub fn local(&self) -> &PublicKey {
-        &self.local
-    }
-
-    pub fn interrupt_pack_writer(&mut self) {
-        self.interrupt.store(true, atomic::Ordering::Relaxed);
-    }
-
-    pub fn verified(&self, head: Oid) -> Result<Doc<Verified>, DocError> {
-        Ok(self.repo.identity_doc_at(head)?.doc)
-    }
-
-    pub fn allowed(&self) -> Allowed {
-        self.allowed.clone()
-    }
-}
-
-pub mod error {
-    use std::io;
-
-    use radicle::node::policy;
-    use radicle::prelude::RepoId;
-    use radicle::{git, storage};
-    use thiserror::Error;
-
-    #[derive(Debug, Error)]
-    pub enum Init {
-        #[error(transparent)]
-        Io(#[from] io::Error),
-        #[error(transparent)]
-        Tracking(#[from] policy::config::Error),
-    }
-
-    #[derive(Debug, Error)]
-    pub enum Tracking {
-        #[error("failed to find policy for {rid}")]
-        FailedPolicy {
-            rid: RepoId,
-            #[source]
-            err: policy::store::Error,
-        },
-        #[error("cannot fetch {rid} as it is not seeded")]
-        BlockedPolicy { rid: RepoId },
-        #[error("failed to get tracking nodes for {rid}")]
-        FailedNodes {
-            rid: RepoId,
-            #[source]
-            err: policy::store::Error,
-        },
-
-        #[error(transparent)]
-        Storage(#[from] storage::Error),
-
-        #[error(transparent)]
-        Git(#[from] git::raw::Error),
-
-        #[error(transparent)]
-        Refs(#[from] storage::refs::Error),
-    }
-}
diff --git a/radicle-fetch/src/lib.rs b/radicle-fetch/src/lib.rs
deleted file mode 100644
index 348a6c723..000000000
--- a/radicle-fetch/src/lib.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-pub mod git;
-pub mod handle;
-pub mod policy;
-pub mod transport;
-
-pub(crate) mod sigrefs;
-
-mod refs;
-mod stage;
-mod state;
-
-use std::io;
-use std::time::Instant;
-
-use gix_protocol::handshake;
-
-pub use gix_protocol::{transport::bstr::ByteSlice, RemoteProgress};
-pub use handle::Handle;
-pub use policy::{Allowed, BlockList, Scope};
-pub use state::{FetchLimit, FetchResult};
-pub use transport::Transport;
-
-use radicle::crypto::PublicKey;
-use radicle::storage::refs::RefsAt;
-use radicle::storage::ReadRepository as _;
-use state::FetchState;
-use thiserror::Error;
-
-#[derive(Debug, Error)]
-pub enum Error {
-    #[error("failed to perform fetch handshake")]
-    Handshake {
-        #[source]
-        err: io::Error,
-    },
-    #[error("failed to load `rad/id`")]
-    Identity {
-        #[source]
-        err: Box<dyn std::error::Error + Send + Sync + 'static>,
-    },
-    #[error(transparent)]
-    Protocol(#[from] state::error::Protocol),
-    #[error("missing `rad/id`")]
-    MissingRadId,
-    #[error("attempted to replicate from self")]
-    ReplicateSelf,
-}
-
-/// Pull changes from the `remote`.
-///
-/// It is expected that the local peer has a copy of the repository
-/// and is pulling new changes. If the repository does not exist, then
-/// [`clone`] should be used.
-pub fn pull<S>(
-    handle: &mut Handle<S>,
-    limit: FetchLimit,
-    remote: PublicKey,
-    refs_at: Option<Vec<RefsAt>>,
-) -> Result<FetchResult, Error>
-where
-    S: transport::ConnectionStream,
-{
-    let start = Instant::now();
-    let local = *handle.local();
-    if local == remote {
-        return Err(Error::ReplicateSelf);
-    }
-    let handshake = perform_handshake(handle)?;
-    let state = FetchState::default();
-
-    // N.b. ensure that we ignore the local peer's key.
-    handle.blocked.extend([local]);
-    let result = state
-        .run(handle, &handshake, limit, remote, refs_at)
-        .map_err(Error::Protocol);
-
-    log::debug!(
-        target: "fetch",
-        "Finished pull of {} ({}ms)",
-        handle.repo.id(),
-        start.elapsed().as_millis()
-    );
-    result
-}
-
-/// Clone changes from the `remote`.
-///
-/// It is expected that the local peer has an empty repository which
-/// they want to populate with the `remote`'s view of the project.
-pub fn clone<S>(
-    handle: &mut Handle<S>,
-    limit: FetchLimit,
-    remote: PublicKey,
-) -> Result<FetchResult, Error>
-where
-    S: transport::ConnectionStream,
-{
-    let start = Instant::now();
-    if *handle.local() == remote {
-        return Err(Error::ReplicateSelf);
-    }
-    let handshake = perform_handshake(handle)?;
-    let state = FetchState::default();
-    let result = state
-        .run(handle, &handshake, limit, remote, None)
-        .map_err(Error::Protocol);
-    let elapsed = start.elapsed().as_millis();
-    let rid = handle.repo.id();
-
-    match &result {
-        Ok(_) => {
-            log::debug!(
-                target: "fetch",
-                "Finished clone of {rid} from {remote} ({elapsed}ms)",
-            );
-        }
-        Err(e) => {
-            log::debug!(
-                target: "fetch",
-                "Clone of {rid} from {remote} failed with '{e}' ({elapsed}ms)",
-            );
-        }
-    }
-    result
-}
-
-fn perform_handshake<S>(handle: &mut Handle<S>) -> Result<handshake::Outcome, Error>
-where
-    S: transport::ConnectionStream,
-{
-    handle.transport.handshake().map_err(|err| {
-        log::warn!(target: "fetch", "Failed to perform handshake: {err}");
-        Error::Handshake { err }
-    })
-}
diff --git a/radicle-fetch/src/policy.rs b/radicle-fetch/src/policy.rs
deleted file mode 100644
index 508b5d65f..000000000
--- a/radicle-fetch/src/policy.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-use std::collections::HashSet;
-
-use radicle::crypto::PublicKey;
-use radicle::node::policy::config::Config;
-use radicle::node::policy::store::Read;
-use radicle::prelude::RepoId;
-
-pub use radicle::node::policy::{Policy, Scope, SeedingPolicy};
-
-#[derive(Clone, Debug)]
-pub enum Allowed {
-    All,
-    Followed { remotes: HashSet<PublicKey> },
-}
-
-impl Allowed {
-    pub fn from_config(rid: RepoId, config: &Config<Read>) -> Result<Self, error::Policy> {
-        let entry = config
-            .seed_policy(&rid)
-            .map_err(|err| error::Policy::FailedPolicy { rid, err })?;
-        match entry.policy {
-            SeedingPolicy::Block => {
-                log::error!(target: "fetch", "Attempted to fetch non-seeded repo {rid}");
-                Err(error::Policy::BlockedPolicy { rid })
-            }
-            SeedingPolicy::Allow { scope: Scope::All } => Ok(Self::All),
-            SeedingPolicy::Allow {
-                scope: Scope::Followed,
-            } => {
-                let nodes = config
-                    .follow_policies()
-                    .map_err(|err| error::Policy::FailedNodes { rid, err })?;
-                let followed: HashSet<_> = nodes
-                    .filter_map(|node| (node.policy == Policy::Allow).then_some(node.nid))
-                    .collect();
-
-                Ok(Allowed::Followed { remotes: followed })
-            }
-        }
-    }
-}
-
-/// A set of [`PublicKey`]s to ignore when fetching from a remote.
-#[derive(Clone, Debug)]
-pub struct BlockList(HashSet<PublicKey>);
-
-impl FromIterator<PublicKey> for BlockList {
-    fn from_iter<T: IntoIterator<Item = PublicKey>>(iter: T) -> Self {
-        Self(iter.into_iter().collect())
-    }
-}
-
-impl Extend<PublicKey> for BlockList {
-    fn extend<T: IntoIterator<Item = PublicKey>>(&mut self, iter: T) {
-        self.0.extend(iter)
-    }
-}
-
-impl BlockList {
-    pub fn is_blocked(&self, key: &PublicKey) -> bool {
-        self.0.contains(key)
-    }
-
-    pub fn from_config(config: &Config<Read>) -> Result<BlockList, error::Blocked> {
-        Ok(config
-            .follow_policies()?
-            .filter_map(|entry| (entry.policy == Policy::Block).then_some(entry.nid))
-            .collect())
-    }
-}
-
-pub mod error {
-    use radicle::node::policy;
-    use radicle::prelude::RepoId;
-    use radicle::storage;
-    use thiserror::Error;
-
-    #[derive(Debug, Error)]
-    #[error(transparent)]
-    pub struct Blocked(#[from] policy::config::Error);
-
-    #[derive(Debug, Error)]
-    pub enum Policy {
-        #[error("failed to find policy for {rid}")]
-        FailedPolicy {
-            rid: RepoId,
-            #[source]
-            err: policy::store::Error,
-        },
-        #[error("cannot fetch {rid} as it is not seeded")]
-        BlockedPolicy { rid: RepoId },
-        #[error("failed to get followed nodes for {rid}")]
-        FailedNodes {
-            rid: RepoId,
-            #[source]
-            err: policy::store::Error,
-        },
-
-        #[error(transparent)]
-        Storage(#[from] storage::Error),
-
-        #[error(transparent)]
-        Git(#[from] radicle::git::raw::Error),
-
-        #[error(transparent)]
-        Refs(#[from] storage::refs::Error),
-    }
-}
diff --git a/radicle-fetch/src/refs.rs b/radicle-fetch/src/refs.rs
deleted file mode 100644
index f24ef3af3..000000000
--- a/radicle-fetch/src/refs.rs
+++ /dev/null
@@ -1,181 +0,0 @@
-use bstr::{BString, ByteSlice};
-use either::Either;
-use radicle::crypto::PublicKey;
-use radicle::git::{self, Component, Namespaced, Oid, Qualified};
-use thiserror::Error;
-
-pub use radicle::git::refs::storage::Special;
-
-use crate::git::refs::{Policy, Update};
-
-pub(crate) use radicle::git::refs::storage::IDENTITY_BRANCH as REFS_RAD_ID;
-
-#[derive(Debug, Error)]
-#[non_exhaustive]
-pub enum Error {
-    #[error("non-namespaced ref name '{0}' is not 'refs/rad/id'")]
-    NotCanonicalRadID(Qualified<'static>),
-    #[error("invalid remote peer id")]
-    PublicKey(#[from] radicle::crypto::PublicKeyError),
-    #[error(transparent)]
-    Ref(#[from] radicle::git::RefError),
-    #[error(transparent)]
-    Utf8(#[from] bstr::Utf8Error),
-}
-
-pub(crate) fn unpack_ref<'a>(
-    r: gix_protocol::handshake::Ref,
-) -> Result<(ReceivedRefname<'a>, Oid), Error> {
-    use crate::git::oid;
-    use gix_protocol::handshake::Ref;
-
-    match r {
-        Ref::Peeled {
-            full_ref_name,
-            object,
-            ..
-        }
-        | Ref::Direct {
-            full_ref_name,
-            object,
-        }
-        | Ref::Symbolic {
-            full_ref_name,
-            object,
-            ..
-        } => ReceivedRefname::try_from(full_ref_name).map(|name| (name, oid::to_oid(object))),
-        Ref::Unborn { full_ref_name, .. } => {
-            unreachable!("BUG: unborn ref {}", full_ref_name)
-        }
-    }
-}
-
-/// A reference name received during an exchange with another peer. The
-/// expected references are either namespaced references in the form
-/// of [`RemoteRef`] or the canonical `rad/id` reference.
-#[derive(Debug)]
-pub(crate) enum ReceivedRefname<'a> {
-    /// A reference name under a `remote` namespace.
-    ///
-    /// # Examples
-    ///
-    ///   * `refs/namespaces/<remote>/refs/rad/id`
-    ///   * `refs/namespaces/<remote>/refs/rad/sigrefs`
-    ///   * `refs/namespaces/<remote>/refs/heads/main`
-    ///   * `refs/namespaces/<remote>/refs/cobs/issue.rad.xyz`
-    Namespaced {
-        /// The namespace of the remote.
-        remote: PublicKey,
-        /// The reference is expected to either be a [`Special`] reference
-        /// or a generic reference name.
-        suffix: Either<Special, Qualified<'a>>,
-    },
-    /// The canonical `refs/rad/id` reference
-    RadId,
-}
-
-impl<'a> ReceivedRefname<'a> {
-    pub fn remote(remote: PublicKey, suffix: Qualified<'a>) -> Self {
-        Self::Namespaced {
-            remote,
-            suffix: Either::Right(suffix),
-        }
-    }
-
-    pub fn to_qualified<'b>(&self) -> Qualified<'b> {
-        match &self {
-            Self::Namespaced { remote, suffix } => match suffix {
-                Either::Left(s) => Qualified::from(*s)
-                    .with_namespace(Component::from(remote))
-                    .into(),
-                Either::Right(name) => {
-                    Qualified::from(name.with_namespace(Component::from(remote))).to_owned()
-                }
-            },
-            Self::RadId => REFS_RAD_ID.clone(),
-        }
-    }
-
-    pub fn to_namespaced<'b>(&self) -> Option<Namespaced<'b>> {
-        match self {
-            Self::Namespaced { remote, suffix } => Some(match suffix {
-                Either::Left(special) => special.namespaced(remote),
-                Either::Right(refname) => {
-                    refname.with_namespace(Component::from(remote)).to_owned()
-                }
-            }),
-            Self::RadId => None,
-        }
-    }
-}
-
-impl TryFrom<BString> for ReceivedRefname<'_> {
-    type Error = Error;
-
-    fn try_from(value: BString) -> Result<Self, Self::Error> {
-        match git::parse_ref::<PublicKey>(value.to_str()?)? {
-            (None, name) => (name == *REFS_RAD_ID)
-                .then_some(ReceivedRefname::RadId)
-                .ok_or_else(|| Error::NotCanonicalRadID(name.to_owned())),
-            (Some(remote), name) => Ok(ReceivedRefname::Namespaced {
-                remote,
-                suffix: match Special::from_qualified(&name) {
-                    None => Either::Right(name.to_owned()),
-                    Some(special) => Either::Left(special),
-                },
-            }),
-        }
-    }
-}
-
-/// A reference name and the associated tip received during an
-/// exchange with another peer.
-#[derive(Debug)]
-pub(crate) struct ReceivedRef {
-    pub tip: Oid,
-    pub name: ReceivedRefname<'static>,
-}
-
-impl ReceivedRef {
-    pub fn new(tip: Oid, name: ReceivedRefname<'static>) -> Self {
-        Self { tip, name }
-    }
-
-    pub fn to_qualified(&self) -> Qualified<'static> {
-        self.name.to_qualified()
-    }
-
-    pub fn as_special_ref_update<F>(&self, is_delegate: F) -> Option<(PublicKey, Update<'static>)>
-    where
-        F: Fn(&PublicKey) -> bool,
-    {
-        match &self.name {
-            ReceivedRefname::RadId => None,
-            ReceivedRefname::Namespaced { remote, suffix } => {
-                special_update(remote, suffix, self.tip, is_delegate).map(|up| (*remote, up))
-            }
-        }
-    }
-}
-
-pub(crate) fn special_update<F>(
-    remote: &PublicKey,
-    suffix: &Either<Special, Qualified>,
-    tip: Oid,
-    is_delegate: F,
-) -> Option<Update<'static>>
-where
-    F: Fn(&PublicKey) -> bool,
-{
-    suffix.as_ref().left().map(|special| Update::Direct {
-        name: special.namespaced(remote).to_owned(),
-        target: tip,
-        // N.b. reject any updates if the remote is not a delegate,
-        // since this is not fatal.
-        no_ff: if is_delegate(remote) {
-            Policy::Abort
-        } else {
-            Policy::Reject
-        },
-    })
-}
diff --git a/radicle-fetch/src/sigrefs.rs b/radicle-fetch/src/sigrefs.rs
deleted file mode 100644
index b89f48213..000000000
--- a/radicle-fetch/src/sigrefs.rs
+++ /dev/null
@@ -1,138 +0,0 @@
-use std::collections::{BTreeMap, BTreeSet};
-use std::ops::{Deref, Not as _};
-
-pub use radicle::storage::refs::SignedRefsAt;
-pub use radicle::storage::{git::Validation, Validations};
-use radicle::{crypto::PublicKey, storage::ValidateRepository};
-
-use crate::state::Cached;
-
-pub mod error {
-    use radicle::crypto::PublicKey;
-    use thiserror::Error;
-
-    #[derive(Debug, Error)]
-    #[non_exhaustive]
-    pub enum RemoteRefs {
-        #[error("required sigrefs of {0} not found")]
-        NotFound(PublicKey),
-        #[error(transparent)]
-        Load(#[from] Load),
-    }
-
-    pub type Load = radicle::storage::refs::Error;
-}
-
-/// A data carrier that associates that data with whether a given
-/// `PublicKey` is a delegate or a non-delegate.
-///
-/// Construct a `DelegateStatus` via [`DelegateStatus::empty`], if no
-/// data is required, or [`DelegateStatus::new`] if there is data to
-/// associate.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
-pub(crate) enum DelegateStatus<T = ()> {
-    Delegate { remote: PublicKey, data: T },
-    NonDelegate { remote: PublicKey, data: T },
-}
-
-impl DelegateStatus {
-    /// Construct a `DelegateStatus` without any data.
-    pub fn empty(remote: PublicKey, delegates: &BTreeSet<PublicKey>) -> Self {
-        Self::new((), remote, delegates)
-    }
-}
-
-impl<T> DelegateStatus<T> {
-    pub fn new(data: T, remote: PublicKey, delegates: &BTreeSet<PublicKey>) -> Self {
-        if delegates.contains(&remote) {
-            Self::Delegate { remote, data }
-        } else {
-            Self::NonDelegate { remote, data }
-        }
-    }
-
-    /// Construct a `DelegateStatus` with [`SignedRefsAt`] signed reference
-    /// data, if it can be found in `repo`.
-    pub fn load<S>(
-        self,
-        cached: &Cached<S>,
-    ) -> Result<DelegateStatus<Option<SignedRefsAt>>, radicle::storage::refs::Error> {
-        let remote = *self.remote();
-        self.traverse(|_| cached.load(&remote))
-    }
-
-    fn remote(&self) -> &PublicKey {
-        match self {
-            Self::Delegate { remote, .. } => remote,
-            Self::NonDelegate { remote, .. } => remote,
-        }
-    }
-
-    fn traverse<U, E>(self, f: impl FnOnce(T) -> Result<U, E>) -> Result<DelegateStatus<U>, E> {
-        match self {
-            Self::Delegate { remote, data } => Ok(DelegateStatus::Delegate {
-                remote,
-                data: f(data)?,
-            }),
-            Self::NonDelegate { remote, data } => Ok(DelegateStatus::NonDelegate {
-                remote,
-                data: f(data)?,
-            }),
-        }
-    }
-}
-
-pub(crate) fn validate(
-    repo: &impl ValidateRepository,
-    SignedRefsAt { sigrefs, .. }: SignedRefsAt,
-) -> Result<Option<Validations>, radicle::storage::Error> {
-    let remote = radicle::storage::Remote::<radicle::crypto::Verified>::new(sigrefs);
-    let validations = repo.validate_remote(&remote)?;
-    Ok(validations.is_empty().not().then_some(validations))
-}
-
-/// The sigrefs found for each remote.
-///
-/// Construct using [`RemoteRefs::load`].
-#[derive(Debug, Default)]
-pub struct RemoteRefs(BTreeMap<PublicKey, SignedRefsAt>);
-
-impl RemoteRefs {
-    /// Load the sigrefs for each remote in `remotes`.
-    ///
-    /// If the sigrefs are missing for a given remote, regardless of delegate
-    /// status, then that remote is filtered out.
-    pub(crate) fn load<'a, S>(
-        cached: &Cached<S>,
-        remotes: impl Iterator<Item = &'a PublicKey>,
-    ) -> Result<Self, error::RemoteRefs> {
-        remotes
-            .filter_map(|id| match cached.load(id) {
-                Ok(None) => None,
-                Ok(Some(sr)) => Some(Ok((id, sr))),
-                Err(e) => Some(Err(e)),
-            })
-            .try_fold(RemoteRefs::default(), |mut acc, remote_refs| {
-                let (id, sigrefs) = remote_refs?;
-                acc.0.insert(*id, sigrefs);
-                Ok(acc)
-            })
-    }
-}
-
-impl Deref for RemoteRefs {
-    type Target = BTreeMap<PublicKey, SignedRefsAt>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl<'a> IntoIterator for &'a RemoteRefs {
-    type Item = <&'a BTreeMap<PublicKey, SignedRefsAt> as IntoIterator>::Item;
-    type IntoIter = <&'a BTreeMap<PublicKey, SignedRefsAt> as IntoIterator>::IntoIter;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.0.iter()
-    }
-}
diff --git a/radicle-fetch/src/stage.rs b/radicle-fetch/src/stage.rs
deleted file mode 100644
index d41fc12fd..000000000
--- a/radicle-fetch/src/stage.rs
+++ /dev/null
@@ -1,616 +0,0 @@
-//! The Radicle fetch protocol can be split into two actions: `clone`
-//! and `pull`. Each of these actions will interact with the server in
-//! multiple stages, where each stage will perform a single roundtrip
-//! of fetching. These stages are encapsulated in the
-//! [`ProtocolStage`] trait.
-//!
-//! ### Clone
-//!
-//! A `clone` is split into three stages:
-//!
-//!   1. [`CanonicalId`]: fetches the canonical `refs/rad/id` to use
-//!      as an anchor for the rest of the fetch, i.e. provides initial
-//!      delegate data for the repository.
-//!   2. [`SpecialRefs`]: fetches the special references, `rad/id` and
-//!      `rad/sigrefs`, for each configured namespace, i.e. followed
-//!      and delegate peers if the scope is "followed" and all peers is the
-//!      scope is all.
-//!   3. [`DataRefs`]: fetches the `Oid`s for each reference listed in
-//!      the `rad/sigrefs` for each fetched peer in the
-//!      [`SpecialRefs`] stage. Additionally, any references that have
-//!      been removed from `rad/sigrefs` are marked for deletion.
-//!
-//! ### Pull
-//!
-//! A `pull` is split into two stages:
-//!
-//!   1. [`SpecialRefs`]: see above.
-//!   2. [`DataRefs`]: see above.
-
-use std::collections::{BTreeMap, BTreeSet, HashSet};
-
-use bstr::BString;
-use either::Either;
-use gix_protocol::handshake::Ref;
-use nonempty::NonEmpty;
-use radicle::crypto::PublicKey;
-use radicle::git::{refname, Component, Namespaced, Qualified};
-use radicle::storage::git::Repository;
-use radicle::storage::refs::{RefsAt, Special};
-use radicle::storage::ReadRepository;
-
-use crate::git::refs::{Policy, Update, Updates};
-use crate::policy::BlockList;
-use crate::refs::{ReceivedRef, ReceivedRefname};
-use crate::sigrefs;
-use crate::state::FetchState;
-use crate::transport::WantsHaves;
-use crate::{policy, refs};
-
-pub mod error {
-    use radicle::crypto::PublicKey;
-    use radicle::git::RefString;
-    use thiserror::Error;
-
-    use crate::transport::WantsHavesError;
-
-    #[derive(Debug, Error)]
-    pub enum Layout {
-        #[error("missing required refs: {0:?}")]
-        MissingRequiredRefs(Vec<String>),
-        #[error("expected threshold of {threshold} of references, missing: {missing:?}")]
-        InsufficientRefs {
-            threshold: usize,
-            missing: Vec<String>,
-        },
-    }
-
-    #[derive(Debug, Error)]
-    pub enum Prepare {
-        #[error(transparent)]
-        References(#[from] radicle::storage::Error),
-        #[error("verification of rad/id for {remote} failed")]
-        Verification {
-            remote: PublicKey,
-            #[source]
-            err: Box<dyn std::error::Error + Send + Sync + 'static>,
-        },
-    }
-
-    #[derive(Debug, Error)]
-    pub enum WantsHaves {
-        #[error(transparent)]
-        WantsHavesAdd(#[from] WantsHavesError),
-        #[error("expected namespaced ref {0}")]
-        NotNamespaced(RefString),
-    }
-}
-
-/// A [`ProtocolStage`] describes a single roundtrip with the Radicle
-/// node that is serving the data.
-///
-/// The stages are used as input for [`crate::FetchState::step`] and
-/// are called in the order that they are listed here, .i.e:
-///
-///   1. `ls_refs`: asks the server for the provided reference
-///       prefixes.
-///   2. `ref_filter`: filter the advertised refs to the set required
-///       for inspection.
-///   3. `pre_validate`: before fetching the data, ensure the server
-///       advertised the references that are required.
-///   4. `wants_haves`: build the set of `want`s and `have`s to send
-///       to the server.
-///   5. `prepare_updates`: prepares the set of updates to update the
-///      refdb (in-memory and production).
-pub(crate) trait ProtocolStage {
-    /// If and how to perform `ls-refs`.
-    fn ls_refs(&self) -> Option<NonEmpty<BString>>;
-
-    /// Filter a remote-advertised [`Ref`].
-    ///
-    /// Return `Some` if the ref should be considered, `None` otherwise. This
-    /// method may be called with the response of `ls-refs`, the `wanted-refs`
-    /// of a `fetch` response, or both.
-    fn ref_filter(&self, r: Ref) -> Option<ReceivedRef>;
-
-    /// Validate that all advertised refs conform to an expected layout.
-    ///
-    /// The supplied `refs` are `ls-ref`-advertised refs filtered
-    /// through [`ProtocolStage::ref_filter`].
-    fn pre_validate(&self, refs: &[ReceivedRef]) -> Result<(), error::Layout>;
-
-    /// Assemble the `want`s and `have`s for a `fetch`, retaining the refs which
-    /// would need updating after the `fetch` succeeds.
-    ///
-    /// The `refs` are the advertised refs from executing `ls-refs`, filtered
-    /// through [`ProtocolStage::ref_filter`].
-    fn wants_haves(
-        &self,
-        refdb: &Repository,
-        refs: &[ReceivedRef],
-    ) -> Result<WantsHaves, error::WantsHaves> {
-        let mut wants_haves = WantsHaves::default();
-        wants_haves.add(
-            refdb,
-            refs.iter().map(|recv| (recv.to_qualified(), recv.tip)),
-        )?;
-        Ok(wants_haves)
-    }
-
-    /// Prepare the [`Updates`] based on the received `refs`.
-    ///
-    /// These updates can then be used to update the refdb.
-    fn prepare_updates<'a>(
-        &self,
-        s: &FetchState,
-        repo: &Repository,
-        refs: &'a [ReceivedRef],
-    ) -> Result<Updates<'a>, error::Prepare>;
-}
-
-/// The [`ProtocolStage`] for performing an initial clone from a `remote`.
-///
-/// This step asks for the canonical `refs/rad/id` reference, which
-/// allows us to use it as an anchor for the following steps.
-#[derive(Debug)]
-pub struct CanonicalId {
-    pub remote: PublicKey,
-    #[allow(dead_code)]
-    pub limit: u64,
-}
-
-impl ProtocolStage for CanonicalId {
-    fn ls_refs(&self) -> Option<NonEmpty<BString>> {
-        Some(NonEmpty::new(refs::REFS_RAD_ID.as_bstr().into()))
-    }
-
-    fn ref_filter(&self, r: Ref) -> Option<ReceivedRef> {
-        match refs::unpack_ref(r).ok()? {
-            (
-                refname @ ReceivedRefname::Namespaced {
-                    suffix: Either::Left(_),
-                    ..
-                },
-                tip,
-            ) => Some(ReceivedRef::new(tip, refname)),
-            (ReceivedRefname::RadId, tip) => Some(ReceivedRef::new(tip, ReceivedRefname::RadId)),
-            _ => None,
-        }
-    }
-
-    fn pre_validate(&self, refs: &[ReceivedRef]) -> Result<(), error::Layout> {
-        // Ensures that we fetched the canonical 'refs/rad/id'
-        ensure_refs(
-            [BString::from(refs::REFS_RAD_ID.as_bstr())]
-                .into_iter()
-                .collect(),
-            refs.iter()
-                .map(|r| r.to_qualified().to_string().into())
-                .collect(),
-        )
-    }
-
-    fn prepare_updates<'a>(
-        &self,
-        s: &FetchState,
-        repo: &Repository,
-        refs: &'a [ReceivedRef],
-    ) -> Result<Updates<'a>, error::Prepare> {
-        // SAFETY: checked by `pre_validate` that the `refs/rad/id`
-        // was received
-        let verified = repo
-            .identity_doc_at(
-                *s.canonical_rad_id()
-                    .expect("ensure we got canonicdal 'rad/id' ref"),
-            )
-            .map_err(|err| error::Prepare::Verification {
-                remote: self.remote,
-                err: Box::new(err),
-            })?;
-        if verified.delegates.contains(&self.remote.into()) {
-            let is_delegate = |remote: &PublicKey| verified.is_delegate(remote);
-            Ok(Updates::build(
-                refs.iter()
-                    .filter_map(|r| r.as_special_ref_update(is_delegate)),
-            ))
-        } else {
-            Ok(Updates::default())
-        }
-    }
-}
-
-/// The [`ProtocolStage`] for fetching special refs from the set of
-/// remotes in `followed` and `delegates`.
-///
-/// This step asks for all followed and delegate remote's `rad/id` and
-/// `rad/sigrefs`, iff the scope is [`policy::Scope::Followed`].
-/// Otherwise, it asks for all namespaces.
-///
-/// It ensures that all delegate refs were fetched.
-#[derive(Debug)]
-pub struct SpecialRefs {
-    /// The set of nodes that should be blocked from fetching.
-    pub blocked: BlockList,
-    /// The node that is being fetched from.
-    #[allow(dead_code)]
-    pub remote: PublicKey,
-    /// The set of nodes to be fetched.
-    pub followed: policy::Allowed,
-    /// The set of delegates to be fetched, with the local node
-    /// removed in the case of a `pull`.
-    pub delegates: BTreeSet<PublicKey>,
-    /// The threshold of delegates that needs to be fetched.
-    pub threshold: usize,
-    /// The data limit for this stage of fetching.
-    #[allow(dead_code)]
-    pub limit: u64,
-}
-
-impl ProtocolStage for SpecialRefs {
-    fn ls_refs(&self) -> Option<NonEmpty<BString>> {
-        match &self.followed {
-            policy::Allowed::All => Some(NonEmpty::new("refs/namespaces".into())),
-            policy::Allowed::Followed { remotes } => NonEmpty::collect(
-                remotes
-                    .iter()
-                    .chain(self.delegates.iter())
-                    .flat_map(|remote| {
-                        [
-                            BString::from(radicle::git::refs::storage::id(remote).to_string()),
-                            BString::from(radicle::git::refs::storage::sigrefs(remote).to_string()),
-                        ]
-                    }),
-            ),
-        }
-    }
-
-    fn ref_filter(&self, r: Ref) -> Option<ReceivedRef> {
-        let (refname, tip) = refs::unpack_ref(r).ok()?;
-        match refname {
-            // N.b. ensure that any blocked peers are filtered since
-            // `Scope::All` can ls for them
-            ReceivedRefname::Namespaced { remote, .. } if self.blocked.is_blocked(&remote) => None,
-            ReceivedRefname::Namespaced { ref suffix, .. } if suffix.is_left() => {
-                Some(ReceivedRef::new(tip, refname))
-            }
-            ReceivedRefname::Namespaced { .. } | ReceivedRefname::RadId => None,
-        }
-    }
-
-    fn pre_validate(&self, refs: &[ReceivedRef]) -> Result<(), error::Layout> {
-        ensure_threshold(
-            self.delegates
-                .iter()
-                .filter(|id| !self.blocked.is_blocked(id))
-                .map(|id| {
-                    // N.b. we asked for the rad/id but do not need to ensure it
-                    BString::from(radicle::git::refs::storage::sigrefs(id).to_string())
-                })
-                .collect(),
-            refs.iter()
-                .filter_map(|r| r.name.to_namespaced())
-                .map(|r| r.to_string().into())
-                .collect(),
-            self.threshold,
-        )
-    }
-
-    fn prepare_updates<'a>(
-        &self,
-        _s: &FetchState,
-        _repo: &Repository,
-        refs: &'a [ReceivedRef],
-    ) -> Result<Updates<'a>, error::Prepare> {
-        special_refs_updates(&self.delegates, &self.blocked, refs)
-    }
-}
-
-/// The [`ProtocolStage`] for fetching announce `rad/sigrefs`.
-///
-/// This step will ask for the `rad/sigrefs` for the remotes of
-/// `refs_at`.
-#[derive(Debug)]
-pub struct SigrefsAt {
-    /// The set of nodes that should be blocked from fetching.
-    pub blocked: BlockList,
-    /// The node that is being fetched from.
-    #[allow(dead_code)]
-    pub remote: PublicKey,
-    /// The set of remotes and the newly announced `Oid` for their
-    /// `rad/sigrefs`.
-    pub refs_at: Vec<RefsAt>,
-    /// The set of delegates to be fetched, with the local node
-    /// removed in the case of a `pull`.
-    pub delegates: BTreeSet<PublicKey>,
-    /// The data limit for this stage of fetching.
-    #[allow(dead_code)]
-    pub limit: u64,
-}
-
-impl ProtocolStage for SigrefsAt {
-    fn ls_refs(&self) -> Option<NonEmpty<BString>> {
-        // N.b. the `Oid`s are known but the `rad/sigrefs` are still
-        // asked for to mark them for updating the fetch state.
-        NonEmpty::collect(self.refs_at.iter().map(|refs_at| {
-            BString::from(radicle::git::refs::storage::sigrefs(&refs_at.remote).to_string())
-        }))
-    }
-
-    // We only asked for `rad/sigrefs` so we should only get
-    // `rad/sigrefs`.
-    fn ref_filter(&self, r: Ref) -> Option<ReceivedRef> {
-        let (refname, tip) = refs::unpack_ref(r).ok()?;
-        match refname {
-            ReceivedRefname::Namespaced { remote, .. } if self.blocked.is_blocked(&remote) => None,
-            ReceivedRefname::Namespaced {
-                suffix: Either::Left(Special::SignedRefs),
-                ..
-            } => Some(ReceivedRef::new(tip, refname)),
-            ReceivedRefname::Namespaced { .. } | ReceivedRefname::RadId => None,
-        }
-    }
-
-    fn pre_validate(&self, _refs: &[ReceivedRef]) -> Result<(), error::Layout> {
-        Ok(())
-    }
-
-    fn wants_haves(
-        &self,
-        refdb: &Repository,
-        refs: &[ReceivedRef],
-    ) -> Result<WantsHaves, error::WantsHaves> {
-        let mut wants_haves = WantsHaves::default();
-        let sigrefs = self
-            .refs_at
-            .iter()
-            .map(|RefsAt { remote, at }| (Special::SignedRefs.namespaced(remote), *at));
-        wants_haves.add(refdb, sigrefs)?;
-        wants_haves.add(
-            refdb,
-            refs.iter().map(|recv| (recv.to_qualified(), recv.tip)),
-        )?;
-        Ok(wants_haves)
-    }
-
-    fn prepare_updates<'a>(
-        &self,
-        _s: &FetchState,
-        _repo: &Repository,
-        _refs: &'a [ReceivedRef],
-    ) -> Result<Updates<'a>, error::Prepare> {
-        let mut updates = Updates::default();
-        for RefsAt { remote, at } in self.refs_at.iter() {
-            if let Some(up) =
-                refs::special_update(remote, &Either::Left(Special::SignedRefs), *at, |remote| {
-                    self.delegates.contains(remote)
-                })
-            {
-                updates.add(*remote, up);
-            }
-        }
-        Ok(updates)
-    }
-}
-
-/// The [`ProtocolStage`] for fetching data refs from the set of
-/// remotes in `trusted`.
-///
-/// All refs that are listed in the `remotes` sigrefs are checked
-/// against our refdb/odb to build a set of `wants` and `haves`. The
-/// `wants` will then be fetched from the server side to receive those
-/// particular objects.
-///
-/// Those refs and objects are then prepared for updating, removing
-/// any that were found to exist before the latest fetch.
-#[derive(Debug)]
-pub struct DataRefs {
-    /// The node that is being fetched from.
-    #[allow(dead_code)]
-    pub remote: PublicKey,
-    /// The set of signed references from each remote that was
-    /// fetched.
-    pub remotes: sigrefs::RemoteRefs,
-    /// The data limit for this stage of fetching.
-    #[allow(dead_code)]
-    pub limit: u64,
-}
-
-impl ProtocolStage for DataRefs {
-    // We don't need to ask for refs since we have all reference names
-    // and `Oid`s in `rad/sigrefs`.
-    fn ls_refs(&self) -> Option<NonEmpty<BString>> {
-        None
-    }
-
-    // Since we don't ask for refs, we don't need to filter them.
-    fn ref_filter(&self, _: Ref) -> Option<ReceivedRef> {
-        None
-    }
-
-    // Since we don't ask for refs, we don't need to validate them.
-    fn pre_validate(&self, _refs: &[ReceivedRef]) -> Result<(), error::Layout> {
-        Ok(())
-    }
-
-    // We ignore the `ReceivedRef`s since we are using the `remotes`
-    // as the source for refnames and `Oid`s.
-    fn wants_haves(
-        &self,
-        refdb: &Repository,
-        _refs: &[ReceivedRef],
-    ) -> Result<WantsHaves, error::WantsHaves> {
-        let mut wants_haves = WantsHaves::default();
-
-        for (remote, loaded) in &self.remotes {
-            wants_haves.add(
-                refdb,
-                loaded.refs.iter().filter_map(|(refname, tip)| {
-                    let refname = Qualified::from_refstr(refname)
-                        .map(|refname| refname.with_namespace(Component::from(remote)))?;
-                    Some((refname, *tip))
-                }),
-            )?;
-        }
-
-        Ok(wants_haves)
-    }
-
-    fn prepare_updates<'a>(
-        &self,
-        _s: &FetchState,
-        repo: &Repository,
-        _refs: &'a [ReceivedRef],
-    ) -> Result<Updates<'a>, error::Prepare> {
-        let mut updates = Updates::default();
-
-        for (remote, refs) in &self.remotes {
-            let mut signed = HashSet::with_capacity(refs.refs.len());
-            for (name, tip) in refs.iter() {
-                let tracking: Namespaced<'_> = Qualified::from_refstr(name)
-                    .and_then(|q| refs::ReceivedRefname::remote(*remote, q).to_namespaced())
-                    .expect("we checked sigrefs well-formedness in wants_refs already");
-                signed.insert(tracking.clone());
-                updates.add(
-                    *remote,
-                    Update::Direct {
-                        name: tracking,
-                        target: *tip,
-                        no_ff: Policy::Allow,
-                    },
-                );
-            }
-
-            // Prune refs not in signed
-            let prefix_rad = refname!("refs/rad");
-            for (name, target) in repo.references_of(remote)? {
-                // 'rad/' refs are never subject to pruning
-                if name.starts_with(prefix_rad.as_str()) {
-                    continue;
-                }
-
-                let name = Qualified::from_refstr(name)
-                    .expect("BUG: reference is guaranteed to be Qualified")
-                    .with_namespace(Component::from(remote));
-
-                if !signed.contains(&name) {
-                    updates.add(
-                        *remote,
-                        Update::Prune {
-                            name,
-                            prev: either::Left(target),
-                        },
-                    );
-                }
-            }
-        }
-
-        Ok(updates)
-    }
-}
-
-// N.b. the `delegates` are the delegates of the repository, with the
-// potential removal of the local peer in the case of a `pull`.
-fn special_refs_updates<'a>(
-    delegates: &BTreeSet<PublicKey>,
-    blocked: &BlockList,
-    refs: &'a [ReceivedRef],
-) -> Result<Updates<'a>, error::Prepare> {
-    use either::Either::*;
-
-    let grouped = refs
-        .iter()
-        .filter_map(|r| match &r.name {
-            refs::ReceivedRefname::Namespaced { remote, suffix } => {
-                (!blocked.is_blocked(remote)).then_some((remote, r.tip, suffix.clone()))
-            }
-            refs::ReceivedRefname::RadId => None,
-        })
-        .fold(
-            BTreeMap::<PublicKey, Vec<_>>::new(),
-            |mut acc, (remote_id, tip, name)| {
-                acc.entry(*remote_id).or_default().push((tip, name));
-                acc
-            },
-        );
-
-    let mut updates = Updates::default();
-
-    for (remote_id, refs) in grouped {
-        let mut tips_inner = Vec::with_capacity(2);
-        for (tip, suffix) in &refs {
-            match &suffix {
-                Left(refs::Special::Id) => {
-                    if let Some(u) = refs::special_update(&remote_id, suffix, *tip, |remote| {
-                        delegates.contains(remote)
-                    }) {
-                        tips_inner.push(u);
-                    }
-                }
-
-                Left(refs::Special::SignedRefs) => {
-                    if let Some(u) = refs::special_update(&remote_id, suffix, *tip, |remote| {
-                        delegates.contains(remote)
-                    }) {
-                        tips_inner.push(u);
-                    }
-                }
-
-                Right(_) => continue,
-            }
-        }
-
-        updates.append(remote_id, tips_inner);
-    }
-
-    Ok(updates)
-}
-
-fn ensure_refs<T>(required: BTreeSet<T>, wants: BTreeSet<T>) -> Result<(), error::Layout>
-where
-    T: Ord + ToString,
-{
-    if wants.is_empty() {
-        return Ok(());
-    }
-
-    let diff = required.difference(&wants).collect::<Vec<_>>();
-
-    if diff.is_empty() {
-        Ok(())
-    } else {
-        Err(error::Layout::MissingRequiredRefs(
-            diff.into_iter().map(|ns| ns.to_string()).collect(),
-        ))
-    }
-}
-
-fn ensure_threshold<T>(
-    wants: BTreeSet<T>,
-    haves: BTreeSet<T>,
-    threshold: usize,
-) -> Result<(), error::Layout>
-where
-    T: Ord + ToString,
-    T: std::fmt::Debug,
-{
-    // N.b. there's no threshold to meet. This generally means that
-    // the local peer is a delegate and the original threshold is 1,
-    // so they don't require the other peer.
-    if threshold == 0 {
-        return Ok(());
-    }
-
-    if wants.is_empty() {
-        return Ok(());
-    }
-
-    if haves.len() < threshold {
-        let missing = wants
-            .difference(&haves)
-            .map(|ns| ns.to_string())
-            .collect::<Vec<_>>();
-        return Err(error::Layout::InsufficientRefs { threshold, missing });
-    }
-
-    Ok(())
-}
diff --git a/radicle-fetch/src/state.rs b/radicle-fetch/src/state.rs
deleted file mode 100644
index 489cbb832..000000000
--- a/radicle-fetch/src/state.rs
+++ /dev/null
@@ -1,748 +0,0 @@
-use std::collections::{BTreeMap, BTreeSet};
-use std::time::Instant;
-
-use gix_protocol::handshake;
-use radicle::crypto::PublicKey;
-use radicle::git::{Oid, Qualified};
-use radicle::identity::{Did, Doc, DocError};
-
-use radicle::prelude::Verified;
-use radicle::storage;
-use radicle::storage::refs::{RefsAt, SignedRefs};
-use radicle::storage::{
-    git::Validation, Remote, RemoteId, RemoteRepository, Remotes, ValidateRepository, Validations,
-};
-
-use crate::git;
-use crate::git::packfile::Keepfile;
-use crate::git::refs::{Applied, Update};
-use crate::git::repository;
-use crate::sigrefs::SignedRefsAt;
-use crate::stage;
-use crate::stage::ProtocolStage;
-use crate::{refs, sigrefs, transport, Handle};
-
-/// The data size limit, 5Mb, while fetching the special refs,
-/// i.e. `rad/id` and `rad/sigrefs`.
-pub const DEFAULT_FETCH_SPECIAL_REFS_LIMIT: u64 = 1024 * 1024 * 5;
-/// The data size limit, 5Gb, while fetching the data refs,
-/// i.e. `refs/heads`, `refs/tags`, `refs/cobs`, etc.
-pub const DEFAULT_FETCH_DATA_REFS_LIMIT: u64 = 1024 * 1024 * 1024 * 5;
-
-pub mod error {
-    use std::io;
-
-    use radicle::git::Oid;
-    use radicle::prelude::PublicKey;
-    use thiserror::Error;
-
-    use crate::{git, git::repository, handle, sigrefs, stage};
-
-    #[derive(Debug, Error)]
-    pub enum Step {
-        #[error(transparent)]
-        Io(#[from] io::Error),
-        #[error(transparent)]
-        Layout(#[from] stage::error::Layout),
-        #[error(transparent)]
-        Prepare(#[from] stage::error::Prepare),
-        #[error(transparent)]
-        WantsHaves(#[from] stage::error::WantsHaves),
-    }
-
-    #[derive(Debug, Error)]
-    pub enum Protocol {
-        #[error(transparent)]
-        Ancestry(#[from] repository::error::Ancestry),
-        #[error(transparent)]
-        Canonical(#[from] Canonical),
-        #[error("delegate '{remote}' has diverged 'rad/sigrefs': {current} -> {received}")]
-        Diverged {
-            remote: PublicKey,
-            current: Oid,
-            received: Oid,
-        },
-        #[error(transparent)]
-        Io(#[from] io::Error),
-        #[error("canonical 'refs/rad/id' is missing")]
-        MissingRadId,
-        #[error(transparent)]
-        RefdbUpdate(#[from] repository::error::Update),
-        #[error(transparent)]
-        Resolve(#[from] repository::error::Resolve),
-        #[error(transparent)]
-        Refs(#[from] radicle::storage::refs::Error),
-        #[error(transparent)]
-        RemoteRefs(#[from] sigrefs::error::RemoteRefs),
-        #[error("failed to get remote namespaces: {0}")]
-        RemoteIds(#[source] radicle::git::raw::Error),
-        #[error(transparent)]
-        Step(#[from] Step),
-        #[error(transparent)]
-        Tracking(#[from] handle::error::Tracking),
-        #[error(transparent)]
-        Validation(#[from] radicle::storage::Error),
-    }
-
-    #[derive(Debug, Error)]
-    pub enum Canonical {
-        #[error(transparent)]
-        Resolve(#[from] git::repository::error::Resolve),
-        #[error(transparent)]
-        Verified(#[from] radicle::identity::DocError),
-    }
-}
-
-type IdentityTips = BTreeMap<PublicKey, Oid>;
-type SigrefTips = BTreeMap<PublicKey, Oid>;
-
-#[derive(Clone, Copy, Debug)]
-pub struct FetchLimit {
-    pub special: u64,
-    pub refs: u64,
-}
-
-impl Default for FetchLimit {
-    fn default() -> Self {
-        Self {
-            special: DEFAULT_FETCH_SPECIAL_REFS_LIMIT,
-            refs: DEFAULT_FETCH_DATA_REFS_LIMIT,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum FetchResult {
-    Success {
-        /// The set of applied changes to the reference store.
-        applied: Applied<'static>,
-        /// The set of namespaces that were fetched.
-        remotes: BTreeSet<PublicKey>,
-        /// Any validation errors that were found while fetching.
-        validations: sigrefs::Validations,
-    },
-    Failed {
-        /// The threshold that needed to be met.
-        threshold: usize,
-        /// The offending delegates.
-        delegates: BTreeSet<PublicKey>,
-        /// Validation errors that were found while fetching.
-        validations: sigrefs::Validations,
-    },
-}
-
-impl FetchResult {
-    pub fn rejected(&self) -> impl Iterator<Item = &Update<'static>> {
-        match self {
-            Self::Success { applied, .. } => either::Either::Left(applied.rejected.iter()),
-            Self::Failed { .. } => either::Either::Right(std::iter::empty()),
-        }
-    }
-
-    pub fn is_success(&self) -> bool {
-        match self {
-            Self::Success { .. } => true,
-            Self::Failed { .. } => false,
-        }
-    }
-}
-
-#[derive(Default)]
-pub struct FetchState {
-    /// In-memory refdb used to keep track of new updates without
-    /// committing them to the real refdb until all validation has
-    /// occurred.
-    refs: git::mem::Refdb,
-    /// Have we seen the `rad/id` reference?
-    canonical_rad_id: Option<Oid>,
-    /// Seen remote `rad/id` tips.
-    ids: IdentityTips,
-    /// Seen remote `rad/sigrefs` tips.
-    sigrefs: SigrefTips,
-    /// Seen reference tips, per remote.
-    tips: BTreeMap<PublicKey, Vec<Update<'static>>>,
-    /// The `.keep` files created during packfile transfers. They are kept
-    /// within the state, so that when the state is dropped, it also attempts to
-    /// delete the files to release the locks on the packfiles.
-    keepfiles: Vec<Keepfile>,
-}
-
-impl FetchState {
-    /// Remove all tips associated with this `remote` in the
-    /// `FetchState`.
-    pub fn prune(&mut self, remote: &PublicKey) {
-        self.ids.remove(remote);
-        self.sigrefs.remove(remote);
-        self.tips.remove(remote);
-    }
-
-    pub fn canonical_rad_id(&self) -> Option<&Oid> {
-        self.canonical_rad_id.as_ref()
-    }
-
-    /// Update the in-memory refdb with the given updates while also
-    /// keeping track of the updates in [`FetchState::tips`].
-    pub fn update_all<'a, I>(&mut self, other: I) -> Applied<'a>
-    where
-        I: IntoIterator<Item = (PublicKey, Vec<Update<'a>>)>,
-    {
-        let mut ap = Applied::default();
-        for (remote, ups) in other {
-            for up in &ups {
-                ap.append(&mut self.refs.update(Some(up.clone())));
-            }
-            let mut ups = ups
-                .into_iter()
-                .map(|up| up.into_owned())
-                .collect::<Vec<_>>();
-            self.tips
-                .entry(remote)
-                .and_modify(|tips| tips.append(&mut ups))
-                .or_insert(ups);
-        }
-        ap
-    }
-
-    pub(crate) fn as_cached<'a, S>(&'a mut self, handle: &'a mut Handle<S>) -> Cached<'a, S> {
-        Cached {
-            handle,
-            state: self,
-        }
-    }
-}
-
-impl FetchState {
-    /// Perform the ls-refs and fetch for the given `step`. The result
-    /// of these processes is kept track of in the internal state.
-    pub(super) fn run_stage<S, F>(
-        &mut self,
-        handle: &mut Handle<S>,
-        handshake: &handshake::Outcome,
-        step: &F,
-    ) -> Result<BTreeSet<PublicKey>, error::Step>
-    where
-        S: transport::ConnectionStream,
-        F: ProtocolStage,
-    {
-        let refs = match step.ls_refs() {
-            Some(refs) => handle
-                .transport
-                .ls_refs(refs.into(), handshake)?
-                .into_iter()
-                .filter_map(|r| step.ref_filter(r))
-                .collect::<Vec<_>>(),
-            None => vec![],
-        };
-        log::trace!(target: "fetch", "Received refs {:?}", refs);
-        step.pre_validate(&refs)?;
-
-        let wants_haves = step.wants_haves(&handle.repo, &refs)?;
-        if !wants_haves.wants.is_empty() {
-            let keepfile =
-                handle
-                    .transport
-                    .fetch(wants_haves, handle.interrupt.clone(), handshake)?;
-            self.keepfiles.extend(keepfile);
-        } else {
-            log::trace!(target: "fetch", "Nothing to fetch")
-        };
-
-        let mut fetched = BTreeSet::new();
-        for r in &refs {
-            match &r.name {
-                refs::ReceivedRefname::Namespaced { remote, suffix } => {
-                    fetched.insert(*remote);
-                    if let Some(rad) = suffix.as_ref().left() {
-                        match rad {
-                            refs::Special::Id => {
-                                self.ids.insert(*remote, r.tip);
-                            }
-
-                            refs::Special::SignedRefs => {
-                                self.sigrefs.insert(*remote, r.tip);
-                            }
-                        }
-                    }
-                }
-                refs::ReceivedRefname::RadId => self.canonical_rad_id = Some(r.tip),
-            }
-        }
-
-        let up = step.prepare_updates(self, &handle.repo, &refs)?;
-        self.update_all(up.tips);
-
-        Ok(fetched)
-    }
-
-    /// Fetch the set of special refs, depending on `refs_at`.
-    ///
-    /// If `refs_at` is `Some`, then run the [`SigrefsAt`] stage,
-    /// which specifically fetches `rad/sigrefs` which are listed in
-    /// `refs_at`.
-    ///
-    /// If `refs_at` is `None`, then run the [`SpecialRefs`] stage,
-    /// which fetches `rad/sigrefs` and `rad/id` from all tracked and
-    /// delegate peers (scope dependent).
-    ///
-    /// The resulting [`sigrefs::RemoteRefs`] will be the set of
-    /// `rad/sigrefs` of the fetched remotes.
-    #[allow(clippy::too_many_arguments)]
-    fn run_special_refs<S>(
-        &mut self,
-        handle: &mut Handle<S>,
-        handshake: &handshake::Outcome,
-        delegates: BTreeSet<PublicKey>,
-        threshold: usize,
-        limit: &FetchLimit,
-        remote: PublicKey,
-        refs_at: Option<Vec<RefsAt>>,
-    ) -> Result<sigrefs::RemoteRefs, error::Protocol>
-    where
-        S: transport::ConnectionStream,
-    {
-        match refs_at {
-            Some(refs_at) => {
-                let sigrefs_at = stage::SigrefsAt {
-                    remote,
-                    delegates: delegates.clone(),
-                    refs_at: refs_at.clone(),
-                    blocked: handle.blocked.clone(),
-                    limit: limit.special,
-                };
-                log::trace!(target: "fetch", "{sigrefs_at:?}");
-                self.run_stage(handle, handshake, &sigrefs_at)?;
-                let remotes = refs_at.iter().map(|r| &r.remote);
-
-                let signed_refs = sigrefs::RemoteRefs::load(&self.as_cached(handle), remotes)?;
-                Ok(signed_refs)
-            }
-            None => {
-                let followed = handle.allowed();
-                log::trace!(target: "fetch", "Followed nodes {:?}", followed);
-                let special_refs = stage::SpecialRefs {
-                    blocked: handle.blocked.clone(),
-                    remote,
-                    delegates: delegates.clone(),
-                    followed,
-                    threshold,
-                    limit: limit.special,
-                };
-                log::trace!(target: "fetch", "{special_refs:?}");
-                let fetched = self.run_stage(handle, handshake, &special_refs)?;
-
-                let signed_refs = sigrefs::RemoteRefs::load(
-                    &self.as_cached(handle),
-                    fetched.iter().chain(delegates.iter()),
-                )?;
-                Ok(signed_refs)
-            }
-        }
-    }
-
-    /// The finalization of the protocol exchange is as follows:
-    ///
-    ///   1. Load the canonical `rad/id` to use as the anchor for
-    ///      getting the delegates of the identity.
-    ///   2. Calculate the trusted set of peers for fetching from.
-    ///   3. Fetch the special references, i.e. `rad/id` and `rad/sigrefs`.
-    ///   4. Load the signed references, where these signed references
-    ///      must be cryptographically verified for delegates,
-    ///      otherwise they are discarded for non-delegates.
-    ///   5. Fetch the data references, i.e. references found in
-    ///      `rad/sigrefs`.
-    ///   6. Validate the fetched references for delegates and
-    ///      non-delegates, pruning any invalid remotes from the set
-    ///      of updating tips.
-    ///   7. Apply the valid tips, iff no delegates failed validation.
-    ///   8. Signal to the other side that the process has completed.
-    pub(super) fn run<S>(
-        mut self,
-        handle: &mut Handle<S>,
-        handshake: &handshake::Outcome,
-        limit: FetchLimit,
-        remote: PublicKey,
-        refs_at: Option<Vec<RefsAt>>,
-    ) -> Result<FetchResult, error::Protocol>
-    where
-        S: transport::ConnectionStream,
-    {
-        let start = Instant::now();
-        // N.b. we always fetch the `rad/id` since our delegate set
-        // might be further ahead than theirs, e.g. we are the
-        // deciding vote on adding a delegate.
-        self.run_stage(
-            handle,
-            handshake,
-            &stage::CanonicalId {
-                remote,
-                limit: limit.special,
-            },
-        )?;
-        log::debug!(target: "fetch", "Fetched rad/id ({}ms)", start.elapsed().as_millis());
-
-        // N.b. The error case here should not happen. In the case of
-        // a `clone` we have asked for refs/rad/id and ensured it was
-        // fetched. In the case of `pull` the repository should have
-        // the refs/rad/id set.
-        let anchor = self
-            .as_cached(handle)
-            .canonical()?
-            .ok_or(error::Protocol::MissingRadId)?;
-
-        let is_delegate = anchor.delegates.contains(&Did::from(handle.local()));
-        // TODO: not sure we should allow to block *any* peer from the
-        // delegate set. We could end up ignoring delegates.
-        let delegates = anchor
-            .delegates
-            .iter()
-            .filter(|id| !handle.is_blocked(id))
-            .map(|did| PublicKey::from(*did))
-            .collect::<BTreeSet<_>>();
-
-        log::trace!(target: "fetch", "Identity delegates {delegates:?}");
-
-        // The local peer does not need to count towards the threshold
-        // since they must be valid already.
-        let threshold = if is_delegate {
-            anchor.threshold - 1
-        } else {
-            anchor.threshold
-        };
-        let signed_refs = self.run_special_refs(
-            handle,
-            handshake,
-            delegates.clone(),
-            threshold,
-            &limit,
-            remote,
-            refs_at,
-        )?;
-        log::debug!(
-            target: "fetch",
-            "Fetched data for {} remote(s) ({}ms)",
-            signed_refs.len(),
-            start.elapsed().as_millis()
-        );
-
-        let data_refs = stage::DataRefs {
-            remote,
-            remotes: signed_refs,
-            limit: limit.refs,
-        };
-        self.run_stage(handle, handshake, &data_refs)?;
-        log::debug!(
-            target: "fetch",
-            "Fetched data refs for {} remotes ({}ms)",
-            data_refs.remotes.len(),
-            start.elapsed().as_millis()
-        );
-
-        // N.b. signal to exit the upload-pack sequence
-        // We're finished fetching on this side, and all that's left
-        // is validation.
-        match handle.transport.done() {
-            Ok(()) => log::debug!(target: "fetch", "Sent done signal to remote {remote}"),
-            Err(err) => {
-                log::warn!(target: "fetch", "Attempted to send done to remote {remote}: {err}")
-            }
-        }
-
-        // Run validation of signed refs, pruning any offending
-        // remotes from the tips, thus not updating the production Git
-        // repository.
-        let mut failures = sigrefs::Validations::default();
-        let signed_refs = data_refs.remotes;
-
-        // We may prune fetched remotes, so we keep track of
-        // non-pruned, fetched remotes here.
-        let mut remotes = BTreeSet::new();
-
-        // The valid delegates start with all delegates that this peer
-        // currently has valid references for
-        let mut valid_delegates = handle
-            .repository()
-            .remote_ids()
-            .map_err(error::Protocol::RemoteIds)?
-            .filter_map(|id| id.ok())
-            .filter(|id| delegates.contains(id))
-            .collect::<BTreeSet<_>>();
-        let mut failed_delegates = BTreeSet::new();
-
-        // TODO(finto): this might read better if it got its own
-        // private function.
-        for remote in signed_refs.keys() {
-            if handle.is_blocked(remote) {
-                log::trace!(target: "fetch", "Skipping blocked remote {remote}");
-                continue;
-            }
-
-            let remote = sigrefs::DelegateStatus::empty(*remote, &delegates)
-                .load(&self.as_cached(handle))?;
-            match remote {
-                sigrefs::DelegateStatus::NonDelegate { remote, data: None } => {
-                    log::debug!(target: "fetch", "Pruning non-delegate {remote} tips, missing 'rad/sigrefs'");
-                    failures.push(sigrefs::Validation::MissingRadSigRefs(remote));
-                    self.prune(&remote);
-                }
-                sigrefs::DelegateStatus::Delegate { remote, data: None } => {
-                    log::warn!(target: "fetch", "Pruning delegate {remote} tips, missing 'rad/sigrefs'");
-                    failures.push(sigrefs::Validation::MissingRadSigRefs(remote));
-                    self.prune(&remote);
-                    // This delegate has removed their `rad/sigrefs`.
-                    // Technically, we can continue with their
-                    // previous `rad/sigrefs` but if this occurs with
-                    // enough delegates also failing validation we
-                    // would rather surface the issue and fail the fetch.
-                    valid_delegates.remove(&remote);
-                    failed_delegates.insert(remote);
-                }
-                sigrefs::DelegateStatus::NonDelegate {
-                    remote,
-                    data: Some(sigrefs),
-                } => {
-                    if let Some(SignedRefsAt { at, .. }) = SignedRefsAt::load(remote, &handle.repo)?
-                    {
-                        // Prune non-delegates if they're behind or
-                        // diverged. A diverged case is non-fatal for
-                        // delegates.
-                        if matches!(
-                            repository::ancestry(&handle.repo, at, sigrefs.at)?,
-                            repository::Ancestry::Behind | repository::Ancestry::Diverged
-                        ) {
-                            self.prune(&remote);
-                            continue;
-                        }
-                    }
-
-                    let cache = self.as_cached(handle);
-                    if let Some(warns) = sigrefs::validate(&cache, sigrefs)?.as_mut() {
-                        log::debug!(
-                            target: "fetch",
-                            "Pruning non-delegate {remote} tips, due to validation failures"
-                        );
-                        self.prune(&remote);
-                        failures.append(warns);
-                    } else {
-                        remotes.insert(remote);
-                    }
-                }
-                sigrefs::DelegateStatus::Delegate {
-                    remote,
-                    data: Some(sigrefs),
-                } => {
-                    if let Some(SignedRefsAt { at, .. }) = SignedRefsAt::load(remote, &handle.repo)?
-                    {
-                        let ancestry = repository::ancestry(&handle.repo, at, sigrefs.at)?;
-                        if matches!(ancestry, repository::Ancestry::Behind) {
-                            log::trace!(target: "fetch", "Advertised `rad/sigrefs` {} is behind {at} for {remote}", sigrefs.at);
-                            self.prune(&remote);
-                            continue;
-                        } else if matches!(ancestry, repository::Ancestry::Diverged) {
-                            return Err(error::Protocol::Diverged {
-                                remote,
-                                current: at,
-                                received: sigrefs.at,
-                            });
-                        }
-                    }
-
-                    let cache = self.as_cached(handle);
-                    let mut fails = Validations::default();
-                    // N.b. we only validate the existence of the
-                    // default branch for delegates, since it safe for
-                    // non-delegates to not have this branch.
-                    let branch_validation =
-                        validate_project_default_branch(&anchor, &sigrefs.sigrefs);
-                    fails.extend(branch_validation.into_iter());
-                    let validations = sigrefs::validate(&cache, sigrefs)?;
-                    fails.extend(validations.into_iter().flatten());
-                    if !fails.is_empty() {
-                        log::warn!(target: "fetch", "Pruning delegate {remote} tips, due to validation failures");
-                        self.prune(&remote);
-                        valid_delegates.remove(&remote);
-                        failed_delegates.insert(remote);
-                        failures.append(&mut fails)
-                    } else {
-                        valid_delegates.insert(remote);
-                        remotes.insert(remote);
-                    }
-                }
-            }
-        }
-        log::debug!(
-            target: "fetch",
-            "Validated {} remote(s) ({}ms)",
-            remotes.len(),
-            start.elapsed().as_millis()
-        );
-
-        // N.b. only apply to Git repository if there are enough valid
-        // delegates that pass the threshold.
-        if valid_delegates.len() >= threshold {
-            let applied = repository::update(
-                &handle.repo,
-                self.tips
-                    .clone()
-                    .into_values()
-                    .flat_map(|ups| ups.into_iter()),
-            )?;
-            log::debug!(target: "fetch", "Applied updates ({}ms)", start.elapsed().as_millis());
-            Ok(FetchResult::Success {
-                applied,
-                remotes,
-                validations: failures,
-            })
-        } else {
-            log::debug!(
-                target: "fetch",
-                "Fetch failed: {} failure(s) ({}ms)",
-                failures.len(),
-                start.elapsed().as_millis()
-            );
-            Ok(FetchResult::Failed {
-                threshold,
-                delegates: failed_delegates,
-                validations: failures,
-            })
-        }
-    }
-}
-
-/// A cached version of [`Handle`] by using the underlying
-/// [`FetchState`]'s data for performing lookups.
-pub(crate) struct Cached<'a, S> {
-    handle: &'a mut Handle<S>,
-    state: &'a mut FetchState,
-}
-
-impl<'a, S> Cached<'a, S> {
-    /// Resolves `refname` to its [`ObjectId`] by first looking at the
-    /// [`FetchState`] and falling back to the [`Handle::refdb`].
-    pub fn refname_to_id<'b, N>(
-        &self,
-        refname: N,
-    ) -> Result<Option<Oid>, repository::error::Resolve>
-    where
-        N: Into<Qualified<'b>>,
-    {
-        let refname = refname.into();
-        match self.state.refs.refname_to_id(refname.clone()) {
-            None => repository::refname_to_id(&self.handle.repo, refname),
-            Some(oid) => Ok(Some(oid)),
-        }
-    }
-
-    /// Get the `rad/id` found in the [`FetchState`].
-    pub fn canonical_rad_id(&self) -> Option<Oid> {
-        self.state.canonical_rad_id().copied()
-    }
-
-    pub fn verified(&self, head: Oid) -> Result<Doc<Verified>, DocError> {
-        self.handle.verified(head)
-    }
-
-    pub fn canonical(&self) -> Result<Option<Doc<Verified>>, error::Canonical> {
-        let tip = self.refname_to_id(refs::REFS_RAD_ID.clone())?;
-        let cached_tip = self.canonical_rad_id();
-
-        tip.or(cached_tip)
-            .map(|tip| self.verified(tip).map_err(error::Canonical::from))
-            .transpose()
-    }
-
-    pub fn load(&self, remote: &PublicKey) -> Result<Option<SignedRefsAt>, sigrefs::error::Load> {
-        match self.state.sigrefs.get(remote) {
-            None => SignedRefsAt::load(*remote, &self.handle.repo),
-            Some(tip) => SignedRefsAt::load_at(*tip, *remote, &self.handle.repo).map(Some),
-        }
-    }
-
-    #[allow(dead_code)]
-    pub(crate) fn inspect(&self) {
-        self.state.refs.inspect()
-    }
-}
-
-impl<'a, S> RemoteRepository for Cached<'a, S> {
-    fn remote(&self, remote: &RemoteId) -> Result<Remote, storage::refs::Error> {
-        // N.b. this is unused so we just delegate to the underlying
-        // repository for a correct implementation.
-        self.handle.repo.remote(remote)
-    }
-
-    fn remotes(&self) -> Result<Remotes<Verified>, storage::refs::Error> {
-        self.state
-            .sigrefs
-            .keys()
-            .map(|id| self.remote(id).map(|remote| (*id, remote)))
-            .collect::<Result<_, _>>()
-    }
-
-    fn remote_refs_at(&self) -> Result<Vec<RefsAt>, storage::refs::Error> {
-        self.handle.repo.remote_refs_at()
-    }
-}
-
-impl<'a, S> ValidateRepository for Cached<'a, S> {
-    // N.b. we don't verify the `rad/id` of each remote since they may
-    // not have a reference to the COB if they have not interacted
-    // with it.
-    fn validate_remote(&self, remote: &Remote) -> Result<Validations, storage::Error> {
-        // Contains a copy of the signed refs of this remote.
-        let mut signed = BTreeMap::from((*remote.refs).clone());
-        let mut validations = Validations::default();
-        let mut has_sigrefs = false;
-
-        // Check all repository references, making sure they are present in the signed refs map.
-        for (refname, oid) in self.state.refs.references_of(&remote.id) {
-            // Skip validation of the signed refs branch, as it is not part of `Remote`.
-            if refname == storage::refs::SIGREFS_BRANCH.to_ref_string() {
-                has_sigrefs = true;
-                continue;
-            }
-            if let Some(signed_oid) = signed.remove(&refname) {
-                if oid != signed_oid {
-                    validations.push(Validation::MismatchedRef {
-                        refname,
-                        expected: signed_oid,
-                        actual: oid,
-                    });
-                }
-            } else {
-                validations.push(Validation::UnsignedRef(refname));
-            }
-        }
-
-        if !has_sigrefs {
-            validations.push(Validation::MissingRadSigRefs(remote.id));
-        }
-
-        // The refs that are left in the map, are ones that were signed, but are not
-        // in the repository. If any are left, bail.
-        for (name, _) in signed.into_iter() {
-            validations.push(Validation::MissingRef {
-                refname: name,
-                remote: remote.id,
-            });
-        }
-
-        Ok(validations)
-    }
-}
-
-/// If the repository has a project payload, in `anchor`, then
-/// validate that the `sigrefs` contains the listed default branch.
-///
-/// N.b. if the repository does not have the project payload or a
-/// deserialization error occurs, then this will return `None`.
-fn validate_project_default_branch(
-    anchor: &Doc<Verified>,
-    sigrefs: &SignedRefs<Verified>,
-) -> Option<Validation> {
-    let proj = anchor.project().ok()?;
-    let branch = radicle::git::refs::branch(proj.default_branch()).to_ref_string();
-    (!sigrefs.contains_key(&branch)).then_some(Validation::MissingRef {
-        remote: sigrefs.id,
-        refname: branch,
-    })
-}
diff --git a/radicle-fetch/src/transport.rs b/radicle-fetch/src/transport.rs
deleted file mode 100644
index 9b08f79ef..000000000
--- a/radicle-fetch/src/transport.rs
+++ /dev/null
@@ -1,354 +0,0 @@
-pub(crate) mod fetch;
-pub(crate) mod ls_refs;
-
-use std::collections::BTreeSet;
-use std::io;
-use std::path::PathBuf;
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-
-use bstr::BString;
-use gix_features::progress::prodash::progress;
-use gix_protocol::handshake;
-use gix_protocol::FetchConnection;
-use gix_transport::client;
-use gix_transport::client::TransportWithoutIO as _;
-use gix_transport::Protocol;
-use gix_transport::Service;
-use radicle::git::Oid;
-use radicle::git::Qualified;
-use radicle::storage::git::Repository;
-use thiserror::Error;
-
-use crate::git::oid;
-use crate::git::packfile::Keepfile;
-use crate::git::repository;
-
-/// Open a reader and writer stream to pass to the ls-refs and fetch
-/// processes for communicating during their respective protocols.
-pub trait ConnectionStream {
-    type Read: io::Read;
-    type Write: io::Write + SignalEof;
-    type Error: std::error::Error + Send + Sync + 'static;
-
-    fn open(&mut self) -> Result<(&mut Self::Read, &mut Self::Write), Self::Error>;
-}
-
-/// The ability to signal EOF to the server side so that it can stop
-/// serving for this fetch request.
-pub trait SignalEof {
-    type Error: std::error::Error + Send + Sync + 'static;
-
-    /// Since the git protocol is tunneled over an existing
-    /// connection, we can't signal the end of the protocol via the
-    /// usual means, which is to close the connection. Git also
-    /// doesn't have any special message we can send to signal the end
-    /// of the protocol.
-    ///
-    /// Hence, there's no other way for the server to know that we're
-    /// done sending requests than to send a special message outside
-    /// the git protocol. This message can then be processed by the
-    /// remote worker to end the protocol. We use the special "eof"
-    /// control message for this.
-    fn eof(&mut self) -> Result<(), Self::Error>;
-}
-
-/// Configuration for running a Git `handshake`, `ls-refs`, or
-/// `fetch`.
-pub struct Transport<S> {
-    git_dir: PathBuf,
-    repo: BString,
-    stream: S,
-}
-
-impl<S> Transport<S>
-where
-    S: ConnectionStream,
-{
-    pub fn new(git_dir: PathBuf, mut repo: BString, stream: S) -> Self {
-        let repo = if repo.starts_with(b"/") {
-            repo
-        } else {
-            let mut path = BString::new(b"/".to_vec());
-            path.append(&mut repo);
-            path
-        };
-        Self {
-            git_dir,
-            repo,
-            stream,
-        }
-    }
-
-    /// Perform the handshake with the server side.
-    pub(crate) fn handshake(&mut self) -> io::Result<handshake::Outcome> {
-        log::trace!(target: "fetch", "Performing handshake for {}", self.repo);
-        let (read, write) = self.stream.open().map_err(io_other)?;
-        gix_protocol::fetch::handshake(
-            &mut Connection::new(read, write, FetchConnection::AllowReuse, self.repo.clone()),
-            |_| Ok(None),
-            vec![],
-            &mut progress::Discard,
-        )
-        .map_err(io_other)
-    }
-
-    /// Perform ls-refs with the server side.
-    pub(crate) fn ls_refs(
-        &mut self,
-        mut prefixes: Vec<BString>,
-        handshake: &handshake::Outcome,
-    ) -> io::Result<Vec<handshake::Ref>> {
-        prefixes.sort();
-        prefixes.dedup();
-        let (read, write) = self.stream.open().map_err(io_other)?;
-        ls_refs::run(
-            ls_refs::Config {
-                prefixes,
-                extra_params: vec![],
-                repo: self.repo.clone(),
-            },
-            handshake,
-            Connection::new(read, write, FetchConnection::AllowReuse, self.repo.clone()),
-            &mut progress::Discard,
-        )
-        .map_err(io_other)
-    }
-
-    /// Perform the fetch with the server side.
-    pub(crate) fn fetch(
-        &mut self,
-        wants_haves: WantsHaves,
-        interrupt: Arc<AtomicBool>,
-        handshake: &handshake::Outcome,
-    ) -> io::Result<Option<Keepfile>> {
-        log::trace!(
-            target: "fetch",
-            "Running fetch wants={:?}, haves={:?}",
-            wants_haves.wants,
-            wants_haves.haves
-        );
-        let out = {
-            let (read, write) = self.stream.open().map_err(io_other)?;
-            fetch::run(
-                wants_haves.clone(),
-                fetch::PackWriter {
-                    git_dir: self.git_dir.clone(),
-                    interrupt,
-                },
-                handshake,
-                Connection::new(read, write, FetchConnection::AllowReuse, self.repo.clone()),
-                &mut progress::Discard,
-            )
-            .map_err(io_other)?
-        };
-        let pack_path = out
-            .pack
-            .ok_or_else(|| {
-                io::Error::new(
-                    io::ErrorKind::UnexpectedEof,
-                    "empty or no packfile received",
-                )
-            })?
-            .index_path
-            .expect("written packfile must have a path");
-
-        // Validate we got all requested tips in the pack
-        //
-        // N.b. the lookup is a binary search so is efficient for
-        // searching any given oid.
-        {
-            use gix_pack::index::File;
-
-            let idx = File::at(pack_path, gix_hash::Kind::Sha1).map_err(io_other)?;
-            for oid in wants_haves.wants {
-                if idx.lookup(oid::to_object_id(oid)).is_none() {
-                    return Err(io::Error::new(
-                        io::ErrorKind::NotFound,
-                        format!("wanted {oid} not found in pack"),
-                    ));
-                }
-            }
-        }
-
-        Ok(out.keepfile)
-    }
-
-    /// Signal to the server side that we are done sending ls-refs and
-    /// fetch commands.
-    pub(crate) fn done(&mut self) -> io::Result<()> {
-        let (_, w) = self.stream.open().map_err(io_other)?;
-        w.eof().map_err(io_other)
-    }
-}
-
-pub(crate) struct Connection<R, W> {
-    inner: client::git::Connection<R, W>,
-    mode: FetchConnection,
-}
-
-impl<R, W> Connection<R, W>
-where
-    R: io::Read,
-    W: io::Write,
-{
-    pub fn new(read: R, write: W, mode: FetchConnection, repo: BString) -> Self {
-        Self {
-            inner: client::git::Connection::new(
-                read,
-                write,
-                Protocol::V2,
-                repo,
-                None::<(String, Option<u16>)>,
-                client::git::ConnectMode::Daemon,
-                false,
-            ),
-            mode,
-        }
-    }
-}
-
-impl<R, W> client::Transport for Connection<R, W>
-where
-    R: std::io::Read,
-    W: std::io::Write,
-{
-    fn handshake<'b>(
-        &mut self,
-        service: Service,
-        extra_parameters: &'b [(&'b str, Option<&'b str>)],
-    ) -> Result<client::SetServiceResponse<'_>, client::Error> {
-        self.inner.handshake(service, extra_parameters)
-    }
-}
-
-impl<R, W> client::TransportWithoutIO for Connection<R, W>
-where
-    R: std::io::Read,
-    W: std::io::Write,
-{
-    fn request(
-        &mut self,
-        write_mode: client::WriteMode,
-        on_into_read: client::MessageKind,
-        trace: bool,
-    ) -> Result<client::RequestWriter<'_>, client::Error> {
-        self.inner.request(write_mode, on_into_read, trace)
-    }
-
-    fn to_url(&self) -> std::borrow::Cow<'_, bstr::BStr> {
-        self.inner.to_url()
-    }
-
-    fn connection_persists_across_multiple_requests(&self) -> bool {
-        false
-    }
-
-    fn configure(
-        &mut self,
-        config: &dyn std::any::Any,
-    ) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
-        self.inner.configure(config)
-    }
-
-    fn supported_protocol_versions(&self) -> &[Protocol] {
-        &[Protocol::V2]
-    }
-}
-
-fn indicate_end_of_interaction<R, W>(transport: &mut Connection<R, W>) -> Result<(), client::Error>
-where
-    R: io::Read,
-    W: io::Write,
-{
-    // An empty request marks the (early) end of the interaction. Only relevant in stateful transports though.
-    if transport.connection_persists_across_multiple_requests() {
-        transport
-            .request(client::WriteMode::Binary, client::MessageKind::Flush, false)?
-            .into_read()?;
-    }
-    Ok(())
-}
-
-fn io_other(err: impl std::error::Error + Send + Sync + 'static) -> io::Error {
-    io::Error::new(io::ErrorKind::Other, err)
-}
-
-#[derive(Debug, Error)]
-pub enum WantsHavesError {
-    #[error(transparent)]
-    Ancestry(#[from] repository::error::Ancestry),
-    #[error(transparent)]
-    Contains(#[from] repository::error::Contains),
-    #[error(transparent)]
-    Resolve(#[from] repository::error::Resolve),
-}
-
-#[derive(Clone, Default)]
-pub(crate) struct WantsHaves {
-    pub wants: BTreeSet<Oid>,
-    pub haves: BTreeSet<Oid>,
-}
-
-impl WantsHaves {
-    pub fn want(&mut self, oid: Oid) {
-        // N.b. if we have it, then we don't want it.
-        if !self.haves.contains(&oid) {
-            self.wants.insert(oid);
-        }
-    }
-
-    pub fn have(&mut self, oid: Oid) {
-        // N.b. ensure that oid is not in wants
-        self.wants.remove(&oid);
-        self.haves.insert(oid);
-    }
-
-    /// Add a set of references to the `wants` and `haves`.
-    ///
-    /// For each reference we want to build the range between its
-    /// current `Oid` and the advertised `Oid`. This allows the server
-    /// to send all objects between that range.
-    ///
-    /// If the reference exists, the range is given by marking the
-    /// existing `Oid` as a `have` and the tip as the `want`. If the
-    /// `tip`, however, is the same as the existing `Oid` or is in the
-    /// Odb, then there is no need to mark it as a `want`.
-    ///
-    /// If the reference does not exist, the range is simply marking
-    /// the tip as a `want`, iff it does not already exist in the Odb.
-    pub fn add<'a, N>(
-        &mut self,
-        repo: &Repository,
-        refs: impl IntoIterator<Item = (N, Oid)>,
-    ) -> Result<&mut Self, WantsHavesError>
-    where
-        N: Into<Qualified<'a>>,
-    {
-        refs.into_iter().try_fold(self, |acc, (refname, tip)| {
-            match repository::refname_to_id(repo, refname)? {
-                Some(oid) => {
-                    let want = oid != tip && !repository::contains(repo, tip)?;
-                    acc.have(oid);
-
-                    if want {
-                        acc.want(tip)
-                    }
-                }
-                None => {
-                    if !repository::contains(repo, tip)? {
-                        acc.want(tip);
-                    }
-                }
-            };
-            Ok(acc)
-        })
-    }
-}
-
-fn agent_name() -> io::Result<String> {
-    Ok(format!(
-        "git/{}",
-        radicle::git::version().map_err(io_other)?
-    ))
-}
diff --git a/radicle-fetch/src/transport/fetch.rs b/radicle-fetch/src/transport/fetch.rs
deleted file mode 100644
index 6c3838606..000000000
--- a/radicle-fetch/src/transport/fetch.rs
+++ /dev/null
@@ -1,314 +0,0 @@
-use std::borrow::Cow;
-use std::io;
-use std::io::BufRead;
-use std::path::PathBuf;
-use std::sync::{atomic::AtomicBool, Arc};
-
-use gix_features::progress::NestedProgress;
-use gix_pack as pack;
-use gix_protocol::fetch;
-use gix_protocol::fetch::{Delegate, DelegateBlocking};
-use gix_protocol::handshake;
-use gix_protocol::handshake::Ref;
-use gix_protocol::ls_refs;
-use gix_protocol::FetchConnection;
-use gix_transport::bstr::BString;
-use gix_transport::client;
-use gix_transport::client::{ExtendedBufRead, MessageKind};
-use gix_transport::Protocol;
-
-use crate::git::packfile;
-
-use super::{agent_name, indicate_end_of_interaction, Connection, WantsHaves};
-
-pub type Error = gix_protocol::fetch::Error;
-
-pub mod error {
-    use std::io;
-
-    use thiserror::Error;
-
-    #[derive(Debug, Error)]
-    pub enum PackWriter {
-        #[error(transparent)]
-        Io(#[from] io::Error),
-        #[error(transparent)]
-        Write(#[from] gix_pack::bundle::write::Error),
-    }
-}
-
-/// Configuration for writing a packfile.
-pub struct PackWriter {
-    /// The repository path for writing the packfile to. Note this is
-    /// the root of the Git repository, e.g. the `.git` folder.
-    pub git_dir: PathBuf,
-    /// `interrupt` is checked regularly and when true, the whole
-    /// operation will stop.
-    pub interrupt: Arc<AtomicBool>,
-}
-
-impl PackWriter {
-    /// Write the packfile read from `pack` to the `objects/pack`
-    /// directory.
-    pub fn write_pack<P>(
-        &self,
-        mut pack: impl BufRead,
-        mut progress: P,
-    ) -> Result<pack::bundle::write::Outcome, error::PackWriter>
-    where
-        P: NestedProgress,
-        P::SubProgress: 'static,
-    {
-        let options = pack::bundle::write::Options {
-            // N.b. use all cores. Can make configurable if needed
-            // later.
-            thread_limit: None,
-            iteration_mode: pack::data::input::Mode::Verify,
-            index_version: pack::index::Version::V2,
-            object_hash: gix_hash::Kind::Sha1,
-        };
-        let odb_opts = gix_odb::store::init::Options {
-            slots: gix_odb::store::init::Slots::default(),
-            object_hash: gix_hash::Kind::Sha1,
-            use_multi_pack_index: true,
-            current_dir: Some(self.git_dir.clone()),
-        };
-        let thickener = Arc::new(gix_odb::Store::at_opts(
-            self.git_dir.join("objects"),
-            &mut [].into_iter(),
-            odb_opts,
-        )?);
-        let thickener = thickener.to_handle_arc();
-        Ok(pack::Bundle::write_to_directory(
-            &mut pack,
-            Some(&self.git_dir.join("objects").join("pack")),
-            &mut progress,
-            &self.interrupt,
-            Some(thickener),
-            options,
-        )?)
-    }
-}
-
-/// The fetch [`Delegate`] that negotiates the fetch with the
-/// server-side.
-pub struct Fetch {
-    wants_haves: WantsHaves,
-    pack_writer: PackWriter,
-    out: FetchOut,
-}
-
-/// The result of running a fetch via [`run`].
-pub struct FetchOut {
-    pub refs: Vec<Ref>,
-    pub pack: Option<pack::bundle::write::Outcome>,
-    pub keepfile: Option<packfile::Keepfile>,
-}
-
-// FIXME: the delegate pattern will be removed in the near future and
-// we should look at the fetch code being used in gix to see how we
-// can migrate to the proper form of fetching.
-impl<'a> Delegate for &'a mut Fetch {
-    fn receive_pack(
-        &mut self,
-        input: impl io::BufRead,
-        progress: impl NestedProgress + 'static,
-        _refs: &[handshake::Ref],
-        previous_response: &fetch::Response,
-    ) -> io::Result<()> {
-        self.out
-            .refs
-            .extend(previous_response.wanted_refs().iter().map(
-                |fetch::response::WantedRef { id, path }| Ref::Direct {
-                    full_ref_name: path.clone(),
-                    object: *id,
-                },
-            ));
-        let pack = self
-            .pack_writer
-            .write_pack(input, progress)
-            .map_err(|err| io::Error::new(io::ErrorKind::Other, err))?;
-        self.out.keepfile = pack.keep_path.as_ref().and_then(packfile::Keepfile::new);
-        self.out.pack = Some(pack);
-        Ok(())
-    }
-}
-
-impl<'a> DelegateBlocking for &'a mut Fetch {
-    fn negotiate(
-        &mut self,
-        _refs: &[handshake::Ref],
-        arguments: &mut fetch::Arguments,
-        _previous_response: Option<&fetch::Response>,
-    ) -> io::Result<fetch::Action> {
-        use crate::git::oid;
-
-        for oid in &self.wants_haves.wants {
-            arguments.want(oid::to_object_id(*oid));
-        }
-
-        for oid in &self.wants_haves.haves {
-            arguments.have(oid::to_object_id(*oid));
-        }
-
-        // N.b. sends `done` packet
-        Ok(fetch::Action::Cancel)
-    }
-
-    fn prepare_ls_refs(
-        &mut self,
-        _server: &client::Capabilities,
-        _arguments: &mut Vec<BString>,
-        _features: &mut Vec<(&str, Option<Cow<'_, str>>)>,
-    ) -> io::Result<ls_refs::Action> {
-        // N.b. we performed ls-refs before the fetch already.
-        Ok(ls_refs::Action::Skip)
-    }
-
-    fn prepare_fetch(
-        &mut self,
-        _version: Protocol,
-        _server: &client::Capabilities,
-        _features: &mut Vec<(&str, Option<Cow<'_, str>>)>,
-        _refs: &[handshake::Ref],
-    ) -> io::Result<fetch::Action> {
-        if self.wants_haves.wants.is_empty() {
-            return Err(io::Error::new(io::ErrorKind::InvalidData, "empty fetch"));
-        }
-        Ok(fetch::Action::Continue)
-    }
-}
-
-/// Run the fetch process using the provided `config` and
-/// `pack_writer` configuration.
-///
-/// It is expected that the `handshake` was run outside of this
-/// process, since it should be reused across fetch processes.
-#[allow(clippy::result_large_err)]
-pub(crate) fn run<P, R, W>(
-    wants_haves: WantsHaves,
-    pack_writer: PackWriter,
-    handshake: &handshake::Outcome,
-    mut conn: Connection<R, W>,
-    progress: &mut P,
-) -> Result<FetchOut, Error>
-where
-    P: NestedProgress,
-    P::SubProgress: 'static,
-    R: io::Read,
-    W: io::Write,
-{
-    log::trace!(target: "fetch", "Performing fetch");
-
-    let mut delegate = Fetch {
-        wants_haves,
-        pack_writer,
-        out: FetchOut {
-            refs: Vec::new(),
-            pack: None,
-            keepfile: None,
-        },
-    };
-
-    let handshake::Outcome {
-        server_protocol_version: protocol,
-        refs: _refs,
-        capabilities,
-    } = handshake;
-    let agent = agent_name()?;
-    let fetch = gix_protocol::Command::Fetch;
-
-    let mut features = fetch.default_features(*protocol, capabilities);
-    match (&mut delegate).prepare_fetch(*protocol, capabilities, &mut features, &[]) {
-        Ok(fetch::Action::Continue) => {
-            // FIXME: this is a private function in gitoxide
-            // fetch.validate_argument_prefixes_or_panic(protocol, &capabilities, &[], &features)
-        }
-        // N.b. we always return Action::Continue
-        Ok(fetch::Action::Cancel) => unreachable!(),
-        Err(err) => {
-            indicate_end_of_interaction(&mut conn)?;
-            return Err(err.into());
-        }
-    }
-
-    gix_protocol::fetch::Response::check_required_features(*protocol, &features)?;
-    let sideband_all = features.iter().any(|(n, _)| *n == "sideband-all");
-    features.push(("agent", Some(Cow::Owned(agent))));
-    let mut args = fetch::Arguments::new(*protocol, features, false);
-
-    let mut previous_response = None::<fetch::Response>;
-    let mut round = 1;
-    'negotiation: loop {
-        progress.step();
-        progress.set_name(format!("negotiate (round {round})"));
-        round += 1;
-        let action = (&mut delegate).negotiate(&[], &mut args, previous_response.as_ref())?;
-        let mut reader = args.send(&mut conn, action == fetch::Action::Cancel)?;
-        if sideband_all {
-            setup_remote_progress(progress, &mut reader);
-        }
-        let response = fetch::Response::from_line_reader(*protocol, &mut reader, true, false)?;
-        previous_response = if response.has_pack() {
-            progress.step();
-            if !sideband_all {
-                setup_remote_progress(progress, &mut reader);
-            }
-            let timer = std::time::Instant::now();
-            // TODO: remove delegate in favor of functional style to fix progress-hack,
-            //       needed as it needs `'static`. As the top-level seems to pass `Discard`,
-            //       there should be no repercussions right now.
-            (&mut delegate).receive_pack(
-                &mut reader,
-                progress.add_child("receiving pack"),
-                &[],
-                &response,
-            )?;
-            log::trace!(target: "fetch", "Received pack ({}ms)", timer.elapsed().as_millis());
-            assert_eq!(
-                reader.stopped_at(),
-                None,
-                "packs are read without 'overshooting', hence it never encountered EOF"
-            );
-            // Consume anything that might still be left on the wire - this is 'EOF' most of the time,
-            // but some tests have 'garbage' here as well.
-            std::io::copy(&mut reader, &mut std::io::sink())?;
-            assert_eq!(
-                reader.stopped_at(),
-                Some(MessageKind::Flush),
-                "the flush packet was now consumed"
-            );
-            break 'negotiation;
-        } else {
-            match action {
-                fetch::Action::Cancel => break 'negotiation,
-                fetch::Action::Continue => Some(response),
-            }
-        }
-    }
-    if matches!(protocol, Protocol::V2)
-        && matches!(conn.mode, FetchConnection::TerminateOnSuccessfulCompletion)
-    {
-        log::trace!(target: "fetch", "Indicating end of interaction");
-        indicate_end_of_interaction(&mut conn)?;
-    }
-
-    log::trace!(target: "fetch", "fetched refs: {:?}", delegate.out.refs);
-    Ok(delegate.out)
-}
-
-fn setup_remote_progress<'a, P>(
-    progress: &mut P,
-    reader: &mut Box<dyn gix_transport::client::ExtendedBufRead<'a> + Unpin + 'a>,
-) where
-    P: NestedProgress,
-    P::SubProgress: 'static,
-{
-    reader.set_progress_handler(Some(Box::new({
-        let mut remote_progress = progress.add_child("remote");
-        move |is_err: bool, data: &[u8]| {
-            gix_protocol::RemoteProgress::translate_to_progress(is_err, data, &mut remote_progress);
-            gix_transport::packetline::read::ProgressAction::Continue
-        }
-    }) as gix_transport::client::HandleProgress<'a>));
-}
diff --git a/radicle-fetch/src/transport/ls_refs.rs b/radicle-fetch/src/transport/ls_refs.rs
deleted file mode 100644
index 3151c6463..000000000
--- a/radicle-fetch/src/transport/ls_refs.rs
+++ /dev/null
@@ -1,177 +0,0 @@
-use std::borrow::Cow;
-use std::io::{self, BufRead};
-
-use bstr::ByteSlice;
-use gix_features::progress::Progress;
-use gix_protocol::fetch::{self, Delegate, DelegateBlocking};
-use gix_protocol::handshake::{self, Ref};
-use gix_protocol::transport::Protocol;
-use gix_protocol::{ls_refs, Command};
-use gix_transport::bstr::{BString, ByteVec};
-use gix_transport::client::{self, TransportV2Ext};
-
-use super::{agent_name, indicate_end_of_interaction, Connection};
-
-/// Configuration for running an ls-refs process.
-///
-/// See [`run`].
-pub struct Config {
-    /// The repository name, i.e. `/<rid>`.
-    #[allow(dead_code)]
-    pub repo: BString,
-    /// Extra parameters to pass to the ls-refs process.
-    pub extra_params: Vec<(String, Option<String>)>,
-    /// Ref prefixes for filtering the output of the ls-refs process.
-    pub prefixes: Vec<BString>,
-}
-
-/// The Gitoxide delegate for running the ls-refs process.
-struct LsRefs {
-    /// Configuration for the ls-refs process.
-    config: Config,
-    /// The resulting references returned by the ls-refs process.
-    refs: Vec<Ref>,
-}
-
-impl LsRefs {
-    fn new(config: Config) -> Self {
-        Self {
-            config,
-            refs: Vec::new(),
-        }
-    }
-}
-
-// FIXME: the delegate pattern will be removed in the near future and
-// we should look at the fetch code being used in gix to see how we
-// can migrate to the proper form of fetching.
-impl DelegateBlocking for LsRefs {
-    fn handshake_extra_parameters(&self) -> Vec<(String, Option<String>)> {
-        self.config.extra_params.clone()
-    }
-
-    fn prepare_ls_refs(
-        &mut self,
-        _caps: &client::Capabilities,
-        args: &mut Vec<BString>,
-        _: &mut Vec<(&str, Option<Cow<'_, str>>)>,
-    ) -> io::Result<ls_refs::Action> {
-        for prefix in &self.config.prefixes {
-            let mut arg = BString::from("ref-prefix ");
-            arg.push_str(prefix);
-            args.push(arg)
-        }
-        Ok(ls_refs::Action::Continue)
-    }
-
-    fn prepare_fetch(
-        &mut self,
-        _: Protocol,
-        _: &client::Capabilities,
-        _: &mut Vec<(&str, Option<Cow<'_, str>>)>,
-        refs: &[Ref],
-    ) -> io::Result<fetch::Action> {
-        self.refs.extend_from_slice(refs);
-        Ok(fetch::Action::Cancel)
-    }
-
-    fn negotiate(
-        &mut self,
-        _: &[Ref],
-        _: &mut fetch::Arguments,
-        _: Option<&fetch::Response>,
-    ) -> io::Result<fetch::Action> {
-        unreachable!("`negotiate` called even though no `fetch` command was sent")
-    }
-}
-
-impl Delegate for LsRefs {
-    fn receive_pack(
-        &mut self,
-        _: impl BufRead,
-        _: impl Progress,
-        _: &[Ref],
-        _: &fetch::Response,
-    ) -> io::Result<()> {
-        unreachable!("`receive_pack` called even though no `fetch` command was sent")
-    }
-}
-
-/// Run the ls-refs process using the provided `config`.
-///
-/// It is expected that the `handshake` was run outside of this
-/// process, since it should be reused across fetch processes.
-///
-/// The resulting set of references are the ones returned by the
-/// ls-refs process, filtered by any prefixes that were provided by
-/// the `config`.
-pub(crate) fn run<R, W>(
-    config: Config,
-    handshake: &handshake::Outcome,
-    mut conn: Connection<R, W>,
-    progress: &mut impl Progress,
-) -> Result<Vec<Ref>, ls_refs::Error>
-where
-    R: io::Read,
-    W: io::Write,
-{
-    log::trace!(target: "fetch", "Performing ls-refs: {:?}", config.prefixes);
-    let mut delegate = LsRefs::new(config);
-    let handshake::Outcome {
-        server_protocol_version: protocol,
-        capabilities,
-        ..
-    } = handshake;
-
-    if protocol != &Protocol::V2 {
-        return Err(ls_refs::Error::Io(io::Error::new(
-            io::ErrorKind::Other,
-            "expected protocol version 2",
-        )));
-    }
-
-    let ls = Command::LsRefs;
-    let mut features = ls.default_features(Protocol::V2, capabilities);
-    // N.b. copied from gitoxide
-    let mut args = vec![
-        b"symrefs".as_bstr().to_owned(),
-        b"peel".as_bstr().to_owned(),
-    ];
-    if capabilities
-        .capability("ls-refs")
-        .and_then(|cap| cap.supports("unborn"))
-        .unwrap_or_default()
-    {
-        args.push("unborn".into());
-    }
-    let refs = match delegate.prepare_ls_refs(capabilities, &mut args, &mut features) {
-        Ok(ls_refs::Action::Skip) => Vec::new(),
-        Ok(ls_refs::Action::Continue) => {
-            // FIXME: this is a private function
-            // ls.validate_argument_prefixes_or_panic(Protocol::V2, capabilities, &args, &features);
-
-            let agent = agent_name()?;
-            features.push(("agent", Some(Cow::Owned(agent))));
-
-            progress.step();
-            progress.set_name("list refs".into());
-            let mut remote_refs = conn.invoke(
-                ls.as_str(),
-                features.clone().into_iter(),
-                if args.is_empty() {
-                    None
-                } else {
-                    Some(args.into_iter())
-                },
-                false,
-            )?;
-            handshake::refs::from_v2_refs(&mut remote_refs)?
-        }
-        Err(err) => {
-            indicate_end_of_interaction(&mut conn)?;
-            return Err(err.into());
-        }
-    };
-
-    Ok(refs)
-}
diff --git a/radicle-node.1.adoc b/radicle-node.1.adoc
deleted file mode 100644
index b142a2870..000000000
--- a/radicle-node.1.adoc
+++ /dev/null
@@ -1,25 +0,0 @@
-= radicle-node(1)
-The Radicle Team <team@radicle.xyz>
-:doctype: manpage
-:revnumber: 1.0.0
-:revdate: 2024-04-22
-:mansource: rad {revnumber}
-:manmanual: Radicle CLI Manual
-
-== Name
-
-radicle-node - Radicle node
-
-== Synopsis
-
-*radicle-node* --help
-
-== Description
-
-A Radicle node synchronizes its Git repositories with other nodes.
-This manual page is a placeholder to point you at the *--help**
-option.
-
-== SEE ALSO ==
-
-*rad*(1)
diff --git a/radicle-node/Cargo.toml b/radicle-node/Cargo.toml
deleted file mode 100644
index 35f6d502f..000000000
--- a/radicle-node/Cargo.toml
+++ /dev/null
@@ -1,70 +0,0 @@
-[package]
-name = "radicle-node"
-description = "The Radicle Node"
-homepage = "https://radicle.xyz"
-license = "MIT OR Apache-2.0"
-version = "0.10.0"
-authors = ["cloudhead <cloudhead@radicle.xyz>"]
-edition = "2021"
-build = "build.rs"
-
-[features]
-default = ["systemd"]
-systemd = ["dep:radicle-systemd"]
-test = ["radicle/test", "radicle-crypto/test", "radicle-crypto/cyphernet", "qcheck", "snapbox"]
-
-[dependencies]
-amplify = { version = "4.0.0" }
-anyhow = { version = "1" }
-bloomy = { version = "1.2" }
-byteorder = { version = "1" }
-chrono = { version = "0.4.0", default-features = false, features = ["clock"] }
-colored = { version = "2.1.0" }
-crossbeam-channel = { version = "0.5.6" }
-cyphernet = { version = "0.5.2", features = ["tor", "dns", "ed25519", "p2p-ed25519"] }
-fastrand = { version = "2.0.0" }
-io-reactor = { version = "0.5.1", features = ["popol"] }
-lexopt = { version = "0.3.0" }
-libc = { version = "0.2.137" }
-log = { version = "0.4.17", features = ["std"] }
-localtime = { version = "1.2.0" }
-netservices = { version = "0.8.0", features = ["io-reactor", "socket2"] }
-nonempty = { version = "0.9.0", features = ["serialize"] }
-once_cell = { version = "1.13" }
-qcheck = { version = "1", default-features = false, optional = true }
-# N.b. this is required to use macros, even though it's re-exported
-# through radicle
-radicle-git-ext = { version = "0.8.0", features = ["serde"] }
-sqlite = { version = "0.32.0", features = ["bundled"] }
-scrypt = { version = "0.11.0", default-features = false }
-serde = { version = "1", features = ["derive"] }
-serde_json = { version = "1", features = ["preserve_order"] }
-snapbox = { version = "0.4.3", optional = true }
-socket2 = { version = "0.5.7" }
-tempfile = { version = "3.3.0" }
-thiserror = { version = "1" }
-
-[dependencies.radicle]
-path = "../radicle"
-version = "0"
-features = ["logger"]
-
-[dependencies.radicle-fetch]
-path = "../radicle-fetch"
-version = "0"
-
-[dependencies.radicle-signals]
-path = "../radicle-signals"
-version = "0"
-
-[dependencies.radicle-systemd]
-path = "../radicle-systemd"
-version = "0.9.0"
-optional = true
-
-[dev-dependencies]
-radicle = { path = "../radicle", version = "0", features = ["test"] }
-radicle-crypto = { path = "../radicle-crypto", version = "0", features = ["test", "cyphernet"] }
-qcheck = { version = "1", default-features = false }
-qcheck-macros = { version = "1", default-features = false }
-snapbox = { version = "0.4.3" }
diff --git a/radicle-node/build.rs b/radicle-node/build.rs
deleted file mode 120000
index 10238032f..000000000
--- a/radicle-node/build.rs
+++ /dev/null
@@ -1 +0,0 @@
-../build.rs
\ No newline at end of file
diff --git a/radicle-node/src/bounded.rs b/radicle-node/src/bounded.rs
deleted file mode 100644
index 6b9b3c25d..000000000
--- a/radicle-node/src/bounded.rs
+++ /dev/null
@@ -1,241 +0,0 @@
-use std::{
-    collections::BTreeSet,
-    ops::{self, RangeBounds},
-};
-
-#[derive(thiserror::Error, Debug)]
-pub enum Error {
-    #[error("invalid size: expected {expected}, got {actual}")]
-    InvalidSize { expected: usize, actual: usize },
-}
-
-/// A vector with an upper limit on its size using type level constants.
-#[derive(Default, Clone, PartialEq, Eq)]
-pub struct BoundedVec<T, const N: usize> {
-    v: Vec<T>,
-}
-
-impl<T, const N: usize> BoundedVec<T, N> {
-    /// Create a new empty `BoundedVec<T,N>`.
-    pub fn new() -> Self {
-        BoundedVec {
-            v: Vec::with_capacity(N),
-        }
-    }
-
-    /// Build a `BoundedVec` by consuming from the given iterator up to its limit.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use radicle_node::bounded;
-    ///
-    /// let mut iter = (0..4).into_iter();
-    /// let bounded: bounded::BoundedVec<i32,3> = bounded::BoundedVec::collect_from(&mut iter);
-    ///
-    /// assert_eq!(bounded.len(), 3);
-    /// assert_eq!(iter.count(), 1);
-    /// ```
-    pub fn collect_from<I: IntoIterator<Item = T>>(iter: I) -> Self {
-        BoundedVec {
-            v: iter.into_iter().take(N).collect(),
-        }
-    }
-
-    /// Create a new `BoundedVec<T,N>` which takes upto the first N values of its argument, taking
-    /// ownership.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use radicle_node::bounded;
-    ///
-    /// let mut vec = vec![1, 2, 3];
-    /// let bounded = bounded::BoundedVec::<_, 2>::truncate(vec);
-    /// assert_eq!(bounded.len(), 2);
-    /// ```
-    pub fn truncate(mut v: Vec<T>) -> Self {
-        v.truncate(N);
-        BoundedVec { v }
-    }
-
-    /// Like [`Vec::with_capacity`] but returns an error if the allocation size exceeds the limit.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use radicle_node::bounded;
-    ///
-    /// let vec = bounded::BoundedVec::<i32, 11>::with_capacity(10).unwrap();
-    ///
-    /// // The vector contains no items, even though it has capacity for more
-    /// assert_eq!(vec.len(), 0);
-    /// assert!(vec.capacity() >= 10);
-    ///
-    /// // A vector with a capacity over its limit will result in error.
-    /// let vec_res = bounded::BoundedVec::<i32, 10>::with_capacity(11);
-    /// assert!(vec_res.is_err());
-    /// ```
-    #[inline]
-    pub fn with_capacity(capacity: usize) -> Result<Self, Error> {
-        if capacity > N {
-            return Err(Error::InvalidSize {
-                expected: N,
-                actual: capacity,
-            });
-        }
-        Ok(Self {
-            v: Vec::with_capacity(capacity),
-        })
-    }
-
-    /// Return the maximum number of elements BoundedVec can contain.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use radicle_node::bounded;
-    ///
-    /// type Inventory = bounded::BoundedVec<(), 10>;
-    /// assert_eq!(Inventory::max(), 10);
-    /// ```
-    #[inline]
-    pub fn max() -> usize {
-        N
-    }
-
-    /// Extracts a slice containing the entire bounded vector.
-    #[inline]
-    pub fn as_slice(&self) -> &[T] {
-        self.v.as_slice()
-    }
-
-    /// Returns the number of elements the bounded vector can hold without reallocating.
-    pub fn capacity(&self) -> usize {
-        self.v.capacity()
-    }
-
-    /// Like [`Vec::push`] but returns an error if the limit is exceeded.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use radicle_node::bounded;
-    ///
-    /// let mut vec: bounded::BoundedVec<_,3> = vec![1, 2].try_into().unwrap();
-    /// vec.push(3).expect("within limit");
-    /// assert_eq!(vec, vec![1, 2, 3].try_into().unwrap());
-    ///
-    /// // ...but this will exceed its limit, returning an error.
-    /// vec.push(4).expect_err("limit exceeded");
-    /// assert_eq!(vec.len(), 3);
-    /// ```
-    #[inline]
-    pub fn push(&mut self, item: T) -> Result<(), Error> {
-        if self.len() >= N {
-            return Err(Error::InvalidSize {
-                expected: N,
-                actual: N + 1,
-            });
-        }
-        self.v.push(item);
-        Ok(())
-    }
-
-    /// Return the underlying vector without an upper limit.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use radicle_node::bounded;
-    ///
-    /// let mut bounded: bounded::BoundedVec<_,3> = vec![1, 2, 3].try_into().unwrap();
-    /// let mut vec = bounded.unbound();
-    ///
-    /// vec.push(4);
-    /// assert_eq!(vec.len(), 4);
-    /// ```
-    pub fn unbound(self) -> Vec<T> {
-        self.v
-    }
-
-    /// Calls [`std::vec::Drain`].
-    pub fn drain<R: RangeBounds<usize>>(&mut self, range: R) -> std::vec::Drain<T> {
-        self.v.drain(range)
-    }
-}
-
-impl<T: Clone, const N: usize> BoundedVec<T, N> {
-    /// Like [`Vec::extend_from_slice`] but returns an error if out of bounds.
-    pub fn extend_from_slice(&mut self, slice: &[T]) -> Result<(), Error> {
-        if self.len() + slice.len() > N {
-            return Err(Error::InvalidSize {
-                expected: N,
-                actual: self.len() + slice.len(),
-            });
-        }
-        self.v.extend_from_slice(slice);
-
-        Ok(())
-    }
-}
-
-impl<T, const N: usize> ops::Deref for BoundedVec<T, N> {
-    type Target = [T];
-
-    fn deref(&self) -> &Self::Target {
-        self.v.as_slice()
-    }
-}
-
-impl<T, const N: usize> From<Option<T>> for BoundedVec<T, N> {
-    fn from(value: Option<T>) -> Self {
-        let v = match value {
-            None => vec![],
-            Some(v) => vec![v],
-        };
-        BoundedVec { v }
-    }
-}
-
-impl<T, const N: usize> TryFrom<Vec<T>> for BoundedVec<T, N> {
-    type Error = Error;
-
-    fn try_from(value: Vec<T>) -> Result<Self, Self::Error> {
-        if value.len() > N {
-            return Err(Error::InvalidSize {
-                expected: N,
-                actual: value.len(),
-            });
-        }
-        Ok(BoundedVec { v: value })
-    }
-}
-
-impl<T, const N: usize> TryFrom<BTreeSet<T>> for BoundedVec<T, N> {
-    type Error = Error;
-
-    fn try_from(value: BTreeSet<T>) -> Result<Self, Self::Error> {
-        if value.len() > N {
-            return Err(Error::InvalidSize {
-                expected: N,
-                actual: value.len(),
-            });
-        }
-        Ok(BoundedVec {
-            v: value.into_iter().collect(),
-        })
-    }
-}
-
-impl<T, const N: usize> From<BoundedVec<T, N>> for Vec<T> {
-    fn from(value: BoundedVec<T, N>) -> Self {
-        value.v
-    }
-}
-
-impl<T: std::fmt::Debug, const N: usize> std::fmt::Debug for BoundedVec<T, N> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.v.fmt(f)
-    }
-}
diff --git a/radicle-node/src/control.rs b/radicle-node/src/control.rs
deleted file mode 100644
index 9e46469e9..000000000
--- a/radicle-node/src/control.rs
+++ /dev/null
@@ -1,325 +0,0 @@
-//! Client control socket implementation.
-use std::io::prelude::*;
-use std::io::BufReader;
-use std::io::LineWriter;
-use std::os::unix::net::UnixListener;
-use std::os::unix::net::UnixStream;
-use std::path::PathBuf;
-use std::{io, net, time};
-
-use radicle::node::Handle;
-use serde_json as json;
-
-use crate::identity::RepoId;
-use crate::node::NodeId;
-use crate::node::{Command, CommandResult};
-use crate::runtime;
-use crate::runtime::thread;
-
-/// Maximum timeout for waiting for node events.
-const MAX_TIMEOUT: time::Duration = time::Duration::MAX;
-
-#[derive(thiserror::Error, Debug)]
-pub enum Error {
-    #[error("failed to bind control socket listener: {0}")]
-    Bind(io::Error),
-    #[error("invalid socket path specified: {0}")]
-    InvalidPath(PathBuf),
-    #[error("node: {0}")]
-    Node(#[from] runtime::HandleError),
-}
-
-/// Listen for commands on the control socket, and process them.
-pub fn listen<E, H>(listener: UnixListener, handle: H) -> Result<(), Error>
-where
-    H: Handle<Error = runtime::HandleError> + 'static,
-    H::Sessions: serde::Serialize,
-    CommandResult<E>: From<H::Event>,
-    E: serde::Serialize,
-{
-    log::debug!(target: "control", "Control thread listening on socket..");
-    let nid = handle.nid()?;
-
-    for incoming in listener.incoming() {
-        match incoming {
-            Ok(mut stream) => {
-                let handle = handle.clone();
-
-                thread::spawn(&nid, "control", move || {
-                    if let Err(e) = command(&stream, handle) {
-                        log::error!(target: "control", "Command returned error: {e}");
-
-                        CommandResult::error(e).to_writer(&mut stream).ok();
-
-                        stream.flush().ok();
-                        stream.shutdown(net::Shutdown::Both).ok();
-                    }
-                });
-            }
-            Err(e) => log::error!(target: "control", "Failed to accept incoming connection: {}", e),
-        }
-    }
-    log::debug!(target: "control", "Exiting control loop..");
-
-    Ok(())
-}
-
-#[derive(thiserror::Error, Debug)]
-enum CommandError {
-    #[error("(de)serialization failed: {0}")]
-    Serialization(#[from] json::Error),
-    #[error("runtime error: {0}")]
-    Runtime(#[from] runtime::HandleError),
-    #[error("i/o error: {0}")]
-    Io(#[from] io::Error),
-}
-
-fn command<E, H>(stream: &UnixStream, mut handle: H) -> Result<(), CommandError>
-where
-    H: Handle<Error = runtime::HandleError> + 'static,
-    H::Sessions: serde::Serialize,
-    CommandResult<E>: From<H::Event>,
-    E: serde::Serialize,
-{
-    let mut reader = BufReader::new(stream);
-    let mut writer = LineWriter::new(stream);
-    let mut line = String::new();
-
-    reader.read_line(&mut line)?;
-    let input = line.trim_end();
-
-    log::debug!(target: "control", "Received `{input}` on control socket");
-    let cmd: Command = json::from_str(input)?;
-
-    match cmd {
-        Command::Connect { addr, opts } => {
-            let (nid, addr) = addr.into();
-            match handle.connect(nid, addr, opts) {
-                Err(e) => return Err(CommandError::Runtime(e)),
-                Ok(result) => {
-                    json::to_writer(&mut writer, &result)?;
-                    writer.write_all(b"\n")?;
-                }
-            }
-        }
-        Command::Disconnect { nid } => match handle.disconnect(nid) {
-            Err(e) => return Err(CommandError::Runtime(e)),
-            Ok(()) => {
-                CommandResult::ok().to_writer(writer).ok();
-            }
-        },
-        Command::Fetch { rid, nid, timeout } => {
-            fetch(rid, nid, timeout, writer, &mut handle)?;
-        }
-        Command::Config => {
-            let config = handle.config()?;
-
-            CommandResult::Okay(config).to_writer(writer)?;
-        }
-        Command::ListenAddrs => {
-            let addrs = handle.listen_addrs()?;
-
-            CommandResult::Okay(addrs).to_writer(writer)?;
-        }
-        Command::Seeds { rid } => {
-            let seeds = handle.seeds(rid)?;
-
-            CommandResult::Okay(seeds).to_writer(writer)?;
-        }
-        Command::Sessions => {
-            let sessions = handle.sessions()?;
-
-            CommandResult::Okay(sessions).to_writer(writer)?;
-        }
-        Command::Seed { rid, scope } => match handle.seed(rid, scope) {
-            Ok(result) => {
-                CommandResult::updated(result).to_writer(writer)?;
-            }
-            Err(e) => {
-                return Err(CommandError::Runtime(e));
-            }
-        },
-        Command::Unseed { rid } => match handle.unseed(rid) {
-            Ok(result) => {
-                CommandResult::updated(result).to_writer(writer)?;
-            }
-            Err(e) => {
-                return Err(CommandError::Runtime(e));
-            }
-        },
-        Command::Follow { nid, alias } => match handle.follow(nid, alias) {
-            Ok(result) => {
-                CommandResult::updated(result).to_writer(writer)?;
-            }
-            Err(e) => {
-                return Err(CommandError::Runtime(e));
-            }
-        },
-        Command::Unfollow { nid } => match handle.unfollow(nid) {
-            Ok(result) => {
-                CommandResult::updated(result).to_writer(writer)?;
-            }
-            Err(e) => {
-                return Err(CommandError::Runtime(e));
-            }
-        },
-        Command::AnnounceRefs { rid } => {
-            let refs = handle.announce_refs(rid)?;
-
-            CommandResult::Okay(refs).to_writer(writer)?;
-        }
-        Command::AnnounceInventory => {
-            if let Err(e) = handle.announce_inventory() {
-                return Err(CommandError::Runtime(e));
-            }
-            CommandResult::ok().to_writer(writer).ok();
-        }
-        Command::AddInventory { rid } => match handle.add_inventory(rid) {
-            Ok(result) => {
-                CommandResult::updated(result).to_writer(writer)?;
-            }
-            Err(e) => {
-                return Err(CommandError::Runtime(e));
-            }
-        },
-        Command::Subscribe => match handle.subscribe(MAX_TIMEOUT) {
-            Ok(events) => {
-                for e in events {
-                    CommandResult::from(e).to_writer(&mut writer)?;
-                }
-            }
-            Err(e) => return Err(CommandError::Runtime(e)),
-        },
-        Command::Status => {
-            CommandResult::ok().to_writer(writer).ok();
-        }
-        Command::NodeId => match handle.nid() {
-            Ok(nid) => {
-                CommandResult::Okay(nid).to_writer(writer)?;
-            }
-            Err(e) => return Err(CommandError::Runtime(e)),
-        },
-        Command::Debug => {
-            let debug = handle.debug()?;
-
-            CommandResult::Okay(debug).to_writer(writer)?;
-        }
-        Command::Shutdown => {
-            log::debug!(target: "control", "Shutdown requested..");
-            // Channel might already be disconnected if shutdown
-            // came from somewhere else. Ignore errors.
-            handle.shutdown().ok();
-            CommandResult::ok().to_writer(writer).ok();
-        }
-    }
-    Ok(())
-}
-
-fn fetch<W: Write, H: Handle<Error = runtime::HandleError>>(
-    id: RepoId,
-    node: NodeId,
-    timeout: time::Duration,
-    mut writer: W,
-    handle: &mut H,
-) -> Result<(), CommandError> {
-    match handle.fetch(id, node, timeout) {
-        Ok(result) => {
-            json::to_writer(&mut writer, &result)?;
-        }
-        Err(e) => {
-            return Err(CommandError::Runtime(e));
-        }
-    }
-    Ok(())
-}
-
-#[cfg(test)]
-mod tests {
-    use std::io::prelude::*;
-    use std::os::unix::net::UnixStream;
-    use std::thread;
-
-    use super::*;
-    use crate::identity::RepoId;
-    use crate::node::Handle;
-    use crate::node::{Alias, Node, NodeId};
-    use crate::service::policy::Scope;
-    use crate::test;
-
-    #[test]
-    fn test_control_socket() {
-        let tmp = tempfile::tempdir().unwrap();
-        let handle = test::handle::Handle::default();
-        let socket = tmp.path().join("alice.sock");
-        let rids = test::arbitrary::set::<RepoId>(1..3);
-        let listener = UnixListener::bind(&socket).unwrap();
-
-        thread::spawn({
-            let handle = handle.clone();
-
-            move || listen(listener, handle)
-        });
-
-        for rid in &rids {
-            let stream = loop {
-                if let Ok(stream) = UnixStream::connect(&socket) {
-                    break stream;
-                }
-            };
-            writeln!(
-                &stream,
-                "{}",
-                json::to_string(&Command::AnnounceRefs {
-                    rid: rid.to_owned()
-                })
-                .unwrap()
-            )
-            .unwrap();
-
-            let stream = BufReader::new(stream);
-            let line = stream.lines().next().unwrap().unwrap();
-
-            assert_eq!(
-                line,
-                json::json!({
-                    "remote": handle.nid().unwrap(),
-                    "at": "0000000000000000000000000000000000000000"
-                })
-                .to_string()
-            );
-        }
-
-        for rid in &rids {
-            assert!(handle.updates.lock().unwrap().contains(rid));
-        }
-    }
-
-    #[test]
-    fn test_seed_unseed() {
-        let tmp = tempfile::tempdir().unwrap();
-        let socket = tmp.path().join("node.sock");
-        let proj = test::arbitrary::gen::<RepoId>(1);
-        let peer = test::arbitrary::gen::<NodeId>(1);
-        let listener = UnixListener::bind(&socket).unwrap();
-        let mut handle = Node::new(&socket);
-
-        thread::spawn({
-            let handle = crate::test::handle::Handle::default();
-
-            move || crate::control::listen(listener, handle)
-        });
-
-        // Wait for node to be online.
-        while !handle.is_running() {}
-
-        assert!(handle.seed(proj, Scope::default()).unwrap());
-        assert!(!handle.seed(proj, Scope::default()).unwrap());
-        assert!(handle.unseed(proj).unwrap());
-        assert!(!handle.unseed(proj).unwrap());
-
-        assert!(handle.follow(peer, Some(Alias::new("alice"))).unwrap());
-        assert!(!handle.follow(peer, Some(Alias::new("alice"))).unwrap());
-        assert!(handle.unfollow(peer).unwrap());
-        assert!(!handle.unfollow(peer).unwrap());
-    }
-}
diff --git a/radicle-node/src/deserializer.rs b/radicle-node/src/deserializer.rs
deleted file mode 100644
index 3879a9c29..000000000
--- a/radicle-node/src/deserializer.rs
+++ /dev/null
@@ -1,163 +0,0 @@
-use std::io;
-use std::marker::PhantomData;
-
-use crate::bounded;
-use crate::prelude::BoundedVec;
-use crate::service::message::Message;
-use crate::wire;
-
-/// Message stream deserializer.
-///
-/// Used to for example turn a byte stream into network messages.
-#[derive(Debug)]
-pub struct Deserializer<const B: usize, D = Message> {
-    unparsed: BoundedVec<u8, B>,
-    item: PhantomData<D>,
-}
-
-impl<const B: usize, D: wire::Decode> Default for Deserializer<B, D> {
-    fn default() -> Self {
-        Self::new(wire::Size::MAX as usize + 1)
-    }
-}
-
-impl<const B: usize, D> TryFrom<Vec<u8>> for Deserializer<B, D> {
-    type Error = bounded::Error;
-
-    fn try_from(unparsed: Vec<u8>) -> Result<Self, Self::Error> {
-        BoundedVec::try_from(unparsed).map(|unparsed| Self {
-            unparsed,
-            item: PhantomData,
-        })
-    }
-}
-
-impl<const B: usize, D: wire::Decode> Deserializer<B, D> {
-    /// Create a new stream decoder.
-    pub fn new(capacity: usize) -> Self {
-        Self {
-            unparsed: BoundedVec::with_capacity(capacity)
-                .expect("Deserializer::new: capacity exceeds maximum"),
-            item: PhantomData,
-        }
-    }
-
-    /// Input bytes into the decoder.
-    pub fn input(&mut self, bytes: &[u8]) -> Result<(), bounded::Error> {
-        self.unparsed.extend_from_slice(bytes)
-    }
-
-    /// Decode and return the next message. Returns [`None`] if nothing was decoded.
-    pub fn deserialize_next(&mut self) -> Result<Option<D>, wire::Error> {
-        let mut reader = io::Cursor::new(self.unparsed.as_slice());
-
-        match D::decode(&mut reader) {
-            Ok(msg) => {
-                let pos = reader.position() as usize;
-                self.unparsed.drain(..pos);
-
-                Ok(Some(msg))
-            }
-            Err(err) if err.is_eof() => Ok(None),
-            Err(err) => Err(err),
-        }
-    }
-
-    /// Drain the unparsed buffer.
-    pub fn unparsed(&mut self) -> impl ExactSizeIterator<Item = u8> + '_ {
-        self.unparsed.drain(..)
-    }
-
-    /// Return whether there are unparsed bytes.
-    pub fn is_empty(&self) -> bool {
-        self.unparsed.is_empty()
-    }
-
-    /// Return the size of the unparsed data.
-    pub fn len(&self) -> usize {
-        self.unparsed.len()
-    }
-}
-
-impl<const B: usize, D: wire::Decode> io::Write for Deserializer<B, D> {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.input(buf).map_err(|_| io::ErrorKind::OutOfMemory)?;
-
-        Ok(buf.len())
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        Ok(())
-    }
-}
-
-impl<const B: usize, D: wire::Decode> Iterator for Deserializer<B, D> {
-    type Item = Result<D, wire::Error>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.deserialize_next().transpose()
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use qcheck_macros::quickcheck;
-
-    use crate::test::assert_matches;
-
-    const MSG_HELLO: &[u8] = &[5, b'h', b'e', b'l', b'l', b'o'];
-    const MSG_BYE: &[u8] = &[3, b'b', b'y', b'e'];
-
-    #[test]
-    fn test_decode_next() {
-        let mut decoder = Deserializer::<1024, String>::new(8);
-
-        decoder.input(&[3, b'b']).unwrap();
-        assert_matches!(decoder.deserialize_next(), Ok(None));
-        assert_eq!(decoder.unparsed.len(), 2);
-
-        decoder.input(&[b'y']).unwrap();
-        assert_matches!(decoder.deserialize_next(), Ok(None));
-        assert_eq!(decoder.unparsed.len(), 3);
-
-        decoder.input(&[b'e']).unwrap();
-        assert_matches!(decoder.deserialize_next(), Ok(Some(s)) if s.as_str() == "bye");
-        assert_eq!(decoder.unparsed.len(), 0);
-        assert!(decoder.is_empty());
-    }
-
-    #[test]
-    fn test_unparsed() {
-        let mut decoder = Deserializer::<1024, String>::new(8);
-
-        decoder.input(&[3, b'b', b'y']).unwrap();
-        assert_eq!(decoder.unparsed().collect::<Vec<_>>(), vec![3, b'b', b'y']);
-        assert!(decoder.is_empty());
-    }
-
-    #[quickcheck]
-    fn prop_decode_next(chunk_size: usize) {
-        let mut bytes = vec![];
-        let mut msgs = vec![];
-        let mut decoder = Deserializer::<1024, String>::new(8);
-
-        let chunk_size = 1 + chunk_size % MSG_HELLO.len() + MSG_BYE.len();
-
-        bytes.extend_from_slice(MSG_HELLO);
-        bytes.extend_from_slice(MSG_BYE);
-
-        for chunk in bytes.as_slice().chunks(chunk_size) {
-            decoder.input(chunk).unwrap();
-
-            while let Some(msg) = decoder.deserialize_next().unwrap() {
-                msgs.push(msg);
-            }
-        }
-
-        assert_eq!(decoder.unparsed.len(), 0);
-        assert_eq!(msgs.len(), 2);
-        assert_eq!(msgs[0], String::from("hello"));
-        assert_eq!(msgs[1], String::from("bye"));
-    }
-}
diff --git a/radicle-node/src/lib.rs b/radicle-node/src/lib.rs
deleted file mode 100644
index ed47827b7..000000000
--- a/radicle-node/src/lib.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-pub mod bounded;
-pub mod control;
-pub mod deserializer;
-pub mod runtime;
-pub mod service;
-#[cfg(any(test, feature = "test"))]
-pub mod test;
-#[cfg(test)]
-pub mod tests;
-pub mod wire;
-pub mod worker;
-
-use radicle::version::Version;
-
-pub use localtime::{LocalDuration, LocalTime};
-pub use netservices::Direction as Link;
-pub use radicle::node::PROTOCOL_VERSION;
-pub use radicle::prelude::Timestamp;
-pub use radicle::{collections, crypto, git, identity, node, profile, rad, storage};
-pub use runtime::Runtime;
-
-/// Node version.
-pub const VERSION: Version = Version {
-    name: env!("CARGO_PKG_NAME"),
-    commit: env!("GIT_HEAD"),
-    version: env!("RADICLE_VERSION"),
-    timestamp: env!("SOURCE_DATE_EPOCH"),
-};
-
-pub mod prelude {
-    pub use crate::bounded::BoundedVec;
-    pub use crate::crypto::{PublicKey, Signature, Signer};
-    pub use crate::deserializer::Deserializer;
-    pub use crate::identity::{Did, RepoId};
-    pub use crate::node::Address;
-    pub use crate::service::filter::Filter;
-    pub use crate::service::{DisconnectReason, Event, Message, Network, NodeId};
-    pub use crate::storage::refs::Refs;
-    pub use crate::storage::WriteStorage;
-    pub use crate::{LocalDuration, LocalTime, Timestamp};
-}
diff --git a/radicle-node/src/main.rs b/radicle-node/src/main.rs
deleted file mode 100644
index f62a99882..000000000
--- a/radicle-node/src/main.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-use std::io;
-use std::{env, fs, net, path::PathBuf, process};
-
-use anyhow::Context;
-use crossbeam_channel as chan;
-
-use radicle::logger;
-use radicle::prelude::Signer;
-use radicle::profile;
-use radicle_node::crypto::ssh::keystore::{Keystore, MemorySigner};
-use radicle_node::{Runtime, VERSION};
-use radicle_signals as signals;
-
-pub const HELP_MSG: &str = r#"
-Usage
-
-   radicle-node [<option>...]
-
-   If you're running a public seed node, make sure to use `--listen` to bind a listening socket to
-   eg. `0.0.0.0:8776`, and add your external addresses in your configuration.
-
-Options
-
-    --config             <path>         Config file to use (default ~/.radicle/config.json)
-    --force                             Force start even if an existing control socket is found
-    --listen             <address>      Address to listen on
-    --log                <level>        Set log level (default: info)
-    --version                           Print program version
-    --help                              Print help
-"#;
-
-#[derive(Debug)]
-struct Options {
-    config: Option<PathBuf>,
-    listen: Vec<net::SocketAddr>,
-    log: Option<log::Level>,
-    force: bool,
-}
-
-impl Options {
-    fn from_env() -> Result<Self, anyhow::Error> {
-        use lexopt::prelude::*;
-
-        let mut parser = lexopt::Parser::from_env();
-        let mut listen = Vec::new();
-        let mut config = None;
-        let mut force = false;
-        let mut log = None;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("force") => {
-                    force = true;
-                }
-                Long("config") => {
-                    let value = parser.value()?;
-                    let path = PathBuf::from(value);
-                    config = Some(path);
-                }
-                Long("listen") => {
-                    let addr = parser.value()?.parse()?;
-                    listen.push(addr);
-                }
-                Long("log") => {
-                    log = Some(parser.value()?.parse()?);
-                }
-                Long("help") | Short('h') => {
-                    println!("{HELP_MSG}");
-                    process::exit(0);
-                }
-                Long("version") => {
-                    VERSION.write(&mut io::stdout())?;
-                    process::exit(0);
-                }
-                _ => anyhow::bail!(arg.unexpected()),
-            }
-        }
-
-        Ok(Self {
-            force,
-            listen,
-            log,
-            config,
-        })
-    }
-}
-
-fn execute() -> anyhow::Result<()> {
-    let home = profile::home()?;
-    let options = Options::from_env()?;
-    let config = options.config.unwrap_or_else(|| home.config());
-    let mut config = profile::Config::load(&config)?;
-
-    logger::init(options.log.unwrap_or(config.node.log))?;
-
-    log::info!(target: "node", "Starting node..");
-    log::info!(target: "node", "Version {} ({})", env!("RADICLE_VERSION"), env!("GIT_HEAD"));
-    log::info!(target: "node", "Unlocking node keystore..");
-
-    let passphrase = profile::env::passphrase();
-    let keystore = Keystore::new(&home.keys());
-    let signer = MemorySigner::load(&keystore, passphrase).context("couldn't load secret key")?;
-
-    log::info!(target: "node", "Node ID is {}", signer.public_key());
-
-    // Add the preferred seeds as persistent peers so that we reconnect to them automatically.
-    config.node.connect.extend(config.preferred_seeds);
-
-    let listen: Vec<std::net::SocketAddr> = if !options.listen.is_empty() {
-        options.listen.clone()
-    } else {
-        config.node.listen.clone()
-    };
-
-    if let Err(e) = radicle::io::set_file_limit(config.node.limits.max_open_files) {
-        log::warn!(target: "node", "Unable to set process open file limit: {e}");
-    }
-
-    let (notify, signals) = chan::bounded(1);
-    signals::install(notify)?;
-
-    if options.force {
-        log::debug!(target: "node", "Removing existing control socket..");
-        fs::remove_file(home.socket()).ok();
-    }
-    Runtime::init(home, config.node, listen, signals, signer)?.run()?;
-
-    Ok(())
-}
-
-fn main() {
-    if let Err(err) = execute() {
-        if log::log_enabled!(target: "node", log::Level::Error) {
-            log::error!(target: "node", "Fatal: {err:#}");
-        } else {
-            eprintln!("Error: {err:#}");
-        }
-        process::exit(1);
-    }
-}
diff --git a/radicle-node/src/runtime.rs b/radicle-node/src/runtime.rs
deleted file mode 100644
index 0210198bf..000000000
--- a/radicle-node/src/runtime.rs
+++ /dev/null
@@ -1,369 +0,0 @@
-pub mod handle;
-pub mod thread;
-
-use std::os::unix::net::UnixListener;
-use std::path::PathBuf;
-use std::{fs, io, net};
-
-use crossbeam_channel as chan;
-use cyphernet::Ecdh;
-use netservices::resource::NetAccept;
-use radicle_fetch::FetchLimit;
-use radicle_signals::Signal;
-use reactor::poller::popol;
-use reactor::Reactor;
-use thiserror::Error;
-
-use radicle::node;
-use radicle::node::address;
-use radicle::node::address::Store as _;
-use radicle::node::notifications;
-use radicle::node::Handle as _;
-use radicle::node::UserAgent;
-use radicle::profile::Home;
-use radicle::{cob, git, storage, Storage};
-
-use crate::control;
-use crate::crypto::Signer;
-use crate::node::{routing, NodeId};
-use crate::service::message::NodeAnnouncement;
-use crate::service::{gossip, policy, Event, INITIAL_SUBSCRIBE_BACKLOG_DELTA};
-use crate::wire;
-use crate::wire::{Decode, Wire};
-use crate::worker;
-use crate::{service, LocalTime};
-
-pub use handle::Error as HandleError;
-pub use handle::Handle;
-pub use node::events::Emitter;
-
-/// Maximum pending worker tasks allowed.
-pub const MAX_PENDING_TASKS: usize = 1024;
-
-/// A client error.
-#[derive(Error, Debug)]
-pub enum Error {
-    /// A routing database error.
-    #[error("routing database error: {0}")]
-    Routing(#[from] routing::Error),
-    /// A cobs cache database error.
-    #[error("cobs cache database error: {0}")]
-    CobsCache(#[from] cob::cache::Error),
-    /// A node database error.
-    #[error("node database error: {0}")]
-    Database(#[from] node::db::Error),
-    /// A storage error.
-    #[error("storage error: {0}")]
-    Storage(#[from] storage::Error),
-    /// A policies database error.
-    #[error("policies database error: {0}")]
-    Policy(#[from] policy::Error),
-    /// A notifications database error.
-    #[error("notifications database error: {0}")]
-    Notifications(#[from] notifications::Error),
-    /// A gossip database error.
-    #[error("gossip database error: {0}")]
-    Gossip(#[from] gossip::Error),
-    /// An address database error.
-    #[error("address database error: {0}")]
-    Address(#[from] address::Error),
-    /// A service error.
-    #[error("service error: {0}")]
-    Service(#[from] service::Error),
-    /// An I/O error.
-    #[error("i/o error: {0}")]
-    Io(#[from] io::Error),
-    /// A control socket error.
-    #[error("control socket error: {0}")]
-    Control(#[from] control::Error),
-    /// Another node is already running.
-    #[error(
-        "another node appears to be running; \
-        if this isn't the case, delete the socket file at '{0}' \
-        and restart the node"
-    )]
-    AlreadyRunning(PathBuf),
-    /// A git version error.
-    #[error("git version error: {0}")]
-    GitVersion(#[from] git::VersionError),
-}
-
-/// Wraps a [`UnixListener`] but tracks its origin.
-pub enum ControlSocket {
-    /// The listener was created by binding to it.
-    Bound(UnixListener, PathBuf),
-    /// The listener was received via socket activation.
-    Received(UnixListener),
-}
-
-/// Holds join handles to the client threads, as well as a client handle.
-pub struct Runtime {
-    pub id: NodeId,
-    pub home: Home,
-    pub control: ControlSocket,
-    pub handle: Handle,
-    pub storage: Storage,
-    pub reactor: Reactor<wire::Control, popol::Poller>,
-    pub pool: worker::Pool,
-    pub local_addrs: Vec<net::SocketAddr>,
-    pub signals: chan::Receiver<Signal>,
-}
-
-impl Runtime {
-    /// Initialize the runtime.
-    ///
-    /// This function spawns threads.
-    pub fn init<G>(
-        home: Home,
-        config: service::Config,
-        listen: Vec<net::SocketAddr>,
-        signals: chan::Receiver<Signal>,
-        signer: G,
-    ) -> Result<Runtime, Error>
-    where
-        G: Signer + Ecdh<Pk = NodeId> + Clone + 'static,
-    {
-        let id = *signer.public_key();
-        let alias = config.alias.clone();
-        let node_dir = home.node();
-        let network = config.network;
-        let rng = fastrand::Rng::new();
-        let clock = LocalTime::now();
-        let timestamp = clock.into();
-        let storage = Storage::open(home.storage(), git::UserInfo { alias, key: id })?;
-        let policy = config.seeding_policy.into();
-
-        for (key, _) in &config.extra {
-            log::warn!(target: "node", "Unused or deprecated configuration attribute {:?}", key);
-        }
-
-        log::info!(target: "node", "Opening policy database..");
-        let policies = home.policies_mut()?;
-        let policies = policy::Config::new(policy, policies);
-        let notifications = home.notifications_mut()?;
-        let cobs_cache = cob::cache::Store::open(home.cobs().join(cob::cache::COBS_DB_FILE))?;
-
-        log::info!(target: "node", "Default seeding policy set to '{}'", &policy);
-        log::info!(target: "node", "Initializing service ({:?})..", network);
-
-        let announcement = if let Some(ann) = fs::read(node_dir.join(node::NODE_ANNOUNCEMENT_FILE))
-            .ok()
-            .and_then(|ann| NodeAnnouncement::decode(&mut ann.as_slice()).ok())
-            .and_then(|ann| {
-                // If our announcement was made some time ago, the timestamp on it will be old,
-                // and it might not get gossiped to new nodes since it will be purged from caches.
-                // Therefore, we make sure it's never too old.
-                if clock - ann.timestamp.to_local_time() <= INITIAL_SUBSCRIBE_BACKLOG_DELTA {
-                    Some(ann)
-                } else {
-                    None
-                }
-            })
-            .and_then(|ann| {
-                if config.features() == ann.features
-                    && config.alias == ann.alias
-                    && config.external_addresses == ann.addresses.as_ref()
-                {
-                    Some(ann)
-                } else {
-                    None
-                }
-            }) {
-            log::info!(
-                target: "node",
-                "Loaded existing node announcement from file (timestamp={}, work={})",
-                ann.timestamp,
-                ann.work(),
-            );
-            ann
-        } else {
-            service::gossip::node(&config, timestamp)
-                .solve(Default::default())
-                .expect("Runtime::init: unable to solve proof-of-work puzzle")
-        };
-
-        log::info!(target: "node", "Opening node database..");
-        let db = home
-            .database_mut()?
-            .journal_mode(node::db::JournalMode::default())?
-            .init(
-                &id,
-                announcement.features,
-                &announcement.alias,
-                &announcement.agent,
-                announcement.timestamp,
-                announcement.addresses.iter(),
-            )?;
-        let mut stores: service::Stores<_> = db.clone().into();
-
-        if config.connect.is_empty() && stores.addresses().is_empty()? {
-            log::info!(target: "node", "Address book is empty. Adding bootstrap nodes..");
-
-            for (alias, version, addr) in config.network.bootstrap() {
-                let (id, addr) = addr.into();
-
-                stores.addresses_mut().insert(
-                    &id,
-                    version,
-                    radicle::node::Features::SEED,
-                    &alias,
-                    0,
-                    &UserAgent::default(),
-                    clock.into(),
-                    [node::KnownAddress::new(addr, address::Source::Bootstrap)],
-                )?;
-            }
-            log::info!(target: "node", "{} nodes added to address book", stores.addresses().len()?);
-        }
-
-        let emitter: Emitter<Event> = Default::default();
-        let mut service = service::Service::new(
-            config.clone(),
-            stores,
-            storage.clone(),
-            policies,
-            signer.clone(),
-            rng,
-            announcement,
-            emitter.clone(),
-        );
-        service.initialize(clock)?;
-
-        let (worker_send, worker_recv) = chan::bounded::<worker::Task>(MAX_PENDING_TASKS);
-        let mut wire = Wire::new(service, worker_send, signer.clone());
-        let mut local_addrs = Vec::new();
-
-        for addr in listen {
-            let listener = NetAccept::bind(&addr)?;
-            let local_addr = listener.local_addr();
-
-            local_addrs.push(local_addr);
-            wire.listen(listener);
-        }
-        let reactor = Reactor::named(wire, popol::Poller::new(), thread::name(&id, "service"))?;
-        let handle = Handle::new(home.clone(), reactor.controller(), emitter);
-
-        let nid = *signer.public_key();
-        let fetch = worker::FetchConfig {
-            limit: FetchLimit::default(),
-            local: nid,
-            expiry: worker::garbage::Expiry::default(),
-        };
-        let pool = worker::Pool::with(
-            worker_recv,
-            nid,
-            handle.clone(),
-            notifications,
-            cobs_cache,
-            db,
-            worker::Config {
-                capacity: config.workers,
-                storage: storage.clone(),
-                fetch,
-                policy,
-                policies_db: home.node().join(node::POLICIES_DB_FILE),
-            },
-        )?;
-        let control = Self::bind(home.socket())?;
-
-        Ok(Runtime {
-            id,
-            home,
-            control,
-            storage,
-            reactor,
-            handle,
-            pool,
-            signals,
-            local_addrs,
-        })
-    }
-
-    pub fn run(self) -> Result<(), Error> {
-        let home = self.home;
-        let (listener, remove) = match self.control {
-            ControlSocket::Bound(listener, path) => (listener, Some(path)),
-            ControlSocket::Received(listener) => (listener, None),
-        };
-
-        log::info!(target: "node", "Running node {} in {}..", self.id, home.path().display());
-
-        thread::spawn(&self.id, "control", {
-            let handle = self.handle.clone();
-            || control::listen(listener, handle)
-        });
-        let _signals = thread::spawn(&self.id, "signals", move || loop {
-            match self.signals.recv() {
-                Ok(Signal::Terminate | Signal::Interrupt) => {
-                    log::info!(target: "node", "Termination signal received; shutting down..");
-                    self.handle.shutdown().ok();
-                    break;
-                }
-                Ok(Signal::Hangup) => {
-                    log::debug!(target: "node", "Hangup signal (SIGHUP) received; ignoring..");
-                }
-                Ok(Signal::WindowChanged) => {}
-                Err(e) => {
-                    log::warn!(target: "node", "Signal notifications channel error: {e}");
-                    break;
-                }
-            }
-        });
-
-        self.pool.run().unwrap();
-        self.reactor.join().unwrap();
-
-        // Nb. We don't join the control thread here, as we have no way of notifying it that the
-        // node is shutting down.
-
-        // Remove control socket file, but don't freak out if it's not there anymore.
-        remove.map(|path| fs::remove_file(path).ok());
-
-        log::debug!(target: "node", "Node shutdown completed for {}", self.id);
-
-        Ok(())
-    }
-
-    #[cfg(all(feature = "systemd", target_family = "unix"))]
-    fn receive_listener() -> Option<UnixListener> {
-        use std::os::fd::FromRawFd;
-        match radicle_systemd::listen_fd("control") {
-            Ok(Some(fd)) => {
-                // NOTE: Here, we should make a call to [`fstat(2)`](man:fstat(2))
-                // and make sure that the file descriptor we received actually
-                // is `AF_UNIX`. However, this requires fiddling with
-                // `libc` types or another dependency like `nix`, see
-                // <https://github.com/lucab/libsystemd-rs/blob/b43fa5e3b5eca3e6aa16a6c2fad87220dc0ad7a0/src/activation.rs#L192-L196>
-                // systemd also implements such a check, see
-                // <https://github.com/systemd/systemd/blob/v254/src/libsystemd/sd-daemon/sd-daemon.c#L357-L398>
-                Some(unsafe {
-                    // SAFETY: We take ownership of this FD from systemd,
-                    // which guarantees that it is open.
-                    UnixListener::from_raw_fd(fd)
-                })
-            }
-            Ok(None) => None,
-            Err(err) => {
-                log::trace!(target: "node", "Error receiving file descriptors from systemd: {err}");
-                None
-            }
-        }
-    }
-
-    fn bind(path: PathBuf) -> Result<ControlSocket, Error> {
-        #[cfg(all(feature = "systemd", target_family = "unix"))]
-        {
-            if let Some(listener) = Self::receive_listener() {
-                log::info!(target: "node", "Received control socket.");
-                return Ok(ControlSocket::Received(listener));
-            }
-        }
-
-        log::info!(target: "node", "Binding control socket {}..", &path.display());
-        match UnixListener::bind(&path) {
-            Ok(sock) => Ok(ControlSocket::Bound(sock, path)),
-            Err(err) if err.kind() == io::ErrorKind::AddrInUse => Err(Error::AlreadyRunning(path)),
-            Err(err) => Err(err.into()),
-        }
-    }
-}
diff --git a/radicle-node/src/runtime/handle.rs b/radicle-node/src/runtime/handle.rs
deleted file mode 100644
index 0b4a7173d..000000000
--- a/radicle-node/src/runtime/handle.rs
+++ /dev/null
@@ -1,373 +0,0 @@
-use std::net;
-use std::os::unix::net::UnixStream;
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::Arc;
-use std::{fmt, io, time};
-
-use crossbeam_channel as chan;
-use radicle::node::{ConnectOptions, ConnectResult, Link, Seeds};
-use radicle::storage::refs::RefsAt;
-use reactor::poller::popol::PopolWaker;
-use serde_json::json;
-use thiserror::Error;
-
-use crate::identity::RepoId;
-use crate::node::{Alias, Command, FetchResult};
-use crate::profile::Home;
-use crate::runtime::Emitter;
-use crate::service;
-use crate::service::policy;
-use crate::service::NodeId;
-use crate::service::{CommandError, Config, QueryState};
-use crate::service::{Event, Events};
-use crate::wire;
-use crate::wire::StreamId;
-use crate::worker::TaskResult;
-
-/// An error resulting from a handle method.
-#[derive(Error, Debug)]
-pub enum Error {
-    /// The command channel is no longer connected.
-    #[error("command channel is not connected")]
-    ChannelDisconnected,
-    /// The command returned an error.
-    #[error("command failed: {0}")]
-    Command(#[from] CommandError),
-    /// The operation timed out.
-    #[error("the operation timed out")]
-    Timeout,
-    /// An I/O error occured.
-    #[error(transparent)]
-    Io(#[from] std::io::Error),
-}
-
-impl From<chan::RecvError> for Error {
-    fn from(_: chan::RecvError) -> Self {
-        Self::ChannelDisconnected
-    }
-}
-
-impl From<chan::RecvTimeoutError> for Error {
-    fn from(err: chan::RecvTimeoutError) -> Self {
-        match err {
-            chan::RecvTimeoutError::Timeout => Self::Timeout,
-            chan::RecvTimeoutError::Disconnected => Self::ChannelDisconnected,
-        }
-    }
-}
-
-impl<T> From<chan::SendError<T>> for Error {
-    fn from(_: chan::SendError<T>) -> Self {
-        Self::ChannelDisconnected
-    }
-}
-
-pub struct Handle {
-    pub(crate) home: Home,
-    pub(crate) controller: reactor::Controller<wire::Control, PopolWaker>,
-
-    /// Whether a shutdown was initiated or not. Prevents attempting to shutdown twice.
-    shutdown: Arc<AtomicBool>,
-    /// Publishes events to subscribers.
-    emitter: Emitter<Event>,
-}
-
-impl Handle {
-    /// Subscribe to events stream.
-    pub fn events(&self) -> Events {
-        Events::from(self.emitter.subscribe())
-    }
-}
-
-impl fmt::Debug for Handle {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Handle").field("home", &self.home).finish()
-    }
-}
-
-impl Clone for Handle {
-    fn clone(&self) -> Self {
-        Self {
-            home: self.home.clone(),
-            controller: self.controller.clone(),
-            shutdown: self.shutdown.clone(),
-            emitter: self.emitter.clone(),
-        }
-    }
-}
-
-impl Handle {
-    pub fn new(
-        home: Home,
-        controller: reactor::Controller<wire::Control, PopolWaker>,
-        emitter: Emitter<Event>,
-    ) -> Self {
-        Self {
-            home,
-            controller,
-            shutdown: Arc::default(),
-            emitter,
-        }
-    }
-
-    pub fn worker_result(&mut self, result: TaskResult) -> Result<(), io::Error> {
-        self.controller.cmd(wire::Control::Worker(result))
-    }
-
-    pub fn flush(&mut self, remote: NodeId, stream: StreamId) -> Result<(), io::Error> {
-        self.controller.cmd(wire::Control::Flush { remote, stream })
-    }
-
-    pub(crate) fn command(&self, cmd: service::Command) -> Result<(), io::Error> {
-        self.controller.cmd(wire::Control::User(cmd))
-    }
-}
-
-impl radicle::node::Handle for Handle {
-    type Sessions = Vec<radicle::node::Session>;
-    type Events = Events;
-    type Event = Event;
-    type Error = Error;
-
-    fn nid(&self) -> Result<NodeId, Self::Error> {
-        let (sender, receiver) = chan::bounded(1);
-        let query: Arc<QueryState> = Arc::new(move |state| {
-            sender.send(*state.nid()).ok();
-            Ok(())
-        });
-        let (err_sender, err_receiver) = chan::bounded(1);
-        self.command(service::Command::QueryState(query, err_sender))?;
-        err_receiver.recv()??;
-
-        let nid = receiver.recv()?;
-
-        Ok(nid)
-    }
-
-    fn is_running(&self) -> bool {
-        true
-    }
-
-    fn connect(
-        &mut self,
-        node: NodeId,
-        addr: radicle::node::Address,
-        opts: ConnectOptions,
-    ) -> Result<ConnectResult, Error> {
-        let events = self.events();
-        let timeout = opts.timeout;
-        let sessions = self.sessions()?;
-        let session = sessions.iter().find(|s| s.nid == node);
-
-        if let Some(s) = session {
-            if s.state.is_connected() {
-                return Ok(ConnectResult::Connected);
-            }
-        }
-        self.command(service::Command::Connect(node, addr, opts))?;
-
-        events
-            .wait(
-                |e| match e {
-                    Event::PeerConnected { nid } if nid == &node => Some(ConnectResult::Connected),
-                    Event::PeerDisconnected { nid, reason } if nid == &node => {
-                        Some(ConnectResult::Disconnected {
-                            reason: reason.clone(),
-                        })
-                    }
-                    _ => None,
-                },
-                timeout,
-            )
-            .map_err(Error::from)
-    }
-
-    fn disconnect(&mut self, node: NodeId) -> Result<(), Self::Error> {
-        let events = self.events();
-        self.command(service::Command::Disconnect(node))?;
-        events
-            .wait(
-                |e| match e {
-                    Event::PeerDisconnected { nid, .. } if nid == &node => Some(()),
-                    _ => None,
-                },
-                time::Duration::MAX,
-            )
-            .map_err(Error::from)
-    }
-
-    fn seeds(&mut self, id: RepoId) -> Result<Seeds, Self::Error> {
-        let (sender, receiver) = chan::bounded(1);
-        self.command(service::Command::Seeds(id, sender))?;
-        receiver.recv().map_err(Error::from)
-    }
-
-    fn config(&self) -> Result<Config, Self::Error> {
-        let (sender, receiver) = chan::bounded(1);
-        self.command(service::Command::Config(sender))?;
-        receiver.recv().map_err(Error::from)
-    }
-
-    fn listen_addrs(&self) -> Result<Vec<net::SocketAddr>, Self::Error> {
-        let (sender, receiver) = chan::bounded(1);
-        self.command(service::Command::ListenAddrs(sender))?;
-        receiver.recv().map_err(Error::from)
-    }
-
-    fn fetch(
-        &mut self,
-        id: RepoId,
-        from: NodeId,
-        timeout: time::Duration,
-    ) -> Result<FetchResult, Error> {
-        let (sender, receiver) = chan::bounded(1);
-        self.command(service::Command::Fetch(id, from, timeout, sender))?;
-        receiver.recv().map_err(Error::from)
-    }
-
-    fn follow(&mut self, id: NodeId, alias: Option<Alias>) -> Result<bool, Error> {
-        let (sender, receiver) = chan::bounded(1);
-        self.command(service::Command::Follow(id, alias, sender))?;
-        receiver.recv().map_err(Error::from)
-    }
-
-    fn unfollow(&mut self, id: NodeId) -> Result<bool, Error> {
-        let (sender, receiver) = chan::bounded(1);
-        self.command(service::Command::Unfollow(id, sender))?;
-        receiver.recv().map_err(Error::from)
-    }
-
-    fn seed(&mut self, id: RepoId, scope: policy::Scope) -> Result<bool, Error> {
-        let (sender, receiver) = chan::bounded(1);
-        self.command(service::Command::Seed(id, scope, sender))?;
-        receiver.recv().map_err(Error::from)
-    }
-
-    fn unseed(&mut self, id: RepoId) -> Result<bool, Error> {
-        let (sender, receiver) = chan::bounded(1);
-        self.command(service::Command::Unseed(id, sender))?;
-        receiver.recv().map_err(Error::from)
-    }
-
-    fn announce_refs(&mut self, id: RepoId) -> Result<RefsAt, Error> {
-        let (sender, receiver) = chan::bounded(1);
-        self.command(service::Command::AnnounceRefs(id, sender))?;
-        receiver.recv().map_err(Error::from)
-    }
-
-    fn announce_inventory(&mut self) -> Result<(), Error> {
-        self.command(service::Command::AnnounceInventory)
-            .map_err(Error::from)
-    }
-
-    fn add_inventory(&mut self, rid: RepoId) -> Result<bool, Error> {
-        let (sender, receiver) = chan::bounded(1);
-        self.command(service::Command::AddInventory(rid, sender))?;
-        receiver.recv().map_err(Error::from)
-    }
-
-    fn subscribe(&self, _timeout: time::Duration) -> Result<Self::Events, Self::Error> {
-        Ok(self.events())
-    }
-
-    fn sessions(&self) -> Result<Self::Sessions, Error> {
-        let (sender, receiver) = chan::unbounded();
-        let query: Arc<QueryState> = Arc::new(move |state| {
-            let sessions = state
-                .sessions()
-                .iter()
-                .map(|(nid, s)| radicle::node::Session {
-                    nid: *nid,
-                    link: if s.link.is_inbound() {
-                        Link::Inbound
-                    } else {
-                        Link::Outbound
-                    },
-                    addr: s.addr.clone(),
-                    state: s.state.clone(),
-                })
-                .collect();
-            sender.send(sessions).ok();
-
-            Ok(())
-        });
-        let (err_sender, err_receiver) = chan::bounded(1);
-        self.command(service::Command::QueryState(query, err_sender))?;
-        err_receiver.recv()??;
-
-        let sessions = receiver.recv()?;
-
-        Ok(sessions)
-    }
-
-    fn shutdown(self) -> Result<(), Error> {
-        // If the current value is `false`, set it to `true`, otherwise error.
-        if self
-            .shutdown
-            .compare_exchange(false, true, Ordering::SeqCst, Ordering::SeqCst)
-            .is_err()
-        {
-            return Ok(());
-        }
-        // Send a shutdown request to our own control socket. This is the only way to kill the
-        // control thread gracefully. Since the control thread may have called this function,
-        // the control socket may already be disconnected. Ignore errors.
-        UnixStream::connect(self.home.socket())
-            .and_then(|sock| Command::Shutdown.to_writer(sock))
-            .ok();
-
-        self.controller
-            .shutdown()
-            .map_err(|_| Error::ChannelDisconnected)
-    }
-
-    fn debug(&self) -> Result<serde_json::Value, Self::Error> {
-        let (sender, receiver) = chan::bounded(1);
-        let query: Arc<QueryState> = Arc::new(move |state| {
-            let debug = serde_json::json!({
-                "outboxSize": state.outbox().len(),
-                "fetching": state.fetching().iter().map(|(rid, state)| {
-                    json!({
-                        "rid": rid,
-                        "from": state.from,
-                        "refsAt": state.refs_at,
-                        "subscribers": state.subscribers.len(),
-                    })
-                }).collect::<Vec<_>>(),
-                "queue": state.sessions().values().map(|sess| {
-                    json!({
-                        "nid": sess.id,
-                        "queue": sess.queue.iter().map(|fetch| {
-                            json!({
-                                "rid": fetch.rid,
-                                "from": fetch.from,
-                                "refsAt": fetch.refs_at,
-                            })
-                        }).collect::<Vec<_>>()
-                    })
-                }).collect::<Vec<_>>(),
-                "rateLimiter": state.limiter().buckets.iter().map(|(host, bucket)| {
-                    json!({
-                        "host": host.to_string(),
-                        "bucket": bucket
-                    })
-                }).collect::<Vec<_>>(),
-                "events": json!({
-                    "subscribers": state.emitter().subscriptions(),
-                    "pending": state.emitter().pending(),
-                }),
-                "metrics": state.metrics(),
-            });
-            sender.send(debug).ok();
-
-            Ok(())
-        });
-        let (err_sender, err_receiver) = chan::bounded(1);
-        self.command(service::Command::QueryState(query, err_sender))?;
-        err_receiver.recv()??;
-
-        let debug = receiver.recv()?;
-
-        Ok(debug)
-    }
-}
diff --git a/radicle-node/src/runtime/thread.rs b/radicle-node/src/runtime/thread.rs
deleted file mode 100644
index f2df8b991..000000000
--- a/radicle-node/src/runtime/thread.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use std::thread;
-
-pub use thread::*;
-
-use radicle::prelude::NodeId;
-
-/// Spawn an OS thread.
-pub fn spawn<D, F, T>(nid: &NodeId, label: D, f: F) -> thread::JoinHandle<T>
-where
-    D: std::fmt::Display,
-    F: FnOnce() -> T,
-    F: Send + 'static,
-    T: Send + 'static,
-{
-    thread::Builder::new()
-        .name(name(nid, label))
-        .spawn(f)
-        .expect("thread::spawn: thread label must not contain NULL bytes")
-}
-
-/// Spawn a scoped OS thread.
-pub fn spawn_scoped<'scope, 'env, D, F, T>(
-    nid: &NodeId,
-    label: D,
-    scope: &'scope thread::Scope<'scope, 'env>,
-    f: F,
-) -> thread::ScopedJoinHandle<'scope, T>
-where
-    D: std::fmt::Display,
-    F: FnOnce() -> T,
-    F: Send + 'scope,
-    T: Send + 'scope,
-{
-    thread::Builder::new()
-        .name(name(nid, label))
-        .spawn_scoped(scope, f)
-        .expect("thread::spawn_scoped: thread label must not contain NULL bytes")
-}
-
-pub fn name<D: std::fmt::Display>(nid: &NodeId, label: D) -> String {
-    if cfg!(debug_assertions) {
-        format!("{nid} {:<14}", format!("<{label}>"))
-    } else {
-        format!("{label}")
-    }
-}
diff --git a/radicle-node/src/service.rs b/radicle-node/src/service.rs
deleted file mode 100644
index 4727fc214..000000000
--- a/radicle-node/src/service.rs
+++ /dev/null
@@ -1,2808 +0,0 @@
-#![allow(clippy::too_many_arguments)]
-#![allow(clippy::collapsible_match)]
-#![allow(clippy::collapsible_if)]
-#![warn(clippy::unwrap_used)]
-pub mod filter;
-pub mod gossip;
-pub mod io;
-pub mod limiter;
-pub mod message;
-pub mod session;
-
-use std::collections::hash_map::Entry;
-use std::collections::{BTreeSet, HashMap, HashSet};
-use std::net::IpAddr;
-use std::ops::{Deref, DerefMut};
-use std::sync::Arc;
-use std::{fmt, net, time};
-
-use crossbeam_channel as chan;
-use fastrand::Rng;
-use localtime::{LocalDuration, LocalTime};
-use log::*;
-use nonempty::NonEmpty;
-
-use radicle::node;
-use radicle::node::address;
-use radicle::node::address::Store as _;
-use radicle::node::address::{AddressBook, AddressType, KnownAddress};
-use radicle::node::config::PeerConfig;
-use radicle::node::refs::Store as _;
-use radicle::node::routing::Store as _;
-use radicle::node::seed;
-use radicle::node::seed::Store as _;
-use radicle::node::{ConnectOptions, Penalty, Severity};
-use radicle::storage::refs::SIGREFS_BRANCH;
-use radicle::storage::RepositoryError;
-use radicle_fetch::policy::SeedingPolicy;
-
-use crate::crypto::{Signer, Verified};
-use crate::identity::{Doc, RepoId};
-use crate::node::routing;
-use crate::node::routing::InsertResult;
-use crate::node::{
-    Address, Alias, Features, FetchResult, HostName, Seed, Seeds, SyncStatus, SyncedAt,
-};
-use crate::prelude::*;
-use crate::runtime::Emitter;
-use crate::service::gossip::Store as _;
-use crate::service::message::{
-    Announcement, AnnouncementMessage, Info, NodeAnnouncement, Ping, RefsAnnouncement, RefsStatus,
-};
-use crate::service::policy::{store::Write, Scope};
-use crate::storage;
-use crate::storage::{refs::RefsAt, Namespaces, ReadStorage};
-use crate::worker::fetch;
-use crate::worker::FetchError;
-use crate::Link;
-use crate::{crypto, PROTOCOL_VERSION};
-
-pub use crate::node::events::{Event, Events};
-pub use crate::node::{config::Network, Config, NodeId};
-pub use crate::service::message::{Message, ZeroBytes};
-pub use crate::service::session::{QueuedFetch, Session};
-
-pub use radicle::node::policy::config as policy;
-
-use self::io::Outbox;
-use self::limiter::RateLimiter;
-use self::message::InventoryAnnouncement;
-use self::policy::NamespacesError;
-
-/// How often to run the "idle" task.
-pub const IDLE_INTERVAL: LocalDuration = LocalDuration::from_secs(30);
-/// How often to run the "gossip" task.
-pub const GOSSIP_INTERVAL: LocalDuration = LocalDuration::from_secs(6);
-/// How often to run the "announce" task.
-pub const ANNOUNCE_INTERVAL: LocalDuration = LocalDuration::from_mins(60);
-/// How often to run the "sync" task.
-pub const SYNC_INTERVAL: LocalDuration = LocalDuration::from_secs(60);
-/// How often to run the "prune" task.
-pub const PRUNE_INTERVAL: LocalDuration = LocalDuration::from_mins(30);
-/// Duration to wait on an unresponsive peer before dropping its connection.
-pub const STALE_CONNECTION_TIMEOUT: LocalDuration = LocalDuration::from_mins(2);
-/// How much time should pass after a peer was last active for a *ping* to be sent.
-pub const KEEP_ALIVE_DELTA: LocalDuration = LocalDuration::from_mins(1);
-/// Maximum number of latency values to keep for a session.
-pub const MAX_LATENCIES: usize = 16;
-/// Maximum time difference between the local time, and an announcement timestamp.
-pub const MAX_TIME_DELTA: LocalDuration = LocalDuration::from_mins(60);
-/// Maximum attempts to connect to a peer before we give up.
-pub const MAX_CONNECTION_ATTEMPTS: usize = 3;
-/// How far back from the present time should we request gossip messages when connecting to a peer,
-/// when we come online for the first time.
-pub const INITIAL_SUBSCRIBE_BACKLOG_DELTA: LocalDuration = LocalDuration::from_mins(60 * 24);
-/// When subscribing, what margin of error do we give ourselves. A igher delta means we ask for
-/// messages further back than strictly necessary, to account for missed messages.
-pub const SUBSCRIBE_BACKLOG_DELTA: LocalDuration = LocalDuration::from_mins(3);
-/// Minimum amount of time to wait before reconnecting to a peer.
-pub const MIN_RECONNECTION_DELTA: LocalDuration = LocalDuration::from_secs(3);
-/// Maximum amount of time to wait before reconnecting to a peer.
-pub const MAX_RECONNECTION_DELTA: LocalDuration = LocalDuration::from_mins(60);
-/// Connection retry delta used for ephemeral peers that failed to connect previously.
-pub const CONNECTION_RETRY_DELTA: LocalDuration = LocalDuration::from_mins(10);
-/// How long to wait for a fetch to stall before aborting, default is 3s.
-pub const FETCH_TIMEOUT: time::Duration = time::Duration::from_secs(3);
-/// Target number of peers to maintain connections to.
-pub const TARGET_OUTBOUND_PEERS: usize = 8;
-
-/// Maximum external address limit imposed by message size limits.
-pub use message::ADDRESS_LIMIT;
-/// Maximum inventory limit imposed by message size limits.
-pub use message::INVENTORY_LIMIT;
-/// Maximum number of project git references imposed by message size limits.
-pub use message::REF_REMOTE_LIMIT;
-
-/// Metrics we track.
-#[derive(Clone, Debug, Default, serde::Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Metrics {
-    /// Metrics for each peer.
-    pub peers: HashMap<NodeId, PeerMetrics>,
-    /// Tasks queued in worker queue.
-    pub worker_queue_size: usize,
-    /// Current open channel count.
-    pub open_channels: usize,
-}
-
-impl Metrics {
-    /// Get metrics for the given peer.
-    pub fn peer(&mut self, nid: NodeId) -> &mut PeerMetrics {
-        self.peers.entry(nid).or_default()
-    }
-}
-
-/// Per-peer metrics we track.
-#[derive(Clone, Debug, Default, serde::Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PeerMetrics {
-    pub received_git_bytes: usize,
-    pub received_fetch_requests: usize,
-    pub received_bytes: usize,
-    pub received_gossip_messages: usize,
-    pub sent_bytes: usize,
-    pub sent_fetch_requests: usize,
-    pub sent_git_bytes: usize,
-    pub sent_gossip_messages: usize,
-    pub streams_opened: usize,
-    pub inbound_connection_attempts: usize,
-    pub outbound_connection_attempts: usize,
-    pub disconnects: usize,
-}
-
-/// Result of syncing our routing table with a node's inventory.
-#[derive(Default)]
-struct SyncedRouting {
-    /// Repo entries added.
-    added: Vec<RepoId>,
-    /// Repo entries removed.
-    removed: Vec<RepoId>,
-    /// Repo entries updated (time).
-    updated: Vec<RepoId>,
-}
-
-impl SyncedRouting {
-    fn is_empty(&self) -> bool {
-        self.added.is_empty() && self.removed.is_empty() && self.updated.is_empty()
-    }
-}
-
-/// A peer we can connect to.
-#[derive(Debug, Clone)]
-struct Peer {
-    nid: NodeId,
-    addresses: Vec<KnownAddress>,
-    penalty: Penalty,
-}
-
-/// General service error.
-#[derive(thiserror::Error, Debug)]
-pub enum Error {
-    #[error(transparent)]
-    Git(#[from] radicle::git::raw::Error),
-    #[error(transparent)]
-    GitExt(#[from] radicle::git::ext::Error),
-    #[error(transparent)]
-    Storage(#[from] storage::Error),
-    #[error(transparent)]
-    Gossip(#[from] gossip::Error),
-    #[error(transparent)]
-    Refs(#[from] storage::refs::Error),
-    #[error(transparent)]
-    Routing(#[from] routing::Error),
-    #[error(transparent)]
-    Address(#[from] address::Error),
-    #[error(transparent)]
-    Database(#[from] node::db::Error),
-    #[error(transparent)]
-    Seeds(#[from] seed::Error),
-    #[error(transparent)]
-    Policy(#[from] policy::Error),
-    #[error(transparent)]
-    Repository(#[from] radicle::storage::RepositoryError),
-    #[error("namespaces error: {0}")]
-    Namespaces(#[from] NamespacesError),
-}
-
-/// A store for all node data.
-pub trait Store:
-    address::Store + gossip::Store + routing::Store + seed::Store + node::refs::Store
-{
-}
-
-impl Store for node::Database {}
-
-/// Function used to query internal service state.
-pub type QueryState = dyn Fn(&dyn ServiceState) -> Result<(), CommandError> + Send + Sync;
-
-/// Commands sent to the service by the operator.
-pub enum Command {
-    /// Announce repository references for given repository to peers.
-    AnnounceRefs(RepoId, chan::Sender<RefsAt>),
-    /// Announce local repositories to peers.
-    AnnounceInventory,
-    /// Add repository to local inventory.
-    AddInventory(RepoId, chan::Sender<bool>),
-    /// Connect to node with the given address.
-    Connect(NodeId, Address, ConnectOptions),
-    /// Disconnect from node.
-    Disconnect(NodeId),
-    /// Get the node configuration.
-    Config(chan::Sender<Config>),
-    /// Get the node's listen addresses.
-    ListenAddrs(chan::Sender<Vec<std::net::SocketAddr>>),
-    /// Lookup seeds for the given repository in the routing table.
-    Seeds(RepoId, chan::Sender<Seeds>),
-    /// Fetch the given repository from the network.
-    Fetch(RepoId, NodeId, time::Duration, chan::Sender<FetchResult>),
-    /// Seed the given repository.
-    Seed(RepoId, Scope, chan::Sender<bool>),
-    /// Unseed the given repository.
-    Unseed(RepoId, chan::Sender<bool>),
-    /// Follow the given node.
-    Follow(NodeId, Option<Alias>, chan::Sender<bool>),
-    /// Unfollow the given node.
-    Unfollow(NodeId, chan::Sender<bool>),
-    /// Query the internal service state.
-    QueryState(Arc<QueryState>, chan::Sender<Result<(), CommandError>>),
-}
-
-impl fmt::Debug for Command {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::AnnounceRefs(id, _) => write!(f, "AnnounceRefs({id})"),
-            Self::AnnounceInventory => write!(f, "AnnounceInventory"),
-            Self::AddInventory(rid, _) => write!(f, "AddInventory({rid})"),
-            Self::Connect(id, addr, opts) => write!(f, "Connect({id}, {addr}, {opts:?})"),
-            Self::Disconnect(id) => write!(f, "Disconnect({id})"),
-            Self::Config(_) => write!(f, "Config"),
-            Self::ListenAddrs(_) => write!(f, "ListenAddrs"),
-            Self::Seeds(id, _) => write!(f, "Seeds({id})"),
-            Self::Fetch(id, node, _, _) => write!(f, "Fetch({id}, {node})"),
-            Self::Seed(id, scope, _) => write!(f, "Seed({id}, {scope})"),
-            Self::Unseed(id, _) => write!(f, "Unseed({id})"),
-            Self::Follow(id, _, _) => write!(f, "Follow({id})"),
-            Self::Unfollow(id, _) => write!(f, "Unfollow({id})"),
-            Self::QueryState { .. } => write!(f, "QueryState(..)"),
-        }
-    }
-}
-
-/// Command-related errors.
-#[derive(thiserror::Error, Debug)]
-pub enum CommandError {
-    #[error(transparent)]
-    Storage(#[from] storage::Error),
-    #[error(transparent)]
-    Routing(#[from] routing::Error),
-    #[error(transparent)]
-    Policy(#[from] policy::Error),
-}
-
-/// Error returned by [`Service::try_fetch`].
-#[derive(thiserror::Error, Debug)]
-enum TryFetchError<'a> {
-    #[error("ongoing fetch for repository exists")]
-    AlreadyFetching(&'a mut FetchState),
-    #[error("peer is not connected; cannot initiate fetch")]
-    SessionNotConnected,
-    #[error("peer fetch capacity reached; cannot initiate fetch")]
-    SessionCapacityReached,
-    #[error(transparent)]
-    Namespaces(#[from] NamespacesError),
-}
-
-/// Fetch state for an ongoing fetch.
-#[derive(Debug)]
-pub struct FetchState {
-    /// Node we're fetching from.
-    pub from: NodeId,
-    /// What refs we're fetching.
-    pub refs_at: Vec<RefsAt>,
-    /// Channels waiting for fetch results.
-    pub subscribers: Vec<chan::Sender<FetchResult>>,
-}
-
-impl FetchState {
-    /// Add a subscriber to this fetch.
-    fn subscribe(&mut self, c: chan::Sender<FetchResult>) {
-        if !self.subscribers.iter().any(|s| s.same_channel(&c)) {
-            self.subscribers.push(c);
-        }
-    }
-}
-
-/// Holds all node stores.
-#[derive(Debug)]
-pub struct Stores<D>(D);
-
-impl<D> Stores<D>
-where
-    D: Store,
-{
-    /// Get the database as a routing store.
-    pub fn routing(&self) -> &impl routing::Store {
-        &self.0
-    }
-
-    /// Get the database as a routing store, mutably.
-    pub fn routing_mut(&mut self) -> &mut impl routing::Store {
-        &mut self.0
-    }
-
-    /// Get the database as an address store.
-    pub fn addresses(&self) -> &impl address::Store {
-        &self.0
-    }
-
-    /// Get the database as an address store, mutably.
-    pub fn addresses_mut(&mut self) -> &mut impl address::Store {
-        &mut self.0
-    }
-
-    /// Get the database as a gossip store.
-    pub fn gossip(&self) -> &impl gossip::Store {
-        &self.0
-    }
-
-    /// Get the database as a gossip store, mutably.
-    pub fn gossip_mut(&mut self) -> &mut impl gossip::Store {
-        &mut self.0
-    }
-
-    /// Get the database as a seed store.
-    pub fn seeds(&self) -> &impl seed::Store {
-        &self.0
-    }
-
-    /// Get the database as a seed store, mutably.
-    pub fn seeds_mut(&mut self) -> &mut impl seed::Store {
-        &mut self.0
-    }
-
-    /// Get the database as a refs db.
-    pub fn refs(&self) -> &impl node::refs::Store {
-        &self.0
-    }
-
-    /// Get the database as a refs db, mutably.
-    pub fn refs_mut(&mut self) -> &mut impl node::refs::Store {
-        &mut self.0
-    }
-}
-
-impl<D> AsMut<D> for Stores<D> {
-    fn as_mut(&mut self) -> &mut D {
-        &mut self.0
-    }
-}
-
-impl<D> From<D> for Stores<D> {
-    fn from(db: D) -> Self {
-        Self(db)
-    }
-}
-
-/// The node service.
-#[derive(Debug)]
-pub struct Service<D, S, G> {
-    /// Service configuration.
-    config: Config,
-    /// Our cryptographic signer and key.
-    signer: G,
-    /// Project storage.
-    storage: S,
-    /// Node database.
-    db: Stores<D>,
-    /// Policy configuration.
-    policies: policy::Config<Write>,
-    /// Peer sessions, currently or recently connected.
-    sessions: Sessions,
-    /// Clock. Tells the time.
-    clock: LocalTime,
-    /// Who relayed what announcement to us. We keep track of this to ensure that
-    /// we don't relay messages to nodes that already know about these messages.
-    relayed_by: HashMap<gossip::AnnouncementId, Vec<NodeId>>,
-    /// I/O outbox.
-    outbox: Outbox,
-    /// Cached local node announcement.
-    node: NodeAnnouncement,
-    /// Cached local inventory announcement.
-    inventory: InventoryAnnouncement,
-    /// Source of entropy.
-    rng: Rng,
-    /// Ongoing fetches.
-    fetching: HashMap<RepoId, FetchState>,
-    /// Request/connection rate limiter.
-    limiter: RateLimiter,
-    /// Current seeded repositories bloom filter.
-    filter: Filter,
-    /// Last time the service was idle.
-    last_idle: LocalTime,
-    /// Last time the gossip messages were relayed.
-    last_gossip: LocalTime,
-    /// Last time the service synced.
-    last_sync: LocalTime,
-    /// Last time the service routing table was pruned.
-    last_prune: LocalTime,
-    /// Last time the announcement task was run.
-    last_announce: LocalTime,
-    /// Timestamp of last local inventory announced.
-    last_inventory: LocalTime,
-    /// Last timestamp used for announcements.
-    last_timestamp: Timestamp,
-    /// Time when the service was initialized, or `None` if it wasn't initialized.
-    started_at: Option<LocalTime>,
-    /// Time when the service was last online, or `None` if this is the first time.
-    last_online_at: Option<LocalTime>,
-    /// Publishes events to subscribers.
-    emitter: Emitter<Event>,
-    /// Local listening addresses.
-    listening: Vec<net::SocketAddr>,
-    /// Latest metrics for all nodes connected to since the last start.
-    metrics: Metrics,
-}
-
-impl<D, S, G> Service<D, S, G>
-where
-    G: crypto::Signer,
-{
-    /// Get the local node id.
-    pub fn node_id(&self) -> NodeId {
-        *self.signer.public_key()
-    }
-
-    /// Get the local service time.
-    pub fn local_time(&self) -> LocalTime {
-        self.clock
-    }
-
-    pub fn emitter(&self) -> Emitter<Event> {
-        self.emitter.clone()
-    }
-}
-
-impl<D, S, G> Service<D, S, G>
-where
-    D: Store,
-    S: ReadStorage + 'static,
-    G: Signer,
-{
-    pub fn new(
-        config: Config,
-        db: Stores<D>,
-        storage: S,
-        policies: policy::Config<Write>,
-        signer: G,
-        rng: Rng,
-        node: NodeAnnouncement,
-        emitter: Emitter<Event>,
-    ) -> Self {
-        let sessions = Sessions::new(rng.clone());
-        let limiter = RateLimiter::new(config.peers());
-        let last_timestamp = node.timestamp;
-        let clock = LocalTime::default(); // Updated on initialize.
-        let inventory = gossip::inventory(clock.into(), []); // Updated on initialize.
-
-        Self {
-            config,
-            storage,
-            policies,
-            signer,
-            rng,
-            inventory,
-            node,
-            clock,
-            db,
-            outbox: Outbox::default(),
-            limiter,
-            sessions,
-            fetching: HashMap::new(),
-            filter: Filter::empty(),
-            relayed_by: HashMap::default(),
-            last_idle: LocalTime::default(),
-            last_gossip: LocalTime::default(),
-            last_sync: LocalTime::default(),
-            last_prune: LocalTime::default(),
-            last_timestamp,
-            last_announce: LocalTime::default(),
-            last_inventory: LocalTime::default(),
-            started_at: None,     // Updated on initialize.
-            last_online_at: None, // Updated on initialize.
-            emitter,
-            listening: vec![],
-            metrics: Metrics::default(),
-        }
-    }
-
-    /// Whether the service was started (initialized) and if so, at what time.
-    pub fn started(&self) -> Option<LocalTime> {
-        self.started_at
-    }
-
-    /// Return the next i/o action to execute.
-    #[allow(clippy::should_implement_trait)]
-    pub fn next(&mut self) -> Option<io::Io> {
-        self.outbox.next()
-    }
-
-    /// Seed a repository.
-    /// Returns whether or not the repo policy was updated.
-    pub fn seed(&mut self, id: &RepoId, scope: Scope) -> Result<bool, policy::Error> {
-        let updated = self.policies.seed(id, scope)?;
-        self.filter.insert(id);
-
-        Ok(updated)
-    }
-
-    /// Unseed a repository.
-    /// Returns whether or not the repo policy was updated.
-    /// Note that when unseeding, we don't announce anything to the network. This is because by
-    /// simply not announcing it anymore, it will eventually be pruned by nodes.
-    pub fn unseed(&mut self, id: &RepoId) -> Result<bool, policy::Error> {
-        let updated = self.policies.unseed(id)?;
-
-        if updated {
-            // Nb. This is potentially slow if we have lots of repos. We should probably
-            // only re-compute the filter when we've unseeded a certain amount of repos
-            // and the filter is really out of date.
-            //
-            // TODO: Share this code with initialization code.
-            self.filter = Filter::new(
-                self.policies
-                    .seed_policies()?
-                    .filter_map(|t| (t.policy.is_allow()).then_some(t.rid)),
-            );
-            // Update and announce new inventory.
-            if let Err(e) = self.remove_inventory(id) {
-                error!(target: "service", "Error updating inventory after unseed: {e}");
-            }
-        }
-        Ok(updated)
-    }
-
-    /// Find the closest `n` peers by proximity in seeding graphs.
-    /// Returns a sorted list from the closest peer to the furthest.
-    /// Peers with more seedings in common score score higher.
-    #[allow(unused)]
-    pub fn closest_peers(&self, n: usize) -> Vec<NodeId> {
-        todo!()
-    }
-
-    /// Get the database.
-    pub fn database(&self) -> &Stores<D> {
-        &self.db
-    }
-
-    /// Get the mutable database.
-    pub fn database_mut(&mut self) -> &mut Stores<D> {
-        &mut self.db
-    }
-
-    /// Get the storage instance.
-    pub fn storage(&self) -> &S {
-        &self.storage
-    }
-
-    /// Get the mutable storage instance.
-    pub fn storage_mut(&mut self) -> &mut S {
-        &mut self.storage
-    }
-
-    /// Get the node policies.
-    pub fn policies(&self) -> &policy::Config<Write> {
-        &self.policies
-    }
-
-    /// Get the local signer.
-    pub fn signer(&self) -> &G {
-        &self.signer
-    }
-
-    /// Subscriber to inner `Emitter` events.
-    pub fn events(&mut self) -> Events {
-        Events::from(self.emitter.subscribe())
-    }
-
-    /// Get I/O outbox.
-    pub fn outbox(&mut self) -> &mut Outbox {
-        &mut self.outbox
-    }
-
-    /// Get configuration.
-    pub fn config(&self) -> &Config {
-        &self.config
-    }
-
-    /// Lookup a repository, both locally and in the routing table.
-    pub fn lookup(&self, rid: RepoId) -> Result<Lookup, LookupError> {
-        let this = self.nid();
-        let local = self.storage.get(rid)?;
-        let remote = self
-            .db
-            .routing()
-            .get(&rid)?
-            .iter()
-            .filter(|nid| nid != &this)
-            .cloned()
-            .collect();
-
-        Ok(Lookup { local, remote })
-    }
-
-    /// Initialize service with current time. Call this once.
-    pub fn initialize(&mut self, time: LocalTime) -> Result<(), Error> {
-        debug!(target: "service", "Init @{}", time.as_millis());
-        assert_ne!(time, LocalTime::default());
-
-        let nid = self.node_id();
-
-        self.clock = time;
-        self.started_at = Some(time);
-        self.last_online_at = match self.db.gossip().last() {
-            Ok(Some(last)) => Some(last.to_local_time()),
-            Ok(None) => None,
-            Err(e) => {
-                error!(target: "service", "Error getting the lastest gossip message from db: {e}");
-                None
-            }
-        };
-
-        // Populate refs database. This is only useful as part of the upgrade process for nodes
-        // that have been online since before the refs database was created.
-        match self.db.refs().count() {
-            Ok(0) => {
-                info!(target: "service", "Empty refs database, populating from storage..");
-                if let Err(e) = self.db.refs_mut().populate(&self.storage) {
-                    error!(target: "service", "Failed to populate refs database: {e}");
-                }
-            }
-            Ok(n) => debug!(target: "service", "Refs database has {n} cached references"),
-            Err(e) => error!(target: "service", "Error checking refs database: {e}"),
-        }
-
-        let announced = self
-            .db
-            .seeds()
-            .seeded_by(&nid)?
-            .collect::<Result<HashMap<_, _>, _>>()?;
-        let mut inventory = BTreeSet::new();
-        let mut private = BTreeSet::new();
-
-        for repo in self.storage.repositories()? {
-            let rid = repo.rid;
-
-            // If we're not seeding this repo, just skip it.
-            if !self.policies.is_seeding(&rid)? {
-                warn!(target: "service", "Local repository {rid} is not seeded");
-                continue;
-            }
-            // Add public repositories to inventory.
-            if repo.doc.visibility.is_public() {
-                inventory.insert(rid);
-            } else {
-                private.insert(rid);
-            }
-            // If we have no owned refs for this repo, then there's nothing to announce.
-            let Some(updated_at) = repo.synced_at else {
-                continue;
-            };
-            // Skip this repo if the sync status matches what we have in storage.
-            if let Some(announced) = announced.get(&rid) {
-                if updated_at.oid == announced.oid {
-                    continue;
-                }
-            }
-            // Make sure our local node's sync status is up to date with storage.
-            if self.db.seeds_mut().synced(
-                &rid,
-                &nid,
-                updated_at.oid,
-                updated_at.timestamp.into(),
-            )? {
-                debug!(target: "service", "Saved local sync status for {rid}..");
-            }
-            // If we got here, it likely means a repo was updated while the node was stopped.
-            // Therefore, we pre-load a refs announcement for this repo, so that it is included in
-            // the historical gossip messages when a node connects and subscribes to this repo.
-            if let Ok((ann, _)) = self.refs_announcement_for(rid, [nid]) {
-                debug!(target: "service", "Adding refs announcement for {rid} to historical gossip messages..");
-                self.db.gossip_mut().announced(&nid, &ann)?;
-            }
-        }
-
-        // Ensure that our inventory is recorded in our routing table, and we are seeding
-        // all of it. It can happen that inventory is not properly seeded if for eg. the
-        // user creates a new repository while the node is stopped.
-        self.db
-            .routing_mut()
-            .add_inventory(inventory.iter(), nid, time.into())?;
-        self.inventory = gossip::inventory(self.timestamp(), inventory);
-
-        // Ensure that private repositories are not in our inventory. It's possible that
-        // a repository was public and then it was made private.
-        self.db
-            .routing_mut()
-            .remove_inventories(private.iter(), &nid)?;
-
-        // Setup subscription filter for seeded repos.
-        self.filter = Filter::new(
-            self.policies
-                .seed_policies()?
-                .filter_map(|t| (t.policy.is_allow()).then_some(t.rid)),
-        );
-        // Connect to configured peers.
-        let addrs = self.config.connect.clone();
-        for (id, addr) in addrs.into_iter().map(|ca| ca.into()) {
-            self.connect(id, addr);
-        }
-        // Try to establish some connections.
-        self.maintain_connections();
-        // Start periodic tasks.
-        self.outbox.wakeup(IDLE_INTERVAL);
-        self.outbox.wakeup(GOSSIP_INTERVAL);
-
-        Ok(())
-    }
-
-    pub fn tick(&mut self, now: LocalTime, metrics: &Metrics) {
-        trace!(
-            target: "service",
-            "Tick +{}",
-            now - self.started_at.expect("Service::tick: service must be initialized")
-        );
-        if now >= self.clock {
-            self.clock = now;
-        } else {
-            // Nb. In tests, we often move the clock forwards in time to test different behaviors,
-            // so this warning isn't applicable there.
-            #[cfg(not(test))]
-            warn!(
-                target: "service",
-                "System clock is not monotonic: {now} is not greater or equal to {}", self.clock
-            );
-        }
-        self.metrics = metrics.clone();
-    }
-
-    pub fn wake(&mut self) {
-        let now = self.clock;
-
-        trace!(
-            target: "service",
-            "Wake +{}",
-            now - self.started_at.expect("Service::wake: service must be initialized")
-        );
-
-        if now - self.last_idle >= IDLE_INTERVAL {
-            trace!(target: "service", "Running 'idle' task...");
-
-            self.keep_alive(&now);
-            self.disconnect_unresponsive_peers(&now);
-            self.idle_connections();
-            self.maintain_connections();
-            self.dequeue_fetches();
-            self.outbox.wakeup(IDLE_INTERVAL);
-            self.last_idle = now;
-        }
-        if now - self.last_gossip >= GOSSIP_INTERVAL {
-            trace!(target: "service", "Running 'gossip' task...");
-
-            if let Err(e) = self.relay_announcements() {
-                error!(target: "service", "Error relaying stored announcements: {e}");
-            }
-            self.outbox.wakeup(GOSSIP_INTERVAL);
-            self.last_gossip = now;
-        }
-        if now - self.last_sync >= SYNC_INTERVAL {
-            trace!(target: "service", "Running 'sync' task...");
-
-            if let Err(e) = self.fetch_missing_repositories() {
-                error!(target: "service", "Error fetching missing inventory: {e}");
-            }
-            self.outbox.wakeup(SYNC_INTERVAL);
-            self.last_sync = now;
-        }
-        if now - self.last_announce >= ANNOUNCE_INTERVAL {
-            trace!(target: "service", "Running 'announce' task...");
-
-            self.announce_inventory();
-            self.outbox.wakeup(ANNOUNCE_INTERVAL);
-            self.last_announce = now;
-        }
-        if now - self.last_prune >= PRUNE_INTERVAL {
-            trace!(target: "service", "Running 'prune' task...");
-
-            if let Err(err) = self.prune_routing_entries(&now) {
-                error!(target: "service", "Error pruning routing entries: {err}");
-            }
-            if let Err(err) = self
-                .db
-                .gossip_mut()
-                .prune((now - self.config.limits.gossip_max_age).into())
-            {
-                error!(target: "service", "Error pruning gossip entries: {err}");
-            }
-
-            self.outbox.wakeup(PRUNE_INTERVAL);
-            self.last_prune = now;
-        }
-
-        // Always check whether there are persistent peers that need reconnecting.
-        self.maintain_persistent();
-    }
-
-    pub fn command(&mut self, cmd: Command) {
-        info!(target: "service", "Received command {:?}", cmd);
-
-        match cmd {
-            Command::Connect(nid, addr, opts) => {
-                if opts.persistent {
-                    self.config.connect.insert((nid, addr.clone()).into());
-                }
-                if !self.connect(nid, addr) {
-                    // TODO: Return error to command.
-                }
-            }
-            Command::Disconnect(nid) => {
-                self.outbox.disconnect(nid, DisconnectReason::Command);
-            }
-            Command::Config(resp) => {
-                resp.send(self.config.clone()).ok();
-            }
-            Command::ListenAddrs(resp) => {
-                resp.send(self.listening.clone()).ok();
-            }
-            Command::Seeds(rid, resp) => match self.seeds(&rid) {
-                Ok(seeds) => {
-                    let (connected, disconnected) = seeds.partition();
-                    debug!(
-                        target: "service",
-                        "Found {} connected seed(s) and {} disconnected seed(s) for {}",
-                        connected.len(), disconnected.len(),  rid
-                    );
-                    resp.send(seeds).ok();
-                }
-                Err(e) => {
-                    error!(target: "service", "Error getting seeds for {rid}: {e}");
-                }
-            },
-            Command::Fetch(rid, seed, timeout, resp) => {
-                self.fetch(rid, seed, timeout, Some(resp));
-            }
-            Command::Seed(rid, scope, resp) => {
-                // Update our seeding policy.
-                let seeded = self
-                    .seed(&rid, scope)
-                    .expect("Service::command: error seeding repository");
-                resp.send(seeded).ok();
-
-                // Let all our peers know that we're interested in this repo from now on.
-                self.outbox.broadcast(
-                    Message::subscribe(self.filter(), self.clock.into(), Timestamp::MAX),
-                    self.sessions.connected().map(|(_, s)| s),
-                );
-            }
-            Command::Unseed(id, resp) => {
-                let updated = self
-                    .unseed(&id)
-                    .expect("Service::command: error unseeding repository");
-                resp.send(updated).ok();
-            }
-            Command::Follow(id, alias, resp) => {
-                let seeded = self
-                    .policies
-                    .follow(&id, alias.as_deref())
-                    .expect("Service::command: error following node");
-                resp.send(seeded).ok();
-            }
-            Command::Unfollow(id, resp) => {
-                let updated = self
-                    .policies
-                    .unfollow(&id)
-                    .expect("Service::command: error unfollowing node");
-                resp.send(updated).ok();
-            }
-            Command::AnnounceRefs(id, resp) => {
-                let doc = match self.storage.get(id) {
-                    Ok(Some(doc)) => doc,
-                    Ok(None) => {
-                        error!(target: "service", "Error announcing refs: repository {id} not found");
-                        return;
-                    }
-                    Err(e) => {
-                        error!(target: "service", "Error announcing refs: doc error: {e}");
-                        return;
-                    }
-                };
-
-                match self.announce_own_refs(id, doc) {
-                    Ok(refs) => match refs.as_slice() {
-                        &[refs] => {
-                            resp.send(refs).ok();
-                        }
-                        // SAFETY: Since we passed in one NID, we should get exactly one item back.
-                        [..] => panic!("Service::command: unexpected refs returned"),
-                    },
-                    Err(err) => {
-                        error!(target: "service", "Error announcing refs: {err}");
-                    }
-                }
-            }
-            Command::AnnounceInventory => {
-                self.announce_inventory();
-            }
-            Command::AddInventory(rid, resp) => match self.add_inventory(rid) {
-                Ok(updated) => {
-                    resp.send(updated).ok();
-                }
-                Err(e) => {
-                    error!(target: "service", "Error adding {rid} to inventory: {e}");
-                }
-            },
-            Command::QueryState(query, sender) => {
-                sender.send(query(self)).ok();
-            }
-        }
-    }
-
-    /// Initiate an outgoing fetch for some repository, based on another node's announcement.
-    /// Returns `true` if the fetch was initiated and `false` if it was skipped.
-    fn fetch_refs_at(
-        &mut self,
-        rid: RepoId,
-        from: NodeId,
-        refs: NonEmpty<RefsAt>,
-        scope: Scope,
-        timeout: time::Duration,
-        channel: Option<chan::Sender<FetchResult>>,
-    ) -> bool {
-        match self.refs_status_of(rid, refs, &scope) {
-            Ok(status) => {
-                if status.want.is_empty() {
-                    debug!(target: "service", "Skipping fetch for {rid}, all refs are already in storage");
-                } else {
-                    return self._fetch(rid, from, status.want, timeout, channel);
-                }
-            }
-            Err(e) => {
-                error!(target: "service", "Error getting the refs status of {rid}: {e}");
-            }
-        }
-        // We didn't try to fetch anything.
-        false
-    }
-
-    /// Initiate an outgoing fetch for some repository.
-    fn fetch(
-        &mut self,
-        rid: RepoId,
-        from: NodeId,
-        timeout: time::Duration,
-        channel: Option<chan::Sender<FetchResult>>,
-    ) -> bool {
-        self._fetch(rid, from, vec![], timeout, channel)
-    }
-
-    fn _fetch(
-        &mut self,
-        rid: RepoId,
-        from: NodeId,
-        refs_at: Vec<RefsAt>,
-        timeout: time::Duration,
-        channel: Option<chan::Sender<FetchResult>>,
-    ) -> bool {
-        match self.try_fetch(rid, &from, refs_at.clone(), timeout) {
-            Ok(fetching) => {
-                if let Some(c) = channel {
-                    fetching.subscribe(c);
-                }
-                return true;
-            }
-            Err(TryFetchError::AlreadyFetching(fetching)) => {
-                // If we're already fetching the same refs from the requested peer, there's nothing
-                // to do, we simply add the supplied channel to the list of subscribers so that it
-                // is notified on completion. Otherwise, we queue a fetch with the requested peer.
-                if fetching.from == from && fetching.refs_at == refs_at {
-                    debug!(target: "service", "Ignoring redundant fetch of {rid} from {from}");
-
-                    if let Some(c) = channel {
-                        fetching.subscribe(c);
-                    }
-                } else {
-                    let fetch = QueuedFetch {
-                        rid,
-                        refs_at,
-                        from,
-                        timeout,
-                        channel,
-                    };
-                    debug!(target: "service", "Queueing fetch for {rid} with {from} (already fetching)..");
-
-                    self.queue_fetch(fetch);
-                }
-            }
-            Err(TryFetchError::SessionCapacityReached) => {
-                debug!(target: "service", "Fetch capacity reached for {from}, queueing {rid}..");
-                self.queue_fetch(QueuedFetch {
-                    rid,
-                    refs_at,
-                    from,
-                    timeout,
-                    channel,
-                });
-            }
-            Err(e) => {
-                if let Some(c) = channel {
-                    c.send(FetchResult::Failed {
-                        reason: e.to_string(),
-                    })
-                    .ok();
-                }
-            }
-        }
-        false
-    }
-
-    fn queue_fetch(&mut self, fetch: QueuedFetch) {
-        let Some(s) = self.sessions.get_mut(&fetch.from) else {
-            log::error!(target: "service", "Cannot queue fetch for unknown session {}", fetch.from);
-            return;
-        };
-        if let Err(e) = s.queue_fetch(fetch) {
-            let fetch = e.inner();
-            log::debug!(target: "service", "Unable to queue fetch for {} with {}: {e}", &fetch.rid, &fetch.from);
-        }
-    }
-
-    // TODO: Buffer/throttle fetches.
-    fn try_fetch(
-        &mut self,
-        rid: RepoId,
-        from: &NodeId,
-        refs_at: Vec<RefsAt>,
-        timeout: time::Duration,
-    ) -> Result<&mut FetchState, TryFetchError> {
-        let from = *from;
-        let Some(session) = self.sessions.get_mut(&from) else {
-            return Err(TryFetchError::SessionNotConnected);
-        };
-        let fetching = self.fetching.entry(rid);
-
-        trace!(target: "service", "Trying to fetch {refs_at:?} for {rid}..");
-
-        let fetching = match fetching {
-            Entry::Vacant(fetching) => fetching,
-            Entry::Occupied(fetching) => {
-                // We're already fetching this repo from some peer.
-                return Err(TryFetchError::AlreadyFetching(fetching.into_mut()));
-            }
-        };
-        // Sanity check: We shouldn't be fetching from this session, since we return above if we're
-        // fetching from any session.
-        debug_assert!(!session.is_fetching(&rid));
-
-        if !session.is_connected() {
-            // This can happen if a session disconnects in the time between asking for seeds to
-            // fetch from, and initiating the fetch from one of those seeds.
-            return Err(TryFetchError::SessionNotConnected);
-        }
-        if session.is_at_capacity() {
-            // If we're already fetching multiple repos from this peer.
-            return Err(TryFetchError::SessionCapacityReached);
-        }
-
-        let fetching = fetching.insert(FetchState {
-            from,
-            refs_at: refs_at.clone(),
-            subscribers: vec![],
-        });
-        self.outbox.fetch(session, rid, refs_at, timeout);
-
-        Ok(fetching)
-    }
-
-    pub fn fetched(
-        &mut self,
-        rid: RepoId,
-        remote: NodeId,
-        result: Result<fetch::FetchResult, FetchError>,
-    ) {
-        let Some(fetching) = self.fetching.remove(&rid) else {
-            error!(target: "service", "Received unexpected fetch result for {rid}, from {remote}");
-            return;
-        };
-        debug_assert_eq!(fetching.from, remote);
-
-        if let Some(s) = self.sessions.get_mut(&remote) {
-            // Mark this RID as fetched for this session.
-            s.fetched(rid);
-        }
-
-        // Notify all fetch subscribers of the fetch result. This is used when the user requests
-        // a fetch via the CLI, for example.
-        for sub in &fetching.subscribers {
-            debug!(target: "service", "Found existing fetch request from {remote}, sending result..");
-
-            let result = match &result {
-                Ok(success) => FetchResult::Success {
-                    updated: success.updated.clone(),
-                    namespaces: success.namespaces.clone(),
-                    clone: success.clone,
-                },
-                Err(e) => FetchResult::Failed {
-                    reason: e.to_string(),
-                },
-            };
-            if sub.send(result).is_err() {
-                error!(target: "service", "Error sending fetch result for {rid} from {remote}..");
-            } else {
-                debug!(target: "service", "Sent fetch result for {rid} from {remote}..");
-            }
-        }
-
-        match result {
-            Ok(fetch::FetchResult {
-                updated,
-                namespaces,
-                clone,
-                doc,
-            }) => {
-                info!(target: "service", "Fetched {rid} from {remote} successfully");
-                // Update our routing table in case this fetch was user-initiated and doesn't
-                // come from an announcement.
-                self.seed_discovered(rid, remote, self.clock.into());
-
-                for update in &updated {
-                    if update.is_skipped() {
-                        trace!(target: "service", "Ref skipped: {update} for {rid}");
-                    } else {
-                        debug!(target: "service", "Ref updated: {update} for {rid}");
-                    }
-                }
-                self.emitter.emit(Event::RefsFetched {
-                    remote,
-                    rid,
-                    updated: updated.clone(),
-                });
-
-                // Announce our new inventory if this fetch was a full clone.
-                // Only update and announce inventory for public repositories.
-                if clone && doc.visibility.is_public() {
-                    debug!(target: "service", "Updating and announcing inventory for cloned repository {rid}..");
-
-                    if let Err(e) = self.add_inventory(rid) {
-                        error!(target: "service", "Error announcing inventory for {rid}: {e}");
-                    }
-                }
-
-                // It's possible for a fetch to succeed but nothing was updated.
-                if updated.is_empty() || updated.iter().all(|u| u.is_skipped()) {
-                    debug!(target: "service", "Nothing to announce, no refs were updated..");
-                } else {
-                    // Finally, announce the refs. This is useful for nodes to know what we've synced,
-                    // beyond just knowing that we have added an item to our inventory.
-                    if let Err(e) = self.announce_refs(rid, doc.into(), namespaces) {
-                        error!(target: "service", "Failed to announce new refs: {e}");
-                    }
-                }
-            }
-            Err(err) => {
-                error!(target: "service", "Fetch failed for {rid} from {remote}: {err}");
-
-                // For now, we only disconnect the remote in case of timeout. In the future,
-                // there may be other reasons to disconnect.
-                if err.is_timeout() {
-                    self.outbox.disconnect(remote, DisconnectReason::Fetch(err));
-                }
-            }
-        }
-        // We can now try to dequeue more fetches.
-        self.dequeue_fetches();
-    }
-
-    /// Attempt to dequeue fetches from all peers.
-    /// At most one fetch is dequeued per peer. If the fetch cannot be processed,
-    /// it is put back on the queue for that peer.
-    ///
-    /// Fetches are queued for two reasons:
-    /// 1. The RID was already being fetched.
-    /// 2. The session was already at fetch capacity.
-    pub fn dequeue_fetches(&mut self) {
-        let sessions = self
-            .sessions
-            .shuffled()
-            .map(|(k, _)| *k)
-            .collect::<Vec<_>>();
-
-        // Try to dequeue once per session.
-        for nid in sessions {
-            // SAFETY: All the keys we are iterating on exist.
-            #[allow(clippy::unwrap_used)]
-            let sess = self.sessions.get_mut(&nid).unwrap();
-            if !sess.is_connected() || sess.is_at_capacity() {
-                continue;
-            }
-
-            if let Some(QueuedFetch {
-                rid,
-                from,
-                refs_at,
-                timeout,
-                channel,
-            }) = sess.dequeue_fetch()
-            {
-                debug!(target: "service", "Dequeued fetch for {rid} from session {from}..");
-
-                if let Some(refs) = NonEmpty::from_vec(refs_at) {
-                    let repo_entry = self.policies.seed_policy(&rid).expect(
-                        "Service::dequeue_fetch: error accessing repo seeding configuration",
-                    );
-                    let SeedingPolicy::Allow { scope } = repo_entry.policy else {
-                        debug!(target: "service", "Repository {rid} is no longer seeded, skipping..");
-                        continue;
-                    };
-                    self.fetch_refs_at(rid, from, refs, scope, timeout, channel);
-                } else {
-                    // If no refs are specified, always do a full fetch.
-                    self.fetch(rid, from, timeout, channel);
-                }
-            }
-        }
-    }
-
-    /// Inbound connection attempt.
-    pub fn accepted(&mut self, ip: IpAddr) -> bool {
-        // Always accept localhost connections, even if we already reached
-        // our inbound connection limit.
-        if ip.is_loopback() || ip.is_unspecified() {
-            return true;
-        }
-        // Check for inbound connection limit.
-        if self.sessions.inbound().count() >= self.config.limits.connection.inbound {
-            return false;
-        }
-        match self.db.addresses().is_ip_banned(ip) {
-            Ok(banned) => {
-                if banned {
-                    debug!(target: "service", "Rejecting inbound connection from banned ip {ip}");
-                    return false;
-                }
-            }
-            Err(e) => error!(target: "service", "Error querying ban status for {ip}: {e}"),
-        }
-        let host: HostName = ip.into();
-
-        if self.limiter.limit(
-            host.clone(),
-            None,
-            &self.config.limits.rate.inbound,
-            self.clock,
-        ) {
-            trace!(target: "service", "Rate limiting inbound connection from {host}..");
-            return false;
-        }
-        true
-    }
-
-    pub fn attempted(&mut self, nid: NodeId, addr: Address) {
-        debug!(target: "service", "Attempted connection to {nid} ({addr})");
-
-        if let Some(sess) = self.sessions.get_mut(&nid) {
-            sess.to_attempted();
-        } else {
-            #[cfg(debug_assertions)]
-            panic!("Service::attempted: unknown session {nid}@{addr}");
-        }
-    }
-
-    pub fn listening(&mut self, local_addr: net::SocketAddr) {
-        info!(target: "node", "Listening on {local_addr}..");
-
-        self.listening.push(local_addr);
-    }
-
-    pub fn connected(&mut self, remote: NodeId, addr: Address, link: Link) {
-        info!(target: "service", "Connected to {remote} ({addr}) ({link:?})");
-        self.emitter.emit(Event::PeerConnected { nid: remote });
-
-        let msgs = self.initial(link);
-
-        if link.is_outbound() {
-            if let Some(peer) = self.sessions.get_mut(&remote) {
-                peer.to_connected(self.clock);
-                self.outbox.write_all(peer, msgs);
-            }
-        } else {
-            match self.sessions.entry(remote) {
-                Entry::Occupied(mut e) => {
-                    // In this scenario, it's possible that our peer is persistent, and
-                    // disconnected. We get an inbound connection before we attempt a re-connection,
-                    // and therefore we treat it as a regular inbound connection.
-                    //
-                    // It's also possible that a disconnection hasn't gone through yet and our
-                    // peer is still in connected state here, while a new inbound connection from
-                    // that same peer is made. This results in a new connection from a peer that is
-                    // already connected from the perspective of the service. This appears to be
-                    // a bug in the underlying networking library.
-                    let peer = e.get_mut();
-                    debug!(
-                        target: "service",
-                        "Connecting peer {remote} already has a session open ({peer})"
-                    );
-                    peer.link = link;
-                    peer.to_connected(self.clock);
-                    self.outbox.write_all(peer, msgs);
-                }
-                Entry::Vacant(e) => {
-                    if let HostName::Ip(ip) = addr.host {
-                        if !address::is_local(&ip) {
-                            if let Err(e) =
-                                self.db
-                                    .addresses_mut()
-                                    .record_ip(&remote, ip, self.clock.into())
-                            {
-                                log::error!(target: "service", "Error recording IP address for {remote}: {e}");
-                            }
-                        }
-                    }
-                    let peer = e.insert(Session::inbound(
-                        remote,
-                        addr,
-                        self.config.is_persistent(&remote),
-                        self.rng.clone(),
-                        self.clock,
-                        self.config.limits.clone(),
-                    ));
-                    self.outbox.write_all(peer, msgs);
-                }
-            }
-        }
-    }
-
-    pub fn disconnected(&mut self, remote: NodeId, link: Link, reason: &DisconnectReason) {
-        let since = self.local_time();
-        let Some(session) = self.sessions.get_mut(&remote) else {
-            // Since we sometimes disconnect the service eagerly, it's not unusual to get a second
-            // disconnection event once the transport is dropped.
-            trace!(target: "service", "Redundant disconnection for {} ({})", remote, reason);
-            return;
-        };
-        // In cases of connection conflicts, there may be disconnections of one of the two
-        // connections. In that case we don't want the service to remove the session.
-        if session.link != link {
-            return;
-        }
-
-        info!(target: "service", "Disconnected from {} ({})", remote, reason);
-        self.emitter.emit(Event::PeerDisconnected {
-            nid: remote,
-            reason: reason.to_string(),
-        });
-
-        let link = session.link;
-        let addr = session.addr.clone();
-
-        self.fetching.retain(|_, fetching| {
-            if fetching.from != remote {
-                return true;
-            }
-            // Remove and fail any pending fetches from this remote node.
-            for resp in &fetching.subscribers {
-                resp.send(FetchResult::Failed {
-                    reason: format!("disconnected: {reason}"),
-                })
-                .ok();
-            }
-            false
-        });
-
-        // Attempt to re-connect to persistent peers.
-        if self.config.peer(&remote).is_some() {
-            let delay = LocalDuration::from_secs(2u64.saturating_pow(session.attempts() as u32))
-                .clamp(MIN_RECONNECTION_DELTA, MAX_RECONNECTION_DELTA);
-
-            // Nb. We always try to reconnect to persistent peers, even when the error appears
-            // to not be transient.
-            session.to_disconnected(since, since + delay);
-
-            debug!(target: "service", "Reconnecting to {remote} in {delay}..");
-
-            self.outbox.wakeup(delay);
-        } else {
-            debug!(target: "service", "Dropping peer {remote}..");
-            self.sessions.remove(&remote);
-
-            let severity = match reason {
-                DisconnectReason::Dial(_)
-                | DisconnectReason::Fetch(_)
-                | DisconnectReason::Connection(_) => {
-                    if self.is_online() {
-                        // If we're "online", there's something wrong with this
-                        // peer connection specifically.
-                        Severity::Medium
-                    } else {
-                        Severity::Low
-                    }
-                }
-                DisconnectReason::Session(e) => e.severity(),
-                DisconnectReason::Command
-                | DisconnectReason::Conflict
-                | DisconnectReason::SelfConnection => Severity::Low,
-            };
-
-            if let Err(e) = self
-                .db
-                .addresses_mut()
-                .disconnected(&remote, &addr, severity)
-            {
-                error!(target: "service", "Error updating address store: {e}");
-            }
-            // Only re-attempt outbound connections, since we don't care if an inbound connection
-            // is dropped.
-            if link.is_outbound() {
-                self.maintain_connections();
-            }
-        }
-        self.dequeue_fetches();
-    }
-
-    pub fn received_message(&mut self, remote: NodeId, message: Message) {
-        if let Err(err) = self.handle_message(&remote, message) {
-            // If there's an error, stop processing messages from this peer.
-            // However, we still relay messages returned up to this point.
-            self.outbox
-                .disconnect(remote, DisconnectReason::Session(err));
-
-            // FIXME: The peer should be set in a state such that we don't
-            // process further messages.
-        }
-    }
-
-    /// Handle an announcement message.
-    ///
-    /// Returns `true` if this announcement should be stored and relayed to connected peers,
-    /// and `false` if it should not.
-    pub fn handle_announcement(
-        &mut self,
-        relayer: &NodeId,
-        relayer_addr: &Address,
-        announcement: &Announcement,
-    ) -> Result<Option<gossip::AnnouncementId>, session::Error> {
-        if !announcement.verify() {
-            return Err(session::Error::Misbehavior);
-        }
-        let Announcement {
-            node: announcer,
-            message,
-            ..
-        } = announcement;
-
-        // Ignore our own announcements, in case the relayer sent one by mistake.
-        if announcer == self.nid() {
-            return Ok(None);
-        }
-        let now = self.clock;
-        let timestamp = message.timestamp();
-
-        // Don't allow messages from too far in the future.
-        if timestamp.saturating_sub(now.as_millis()) > MAX_TIME_DELTA.as_millis() as u64 {
-            return Err(session::Error::InvalidTimestamp(timestamp));
-        }
-
-        // We don't process announcements from nodes we don't know, since the node announcement is
-        // what provides DoS protection.
-        //
-        // Note that it's possible to *not* receive the node announcement, but receive the
-        // subsequent announcements of a node in the case of historical gossip messages requested
-        // from the `subscribe` message. This can happen if the cut-off time is after the node
-        // announcement timestamp, but before the other announcements. In that case, we simply
-        // ignore all announcements of that node until we get a node announcement.
-        if let AnnouncementMessage::Inventory(_) | AnnouncementMessage::Refs(_) = message {
-            match self.db.addresses().get(announcer) {
-                Ok(node) => {
-                    if node.is_none() {
-                        debug!(target: "service", "Ignoring announcement from unknown node {announcer} (t={timestamp})");
-                        return Ok(None);
-                    }
-                }
-                Err(e) => {
-                    error!(target: "service", "Error looking up node in address book: {e}");
-                    return Ok(None);
-                }
-            }
-        }
-
-        // Discard announcement messages we've already seen, otherwise update our last seen time.
-        let relay = match self.db.gossip_mut().announced(announcer, announcement) {
-            Ok(Some(id)) => {
-                log::debug!(
-                    target: "service",
-                    "Stored announcement from {announcer} to be broadcast in {} (t={timestamp})",
-                    (self.last_gossip + GOSSIP_INTERVAL) - self.clock
-                );
-                // Keep track of who relayed the message for later.
-                self.relayed_by.entry(id).or_default().push(*relayer);
-
-                // Decide whether or not to relay this message, if it's fresh.
-                // To avoid spamming peers on startup with historical gossip messages,
-                // don't relay messages that are too old. We make an exception for node announcements,
-                // since they are cached, and will hence often carry old timestamps.
-                let relay = message.is_node_announcement()
-                    || now - timestamp.to_local_time() <= MAX_TIME_DELTA;
-                relay.then_some(id)
-            }
-            Ok(None) => {
-                // FIXME: Still mark as relayed by this peer.
-                // FIXME: Refs announcements should not be delayed, since they are only sent
-                // to subscribers.
-                debug!(target: "service", "Ignoring stale announcement from {announcer} (t={timestamp})");
-                return Ok(None);
-            }
-            Err(e) => {
-                error!(target: "service", "Error updating gossip entry from {announcer}: {e}");
-                return Ok(None);
-            }
-        };
-
-        match message {
-            // Process a peer inventory update announcement by (maybe) fetching.
-            AnnouncementMessage::Inventory(message) => {
-                self.emitter.emit(Event::InventoryAnnounced {
-                    nid: *announcer,
-                    inventory: message.inventory.to_vec(),
-                    timestamp: message.timestamp,
-                });
-                match self.sync_routing(
-                    message.inventory.iter().cloned(),
-                    *announcer,
-                    message.timestamp,
-                ) {
-                    Ok(synced) => {
-                        if synced.is_empty() {
-                            trace!(target: "service", "No routes updated by inventory announcement from {announcer}");
-                            return Ok(None);
-                        }
-                    }
-                    Err(e) => {
-                        error!(target: "service", "Error processing inventory from {announcer}: {e}");
-                        return Ok(None);
-                    }
-                }
-                let mut missing = Vec::new();
-                let nid = *self.nid();
-
-                // Here we handle the special case where the inventory we received is that of
-                // a connected peer, as opposed to being relayed to us.
-                if let Some(sess) = self.sessions.get_mut(announcer) {
-                    for id in message.inventory.as_slice() {
-                        // If we are connected to the announcer of this inventory, update the peer's
-                        // subscription filter to include all inventory items. This way, we'll
-                        // relay messages relating to the peer's inventory.
-                        if let Some(sub) = &mut sess.subscribe {
-                            sub.filter.insert(id);
-                        }
-
-                        // If we're seeding and connected to the announcer, and we don't have
-                        // the inventory, fetch it from the announcer.
-                        if self.policies.is_seeding(id).expect(
-                            "Service::handle_announcement: error accessing seeding configuration",
-                        ) {
-                            // Only if we do not have the repository locally do we fetch here.
-                            // If we do have it, only fetch after receiving a ref announcement.
-                            match self.db.routing().entry(id, &nid) {
-                                Ok(entry) => {
-                                    if entry.is_none() {
-                                        missing.push(*id);
-                                    }
-                                }
-                                Err(e) => error!(
-                                    target: "service",
-                                    "Error checking local inventory for {id}: {e}"
-                                ),
-                            }
-                        }
-                    }
-                }
-                // Since we have limited fetch capacity, it may be that we can't fetch an entire
-                // inventory from a peer. Therefore we randomize the order of the RIDs to fetch
-                // different RIDs from different peers in case multiple peers announce the same
-                // RIDs.
-                self.rng.shuffle(&mut missing);
-
-                for rid in missing {
-                    debug!(target: "service", "Missing seeded inventory {rid}; initiating fetch..");
-                    self.fetch(rid, *announcer, FETCH_TIMEOUT, None);
-                }
-                return Ok(relay);
-            }
-            AnnouncementMessage::Refs(message) => {
-                self.emitter.emit(Event::RefsAnnounced {
-                    nid: *announcer,
-                    rid: message.rid,
-                    refs: message.refs.to_vec(),
-                    timestamp: message.timestamp,
-                });
-                // Empty announcements can be safely ignored.
-                let Some(refs) = NonEmpty::from_vec(message.refs.to_vec()) else {
-                    debug!(target: "service", "Skipping fetch, no refs in announcement for {} (t={timestamp})", message.rid);
-                    return Ok(None);
-                };
-                // We update inventories when receiving ref announcements, as these could come
-                // from a new repository being initialized.
-                self.seed_discovered(message.rid, *announcer, message.timestamp);
-
-                // Update sync status of announcer for this repo.
-                if let Some(refs) = refs.iter().find(|r| &r.remote == self.nid()) {
-                    debug!(
-                        target: "service",
-                        "Refs announcement of {announcer} for {} contains our own remote at {} (t={})",
-                        message.rid, refs.at, message.timestamp
-                    );
-                    match self.db.seeds_mut().synced(
-                        &message.rid,
-                        announcer,
-                        refs.at,
-                        message.timestamp,
-                    ) {
-                        Ok(updated) => {
-                            if updated {
-                                debug!(
-                                    target: "service",
-                                    "Updating sync status of {announcer} for {} to {}",
-                                    message.rid, refs.at
-                                );
-                                self.emitter.emit(Event::RefsSynced {
-                                    rid: message.rid,
-                                    remote: *announcer,
-                                    at: refs.at,
-                                });
-                            } else {
-                                debug!(
-                                    target: "service",
-                                    "Sync status of {announcer} was not updated for {}",
-                                    message.rid,
-                                );
-                            }
-                        }
-                        Err(e) => {
-                            error!(target: "service", "Error updating sync status for {}: {e}", message.rid);
-                        }
-                    }
-                }
-                let repo_entry = self.policies.seed_policy(&message.rid).expect(
-                    "Service::handle_announcement: error accessing repo seeding configuration",
-                );
-                let SeedingPolicy::Allow { scope } = repo_entry.policy else {
-                    debug!(
-                        target: "service",
-                        "Ignoring refs announcement from {announcer}: repository {} isn't seeded (t={timestamp})",
-                        message.rid
-                    );
-                    return Ok(None);
-                };
-                // Refs can be relayed by peers who don't have the data in storage,
-                // therefore we only check whether we are connected to the *announcer*,
-                // which is required by the protocol to only announce refs it has.
-                let Some(remote) = self.sessions.get(announcer).cloned() else {
-                    trace!(
-                        target: "service",
-                        "Skipping fetch of {}, no sessions connected to {announcer}",
-                        message.rid
-                    );
-                    return Ok(relay);
-                };
-                // Finally, start the fetch.
-                self.fetch_refs_at(message.rid, remote.id, refs, scope, FETCH_TIMEOUT, None);
-
-                return Ok(relay);
-            }
-            AnnouncementMessage::Node(
-                ann @ NodeAnnouncement {
-                    features,
-                    addresses,
-                    ..
-                },
-            ) => {
-                self.emitter.emit(Event::NodeAnnounced {
-                    nid: *announcer,
-                    alias: ann.alias.clone(),
-                    timestamp: ann.timestamp,
-                    features: *features,
-                    addresses: addresses.to_vec(),
-                });
-                // If this node isn't a seed, we're not interested in adding it
-                // to our address book, but other nodes may be, so we relay the message anyway.
-                if !features.has(Features::SEED) {
-                    return Ok(relay);
-                }
-
-                match self.db.addresses_mut().insert(
-                    announcer,
-                    ann.version,
-                    ann.features,
-                    &ann.alias,
-                    ann.work(),
-                    &ann.agent,
-                    timestamp,
-                    addresses
-                        .iter()
-                        // Ignore non-routable addresses unless received from a local network
-                        // peer. This allows the node to function in a local network.
-                        .filter(|a| a.is_routable() || relayer_addr.is_local())
-                        .map(|a| KnownAddress::new(a.clone(), address::Source::Peer)),
-                ) {
-                    Ok(updated) => {
-                        // Only relay if we received new information.
-                        if updated {
-                            debug!(
-                                target: "service",
-                                "Address store entry for node {announcer} updated at {timestamp}"
-                            );
-                            return Ok(relay);
-                        }
-                    }
-                    Err(err) => {
-                        // An error here is due to a fault in our address store.
-                        error!(target: "service", "Error processing node announcement from {announcer}: {err}");
-                    }
-                }
-            }
-        }
-        Ok(None)
-    }
-
-    pub fn handle_info(&mut self, remote: NodeId, info: &Info) -> Result<(), session::Error> {
-        match info {
-            // Nb. We don't currently send this message.
-            Info::RefsAlreadySynced { rid, at } => {
-                debug!(target: "service", "Refs already synced for {rid} by {remote}");
-                self.emitter.emit(Event::RefsSynced {
-                    rid: *rid,
-                    remote,
-                    at: *at,
-                });
-            }
-        }
-
-        Ok(())
-    }
-
-    pub fn handle_message(
-        &mut self,
-        remote: &NodeId,
-        message: Message,
-    ) -> Result<(), session::Error> {
-        let local = self.node_id();
-        let relay = self.config.is_relay();
-        let Some(peer) = self.sessions.get_mut(remote) else {
-            warn!(target: "service", "Session not found for {remote}");
-            return Ok(());
-        };
-        peer.last_active = self.clock;
-
-        let limit = match peer.link {
-            Link::Outbound => &self.config.limits.rate.outbound,
-            Link::Inbound => &self.config.limits.rate.inbound,
-        };
-        if self
-            .limiter
-            .limit(peer.addr.clone().into(), Some(remote), limit, self.clock)
-        {
-            debug!(target: "service", "Rate limiting message from {remote} ({})", peer.addr);
-            return Ok(());
-        }
-        message.log(log::Level::Debug, remote, Link::Inbound);
-
-        let connected = match &mut peer.state {
-            session::State::Disconnected { .. } => {
-                debug!(target: "service", "Ignoring message from disconnected peer {}", peer.id);
-                return Ok(());
-            }
-            // In case of a discrepancy between the service state and the state of the underlying
-            // wire protocol, we may receive a message from a peer that we consider not fully connected
-            // at the service level. To remedy this, we simply transition the peer to a connected state.
-            //
-            // This is not ideal, but until the wire protocol and service are unified, it's the simplest
-            // solution to converge towards the same state.
-            session::State::Attempted { .. } | session::State::Initial => {
-                debug!(target: "service", "Received unexpected message from connecting peer {}", peer.id);
-                debug!(target: "service", "Transitioning peer {} to 'connected' state", peer.id);
-
-                peer.to_connected(self.clock);
-
-                None
-            }
-            session::State::Connected {
-                ping, latencies, ..
-            } => Some((ping, latencies)),
-        };
-
-        trace!(target: "service", "Received message {message:?} from {remote}");
-
-        match message {
-            // Process a peer announcement.
-            Message::Announcement(ann) => {
-                let relayer = remote;
-                let relayer_addr = peer.addr.clone();
-
-                if let Some(id) = self.handle_announcement(relayer, &relayer_addr, &ann)? {
-                    if self.config.is_relay() {
-                        if let AnnouncementMessage::Inventory(_) = ann.message {
-                            if let Err(e) = self
-                                .database_mut()
-                                .gossip_mut()
-                                .set_relay(id, gossip::RelayStatus::Relay)
-                            {
-                                error!(target: "service", "Error setting relay flag for message: {e}");
-                                return Ok(());
-                            }
-                        } else {
-                            self.relay(id, ann);
-                        }
-                    }
-                }
-            }
-            Message::Subscribe(subscribe) => {
-                // Filter announcements by interest.
-                match self
-                    .db
-                    .gossip()
-                    .filtered(&subscribe.filter, subscribe.since, subscribe.until)
-                {
-                    Ok(anns) => {
-                        for ann in anns {
-                            let ann = match ann {
-                                Ok(a) => a,
-                                Err(e) => {
-                                    error!(target: "service", "Error reading gossip message from store: {e}");
-                                    continue;
-                                }
-                            };
-                            // Don't send announcements authored by the remote, back to the remote.
-                            if ann.node == *remote {
-                                continue;
-                            }
-                            // Only send messages if we're a relay, or it's our own messages.
-                            if relay || ann.node == local {
-                                self.outbox.write(peer, ann.into());
-                            }
-                        }
-                    }
-                    Err(e) => {
-                        error!(target: "service", "Error querying gossip messages from store: {e}");
-                    }
-                }
-                peer.subscribe = Some(subscribe);
-            }
-            Message::Info(info) => {
-                self.handle_info(*remote, &info)?;
-            }
-            Message::Ping(Ping { ponglen, .. }) => {
-                // Ignore pings which ask for too much data.
-                if ponglen > Ping::MAX_PONG_ZEROES {
-                    return Ok(());
-                }
-                self.outbox.write(
-                    peer,
-                    Message::Pong {
-                        zeroes: ZeroBytes::new(ponglen),
-                    },
-                );
-            }
-            Message::Pong { zeroes } => {
-                if let Some((ping, latencies)) = connected {
-                    if let session::PingState::AwaitingResponse {
-                        len: ponglen,
-                        since,
-                    } = *ping
-                    {
-                        if (ponglen as usize) == zeroes.len() {
-                            *ping = session::PingState::Ok;
-                            // Keep track of peer latency.
-                            latencies.push_back(self.clock - since);
-                            if latencies.len() > MAX_LATENCIES {
-                                latencies.pop_front();
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        Ok(())
-    }
-
-    /// A convenient method to check if we should fetch from a `RefsAnnouncement` with `scope`.
-    fn refs_status_of(
-        &self,
-        rid: RepoId,
-        refs: NonEmpty<RefsAt>,
-        scope: &policy::Scope,
-    ) -> Result<RefsStatus, Error> {
-        let mut refs = RefsStatus::new(rid, refs, self.db.refs())?;
-        // Check that there's something we want.
-        if refs.want.is_empty() {
-            return Ok(refs);
-        }
-        // Check scope.
-        let mut refs = match scope {
-            policy::Scope::All => refs,
-            policy::Scope::Followed => match self.policies.namespaces_for(&self.storage, &rid) {
-                Ok(Namespaces::All) => refs,
-                Ok(Namespaces::Followed(followed)) => {
-                    refs.want.retain(|r| followed.contains(&r.remote));
-                    refs
-                }
-                Err(e) => return Err(e.into()),
-            },
-        };
-        // Remove our own remote, we don't want to fetch that.
-        refs.want.retain(|r| r.remote != self.node_id());
-
-        Ok(refs)
-    }
-
-    /// Add a seed to our routing table.
-    fn seed_discovered(&mut self, rid: RepoId, nid: NodeId, time: Timestamp) {
-        if let Ok(result) = self.db.routing_mut().add_inventory([&rid], nid, time) {
-            if let &[(_, InsertResult::SeedAdded)] = result.as_slice() {
-                self.emitter.emit(Event::SeedDiscovered { rid, nid });
-                info!(target: "service", "Routing table updated for {} with seed {nid}", rid);
-            }
-        }
-    }
-
-    /// Set of initial messages to send to a peer.
-    fn initial(&mut self, _link: Link) -> Vec<Message> {
-        let now = self.clock();
-        let filter = self.filter();
-
-        // TODO: Only subscribe to outbound connections, otherwise we will consume too
-        // much bandwidth.
-
-        // If we've been previously connected to the network, we'll have received gossip messages.
-        // Instead of simply taking the last timestamp we try to ensure we don't miss any
-        // messages due un-synchronized clocks.
-        //
-        // If this is our first connection to the network, we just ask for a fixed backlog
-        // of messages to get us started.
-        let since = if let Some(last) = self.last_online_at {
-            Timestamp::from(last - SUBSCRIBE_BACKLOG_DELTA)
-        } else {
-            (*now - INITIAL_SUBSCRIBE_BACKLOG_DELTA).into()
-        };
-        debug!(target: "service", "Subscribing to messages since timestamp {since}..");
-
-        vec![
-            Message::node(self.node.clone(), &self.signer),
-            Message::inventory(self.inventory.clone(), &self.signer),
-            Message::subscribe(filter, since, Timestamp::MAX),
-        ]
-    }
-
-    /// Try to guess whether we're online or not.
-    fn is_online(&self) -> bool {
-        self.sessions
-            .connected()
-            .filter(|(_, s)| s.addr.is_routable() && s.last_active >= self.clock - IDLE_INTERVAL)
-            .count()
-            > 0
-    }
-
-    /// Remove a local repository from our inventory.
-    fn remove_inventory(&mut self, rid: &RepoId) -> Result<bool, Error> {
-        let node = self.node_id();
-        let now = self.timestamp();
-
-        let removed = self.db.routing_mut().remove_inventory(rid, &node)?;
-        if removed {
-            self.refresh_and_announce_inventory(now)?;
-        }
-        Ok(removed)
-    }
-
-    /// Add a local repository to our inventory.
-    fn add_inventory(&mut self, rid: RepoId) -> Result<bool, Error> {
-        let node = self.node_id();
-        let now = self.timestamp();
-
-        if !self.storage.contains(&rid)? {
-            error!(target: "service", "Attempt to add non-existing inventory {rid}: repository not found in storage");
-            return Ok(false);
-        }
-        // Add to our local inventory.
-        let updates = self.db.routing_mut().add_inventory([&rid], node, now)?;
-        let updated = !updates.is_empty();
-
-        if updated {
-            self.refresh_and_announce_inventory(now)?;
-        }
-        Ok(updated)
-    }
-
-    /// Update cached inventory message, and announce new inventory to peers.
-    fn refresh_and_announce_inventory(&mut self, time: Timestamp) -> Result<(), Error> {
-        let inventory = self.inventory()?;
-
-        self.inventory = gossip::inventory(time, inventory);
-        self.announce_inventory();
-
-        Ok(())
-    }
-
-    /// Get our local inventory.
-    ///
-    /// A node's inventory is the advertized list of repositories offered by a node.
-    ///
-    /// A node's inventory consists of *public* repositories that are seeded and available locally
-    /// in the node's storage. We use the routing table as the canonical state of all inventories,
-    /// including the local node's.
-    ///
-    /// When a repository is unseeded, it is also removed from the inventory. Private repositories
-    /// are *not* part of a node's inventory.
-    fn inventory(&self) -> Result<HashSet<RepoId>, Error> {
-        self.db
-            .routing()
-            .get_inventory(self.nid())
-            .map_err(Error::from)
-    }
-
-    /// Process a peer inventory announcement by updating our routing table.
-    /// This function expects the peer's full inventory, and prunes entries that are not in the
-    /// given inventory.
-    fn sync_routing(
-        &mut self,
-        inventory: impl IntoIterator<Item = RepoId>,
-        from: NodeId,
-        timestamp: Timestamp,
-    ) -> Result<SyncedRouting, Error> {
-        let mut synced = SyncedRouting::default();
-        let included = inventory.into_iter().collect::<BTreeSet<_>>();
-
-        for (rid, result) in
-            self.db
-                .routing_mut()
-                .add_inventory(included.iter(), from, timestamp)?
-        {
-            match result {
-                InsertResult::SeedAdded => {
-                    info!(target: "service", "Routing table updated for {rid} with seed {from}");
-                    self.emitter.emit(Event::SeedDiscovered { rid, nid: from });
-
-                    if self
-                        .policies
-                        .is_seeding(&rid)
-                        .expect("Service::process_inventory: error accessing seeding configuration")
-                    {
-                        // TODO: We should fetch here if we're already connected, case this seed has
-                        // refs we don't have.
-                    }
-                    synced.added.push(rid);
-                }
-                InsertResult::TimeUpdated => {
-                    synced.updated.push(rid);
-                }
-                InsertResult::NotUpdated => {}
-            }
-        }
-        for rid in self.db.routing().get_inventory(&from)?.into_iter() {
-            if !included.contains(&rid) {
-                if self.db.routing_mut().remove_inventory(&rid, &from)? {
-                    synced.removed.push(rid);
-                    self.emitter.emit(Event::SeedDropped { rid, nid: from });
-                }
-            }
-        }
-        Ok(synced)
-    }
-
-    /// Return a refs announcement including the given remotes.
-    fn refs_announcement_for(
-        &mut self,
-        rid: RepoId,
-        remotes: impl IntoIterator<Item = NodeId>,
-    ) -> Result<(Announcement, Vec<RefsAt>), Error> {
-        let repo = self.storage.repository(rid)?;
-        let timestamp = self.timestamp();
-        let mut refs = BoundedVec::<_, REF_REMOTE_LIMIT>::new();
-
-        for remote_id in remotes.into_iter() {
-            let refs_at = RefsAt::new(&repo, remote_id)?;
-
-            if refs.push(refs_at).is_err() {
-                warn!(
-                    target: "service",
-                    "refs announcement limit ({}) exceeded, peers will see only some of your repository references",
-                    REF_REMOTE_LIMIT,
-                );
-                break;
-            }
-        }
-
-        let msg = AnnouncementMessage::from(RefsAnnouncement {
-            rid,
-            refs: refs.clone(),
-            timestamp,
-        });
-        Ok((msg.signed(&self.signer), refs.into()))
-    }
-
-    /// Announce our own refs for the given repo.
-    fn announce_own_refs(&mut self, rid: RepoId, doc: Doc<Verified>) -> Result<Vec<RefsAt>, Error> {
-        let (refs, timestamp) = self.announce_refs(rid, doc, [self.node_id()])?;
-
-        // Update refs database with our signed refs branches.
-        // This isn't strictly necessary for now, as we only use the database for fetches, and
-        // we don't fetch our own refs that are announced, but it's for good measure.
-        if let &[r] = refs.as_slice() {
-            self.emitter.emit(Event::LocalRefsAnnounced {
-                rid,
-                refs: r,
-                timestamp,
-            });
-            if let Err(e) = self.database_mut().refs_mut().set(
-                &rid,
-                &r.remote,
-                &SIGREFS_BRANCH,
-                r.at,
-                timestamp.to_local_time(),
-            ) {
-                error!(
-                    target: "service",
-                    "Error updating refs database for `rad/sigrefs` of {} in {rid}: {e}",
-                    r.remote
-                );
-            }
-        }
-        Ok(refs)
-    }
-
-    /// Announce local refs for given repo.
-    fn announce_refs(
-        &mut self,
-        rid: RepoId,
-        doc: Doc<Verified>,
-        remotes: impl IntoIterator<Item = NodeId>,
-    ) -> Result<(Vec<RefsAt>, Timestamp), Error> {
-        let (ann, refs) = self.refs_announcement_for(rid, remotes)?;
-        let timestamp = ann.timestamp();
-        let peers = self.sessions.connected().map(|(_, p)| p);
-
-        // Update our sync status for our own refs. This is useful for determining if refs were
-        // updated while the node was stopped.
-        if let Some(refs) = refs.iter().find(|r| r.remote == ann.node) {
-            info!(
-                target: "service",
-                "Announcing own refs for {rid} to peers ({}) (t={timestamp})..",
-                refs.at
-            );
-            // Update our local node's sync status to mark the refs as announced.
-            if let Err(e) = self
-                .db
-                .seeds_mut()
-                .synced(&rid, &ann.node, refs.at, timestamp)
-            {
-                error!(target: "service", "Error updating sync status for local node: {e}");
-            } else {
-                debug!(target: "service", "Saved local sync status for {rid}..");
-            }
-        }
-
-        self.outbox.announce(
-            ann,
-            peers.filter(|p| {
-                // Only announce to peers who are allowed to view this repo.
-                doc.is_visible_to(&p.id)
-            }),
-            self.db.gossip_mut(),
-        );
-        Ok((refs, timestamp))
-    }
-
-    fn reconnect(&mut self, nid: NodeId, addr: Address) -> bool {
-        if let Some(sess) = self.sessions.get_mut(&nid) {
-            sess.to_initial();
-            self.outbox.connect(nid, addr);
-
-            return true;
-        }
-        false
-    }
-
-    fn connect(&mut self, nid: NodeId, addr: Address) -> bool {
-        debug!(target: "service", "Connecting to {nid} ({addr})..");
-
-        if self.sessions.contains_key(&nid) {
-            warn!(target: "service", "Attempted connection to peer {nid} which already has a session");
-            return false;
-        }
-        if nid == self.node_id() {
-            error!(target: "service", "Attempted connection to self");
-            return false;
-        }
-        if self.sessions.outbound().count() >= self.config.limits.connection.outbound {
-            error!(target: "service", "Outbound connection limit reached when attempting {nid} ({addr})");
-            return false;
-        }
-        let persistent = self.config.is_persistent(&nid);
-        let timestamp: Timestamp = self.clock.into();
-
-        if let Err(e) = self.db.addresses_mut().attempted(&nid, &addr, timestamp) {
-            error!(target: "service", "Error updating address book with connection attempt: {e}");
-        }
-        self.sessions.insert(
-            nid,
-            Session::outbound(
-                nid,
-                addr.clone(),
-                persistent,
-                self.rng.clone(),
-                self.config.limits.clone(),
-            ),
-        );
-        self.outbox.connect(nid, addr);
-
-        true
-    }
-
-    fn seeds(&self, rid: &RepoId) -> Result<Seeds, Error> {
-        let mut seeds = Seeds::new(self.rng.clone());
-
-        // First build a list from peers that have synced our own refs, if any.
-        // This step is skipped if we don't have the repository yet, or don't have
-        // our own refs.
-        if let Ok(repo) = self.storage.repository(*rid) {
-            if let Ok(local) = RefsAt::new(&repo, self.node_id()) {
-                for seed in self.db.seeds().seeds_for(rid)? {
-                    let seed = seed?;
-                    let state = self.sessions.get(&seed.nid).map(|s| s.state.clone());
-                    let synced = if local.at == seed.synced_at.oid {
-                        SyncStatus::Synced { at: seed.synced_at }
-                    } else {
-                        let local = SyncedAt::new(local.at, &repo)?;
-
-                        SyncStatus::OutOfSync {
-                            local,
-                            remote: seed.synced_at,
-                        }
-                    };
-                    seeds.insert(Seed::new(seed.nid, seed.addresses, state, Some(synced)));
-                }
-            }
-        }
-
-        // Then, add peers we know about but have no information about the sync status.
-        // These peers have announced that they seed the repository via an inventory
-        // announcement, but we haven't received any ref announcements from them.
-        for nid in self.db.routing().get(rid)? {
-            if nid == self.node_id() {
-                continue;
-            }
-            if seeds.contains(&nid) {
-                // We already have a richer entry for this node.
-                continue;
-            }
-            let addrs = self.db.addresses().addresses_of(&nid)?;
-            let state = self.sessions.get(&nid).map(|s| s.state.clone());
-
-            seeds.insert(Seed::new(nid, addrs, state, None));
-        }
-        Ok(seeds)
-    }
-
-    /// Return a new filter object, based on our seeding policy.
-    fn filter(&self) -> Filter {
-        if self.config.seeding_policy.is_allow() {
-            // TODO: Remove bits for blocked repos.
-            Filter::default()
-        } else {
-            self.filter.clone()
-        }
-    }
-
-    /// Get a timestamp for using in announcements.
-    /// Never returns the same timestamp twice.
-    fn timestamp(&mut self) -> Timestamp {
-        let now = Timestamp::from(self.clock);
-        if *now > *self.last_timestamp {
-            self.last_timestamp = now;
-        } else {
-            self.last_timestamp = self.last_timestamp + 1;
-        }
-        self.last_timestamp
-    }
-
-    fn relay(&mut self, id: gossip::AnnouncementId, msg: Announcement) {
-        let announcer = msg.node;
-        let relayed_by = self.relayed_by.get(&id);
-        // Choose peers we should relay this message to.
-        // 1. Don't relay to a peer who sent us this message.
-        // 2. Don't relay to the peer who signed this announcement.
-        let relay_to = self
-            .sessions
-            .connected()
-            .filter(|(id, _)| {
-                relayed_by
-                    .map(|relayers| !relayers.contains(id))
-                    .unwrap_or(true) // If there are no relayers we let it through.
-            })
-            .filter(|(id, _)| **id != announcer)
-            .map(|(_, p)| p);
-
-        self.outbox.relay(msg, relay_to);
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Periodic tasks
-    ////////////////////////////////////////////////////////////////////////////
-
-    fn relay_announcements(&mut self) -> Result<(), Error> {
-        let now = self.clock.into();
-        let rows = self.database_mut().gossip_mut().relays(now)?;
-        let local = self.node_id();
-
-        for (id, msg) in rows {
-            let announcer = msg.node;
-            if announcer == local {
-                // Don't relay our own stored gossip messages.
-                continue;
-            }
-            self.relay(id, msg);
-        }
-        Ok(())
-    }
-
-    /// Announce our inventory to all connected peers, unless it was already announced.
-    fn announce_inventory(&mut self) {
-        let timestamp = self.inventory.timestamp.to_local_time();
-
-        if self.last_inventory == timestamp {
-            debug!(target: "service", "Skipping redundant inventory announcement (t={})", self.inventory.timestamp);
-            return;
-        }
-        let msg = AnnouncementMessage::from(self.inventory.clone());
-
-        self.outbox.announce(
-            msg.signed(&self.signer),
-            self.sessions.connected().map(|(_, p)| p),
-            self.db.gossip_mut(),
-        );
-        self.last_inventory = timestamp;
-    }
-
-    fn prune_routing_entries(&mut self, now: &LocalTime) -> Result<(), routing::Error> {
-        let count = self.db.routing().len()?;
-        if count <= self.config.limits.routing_max_size {
-            return Ok(());
-        }
-
-        let delta = count - self.config.limits.routing_max_size;
-        let nid = self.node_id();
-        self.db.routing_mut().prune(
-            (*now - self.config.limits.routing_max_age).into(),
-            Some(delta),
-            &nid,
-        )?;
-        Ok(())
-    }
-
-    fn disconnect_unresponsive_peers(&mut self, now: &LocalTime) {
-        let stale = self
-            .sessions
-            .connected()
-            .filter(|(_, session)| *now - session.last_active >= STALE_CONNECTION_TIMEOUT);
-
-        for (_, session) in stale {
-            debug!(target: "service", "Disconnecting unresponsive peer {}..", session.id);
-
-            // TODO: Should we switch the session state to "disconnected" even before receiving
-            // an official "disconnect"? Otherwise we keep pinging until we get the disconnection.
-
-            self.outbox.disconnect(
-                session.id,
-                DisconnectReason::Session(session::Error::Timeout),
-            );
-        }
-    }
-
-    /// Ensure connection health by pinging connected peers.
-    fn keep_alive(&mut self, now: &LocalTime) {
-        let inactive_sessions = self
-            .sessions
-            .connected_mut()
-            .filter(|(_, session)| *now - session.last_active >= KEEP_ALIVE_DELTA)
-            .map(|(_, session)| session);
-        for session in inactive_sessions {
-            session.ping(self.clock, &mut self.outbox).ok();
-        }
-    }
-
-    /// Get a list of peers available to connect to, sorted by lowest penalty.
-    fn available_peers(&mut self) -> Vec<Peer> {
-        match self.db.addresses().entries() {
-            Ok(entries) => {
-                // Nb. we don't want to connect to any peers that already have a session with us,
-                // even if it's in a disconnected state. Those sessions are re-attempted automatically.
-                let mut peers = entries
-                    .filter(|entry| entry.version == PROTOCOL_VERSION)
-                    .filter(|entry| !entry.address.banned)
-                    .filter(|entry| !entry.penalty.is_connect_threshold_reached())
-                    .filter(|entry| !self.sessions.contains_key(&entry.node))
-                    .filter(|entry| !self.config.external_addresses.contains(&entry.address.addr))
-                    .filter(|entry| &entry.node != self.nid())
-                    .fold(HashMap::new(), |mut acc, entry| {
-                        acc.entry(entry.node)
-                            .and_modify(|e: &mut Peer| e.addresses.push(entry.address.clone()))
-                            .or_insert_with(|| Peer {
-                                nid: entry.node,
-                                addresses: vec![entry.address],
-                                penalty: entry.penalty,
-                            });
-                        acc
-                    })
-                    .into_values()
-                    .collect::<Vec<_>>();
-                peers.sort_by_key(|p| p.penalty);
-                peers
-            }
-            Err(e) => {
-                error!(target: "service", "Unable to lookup available peers in address book: {e}");
-                Vec::new()
-            }
-        }
-    }
-
-    /// Fetch all repositories that are seeded but missing from storage.
-    fn fetch_missing_repositories(&mut self) -> Result<(), Error> {
-        for policy in self.policies.seed_policies()? {
-            let rid = policy.rid;
-
-            if !policy.is_allow() {
-                continue;
-            }
-            if self.storage.contains(&rid)? {
-                continue;
-            }
-            match self.seeds(&rid) {
-                Ok(seeds) => {
-                    if let Some(connected) = NonEmpty::from_vec(seeds.connected().collect()) {
-                        for seed in connected {
-                            self.fetch(rid, seed.nid, FETCH_TIMEOUT, None);
-                        }
-                    } else {
-                        // TODO: We should make sure that this fetch is retried later, either
-                        // when we connect to a seed, or when we discover a new seed.
-                        // Since new connections and routing table updates are both conditions for
-                        // fetching, we should trigger fetches when those conditions appear.
-                        // Another way to handle this would be to update our database, saying
-                        // that we're trying to fetch a certain repo. We would then just
-                        // iterate over those entries in the above circumstances. This is
-                        // merely an optimization though, we can also iterate over all seeded
-                        // repos and check which ones are not in our inventory.
-                        debug!(target: "service", "No connected seeds found for {rid}..");
-                    }
-                }
-                Err(e) => {
-                    error!(target: "service", "Couldn't fetch missing repo {rid}: failed to lookup seeds: {e}");
-                }
-            }
-        }
-        Ok(())
-    }
-
-    /// Run idle task for all connections.
-    fn idle_connections(&mut self) {
-        for (_, sess) in self.sessions.iter_mut() {
-            sess.idle(self.clock);
-
-            if sess.is_stable() {
-                // Mark as connected once connection is stable.
-                if let Err(e) =
-                    self.db
-                        .addresses_mut()
-                        .connected(&sess.id, &sess.addr, self.clock.into())
-                {
-                    error!(target: "service", "Error updating address book with connection: {e}");
-                }
-            }
-        }
-    }
-
-    /// Try to maintain a target number of connections.
-    fn maintain_connections(&mut self) {
-        let PeerConfig::Dynamic = self.config.peers else {
-            return;
-        };
-        trace!(target: "service", "Maintaining connections..");
-
-        let target = TARGET_OUTBOUND_PEERS;
-        let now = self.clock;
-        let outbound = self
-            .sessions
-            .values()
-            .filter(|s| s.link.is_outbound())
-            .filter(|s| s.is_connected() || s.is_connecting())
-            .count();
-        let wanted = target.saturating_sub(outbound);
-
-        // Don't connect to more peers than needed.
-        if wanted == 0 {
-            return;
-        }
-
-        // Peers available to connect to.
-        let available = self
-            .available_peers()
-            .into_iter()
-            .filter_map(|peer| {
-                peer.addresses
-                    .into_iter()
-                    .find(|ka| match (ka.last_success, ka.last_attempt) {
-                        // If we succeeded the last time we tried, this is a good address.
-                        // If it's been long enough that we failed to connect, we also try again.
-                        (Some(success), Some(attempt)) => {
-                            success >= attempt || now - attempt >= CONNECTION_RETRY_DELTA
-                        }
-                        // If we haven't succeeded yet, and we waited long enough, we can try this address.
-                        (None, Some(attempt)) => now - attempt >= CONNECTION_RETRY_DELTA,
-                        // If we have no failed attempts for this address, it's worth a try.
-                        (_, None) => true,
-                    })
-                    .map(|ka| (peer.nid, ka))
-            })
-            .filter(|(_, ka)| match AddressType::from(&ka.addr) {
-                // Only consider onion addresses if configured.
-                AddressType::Onion => self.config.onion.is_some(),
-                AddressType::Dns | AddressType::Ipv4 | AddressType::Ipv6 => true,
-            });
-
-        // Peers we are going to attempt connections to.
-        let connect = available.take(wanted).collect::<Vec<_>>();
-        if connect.len() < wanted {
-            log::debug!(
-                target: "service",
-                "Not enough available peers to connect to (available={}, wanted={wanted})",
-                connect.len()
-            );
-        }
-        for (id, ka) in connect {
-            self.connect(id, ka.addr.clone());
-        }
-    }
-
-    /// Maintain persistent peer connections.
-    fn maintain_persistent(&mut self) {
-        trace!(target: "service", "Maintaining persistent peers..");
-
-        let now = self.local_time();
-        let mut reconnect = Vec::new();
-
-        for (nid, session) in self.sessions.iter_mut() {
-            if let Some(addr) = self.config.peer(nid) {
-                if let session::State::Disconnected { retry_at, .. } = &mut session.state {
-                    // TODO: Try to reconnect only if the peer was attempted. A disconnect without
-                    // even a successful attempt means that we're unlikely to be able to reconnect.
-
-                    if now >= *retry_at {
-                        reconnect.push((*nid, addr.clone(), session.attempts()));
-                    }
-                }
-            }
-        }
-
-        for (nid, addr, attempts) in reconnect {
-            if self.reconnect(nid, addr) {
-                debug!(target: "service", "Reconnecting to {nid} (attempts={attempts})...");
-            }
-        }
-    }
-}
-
-/// Gives read access to the service state.
-pub trait ServiceState {
-    /// Get the Node ID.
-    fn nid(&self) -> &NodeId;
-    /// Get the existing sessions.
-    fn sessions(&self) -> &Sessions;
-    /// Get fetch state.
-    fn fetching(&self) -> &HashMap<RepoId, FetchState>;
-    /// Get outbox.
-    fn outbox(&self) -> &Outbox;
-    /// Get rate limiter.
-    fn limiter(&self) -> &RateLimiter;
-    /// Get event emitter.
-    fn emitter(&self) -> &Emitter<Event>;
-    /// Get a repository from storage.
-    fn get(&self, rid: RepoId) -> Result<Option<Doc<Verified>>, RepositoryError>;
-    /// Get the clock.
-    fn clock(&self) -> &LocalTime;
-    /// Get the clock mutably.
-    fn clock_mut(&mut self) -> &mut LocalTime;
-    /// Get service configuration.
-    fn config(&self) -> &Config;
-    /// Get service metrics.
-    fn metrics(&self) -> &Metrics;
-}
-
-impl<D, S, G> ServiceState for Service<D, S, G>
-where
-    D: routing::Store,
-    G: Signer,
-    S: ReadStorage,
-{
-    fn nid(&self) -> &NodeId {
-        self.signer.public_key()
-    }
-
-    fn sessions(&self) -> &Sessions {
-        &self.sessions
-    }
-
-    fn fetching(&self) -> &HashMap<RepoId, FetchState> {
-        &self.fetching
-    }
-
-    fn outbox(&self) -> &Outbox {
-        &self.outbox
-    }
-
-    fn limiter(&self) -> &RateLimiter {
-        &self.limiter
-    }
-
-    fn emitter(&self) -> &Emitter<Event> {
-        &self.emitter
-    }
-
-    fn get(&self, rid: RepoId) -> Result<Option<Doc<Verified>>, RepositoryError> {
-        self.storage.get(rid)
-    }
-
-    fn clock(&self) -> &LocalTime {
-        &self.clock
-    }
-
-    fn clock_mut(&mut self) -> &mut LocalTime {
-        &mut self.clock
-    }
-
-    fn config(&self) -> &Config {
-        &self.config
-    }
-
-    fn metrics(&self) -> &Metrics {
-        &self.metrics
-    }
-}
-
-/// Disconnect reason.
-#[derive(Debug)]
-pub enum DisconnectReason {
-    /// Error while dialing the remote. This error occures before a connection is
-    /// even established. Errors of this kind are usually not transient.
-    Dial(Arc<dyn std::error::Error + Sync + Send>),
-    /// Error with an underlying established connection. Sometimes, reconnecting
-    /// after such an error is possible.
-    Connection(Arc<dyn std::error::Error + Sync + Send>),
-    /// Error with a fetch.
-    Fetch(FetchError),
-    /// Session error.
-    Session(session::Error),
-    /// Session conflicts with existing session.
-    Conflict,
-    /// Connection to self.
-    SelfConnection,
-    /// User requested disconnect
-    Command,
-}
-
-impl DisconnectReason {
-    pub fn is_dial_err(&self) -> bool {
-        matches!(self, Self::Dial(_))
-    }
-
-    pub fn is_connection_err(&self) -> bool {
-        matches!(self, Self::Connection(_))
-    }
-
-    pub fn connection() -> Self {
-        DisconnectReason::Connection(Arc::new(std::io::Error::from(
-            std::io::ErrorKind::ConnectionReset,
-        )))
-    }
-}
-
-impl fmt::Display for DisconnectReason {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Dial(err) => write!(f, "{err}"),
-            Self::Connection(err) => write!(f, "{err}"),
-            Self::Command => write!(f, "command"),
-            Self::SelfConnection => write!(f, "self-connection"),
-            Self::Conflict => write!(f, "conflict"),
-            Self::Session(err) => write!(f, "{err}"),
-            Self::Fetch(err) => write!(f, "fetch: {err}"),
-        }
-    }
-}
-
-/// Result of a project lookup.
-#[derive(Debug)]
-pub struct Lookup {
-    /// Whether the project was found locally or not.
-    pub local: Option<Doc<Verified>>,
-    /// A list of remote peers on which the project is known to exist.
-    pub remote: Vec<NodeId>,
-}
-
-#[derive(thiserror::Error, Debug)]
-pub enum LookupError {
-    #[error(transparent)]
-    Routing(#[from] routing::Error),
-    #[error(transparent)]
-    Repository(#[from] RepositoryError),
-}
-
-#[derive(Debug, Clone)]
-/// Holds currently (or recently) connected peers.
-pub struct Sessions(AddressBook<NodeId, Session>);
-
-impl Sessions {
-    pub fn new(rng: Rng) -> Self {
-        Self(AddressBook::new(rng))
-    }
-
-    /// Iterator over fully connected peers.
-    pub fn connected(&self) -> impl Iterator<Item = (&NodeId, &Session)> + Clone {
-        self.0
-            .iter()
-            .filter_map(move |(id, sess)| match &sess.state {
-                session::State::Connected { .. } => Some((id, sess)),
-                _ => None,
-            })
-    }
-
-    /// Iterator over connected inbound peers.
-    pub fn inbound(&self) -> impl Iterator<Item = (&NodeId, &Session)> + Clone {
-        self.connected().filter(|(_, s)| s.link.is_inbound())
-    }
-
-    /// Iterator over outbound peers.
-    pub fn outbound(&self) -> impl Iterator<Item = (&NodeId, &Session)> + Clone {
-        self.connected().filter(|(_, s)| s.link.is_outbound())
-    }
-
-    /// Iterator over mutable fully connected peers.
-    pub fn connected_mut(&mut self) -> impl Iterator<Item = (&NodeId, &mut Session)> {
-        self.0.iter_mut().filter(move |(_, s)| s.is_connected())
-    }
-
-    /// Iterator over disconnected peers.
-    pub fn disconnected_mut(&mut self) -> impl Iterator<Item = (&NodeId, &mut Session)> {
-        self.0.iter_mut().filter(move |(_, s)| s.is_disconnected())
-    }
-
-    /// Return whether this node has a fully established session.
-    pub fn is_connected(&self, id: &NodeId) -> bool {
-        self.0.get(id).map(|s| s.is_connected()).unwrap_or(false)
-    }
-
-    /// Return whether this node can be connected to.
-    pub fn is_disconnected(&self, id: &NodeId) -> bool {
-        self.0.get(id).map(|s| s.is_disconnected()).unwrap_or(true)
-    }
-}
-
-impl Deref for Sessions {
-    type Target = AddressBook<NodeId, Session>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for Sessions {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
diff --git a/radicle-node/src/service/filter.rs b/radicle-node/src/service/filter.rs
deleted file mode 100644
index eae7c3607..000000000
--- a/radicle-node/src/service/filter.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-#![allow(clippy::identity_op)]
-use std::ops::{Deref, DerefMut};
-
-pub use bloomy::BloomFilter;
-
-use crate::identity::RepoId;
-
-/// Size in bytes of *large* bloom filter.
-/// It can store about 13'675 items with a false positive rate of 1%.
-pub const FILTER_SIZE_L: usize = 16 * 1024;
-/// Size in bytes of *medium* bloom filter.
-/// It can store about 3'419 items with a false positive rate of 1%.
-pub const FILTER_SIZE_M: usize = 4 * 1024;
-/// Size in bytes of *small* bloom filter.
-/// It can store about 855 items with a false positive rate of 1%.
-pub const FILTER_SIZE_S: usize = 1 * 1024;
-
-/// Valid filter sizes.
-pub const FILTER_SIZES: [usize; 3] = [FILTER_SIZE_S, FILTER_SIZE_M, FILTER_SIZE_L];
-
-/// Target false positive rate of filter.
-pub const FILTER_FP_RATE: f64 = 0.01;
-/// Number of hashes used for bloom filter.
-pub const FILTER_HASHES: usize = 7;
-
-/// Inventory filter used for subscriptions and inventory comparison.
-///
-/// The [`Default`] instance has all bits set to `1`, ie. it will match
-/// everything.
-#[derive(Clone, PartialEq, Eq, Debug)]
-pub struct Filter(BloomFilter<RepoId>);
-
-impl Default for Filter {
-    fn default() -> Self {
-        Self(BloomFilter::from(vec![0xff; FILTER_SIZE_S]))
-    }
-}
-
-impl Filter {
-    /// Create a new filter with the given items.
-    ///
-    /// Uses the iterator's size hint to determine the size of the filter.
-    pub fn new(ids: impl IntoIterator<Item = RepoId>) -> Self {
-        let iterator = ids.into_iter();
-        let (min, _) = iterator.size_hint();
-        let size = bloomy::bloom::optimal_bits(min, FILTER_FP_RATE) / 8;
-        let size = if size > FILTER_SIZE_M {
-            FILTER_SIZE_L
-        } else if size > FILTER_SIZE_S {
-            FILTER_SIZE_M
-        } else {
-            FILTER_SIZE_S
-        };
-        let mut bloom = BloomFilter::with_size(size);
-
-        for id in iterator {
-            bloom.insert(&id);
-        }
-        Self(bloom)
-    }
-
-    /// Empty filter with nothing set.
-    pub fn empty() -> Self {
-        Self(BloomFilter::from(vec![0x0; FILTER_SIZE_S]))
-    }
-
-    /// Size in bytes.
-    pub fn size(&self) -> usize {
-        self.0.bits() / 8
-    }
-}
-
-impl Deref for Filter {
-    type Target = BloomFilter<RepoId>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for Filter {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-impl From<BloomFilter<RepoId>> for Filter {
-    fn from(bloom: BloomFilter<RepoId>) -> Self {
-        Self(bloom)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::test::arbitrary;
-
-    #[test]
-    fn test_parameters() {
-        // To store 10'000 items with a false positive rate of 1%, we need about 12KB.
-        assert_eq!(bloomy::bloom::optimal_bits(10_000, 0.01) / 8, 11_981);
-        // To store 1'000 items with a false positive rate of 1%, we need about 1KB.
-        assert_eq!(bloomy::bloom::optimal_bits(1_000, 0.01) / 8, 1198);
-        // To store 100 items with a false positive rate of 1%, we need about 120B.
-        assert_eq!(bloomy::bloom::optimal_bits(100, 0.01) / 8, 119);
-
-        // With 16KB, we can store 13'675 items with a false positive rate of 1%.
-        assert_eq!(
-            bloomy::bloom::optimal_capacity(FILTER_SIZE_L * 8, FILTER_FP_RATE),
-            13_675
-        );
-        // With 4KB, we can store 3'419 items with a false positive rate of 1%.
-        assert_eq!(
-            bloomy::bloom::optimal_capacity(FILTER_SIZE_M * 8, FILTER_FP_RATE),
-            3419
-        );
-        // With 1KB, we can store 855 items with a false positive rate of 1%.
-        assert_eq!(
-            bloomy::bloom::optimal_capacity(FILTER_SIZE_S * 8, FILTER_FP_RATE),
-            855
-        );
-
-        assert_eq!(
-            bloomy::bloom::optimal_hashes(FILTER_SIZE_L * 8, 13_675),
-            FILTER_HASHES
-        );
-        assert_eq!(
-            bloomy::bloom::optimal_hashes(FILTER_SIZE_M * 8, 3419),
-            FILTER_HASHES
-        );
-        assert_eq!(
-            bloomy::bloom::optimal_hashes(FILTER_SIZE_S * 8, 855),
-            FILTER_HASHES
-        );
-    }
-
-    #[test]
-    fn test_sizes() {
-        let ids = arbitrary::vec::<RepoId>(3420);
-        let f = Filter::new(ids.iter().cloned().take(10));
-        assert_eq!(f.size(), FILTER_SIZE_S);
-
-        let f = Filter::new(ids.iter().cloned().take(1000));
-        assert_eq!(f.size(), FILTER_SIZE_M);
-
-        let f = Filter::new(ids.iter().cloned());
-        assert_eq!(f.size(), FILTER_SIZE_L);
-
-        // Just checking that iterators over hash sets give correct size hints.
-        let hs = arbitrary::set::<RepoId>(42..=42);
-        assert_eq!(hs.iter().size_hint(), (42, Some(42)));
-    }
-}
diff --git a/radicle-node/src/service/gossip.rs b/radicle-node/src/service/gossip.rs
deleted file mode 100644
index 1ee912d8b..000000000
--- a/radicle-node/src/service/gossip.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-pub mod store;
-
-use std::str::FromStr;
-
-use super::*;
-use crate::{PROTOCOL_VERSION, VERSION};
-use once_cell::sync::Lazy;
-use radicle::node::UserAgent;
-
-pub use store::{AnnouncementId, Error, RelayStatus, Store};
-
-/// This node's user agent string.
-pub static USER_AGENT: Lazy<UserAgent> = Lazy::new(|| {
-    FromStr::from_str(format!("/radicle:{}/", VERSION.version).as_str())
-        .expect("user agent is valid")
-});
-
-pub fn node(config: &Config, timestamp: Timestamp) -> NodeAnnouncement {
-    let features = config.features();
-    let alias = config.alias.clone();
-    let addresses: BoundedVec<_, ADDRESS_LIMIT> = config
-        .external_addresses
-        .clone()
-        .try_into()
-        .expect("external addresses are within the limit");
-    let agent = USER_AGENT.clone();
-    let version = PROTOCOL_VERSION;
-
-    NodeAnnouncement {
-        features,
-        version,
-        timestamp,
-        alias,
-        addresses,
-        nonce: 0,
-        agent,
-    }
-}
-
-pub fn inventory(
-    timestamp: Timestamp,
-    inventory: impl IntoIterator<Item = RepoId>,
-) -> InventoryAnnouncement {
-    let inventory = inventory.into_iter().collect::<Vec<_>>();
-    if inventory.len() > INVENTORY_LIMIT {
-        error!(
-            target: "service",
-            "inventory announcement limit ({}) exceeded, other nodes will see only some of your projects",
-            inventory.len()
-        );
-    }
-
-    InventoryAnnouncement {
-        inventory: BoundedVec::truncate(inventory),
-        timestamp,
-    }
-}
diff --git a/radicle-node/src/service/gossip/store.rs b/radicle-node/src/service/gossip/store.rs
deleted file mode 100644
index 9ae6dad82..000000000
--- a/radicle-node/src/service/gossip/store.rs
+++ /dev/null
@@ -1,446 +0,0 @@
-use std::num::TryFromIntError;
-use std::{fmt, io};
-
-use radicle::crypto::Signature;
-use sqlite as sql;
-use thiserror::Error;
-
-use crate::node::{Database, NodeId};
-use crate::prelude::{Filter, Timestamp};
-use crate::service::message::{
-    Announcement, AnnouncementMessage, InventoryAnnouncement, NodeAnnouncement, RefsAnnouncement,
-};
-use crate::wire;
-use crate::wire::Decode;
-
-#[derive(Error, Debug)]
-pub enum Error {
-    /// An Internal error.
-    #[error("internal error: {0}")]
-    Internal(#[from] sql::Error),
-    /// Unit overflow.
-    #[error("unit overflow:: {0}")]
-    UnitOverflow(#[from] TryFromIntError),
-}
-
-/// Unique announcement identifier.
-pub type AnnouncementId = u64;
-
-/// A database that has access to historical gossip messages.
-/// Keeps track of the latest received gossip messages for each node.
-/// Grows linearly with the number of nodes on the network.
-pub trait Store {
-    /// Prune announcements older than the cutoff time.
-    fn prune(&mut self, cutoff: Timestamp) -> Result<usize, Error>;
-
-    /// Get the timestamp of the last announcement in the store.
-    fn last(&self) -> Result<Option<Timestamp>, Error>;
-
-    /// Process an announcement for the given node.
-    /// Returns `true` if the timestamp was updated or the announcement wasn't there before.
-    fn announced(
-        &mut self,
-        nid: &NodeId,
-        ann: &Announcement,
-    ) -> Result<Option<AnnouncementId>, Error>;
-
-    /// Set whether a message should be relayed or not.
-    fn set_relay(&mut self, id: AnnouncementId, relay: RelayStatus) -> Result<(), Error>;
-
-    /// Return messages that should be relayed.
-    fn relays(&mut self, now: Timestamp) -> Result<Vec<(AnnouncementId, Announcement)>, Error>;
-
-    /// Get all the latest gossip messages of all nodes, filtered by inventory filter and
-    /// announcement timestamps.
-    ///
-    /// # Panics
-    ///
-    /// Panics if `from` > `to`.
-    ///
-    fn filtered<'a>(
-        &'a self,
-        filter: &'a Filter,
-        from: Timestamp,
-        to: Timestamp,
-    ) -> Result<Box<dyn Iterator<Item = Result<Announcement, Error>> + 'a>, Error>;
-}
-
-impl Store for Database {
-    fn prune(&mut self, cutoff: Timestamp) -> Result<usize, Error> {
-        let mut stmt = self
-            .db
-            .prepare("DELETE FROM `announcements` WHERE timestamp < ?1")?;
-
-        stmt.bind((1, &cutoff))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count())
-    }
-
-    fn last(&self) -> Result<Option<Timestamp>, Error> {
-        let stmt = self
-            .db
-            .prepare("SELECT MAX(timestamp) AS latest FROM `announcements`")?;
-
-        if let Some(Ok(row)) = stmt.into_iter().next() {
-            return match row.try_read::<Option<i64>, _>(0)? {
-                Some(i) => Ok(Some(Timestamp::try_from(i)?)),
-                None => Ok(None),
-            };
-        }
-        Ok(None)
-    }
-
-    fn announced(
-        &mut self,
-        nid: &NodeId,
-        ann: &Announcement,
-    ) -> Result<Option<AnnouncementId>, Error> {
-        assert_ne!(
-            ann.timestamp(),
-            Timestamp::MIN,
-            "Timestamp of {ann:?} must not be zero"
-        );
-        let mut stmt = self.db.prepare(
-            "INSERT INTO `announcements` (node, repo, type, message, signature, timestamp)
-             VALUES (?1, ?2, ?3, ?4, ?5, ?6)
-             ON CONFLICT DO UPDATE
-             SET message = ?4, signature = ?5, timestamp = ?6
-             WHERE timestamp < ?6
-             RETURNING rowid",
-        )?;
-        stmt.bind((1, nid))?;
-
-        match &ann.message {
-            AnnouncementMessage::Node(msg) => {
-                stmt.bind((2, sql::Value::String(String::new())))?;
-                stmt.bind((3, &GossipType::Node))?;
-                stmt.bind((4, msg))?;
-            }
-            AnnouncementMessage::Refs(msg) => {
-                stmt.bind((2, &msg.rid))?;
-                stmt.bind((3, &GossipType::Refs))?;
-                stmt.bind((4, msg))?;
-            }
-            AnnouncementMessage::Inventory(msg) => {
-                stmt.bind((2, sql::Value::String(String::new())))?;
-                stmt.bind((3, &GossipType::Inventory))?;
-                stmt.bind((4, msg))?;
-            }
-        }
-        stmt.bind((5, &ann.signature))?;
-        stmt.bind((6, &ann.message.timestamp()))?;
-
-        if let Some(row) = stmt.into_iter().next() {
-            let row = row?;
-            let id = row.read::<i64, _>("rowid");
-
-            Ok(Some(id as AnnouncementId))
-        } else {
-            Ok(None)
-        }
-    }
-
-    fn set_relay(&mut self, id: AnnouncementId, relay: RelayStatus) -> Result<(), Error> {
-        let mut stmt = self.db.prepare(
-            "UPDATE announcements
-             SET relay = ?1
-             WHERE rowid = ?2",
-        )?;
-        stmt.bind((1, relay))?;
-        stmt.bind((2, id as i64))?;
-        stmt.next()?;
-
-        Ok(())
-    }
-
-    fn relays(&mut self, now: Timestamp) -> Result<Vec<(AnnouncementId, Announcement)>, Error> {
-        let mut stmt = self.db.prepare(
-            "UPDATE announcements
-             SET relay = ?1
-             WHERE relay IS ?2
-             RETURNING rowid, node, type, message, signature, timestamp",
-        )?;
-        stmt.bind((1, RelayStatus::RelayedAt(now)))?;
-        stmt.bind((2, RelayStatus::Relay))?;
-
-        let mut rows = stmt
-            .into_iter()
-            .map(|row| {
-                let row = row?;
-                parse::announcement(row)
-            })
-            .collect::<Result<Vec<_>, _>>()?;
-
-        // Nb. Manually sort by insertion order, because we can't use `ORDER BY` with `RETURNING`
-        // as of SQLite 3.45.
-        rows.sort_by_key(|(id, _)| *id);
-
-        Ok(rows)
-    }
-
-    fn filtered<'a>(
-        &'a self,
-        filter: &'a Filter,
-        from: Timestamp,
-        to: Timestamp,
-    ) -> Result<Box<dyn Iterator<Item = Result<Announcement, Error>> + 'a>, Error> {
-        let mut stmt = self.db.prepare(
-            "SELECT rowid, node, type, message, signature, timestamp
-             FROM announcements
-             WHERE timestamp >= ?1 and timestamp < ?2
-             ORDER BY timestamp, node, type",
-        )?;
-        assert!(*from <= *to);
-
-        stmt.bind((1, &from))?;
-        stmt.bind((2, &to))?;
-
-        Ok(Box::new(
-            stmt.into_iter()
-                .map(|row| {
-                    let row = row?;
-                    let (_, ann) = parse::announcement(row)?;
-
-                    Ok(ann)
-                })
-                .filter(|ann| match ann {
-                    Ok(a) => a.matches(filter),
-                    Err(_) => true,
-                }),
-        ))
-    }
-}
-
-impl TryFrom<&sql::Value> for NodeAnnouncement {
-    type Error = sql::Error;
-
-    fn try_from(value: &sql::Value) -> Result<Self, Self::Error> {
-        match value {
-            sql::Value::Binary(bytes) => {
-                let mut reader = io::Cursor::new(bytes);
-                NodeAnnouncement::decode(&mut reader).map_err(wire::Error::into)
-            }
-            _ => Err(sql::Error {
-                code: None,
-                message: Some("sql: invalid type for node announcement".to_owned()),
-            }),
-        }
-    }
-}
-
-impl sql::BindableWithIndex for &NodeAnnouncement {
-    fn bind<I: sql::ParameterIndex>(self, stmt: &mut sql::Statement<'_>, i: I) -> sql::Result<()> {
-        wire::serialize(self).bind(stmt, i)
-    }
-}
-
-impl TryFrom<&sql::Value> for RefsAnnouncement {
-    type Error = sql::Error;
-
-    fn try_from(value: &sql::Value) -> Result<Self, Self::Error> {
-        match value {
-            sql::Value::Binary(bytes) => {
-                let mut reader = io::Cursor::new(bytes);
-                RefsAnnouncement::decode(&mut reader).map_err(wire::Error::into)
-            }
-            _ => Err(sql::Error {
-                code: None,
-                message: Some("sql: invalid type for refs announcement".to_owned()),
-            }),
-        }
-    }
-}
-
-impl sql::BindableWithIndex for &RefsAnnouncement {
-    fn bind<I: sql::ParameterIndex>(self, stmt: &mut sql::Statement<'_>, i: I) -> sql::Result<()> {
-        wire::serialize(self).bind(stmt, i)
-    }
-}
-
-impl TryFrom<&sql::Value> for InventoryAnnouncement {
-    type Error = sql::Error;
-
-    fn try_from(value: &sql::Value) -> Result<Self, Self::Error> {
-        match value {
-            sql::Value::Binary(bytes) => {
-                let mut reader = io::Cursor::new(bytes);
-                InventoryAnnouncement::decode(&mut reader).map_err(wire::Error::into)
-            }
-            _ => Err(sql::Error {
-                code: None,
-                message: Some("sql: invalid type for inventory announcement".to_owned()),
-            }),
-        }
-    }
-}
-
-impl sql::BindableWithIndex for &InventoryAnnouncement {
-    fn bind<I: sql::ParameterIndex>(self, stmt: &mut sql::Statement<'_>, i: I) -> sql::Result<()> {
-        wire::serialize(self).bind(stmt, i)
-    }
-}
-
-impl From<wire::Error> for sql::Error {
-    fn from(other: wire::Error) -> Self {
-        sql::Error {
-            code: None,
-            message: Some(other.to_string()),
-        }
-    }
-}
-
-/// Message relay status.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum RelayStatus {
-    Relay,
-    DontRelay,
-    RelayedAt(Timestamp),
-}
-
-impl sql::BindableWithIndex for RelayStatus {
-    fn bind<I: sql::ParameterIndex>(self, stmt: &mut sql::Statement<'_>, i: I) -> sql::Result<()> {
-        match self {
-            Self::Relay => sql::Value::Null.bind(stmt, i),
-            Self::DontRelay => sql::Value::Integer(-1).bind(stmt, i),
-            Self::RelayedAt(t) => t.bind(stmt, i),
-        }
-    }
-}
-
-/// Type of gossip message.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-enum GossipType {
-    Refs,
-    Node,
-    Inventory,
-}
-
-impl fmt::Display for GossipType {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Refs => write!(f, "refs"),
-            Self::Node => write!(f, "node"),
-            Self::Inventory => write!(f, "inventory"),
-        }
-    }
-}
-
-impl sql::BindableWithIndex for &GossipType {
-    fn bind<I: sql::ParameterIndex>(self, stmt: &mut sql::Statement<'_>, i: I) -> sql::Result<()> {
-        self.to_string().as_str().bind(stmt, i)
-    }
-}
-
-impl TryFrom<&sql::Value> for GossipType {
-    type Error = sql::Error;
-
-    fn try_from(value: &sql::Value) -> Result<Self, Self::Error> {
-        match value {
-            sql::Value::String(s) => match s.as_str() {
-                "refs" => Ok(Self::Refs),
-                "node" => Ok(Self::Node),
-                "inventory" => Ok(Self::Inventory),
-                other => Err(sql::Error {
-                    code: None,
-                    message: Some(format!("unknown gossip type '{other}'")),
-                }),
-            },
-            _ => Err(sql::Error {
-                code: None,
-                message: Some("sql: invalid type for gossip type".to_owned()),
-            }),
-        }
-    }
-}
-
-mod parse {
-    use super::*;
-
-    pub fn announcement(row: sql::Row) -> Result<(AnnouncementId, Announcement), Error> {
-        let id = row.read::<i64, _>("rowid") as AnnouncementId;
-        let node = row.read::<NodeId, _>("node");
-        let gt = row.read::<GossipType, _>("type");
-        let message = match gt {
-            GossipType::Refs => {
-                let ann = row.try_read::<RefsAnnouncement, _>("message")?;
-                AnnouncementMessage::Refs(ann)
-            }
-            GossipType::Inventory => {
-                let ann = row.try_read::<InventoryAnnouncement, _>("message")?;
-                AnnouncementMessage::Inventory(ann)
-            }
-            GossipType::Node => {
-                let ann = row.try_read::<NodeAnnouncement, _>("message")?;
-                AnnouncementMessage::Node(ann)
-            }
-        };
-        let signature = row.read::<Signature, _>("signature");
-        let timestamp = row.read::<Timestamp, _>("timestamp");
-
-        debug_assert_eq!(timestamp, message.timestamp());
-
-        Ok((
-            id,
-            Announcement {
-                node,
-                message,
-                signature,
-            },
-        ))
-    }
-}
-
-#[cfg(test)]
-#[allow(clippy::unwrap_used)]
-mod test {
-    use super::*;
-    use crate::prelude::{BoundedVec, RepoId};
-    use crate::test::arbitrary;
-    use localtime::LocalTime;
-    use radicle::assert_matches;
-    use radicle_crypto::test::signer::MockSigner;
-
-    #[test]
-    fn test_announced() {
-        let mut db = Database::memory().unwrap();
-        let nid = arbitrary::gen::<NodeId>(1);
-        let rid = arbitrary::gen::<RepoId>(1);
-        let timestamp = LocalTime::now().into();
-        let signer = MockSigner::default();
-        let refs = AnnouncementMessage::Refs(RefsAnnouncement {
-            rid,
-            refs: BoundedVec::new(),
-            timestamp,
-        })
-        .signed(&signer);
-        let inv = AnnouncementMessage::Inventory(InventoryAnnouncement {
-            inventory: BoundedVec::new(),
-            timestamp,
-        })
-        .signed(&signer);
-
-        // Only the first announcement of each type is recognized as new.
-        let id1 = db.announced(&nid, &refs).unwrap().unwrap();
-        assert!(db.announced(&nid, &refs).unwrap().is_none());
-
-        let id2 = db.announced(&nid, &inv).unwrap().unwrap();
-        assert!(db.announced(&nid, &inv).unwrap().is_none());
-
-        // Nothing was set to be relayed.
-        assert_eq!(db.relays(LocalTime::now().into()).unwrap().len(), 0);
-
-        // Set the messages to be relayed.
-        db.set_relay(id1, RelayStatus::Relay).unwrap();
-        db.set_relay(id2, RelayStatus::Relay).unwrap();
-
-        // Now they are returned.
-        assert_matches!(
-            db.relays(LocalTime::now().into()).unwrap().as_slice(),
-            &[(id1_, _), (id2_, _)]
-            if id1_ == id1 && id2_ == id2
-        );
-        // But only once.
-        assert_matches!(db.relays(LocalTime::now().into()).unwrap().as_slice(), &[]);
-    }
-}
diff --git a/radicle-node/src/service/io.rs b/radicle-node/src/service/io.rs
deleted file mode 100644
index 5232f9223..000000000
--- a/radicle-node/src/service/io.rs
+++ /dev/null
@@ -1,198 +0,0 @@
-use std::collections::VecDeque;
-use std::time;
-
-use log::*;
-use radicle::storage::refs::RefsAt;
-
-use crate::prelude::*;
-use crate::service::session::Session;
-use crate::service::Link;
-
-use super::gossip;
-use super::message::{Announcement, AnnouncementMessage};
-
-/// I/O operation to execute at the network/wire level.
-#[derive(Debug)]
-pub enum Io {
-    /// There are some messages ready to be sent to a peer.
-    Write(NodeId, Vec<Message>),
-    /// Connect to a peer.
-    Connect(NodeId, Address),
-    /// Disconnect from a peer.
-    Disconnect(NodeId, DisconnectReason),
-    /// Fetch repository data from a peer.
-    Fetch {
-        /// Repo being fetched.
-        rid: RepoId,
-        /// Remote node being fetched from.
-        remote: NodeId,
-        /// If the node is fetching specific `rad/sigrefs`.
-        refs_at: Option<Vec<RefsAt>>,
-        /// Fetch timeout.
-        timeout: time::Duration,
-    },
-    /// Ask for a wakeup in a specified amount of time.
-    Wakeup(LocalDuration),
-}
-
-/// Interface to the network.
-#[derive(Debug, Default)]
-pub struct Outbox {
-    /// Outgoing I/O queue.
-    io: VecDeque<Io>,
-}
-
-impl Outbox {
-    /// Connect to a peer.
-    pub fn connect(&mut self, id: NodeId, addr: Address) {
-        self.io.push_back(Io::Connect(id, addr));
-    }
-
-    /// Disconnect a peer.
-    pub fn disconnect(&mut self, id: NodeId, reason: DisconnectReason) {
-        self.io.push_back(Io::Disconnect(id, reason));
-    }
-
-    pub fn write(&mut self, remote: &Session, msg: Message) {
-        msg.log(log::Level::Debug, &remote.id, Link::Outbound);
-        trace!(target: "service", "Write {:?} to {}", &msg, remote);
-
-        self.io.push_back(Io::Write(remote.id, vec![msg]));
-    }
-
-    /// Announce something to a peer. This is meant for our own announcement messages.
-    pub fn announce<'a>(
-        &mut self,
-        ann: Announcement,
-        peers: impl Iterator<Item = &'a Session>,
-        gossip: &mut impl gossip::Store,
-    ) {
-        // Store our announcement so that it can be retrieved from us later, just like
-        // announcements we receive from peers.
-        if let Err(e) = gossip.announced(&ann.node, &ann) {
-            error!(target: "service", "Error updating our gossip store with announced message: {e}");
-        }
-
-        for peer in peers {
-            if let AnnouncementMessage::Refs(refs) = &ann.message {
-                if let Some(subscribe) = &peer.subscribe {
-                    if subscribe.filter.contains(&refs.rid) {
-                        self.write(peer, ann.clone().into());
-                    } else {
-                        debug!(
-                            target: "service",
-                            "Skipping refs announcement relay to {peer}: peer isn't subscribed to {}",
-                            refs.rid
-                        );
-                    }
-                } else {
-                    debug!(
-                        target: "service",
-                        "Skipping refs announcement relay to {peer}: peer didn't send a subscription filter"
-                    );
-                }
-            } else {
-                self.write(peer, ann.clone().into());
-            }
-        }
-    }
-
-    pub fn write_all(&mut self, remote: &Session, msgs: impl IntoIterator<Item = Message>) {
-        let msgs = msgs.into_iter().collect::<Vec<_>>();
-
-        for (ix, msg) in msgs.iter().enumerate() {
-            trace!(
-                target: "service",
-                "Write {:?} to {} ({}/{})",
-                msg,
-                remote,
-                ix + 1,
-                msgs.len()
-            );
-            msg.log(log::Level::Trace, &remote.id, Link::Outbound);
-        }
-        self.io.push_back(Io::Write(remote.id, msgs));
-    }
-
-    pub fn wakeup(&mut self, after: LocalDuration) {
-        self.io.push_back(Io::Wakeup(after));
-    }
-
-    pub fn fetch(
-        &mut self,
-        peer: &mut Session,
-        rid: RepoId,
-        refs_at: Vec<RefsAt>,
-        timeout: time::Duration,
-    ) {
-        peer.fetching(rid);
-
-        let refs_at = (!refs_at.is_empty()).then_some(refs_at);
-
-        if let Some(refs_at) = &refs_at {
-            debug!(
-                target: "service",
-                "Fetch initiated for {rid} with {peer} ({} remote(s))..", refs_at.len()
-            );
-        } else {
-            debug!(target: "service", "Fetch initiated for {rid} with {peer} (all remotes)..");
-        }
-
-        self.io.push_back(Io::Fetch {
-            rid,
-            refs_at,
-            remote: peer.id,
-            timeout,
-        });
-    }
-
-    /// Broadcast a message to a list of peers.
-    pub fn broadcast<'a>(
-        &mut self,
-        msg: impl Into<Message>,
-        peers: impl IntoIterator<Item = &'a Session>,
-    ) {
-        let msg = msg.into();
-        for peer in peers {
-            self.write(peer, msg.clone());
-        }
-    }
-
-    /// Relay a message to interested peers.
-    pub fn relay<'a>(&mut self, ann: Announcement, peers: impl IntoIterator<Item = &'a Session>) {
-        if let AnnouncementMessage::Refs(msg) = &ann.message {
-            let id = msg.rid;
-            let peers = peers.into_iter().filter(|p| {
-                if let Some(subscribe) = &p.subscribe {
-                    subscribe.filter.contains(&id)
-                } else {
-                    // If the peer did not send us a `subscribe` message, we don't
-                    // relay any messages to them.
-                    false
-                }
-            });
-            self.broadcast(ann, peers);
-        } else {
-            self.broadcast(ann, peers);
-        }
-    }
-
-    /// Number of items in outbox.
-    #[allow(clippy::len_without_is_empty)]
-    pub fn len(&self) -> usize {
-        self.io.len()
-    }
-
-    #[cfg(any(test, feature = "test"))]
-    pub(crate) fn queue(&mut self) -> &mut VecDeque<Io> {
-        &mut self.io
-    }
-}
-
-impl Iterator for Outbox {
-    type Item = Io;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.io.pop_front()
-    }
-}
diff --git a/radicle-node/src/service/limiter.rs b/radicle-node/src/service/limiter.rs
deleted file mode 100644
index f91854344..000000000
--- a/radicle-node/src/service/limiter.rs
+++ /dev/null
@@ -1,210 +0,0 @@
-use std::collections::{HashMap, HashSet};
-
-use localtime::LocalTime;
-use radicle::node::{address, config, HostName, NodeId};
-
-/// Peer rate limiter.
-///
-/// Uses a token bucket algorithm, where each address starts with a certain amount of tokens,
-/// and every request from that address consumes one token. Tokens refill at a predefined
-/// rate. This mechanism allows for consistent request rates with potential bursts up to the
-/// bucket's capacity.
-#[derive(Debug, Default)]
-pub struct RateLimiter {
-    pub buckets: HashMap<HostName, TokenBucket>,
-    pub bypass: HashSet<NodeId>,
-}
-
-impl RateLimiter {
-    /// Create a new rate limiter with a bypass list. Nodes in the bypass list are not limited.
-    pub fn new(bypass: impl IntoIterator<Item = NodeId>) -> Self {
-        Self {
-            buckets: HashMap::default(),
-            bypass: bypass.into_iter().collect(),
-        }
-    }
-
-    /// Call this when the address has performed some rate-limited action.
-    /// Returns whether the action is rate-limited or not.
-    ///
-    /// Supplying a different amount of tokens per address is useful if for eg. a peer
-    /// is outbound vs. inbound.
-    pub fn limit<T: AsTokens>(
-        &mut self,
-        addr: HostName,
-        nid: Option<&NodeId>,
-        tokens: &T,
-        now: LocalTime,
-    ) -> bool {
-        if let Some(nid) = nid {
-            if self.bypass.contains(nid) {
-                return false;
-            }
-        }
-        if let HostName::Ip(ip) = addr {
-            // Don't limit LAN addresses.
-            if !address::is_routable(&ip) {
-                return false;
-            }
-        }
-        !self
-            .buckets
-            .entry(addr)
-            .or_insert_with(|| TokenBucket::new(tokens.capacity(), tokens.rate(), now))
-            .take(now)
-    }
-}
-
-/// Any type that can be assigned a number of rate-limit tokens.
-pub trait AsTokens {
-    /// Get the token capacity for this object.
-    fn capacity(&self) -> usize;
-    /// Get the refill rate for this object.
-    /// A rate of `1.0` means one token per second.
-    fn rate(&self) -> f64;
-}
-
-impl AsTokens for config::RateLimit {
-    fn rate(&self) -> f64 {
-        self.fill_rate
-    }
-
-    fn capacity(&self) -> usize {
-        self.capacity
-    }
-}
-
-#[derive(Debug, serde::Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct TokenBucket {
-    /// Token refill rate per second.
-    rate: f64,
-    /// Token capacity.
-    capacity: f64,
-    /// Tokens remaining.
-    tokens: f64,
-    /// Time of last token refill.
-    refilled_at: LocalTime,
-}
-
-impl TokenBucket {
-    fn new(tokens: usize, rate: f64, now: LocalTime) -> Self {
-        Self {
-            rate,
-            capacity: tokens as f64,
-            tokens: tokens as f64,
-            refilled_at: now,
-        }
-    }
-
-    fn refill(&mut self, now: LocalTime) {
-        let elapsed = now.duration_since(self.refilled_at);
-        let tokens = elapsed.as_secs() as f64 * self.rate;
-
-        self.tokens = (self.tokens + tokens).min(self.capacity);
-        self.refilled_at = now;
-    }
-
-    fn take(&mut self, now: LocalTime) -> bool {
-        self.refill(now);
-
-        if self.tokens >= 1.0 {
-            self.tokens -= 1.0;
-            true
-        } else {
-            false
-        }
-    }
-}
-
-#[cfg(test)]
-#[allow(clippy::bool_assert_comparison, clippy::redundant_clone)]
-mod test {
-    use radicle::test::arbitrary;
-
-    use super::*;
-
-    impl AsTokens for (usize, f64) {
-        fn capacity(&self) -> usize {
-            self.0
-        }
-
-        fn rate(&self) -> f64 {
-            self.1
-        }
-    }
-
-    #[test]
-    fn test_limitter_refill() {
-        let mut r = RateLimiter::default();
-        let t = (3, 0.2); // Three tokens burst. One token every 5 seconds.
-        let a = HostName::Dns(String::from("seed.radicle.xyz"));
-        let n = arbitrary::gen::<NodeId>(1);
-        let n = Some(&n);
-
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(0)), false); // Burst capacity
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(1)), false); // Burst capacity
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(2)), false); // Burst capacity
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(3)), true); // Limited
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(4)), true); // Limited
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(5)), false); // Refilled (1)
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(6)), true); // Limited
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(7)), true); // Limited
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(8)), true); // Limited
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(9)), true); // Limited
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(10)), false); // Refilled (1)
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(11)), true); // Limited
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(12)), true); // Limited
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(13)), true); // Limited
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(14)), true); // Limited
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(15)), false); // Refilled (1)
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(16)), true); // Limited
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(60)), false); // Refilled (3)
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(60)), false); // Burst capacity
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(60)), false); // Burst capacity
-        assert_eq!(r.limit(a.clone(), n, &t, LocalTime::from_secs(60)), true); // Limited
-    }
-
-    #[test]
-    #[rustfmt::skip]
-    fn test_limitter_multi() {
-        let t = (1, 1.0); // One token per second. One token burst.
-        let n = arbitrary::gen::<NodeId>(1);
-        let n = Some(&n);
-        let mut r = RateLimiter::default();
-        let addr1 = HostName::Dns(String::from("seed.radicle.xyz"));
-        let addr2 = HostName::Dns(String::from("seed.radicle.net"));
-
-        assert_eq!(r.limit(addr1.clone(), n, &t, LocalTime::from_secs(0)), false);
-        assert_eq!(r.limit(addr1.clone(), n, &t, LocalTime::from_secs(0)), true);
-        assert_eq!(r.limit(addr2.clone(), n, &t, LocalTime::from_secs(0)), false);
-        assert_eq!(r.limit(addr2.clone(), n, &t, LocalTime::from_secs(0)), true);
-        assert_eq!(r.limit(addr1.clone(), n, &t, LocalTime::from_secs(1)), false);
-        assert_eq!(r.limit(addr1.clone(), n, &t, LocalTime::from_secs(1)), true);
-        assert_eq!(r.limit(addr2.clone(), n, &t, LocalTime::from_secs(1)), false);
-        assert_eq!(r.limit(addr2.clone(), n, &t, LocalTime::from_secs(1)), true);
-    }
-
-    #[test]
-    #[rustfmt::skip]
-    fn test_limitter_different_rates() {
-        let t1 = (1, 1.0); // One token per second. One token burst.
-        let t2 = (2, 2.0); // Two tokens per second. Two token burst.
-        let n = arbitrary::gen::<NodeId>(1);
-        let n = Some(&n);
-        let mut r = RateLimiter::default();
-        let addr1 = HostName::Dns(String::from("seed.radicle.xyz"));
-        let addr2 = HostName::Dns(String::from("seed.radicle.net"));
-
-        assert_eq!(r.limit(addr1.clone(), n, &t1, LocalTime::from_secs(0)), false);
-        assert_eq!(r.limit(addr1.clone(), n, &t1, LocalTime::from_secs(0)), true);
-        assert_eq!(r.limit(addr2.clone(), n, &t2, LocalTime::from_secs(0)), false);
-        assert_eq!(r.limit(addr2.clone(), n, &t2, LocalTime::from_secs(0)), false);
-        assert_eq!(r.limit(addr2.clone(), n, &t2, LocalTime::from_secs(0)), true);
-        assert_eq!(r.limit(addr1.clone(), n, &t1, LocalTime::from_secs(1)), false); // Refilled (1)
-        assert_eq!(r.limit(addr1.clone(), n, &t1, LocalTime::from_secs(1)), true);
-        assert_eq!(r.limit(addr2.clone(), n, &t2, LocalTime::from_secs(1)), false); // Refilled (2)
-        assert_eq!(r.limit(addr2.clone(), n, &t2, LocalTime::from_secs(1)), false);
-        assert_eq!(r.limit(addr2.clone(), n, &t2, LocalTime::from_secs(1)), true);
-    }
-}
diff --git a/radicle-node/src/service/message.rs b/radicle-node/src/service/message.rs
deleted file mode 100644
index 45201b3b5..000000000
--- a/radicle-node/src/service/message.rs
+++ /dev/null
@@ -1,695 +0,0 @@
-use std::{fmt, io, mem};
-
-use nonempty::NonEmpty;
-use radicle::git;
-use radicle::storage::refs::RefsAt;
-
-use crate::crypto;
-use crate::identity::RepoId;
-use crate::node;
-use crate::node::{Address, Alias, UserAgent};
-use crate::prelude::BoundedVec;
-use crate::service::filter::Filter;
-use crate::service::{Link, NodeId, Timestamp};
-use crate::storage;
-use crate::wire;
-
-/// Maximum number of addresses which can be announced to other nodes.
-pub const ADDRESS_LIMIT: usize = 16;
-/// Maximum number of repository remotes that can be included in a [`RefsAnnouncement`] message.
-pub const REF_REMOTE_LIMIT: usize = 1024;
-/// Maximum number of inventory which can be announced to other nodes.
-pub const INVENTORY_LIMIT: usize = 2973;
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Subscribe {
-    /// Subscribe to events matching this filter.
-    pub filter: Filter,
-    /// Request messages since this time.
-    pub since: Timestamp,
-    /// Request messages until this time.
-    pub until: Timestamp,
-}
-
-impl Subscribe {
-    pub fn all() -> Self {
-        Self {
-            filter: Filter::default(),
-            since: Timestamp::MIN,
-            until: Timestamp::MAX,
-        }
-    }
-}
-
-/// Node announcing itself to the network.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct NodeAnnouncement {
-    /// Supported protocol version.
-    pub version: u8,
-    /// Advertized features.
-    pub features: node::Features,
-    /// Monotonic timestamp.
-    pub timestamp: Timestamp,
-    /// Non-unique alias.
-    pub alias: Alias,
-    /// Announced addresses.
-    pub addresses: BoundedVec<Address, ADDRESS_LIMIT>,
-    /// Nonce used for announcement proof-of-work.
-    pub nonce: u64,
-    /// User-agent string.
-    pub agent: UserAgent,
-}
-
-impl NodeAnnouncement {
-    /// Calculate the amount of work that went into creating this announcement.
-    ///
-    /// Proof-of-work uses the [`scrypt`] algorithm with the parameters in
-    /// [`Announcement::POW_PARAMS`]. The "work" is calculated by counting the number of leading
-    /// zero bits after running `scrypt` on a serialized [`NodeAnnouncement`] using
-    /// [`wire::serialize`].
-    ///
-    /// In other words, `work = leading-zeros(scrypt(serialize(announcement)))`.
-    ///
-    /// Higher numbers mean higher difficulty. For each increase in work, difficulty is doubled.
-    /// For instance, an output of `7` is *four* times more work than an output of `5`.
-    ///
-    pub fn work(&self) -> u32 {
-        let (n, r, p) = Announcement::POW_PARAMS;
-        let params = scrypt::Params::new(n, r, p, 32).expect("proof-of-work parameters are valid");
-        let mut output = [0u8; 32];
-
-        scrypt::scrypt(
-            wire::serialize(self).as_ref(),
-            Announcement::POW_SALT,
-            &params,
-            &mut output,
-        )
-        .expect("proof-of-work output vector is a valid length");
-
-        // Calculate the number of leading zero bits in the output vector.
-        if let Some((zero_bytes, non_zero)) = output.iter().enumerate().find(|(_, &x)| x != 0) {
-            zero_bytes as u32 * 8 + non_zero.leading_zeros()
-        } else {
-            output.len() as u32 * 8
-        }
-    }
-
-    /// Solve the proof-of-work of a node announcement for the given target, by iterating through
-    /// different nonces.
-    ///
-    /// If the given difficulty target is too high, there may not be a result. In that case, `None`
-    /// is returned.
-    pub fn solve(mut self, target: u32) -> Option<Self> {
-        loop {
-            if let Some(nonce) = self.nonce.checked_add(1) {
-                self.nonce = nonce;
-
-                if self.work() >= target {
-                    break;
-                }
-            } else {
-                return None;
-            }
-        }
-        Some(self)
-    }
-}
-
-impl wire::Encode for NodeAnnouncement {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        let mut n = 0;
-
-        n += self.version.encode(writer)?;
-        n += self.features.encode(writer)?;
-        n += self.timestamp.encode(writer)?;
-        n += self.alias.encode(writer)?;
-        n += self.addresses.encode(writer)?;
-        n += self.nonce.encode(writer)?;
-        n += self.agent.encode(writer)?;
-
-        Ok(n)
-    }
-}
-
-impl wire::Decode for NodeAnnouncement {
-    fn decode<R: std::io::Read + ?Sized>(reader: &mut R) -> Result<Self, wire::Error> {
-        let version = u8::decode(reader)?;
-        let features = node::Features::decode(reader)?;
-        let timestamp = Timestamp::decode(reader)?;
-        let alias = wire::Decode::decode(reader)?;
-        let addresses = BoundedVec::<Address, ADDRESS_LIMIT>::decode(reader)?;
-        let nonce = u64::decode(reader)?;
-        let agent = match UserAgent::decode(reader) {
-            Ok(ua) => ua,
-            Err(e) if e.is_eof() => UserAgent::default(),
-            Err(e) => return Err(e),
-        };
-
-        Ok(Self {
-            version,
-            features,
-            timestamp,
-            alias,
-            addresses,
-            nonce,
-            agent,
-        })
-    }
-}
-
-/// Node announcing project refs being created or updated.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct RefsAnnouncement {
-    /// Repository identifier.
-    pub rid: RepoId,
-    /// Updated `rad/sigrefs`.
-    pub refs: BoundedVec<RefsAt, REF_REMOTE_LIMIT>,
-    /// Time of announcement.
-    pub timestamp: Timestamp,
-}
-
-/// Track the status of `RefsAt` within a given repository.
-#[derive(Default)]
-pub struct RefsStatus {
-    /// The `rad/sigrefs` was missing or it's ahead of the local
-    /// `rad/sigrefs`. We want it.
-    pub want: Vec<RefsAt>,
-    /// The `rad/sigrefs` has been seen before. We already have it.
-    pub have: Vec<RefsAt>,
-}
-
-impl RefsStatus {
-    /// Get the set of `want` and `have` `RefsAt`'s for the given
-    /// announcement.
-    ///
-    /// Nb. We use the refs database as a cache for quick lookups. This does *not* check
-    /// for ancestry matches, since we don't cache the whole history (only the tips).
-    /// This, however, is not a problem because the signed refs branch is fast-forward only,
-    /// and old refs announcements will be discarded due to their lower timestamps.
-    pub fn new<D: node::refs::Store>(
-        rid: RepoId,
-        refs: NonEmpty<RefsAt>,
-        db: &D,
-    ) -> Result<RefsStatus, storage::Error> {
-        let mut status = RefsStatus::default();
-        for theirs in refs.iter() {
-            status.insert(&rid, *theirs, db)?;
-        }
-        Ok(status)
-    }
-
-    fn insert<D: node::refs::Store>(
-        &mut self,
-        repo: &RepoId,
-        theirs: RefsAt,
-        db: &D,
-    ) -> Result<(), storage::Error> {
-        match db.get(repo, &theirs.remote, &storage::refs::SIGREFS_BRANCH) {
-            Ok(Some((ours, _))) => {
-                if theirs.at != ours {
-                    self.want.push(theirs);
-                } else {
-                    self.have.push(theirs);
-                }
-            }
-            Ok(None) => {
-                self.want.push(theirs);
-            }
-            Err(e) => {
-                log::warn!(
-                    target: "service",
-                    "Error getting cached ref of {repo} for refs status: {e}"
-                );
-            }
-        }
-        Ok(())
-    }
-}
-
-/// Node announcing its inventory to the network.
-/// This should be the whole inventory every time.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct InventoryAnnouncement {
-    /// Node inventory.
-    pub inventory: BoundedVec<RepoId, INVENTORY_LIMIT>,
-    /// Time of announcement.
-    pub timestamp: Timestamp,
-}
-
-/// Node announcing information to a connected peer.
-///
-/// This should not be relayed and should be used to send an
-/// informational message a peer.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum Info {
-    /// Tell a node that sent a refs announcement that it was already synced at the given `Oid`,
-    /// for this particular `rid`.
-    RefsAlreadySynced { rid: RepoId, at: git::Oid },
-}
-
-/// Announcement messages are messages that are relayed between peers.
-#[derive(Clone, PartialEq, Eq)]
-pub enum AnnouncementMessage {
-    /// Inventory announcement.
-    Inventory(InventoryAnnouncement),
-    /// Node announcement.
-    Node(NodeAnnouncement),
-    /// Refs announcement.
-    Refs(RefsAnnouncement),
-}
-
-impl AnnouncementMessage {
-    /// Sign this announcement message.
-    pub fn signed<G: crypto::Signer>(self, signer: &G) -> Announcement {
-        let msg = wire::serialize(&self);
-        let signature = signer.sign(&msg);
-
-        Announcement {
-            node: *signer.public_key(),
-            message: self,
-            signature,
-        }
-    }
-
-    pub fn timestamp(&self) -> Timestamp {
-        match self {
-            Self::Inventory(InventoryAnnouncement { timestamp, .. }) => *timestamp,
-            Self::Refs(RefsAnnouncement { timestamp, .. }) => *timestamp,
-            Self::Node(NodeAnnouncement { timestamp, .. }) => *timestamp,
-        }
-    }
-
-    pub fn is_node_announcement(&self) -> bool {
-        matches!(self, Self::Node(_))
-    }
-}
-
-impl From<NodeAnnouncement> for AnnouncementMessage {
-    fn from(ann: NodeAnnouncement) -> Self {
-        Self::Node(ann)
-    }
-}
-
-impl From<InventoryAnnouncement> for AnnouncementMessage {
-    fn from(ann: InventoryAnnouncement) -> Self {
-        Self::Inventory(ann)
-    }
-}
-
-impl From<RefsAnnouncement> for AnnouncementMessage {
-    fn from(ann: RefsAnnouncement) -> Self {
-        Self::Refs(ann)
-    }
-}
-
-impl fmt::Debug for AnnouncementMessage {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Node(message) => write!(f, "Node({})", message.timestamp),
-            Self::Inventory(message) => {
-                write!(
-                    f,
-                    "Inventory([{}], {})",
-                    message
-                        .inventory
-                        .iter()
-                        .map(|i| i.to_string())
-                        .collect::<Vec<String>>()
-                        .join(", "),
-                    message.timestamp
-                )
-            }
-            Self::Refs(message) => {
-                write!(
-                    f,
-                    "Refs({}, {}, {:?})",
-                    message.rid, message.timestamp, message.refs
-                )
-            }
-        }
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Announcement {
-    /// Node identifier.
-    pub node: NodeId,
-    /// Signature over the announcement.
-    pub signature: crypto::Signature,
-    /// Unsigned node announcement.
-    pub message: AnnouncementMessage,
-}
-
-impl Announcement {
-    /// Proof-of-work parameters for announcements.
-    ///
-    /// These parameters are fed into `scrypt`.
-    /// They represent the `log2(N)`, `r`, `p` parameters, respectively.
-    ///
-    /// * log2(N) – iterations count (affects memory and CPU usage), e.g. 15
-    /// * r – block size (affects memory and CPU usage), e.g. 8
-    /// * p – parallelism factor (threads to run in parallel - affects the memory, CPU usage), usually 1
-    ///
-    /// `15, 8, 1` are usually the recommended parameters.
-    ///
-    #[cfg(debug_assertions)]
-    pub const POW_PARAMS: (u8, u32, u32) = (1, 1, 1);
-    #[cfg(not(debug_assertions))]
-    pub const POW_PARAMS: (u8, u32, u32) = (15, 8, 1);
-    /// Salt used for generating PoW.
-    pub const POW_SALT: &'static [u8] = &[b'r', b'a', b'd'];
-
-    /// Verify this announcement's signature.
-    pub fn verify(&self) -> bool {
-        let msg = wire::serialize(&self.message);
-        self.node.verify(msg, &self.signature).is_ok()
-    }
-
-    pub fn matches(&self, filter: &Filter) -> bool {
-        match &self.message {
-            AnnouncementMessage::Inventory(_) => true,
-            AnnouncementMessage::Node(_) => true,
-            AnnouncementMessage::Refs(RefsAnnouncement { rid, .. }) => filter.contains(rid),
-        }
-    }
-
-    /// Check whether this announcement is of the same variant as another.
-    pub fn variant_eq(&self, other: &Self) -> bool {
-        std::mem::discriminant(&self.message) == std::mem::discriminant(&other.message)
-    }
-
-    /// Get the announcement timestamp.
-    pub fn timestamp(&self) -> Timestamp {
-        self.message.timestamp()
-    }
-}
-
-/// Message payload.
-/// These are the messages peers send to each other.
-#[derive(Clone, PartialEq, Eq)]
-pub enum Message {
-    /// Subscribe to gossip messages matching the filter and time range.
-    Subscribe(Subscribe),
-
-    /// Gossip announcement. These messages are relayed to peers, and filtered
-    /// using [`Message::Subscribe`].
-    Announcement(Announcement),
-
-    /// Informational message. These messages are sent between peers for information
-    /// and do not need to be acted upon. They can be safely ignored, though handling
-    /// them can be useful for the user.
-    Info(Info),
-
-    /// Ask a connected peer for a Pong.
-    ///
-    /// Used to check if the remote peer is responsive, or a side-effect free way to keep a
-    /// connection alive.
-    Ping(Ping),
-
-    /// Response to `Ping` message.
-    Pong {
-        /// The pong payload.
-        zeroes: ZeroBytes,
-    },
-}
-
-impl PartialOrd for Message {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for Message {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        let this = wire::serialize(self);
-        let other = wire::serialize(other);
-
-        this.cmp(&other)
-    }
-}
-
-impl Message {
-    pub fn announcement(
-        node: NodeId,
-        message: impl Into<AnnouncementMessage>,
-        signature: crypto::Signature,
-    ) -> Self {
-        Announcement {
-            node,
-            signature,
-            message: message.into(),
-        }
-        .into()
-    }
-
-    pub fn node<G: crypto::Signer>(message: NodeAnnouncement, signer: &G) -> Self {
-        AnnouncementMessage::from(message).signed(signer).into()
-    }
-
-    pub fn inventory<G: crypto::Signer>(message: InventoryAnnouncement, signer: &G) -> Self {
-        AnnouncementMessage::from(message).signed(signer).into()
-    }
-
-    pub fn subscribe(filter: Filter, since: Timestamp, until: Timestamp) -> Self {
-        Self::Subscribe(Subscribe {
-            filter,
-            since,
-            until,
-        })
-    }
-
-    pub fn log(&self, level: log::Level, remote: &NodeId, link: Link) {
-        if !log::log_enabled!(level) {
-            return;
-        }
-        let (verb, prep) = if link.is_inbound() {
-            ("Received", "from")
-        } else {
-            ("Sending", "to")
-        };
-        let msg = match self {
-            Self::Announcement(Announcement { node, message, .. }) => match message {
-                AnnouncementMessage::Node(NodeAnnouncement { addresses, timestamp, .. }) => format!(
-                    "{verb} node announcement of {node} with {} address(es) {prep} {remote} (t={timestamp})",
-                    addresses.len()
-                ),
-                AnnouncementMessage::Refs(RefsAnnouncement { rid, refs, timestamp }) => format!(
-                    "{verb} refs announcement of {node} for {rid} with {} remote(s) {prep} {remote} (t={timestamp})",
-                    refs.len()
-                ),
-                AnnouncementMessage::Inventory(InventoryAnnouncement { inventory, timestamp }) => {
-                    format!(
-                        "{verb} inventory announcement of {node} with {} item(s) {prep} {remote} (t={timestamp})",
-                        inventory.len()
-                    )
-                }
-            },
-            Self::Info(Info::RefsAlreadySynced { rid,  .. }) => {
-                format!(
-                    "{verb} `refs-already-synced` info {prep} {remote} for {rid}"
-                )
-            },
-            Self::Ping { .. } => format!("{verb} ping {prep} {remote}"),
-            Self::Pong { .. } => format!("{verb} pong {prep} {remote}"),
-            Self::Subscribe(Subscribe { .. }) => {
-                format!("{verb} subscription filter {prep} {remote}")
-            }
-        };
-        log::log!(target: "service", level, "{msg}");
-    }
-}
-
-/// A ping message.
-#[derive(Debug, PartialEq, Eq, Clone)]
-pub struct Ping {
-    /// The requested length of the pong message.
-    pub ponglen: wire::Size,
-    /// Zero bytes (ignored).
-    pub zeroes: ZeroBytes,
-}
-
-impl Ping {
-    /// Maximum number of zero bytes in a ping message.
-    pub const MAX_PING_ZEROES: wire::Size = Message::MAX_SIZE // Message size without the type.
-        - mem::size_of::<wire::Size>() as wire::Size // Account for pong length.
-        - mem::size_of::<wire::Size>() as wire::Size; // Account for zeroes length prefix.
-
-    /// Maximum number of zero bytes in a pong message.
-    pub const MAX_PONG_ZEROES: wire::Size =
-        Message::MAX_SIZE - mem::size_of::<wire::Size>() as wire::Size; // Account for zeroes length
-                                                                        // prefix.
-
-    pub fn new(rng: &mut fastrand::Rng) -> Self {
-        let ponglen = rng.u16(0..Self::MAX_PONG_ZEROES);
-
-        Ping {
-            ponglen,
-            zeroes: ZeroBytes::new(rng.u16(0..Self::MAX_PING_ZEROES)),
-        }
-    }
-}
-
-impl From<Announcement> for Message {
-    fn from(ann: Announcement) -> Self {
-        Self::Announcement(ann)
-    }
-}
-
-impl From<Info> for Message {
-    fn from(info: Info) -> Self {
-        Self::Info(info)
-    }
-}
-
-impl fmt::Debug for Message {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Subscribe(Subscribe { since, until, .. }) => {
-                write!(f, "Subscribe({since}..{until})")
-            }
-            Self::Announcement(Announcement { node, message, .. }) => {
-                write!(f, "Announcement({node}, {message:?})")
-            }
-            Self::Info(info) => {
-                write!(f, "Info({info:?})")
-            }
-            Self::Ping(Ping { ponglen, zeroes }) => write!(f, "Ping({ponglen}, {zeroes:?})"),
-            Self::Pong { zeroes } => write!(f, "Pong({zeroes:?})"),
-        }
-    }
-}
-
-/// Represents a vector of zeroes of a certain length.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct ZeroBytes(wire::Size);
-
-impl ZeroBytes {
-    pub fn new(size: wire::Size) -> Self {
-        ZeroBytes(size)
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.0 == 0
-    }
-
-    pub fn len(&self) -> usize {
-        self.0.into()
-    }
-}
-
-#[cfg(test)]
-#[allow(clippy::unwrap_used)]
-mod tests {
-    use std::str::FromStr;
-
-    use fastrand;
-    use qcheck_macros::quickcheck;
-    use radicle::git::raw;
-
-    use super::*;
-    use crate::crypto::test::signer::MockSigner;
-    use crate::prelude::*;
-    use crate::test::arbitrary;
-    use crate::wire::Encode;
-
-    #[test]
-    fn test_ref_remote_limit() {
-        let mut refs = BoundedVec::<_, REF_REMOTE_LIMIT>::new();
-        let signer = MockSigner::default();
-        let at = raw::Oid::zero().into();
-
-        assert_eq!(refs.capacity(), REF_REMOTE_LIMIT);
-
-        for _ in 0..refs.capacity() {
-            refs.push(RefsAt {
-                remote: *signer.public_key(),
-                at,
-            })
-            .unwrap();
-        }
-
-        let msg: Message = AnnouncementMessage::from(RefsAnnouncement {
-            rid: arbitrary::gen(1),
-            refs,
-            timestamp: LocalTime::now().into(),
-        })
-        .signed(&MockSigner::default())
-        .into();
-
-        let mut buf: Vec<u8> = Vec::new();
-        assert!(msg.encode(&mut buf).is_ok());
-
-        let decoded = wire::deserialize(buf.as_slice());
-        assert!(decoded.is_ok());
-        assert_eq!(msg, decoded.unwrap());
-    }
-
-    #[test]
-    fn test_inventory_limit() {
-        let msg = Message::inventory(
-            InventoryAnnouncement {
-                inventory: arbitrary::vec(INVENTORY_LIMIT)
-                    .try_into()
-                    .expect("size within bounds limit"),
-                timestamp: LocalTime::now().into(),
-            },
-            &MockSigner::default(),
-        );
-        let mut buf: Vec<u8> = Vec::new();
-        assert!(
-            msg.encode(&mut buf).is_ok(),
-            "INVENTORY_LIMIT is a valid limit for encoding",
-        );
-
-        let decoded = wire::deserialize(buf.as_slice());
-        assert!(
-            decoded.is_ok(),
-            "INVENTORY_LIMIT is a valid limit for decoding"
-        );
-        assert_eq!(
-            msg,
-            decoded.unwrap(),
-            "encoding and decoding should be safe for message at INVENTORY_LIMIT",
-        );
-    }
-
-    #[quickcheck]
-    fn prop_refs_announcement_signing(rid: RepoId) {
-        let signer = MockSigner::new(&mut fastrand::Rng::new());
-        let timestamp = Timestamp::EPOCH;
-        let at = raw::Oid::zero().into();
-        let refs = BoundedVec::collect_from(
-            &mut [RefsAt {
-                remote: *signer.public_key(),
-                at,
-            }]
-            .into_iter(),
-        );
-        let message = AnnouncementMessage::Refs(RefsAnnouncement {
-            rid,
-            refs,
-            timestamp,
-        });
-        let ann = message.signed(&signer);
-
-        assert!(ann.verify());
-    }
-
-    #[test]
-    fn test_node_announcement_validate() {
-        let ann = NodeAnnouncement {
-            version: 1,
-            features: node::Features::SEED,
-            timestamp: Timestamp::try_from(42491841u64).unwrap(),
-            alias: Alias::new("alice"),
-            addresses: BoundedVec::new(),
-            nonce: 0,
-            agent: UserAgent::from_str("/heartwood:1.0.0/").unwrap(),
-        };
-
-        assert_eq!(ann.work(), 1);
-        assert_eq!(ann.clone().solve(1).unwrap().work(), 1);
-        assert_eq!(ann.clone().solve(8).unwrap().work(), 10);
-        assert_eq!(ann.solve(14).unwrap().work(), 14);
-    }
-}
diff --git a/radicle-node/src/service/session.rs b/radicle-node/src/service/session.rs
deleted file mode 100644
index 91f665e0d..000000000
--- a/radicle-node/src/service/session.rs
+++ /dev/null
@@ -1,346 +0,0 @@
-use std::collections::{HashSet, VecDeque};
-use std::{fmt, time};
-
-use crossbeam_channel as chan;
-
-use crate::node::config::Limits;
-use crate::node::{FetchResult, Severity};
-use crate::service::message;
-use crate::service::message::Message;
-use crate::service::{Address, LocalDuration, LocalTime, NodeId, Outbox, RepoId, Rng};
-use crate::storage::refs::RefsAt;
-use crate::{Link, Timestamp};
-
-pub use crate::node::{PingState, State};
-
-/// Time after which a connection is considered stable.
-pub const CONNECTION_STABLE_THRESHOLD: LocalDuration = LocalDuration::from_mins(1);
-/// Maximum items in the fetch queue.
-pub const MAX_FETCH_QUEUE_SIZE: usize = 128;
-
-#[derive(thiserror::Error, Debug, Clone, Copy)]
-pub enum Error {
-    /// The remote peer sent an invalid announcement timestamp,
-    /// for eg. a timestamp far in the future.
-    #[error("invalid announcement timestamp: {0}")]
-    InvalidTimestamp(Timestamp),
-    /// The remote peer sent git protocol messages while we were expecting
-    /// gossip messages. Or vice-versa.
-    #[error("protocol mismatch")]
-    ProtocolMismatch,
-    /// The remote peer did something that violates the protocol rules.
-    #[error("peer misbehaved")]
-    Misbehavior,
-    /// The remote peer timed out.
-    #[error("peer timed out")]
-    Timeout,
-}
-
-impl Error {
-    /// Return the severity for this error.
-    pub fn severity(&self) -> Severity {
-        match self {
-            Self::InvalidTimestamp(_) => Severity::High,
-            Self::ProtocolMismatch => Severity::High,
-            Self::Misbehavior => Severity::High,
-            Self::Timeout => Severity::Low,
-        }
-    }
-}
-
-/// Error when trying to queue a fetch.
-#[derive(thiserror::Error, Debug, Clone)]
-pub enum QueueError {
-    /// The item already exists in the queue.
-    #[error("item is already queued")]
-    Duplicate(QueuedFetch),
-    /// The queue is at capacity.
-    #[error("queue capacity reached")]
-    CapacityReached(QueuedFetch),
-}
-
-impl QueueError {
-    /// Get the inner [`QueuedFetch`].
-    pub fn inner(&self) -> &QueuedFetch {
-        match self {
-            Self::Duplicate(f) => f,
-            Self::CapacityReached(f) => f,
-        }
-    }
-}
-
-/// Fetch waiting to be processed, in the fetch queue.
-#[derive(Debug, Clone)]
-pub struct QueuedFetch {
-    /// Repo being fetched.
-    pub rid: RepoId,
-    /// Peer being fetched from.
-    pub from: NodeId,
-    /// Refs being fetched.
-    pub refs_at: Vec<RefsAt>,
-    /// The timeout given for the fetch request.
-    pub timeout: time::Duration,
-    /// Result channel.
-    pub channel: Option<chan::Sender<FetchResult>>,
-}
-
-impl PartialEq for QueuedFetch {
-    fn eq(&self, other: &Self) -> bool {
-        self.rid == other.rid
-            && self.from == other.from
-            && self.refs_at == other.refs_at
-            && self.channel.is_none()
-            && other.channel.is_none()
-    }
-}
-
-/// A peer session. Each connected peer will have one session.
-#[derive(Debug, Clone)]
-pub struct Session {
-    /// Peer id.
-    pub id: NodeId,
-    /// Peer address.
-    pub addr: Address,
-    /// Connection direction.
-    pub link: Link,
-    /// Whether we should attempt to re-connect
-    /// to this peer upon disconnection.
-    pub persistent: bool,
-    /// Peer connection state.
-    pub state: State,
-    /// Peer subscription.
-    pub subscribe: Option<message::Subscribe>,
-    /// Last time a message was received from the peer.
-    pub last_active: LocalTime,
-    /// Fetch queue.
-    pub queue: VecDeque<QueuedFetch>,
-
-    /// Connection attempts. For persistent peers, Tracks
-    /// how many times we've attempted to connect. We reset this to zero
-    /// upon successful connection, once the connection is stable.
-    attempts: usize,
-    /// Source of entropy.
-    rng: Rng,
-    /// Protocol limits.
-    limits: Limits,
-}
-
-impl fmt::Display for Session {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let mut attrs = Vec::new();
-        let state = self.state.to_string();
-
-        if self.link.is_inbound() {
-            attrs.push("inbound");
-        } else {
-            attrs.push("outbound");
-        }
-        if self.persistent {
-            attrs.push("persistent");
-        }
-        attrs.push(state.as_str());
-
-        write!(f, "{} [{}]", self.id, attrs.join(" "))
-    }
-}
-
-impl Session {
-    pub fn outbound(id: NodeId, addr: Address, persistent: bool, rng: Rng, limits: Limits) -> Self {
-        Self {
-            id,
-            addr,
-            state: State::Initial,
-            link: Link::Outbound,
-            subscribe: None,
-            persistent,
-            last_active: LocalTime::default(),
-            queue: VecDeque::with_capacity(MAX_FETCH_QUEUE_SIZE),
-            attempts: 1,
-            rng,
-            limits,
-        }
-    }
-
-    pub fn inbound(
-        id: NodeId,
-        addr: Address,
-        persistent: bool,
-        rng: Rng,
-        time: LocalTime,
-        limits: Limits,
-    ) -> Self {
-        Self {
-            id,
-            addr,
-            state: State::Connected {
-                since: time,
-                ping: PingState::default(),
-                fetching: HashSet::default(),
-                latencies: VecDeque::default(),
-                stable: false,
-            },
-            link: Link::Inbound,
-            subscribe: None,
-            persistent,
-            last_active: time,
-            queue: VecDeque::new(),
-            attempts: 0,
-            rng,
-            limits,
-        }
-    }
-
-    pub fn is_connecting(&self) -> bool {
-        matches!(self.state, State::Attempted { .. })
-    }
-
-    pub fn is_stable(&self) -> bool {
-        matches!(self.state, State::Connected { stable: true, .. })
-    }
-
-    pub fn is_connected(&self) -> bool {
-        self.state.is_connected()
-    }
-
-    pub fn is_disconnected(&self) -> bool {
-        matches!(self.state, State::Disconnected { .. })
-    }
-
-    pub fn is_initial(&self) -> bool {
-        matches!(self.state, State::Initial)
-    }
-
-    pub fn is_at_capacity(&self) -> bool {
-        if let State::Connected { fetching, .. } = &self.state {
-            if fetching.len() >= self.limits.fetch_concurrency {
-                return true;
-            }
-        }
-        false
-    }
-
-    pub fn is_fetching(&self, rid: &RepoId) -> bool {
-        if let State::Connected { fetching, .. } = &self.state {
-            return fetching.contains(rid);
-        }
-        false
-    }
-
-    /// Queue a fetch. Returns `true` if it was added to the queue, and `false` if
-    /// it already was present in the queue.
-    pub fn queue_fetch(&mut self, fetch: QueuedFetch) -> Result<(), QueueError> {
-        assert_eq!(fetch.from, self.id);
-
-        if self.queue.len() >= MAX_FETCH_QUEUE_SIZE {
-            return Err(QueueError::CapacityReached(fetch));
-        } else if self.queue.contains(&fetch) {
-            return Err(QueueError::Duplicate(fetch));
-        }
-        self.queue.push_back(fetch);
-
-        Ok(())
-    }
-
-    pub fn dequeue_fetch(&mut self) -> Option<QueuedFetch> {
-        self.queue.pop_front()
-    }
-
-    pub fn attempts(&self) -> usize {
-        self.attempts
-    }
-
-    /// Run 'idle' task for session.
-    pub fn idle(&mut self, now: LocalTime) {
-        if let State::Connected {
-            since,
-            ref mut stable,
-            ..
-        } = self.state
-        {
-            if now >= since && now.duration_since(since) >= CONNECTION_STABLE_THRESHOLD {
-                *stable = true;
-                // Reset number of attempts for stable connections.
-                self.attempts = 0;
-            }
-        }
-    }
-
-    /// Mark this session as fetching the given RID.
-    ///
-    /// # Panics
-    ///
-    /// If it is already fetching that RID, or the session is disconnected.
-    pub fn fetching(&mut self, rid: RepoId) {
-        if let State::Connected { fetching, .. } = &mut self.state {
-            assert!(
-                fetching.insert(rid),
-                "Session must not already be fetching {rid}"
-            );
-        } else {
-            panic!(
-                "Attempting to fetch {rid} from disconnected session {}",
-                self.id
-            );
-        }
-    }
-
-    pub fn fetched(&mut self, rid: RepoId) {
-        if let State::Connected { fetching, .. } = &mut self.state {
-            if !fetching.remove(&rid) {
-                log::warn!(target: "service", "Fetched unknown repository {rid}");
-            }
-        }
-    }
-
-    pub fn to_attempted(&mut self) {
-        assert!(
-            self.is_initial(),
-            "Can only transition to 'attempted' state from 'initial' state"
-        );
-        self.state = State::Attempted;
-        self.attempts += 1;
-    }
-
-    pub fn to_connected(&mut self, since: LocalTime) {
-        self.last_active = since;
-
-        if let State::Connected { .. } = &self.state {
-            log::error!(target: "service", "Session {} is already in 'connected' state, resetting..", self.id);
-        };
-        self.state = State::Connected {
-            since,
-            ping: PingState::default(),
-            fetching: HashSet::default(),
-            latencies: VecDeque::default(),
-            stable: false,
-        };
-    }
-
-    /// Move the session state to "disconnected". Returns any pending RID
-    /// that was requested.
-    pub fn to_disconnected(&mut self, since: LocalTime, retry_at: LocalTime) {
-        self.state = State::Disconnected { since, retry_at };
-    }
-
-    /// Return to initial state from disconnected state. This state transition
-    /// happens when we attempt to re-connect to a disconnected peer.
-    pub fn to_initial(&mut self) {
-        assert!(
-            self.is_disconnected(),
-            "Can only transition to 'initial' state from 'disconnected' state"
-        );
-        self.state = State::Initial;
-    }
-
-    pub fn ping(&mut self, since: LocalTime, reactor: &mut Outbox) -> Result<(), Error> {
-        if let State::Connected { ping, .. } = &mut self.state {
-            let msg = message::Ping::new(&mut self.rng);
-            *ping = PingState::AwaitingResponse {
-                len: msg.ponglen,
-                since,
-            };
-            reactor.write(self, Message::Ping(msg));
-        }
-        Ok(())
-    }
-}
diff --git a/radicle-node/src/test.rs b/radicle-node/src/test.rs
deleted file mode 100644
index d32fcae99..000000000
--- a/radicle-node/src/test.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-pub mod arbitrary;
-pub mod environment;
-pub mod gossip;
-pub mod handle;
-pub mod peer;
-pub mod simulator;
-
-pub use radicle::assert_matches;
-pub use radicle::logger::test as logger;
-pub use radicle::test::*;
diff --git a/radicle-node/src/test/arbitrary.rs b/radicle-node/src/test/arbitrary.rs
deleted file mode 100644
index 197288958..000000000
--- a/radicle-node/src/test/arbitrary.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-use std::collections::HashSet;
-
-use bloomy::BloomFilter;
-use qcheck::Arbitrary;
-use radicle::node::UserAgent;
-
-use crate::crypto;
-use crate::identity::DocAt;
-use crate::node::Alias;
-use crate::prelude::{BoundedVec, NodeId, RepoId, Timestamp};
-use crate::service::filter::{Filter, FILTER_SIZE_L, FILTER_SIZE_M, FILTER_SIZE_S};
-use crate::service::message::{
-    Announcement, Info, InventoryAnnouncement, Message, NodeAnnouncement, Ping, RefsAnnouncement,
-    Subscribe, ZeroBytes,
-};
-use crate::wire::MessageType;
-use crate::worker::fetch::FetchResult;
-
-pub use radicle::test::arbitrary::*;
-
-impl Arbitrary for Filter {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let size = *g
-            .choose(&[FILTER_SIZE_S, FILTER_SIZE_M, FILTER_SIZE_L])
-            .unwrap();
-        let mut bytes = vec![0; size];
-        for _ in 0..64 {
-            let index = usize::arbitrary(g) % bytes.len();
-            bytes[index] = u8::arbitrary(g);
-        }
-        Self::from(BloomFilter::from(bytes))
-    }
-}
-
-impl Arbitrary for FetchResult {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        FetchResult {
-            updated: vec![],
-            namespaces: HashSet::arbitrary(g),
-            clone: bool::arbitrary(g),
-            doc: DocAt::arbitrary(g),
-        }
-    }
-}
-
-impl Arbitrary for Message {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let type_id = g
-            .choose(&[
-                MessageType::InventoryAnnouncement,
-                MessageType::NodeAnnouncement,
-                MessageType::RefsAnnouncement,
-                MessageType::Info,
-                MessageType::Subscribe,
-                MessageType::Ping,
-                MessageType::Pong,
-            ])
-            .unwrap();
-
-        match type_id {
-            MessageType::InventoryAnnouncement => Announcement {
-                node: NodeId::arbitrary(g),
-                message: InventoryAnnouncement {
-                    inventory: BoundedVec::arbitrary(g),
-                    timestamp: Timestamp::arbitrary(g),
-                }
-                .into(),
-                signature: crypto::Signature::from(<[u8; 64]>::arbitrary(g)),
-            }
-            .into(),
-            MessageType::RefsAnnouncement => Announcement {
-                node: NodeId::arbitrary(g),
-                message: RefsAnnouncement {
-                    rid: RepoId::arbitrary(g),
-                    refs: BoundedVec::arbitrary(g),
-                    timestamp: Timestamp::arbitrary(g),
-                }
-                .into(),
-                signature: crypto::Signature::from(<[u8; 64]>::arbitrary(g)),
-            }
-            .into(),
-            MessageType::NodeAnnouncement => {
-                let message = NodeAnnouncement {
-                    version: u8::arbitrary(g),
-                    features: u64::arbitrary(g).into(),
-                    timestamp: Timestamp::arbitrary(g),
-                    alias: Alias::arbitrary(g),
-                    addresses: Arbitrary::arbitrary(g),
-                    nonce: u64::arbitrary(g),
-                    agent: UserAgent::arbitrary(g),
-                }
-                .into();
-                let bytes: [u8; 64] = Arbitrary::arbitrary(g);
-                let signature = crypto::Signature::from(bytes);
-
-                Announcement {
-                    node: NodeId::arbitrary(g),
-                    signature,
-                    message,
-                }
-                .into()
-            }
-            MessageType::Info => {
-                let message = Info::RefsAlreadySynced {
-                    rid: RepoId::arbitrary(g),
-                    at: oid(),
-                };
-                Self::Info(message)
-            }
-            MessageType::Subscribe => Self::Subscribe(Subscribe {
-                filter: Filter::arbitrary(g),
-                since: Timestamp::arbitrary(g),
-                until: Timestamp::arbitrary(g),
-            }),
-            MessageType::Ping => {
-                let mut rng = fastrand::Rng::with_seed(u64::arbitrary(g));
-
-                Self::Ping(Ping::new(&mut rng))
-            }
-            MessageType::Pong => Self::Pong {
-                zeroes: ZeroBytes::new(u16::arbitrary(g).min(Ping::MAX_PONG_ZEROES)),
-            },
-        }
-    }
-}
-
-impl Arbitrary for ZeroBytes {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        ZeroBytes::new(u16::arbitrary(g))
-    }
-}
-
-impl<T, const N: usize> Arbitrary for BoundedVec<T, N>
-where
-    T: Arbitrary + Eq,
-{
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let mut v: Vec<T> = Arbitrary::arbitrary(g);
-        v.truncate(N);
-        v.try_into().expect("size within bounds")
-    }
-}
diff --git a/radicle-node/src/test/environment.rs b/radicle-node/src/test/environment.rs
deleted file mode 100644
index fd3ab43fe..000000000
--- a/radicle-node/src/test/environment.rs
+++ /dev/null
@@ -1,648 +0,0 @@
-use std::io::BufRead as _;
-use std::mem::ManuallyDrop;
-use std::path::{Path, PathBuf};
-use std::{
-    collections::{BTreeMap, BTreeSet},
-    fs, io, iter, net, process, thread, time,
-    time::Duration,
-};
-
-use crossbeam_channel as chan;
-
-use localtime::LocalTime;
-use radicle::cob::cache::COBS_DB_FILE;
-use radicle::cob::issue;
-use radicle::crypto::ssh::{keystore::MemorySigner, Keystore};
-use radicle::crypto::test::signer::MockSigner;
-use radicle::crypto::{KeyPair, Seed, Signer};
-use radicle::git::refname;
-use radicle::identity::{RepoId, Visibility};
-use radicle::node::config::ConnectAddress;
-use radicle::node::policy::store as policy;
-use radicle::node::seed::Store as _;
-use radicle::node::{Alias, Database, UserAgent, POLICIES_DB_FILE};
-use radicle::node::{ConnectOptions, Handle as _};
-use radicle::profile;
-use radicle::profile::{env, Home, Profile};
-use radicle::rad;
-use radicle::storage::{ReadStorage as _, RemoteRepository as _, SignRepository as _};
-use radicle::test::fixtures;
-use radicle::Storage;
-use radicle::{cli, node};
-use radicle::{cob, explorer};
-use radicle::{git, web};
-
-use crate::node::NodeId;
-use crate::service::Event;
-use crate::storage::git::transport;
-use crate::{runtime, runtime::Handle, service, Runtime};
-
-pub use service::Config;
-
-/// Test environment.
-pub struct Environment {
-    tempdir: tempfile::TempDir,
-    users: usize,
-}
-
-impl Default for Environment {
-    fn default() -> Self {
-        Self {
-            tempdir: tempfile::tempdir().unwrap(),
-            users: 0,
-        }
-    }
-}
-
-impl Environment {
-    /// Create a new test environment.
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    /// Return the temp directory path.
-    pub fn tmp(&self) -> PathBuf {
-        self.tempdir.path().join("misc")
-    }
-
-    /// Get the scale or "test size". This is used to scale tests with more data. Defaults to `1`.
-    pub fn scale(&self) -> usize {
-        env::var("RAD_TEST_SCALE")
-            .map(|s| {
-                s.parse()
-                    .expect("repository: invalid value for `RAD_TEST_SCALE`")
-            })
-            .unwrap_or(1)
-    }
-
-    /// Create a new node in this environment. This should be used when a running node
-    /// is required. Use [`Environment::profile`] otherwise.
-    pub fn node(&mut self, node: Config) -> Node<MemorySigner> {
-        let alias = node.alias.clone();
-        let profile = self.profile(profile::Config {
-            node,
-            ..Environment::config(alias)
-        });
-        Node::new(profile)
-    }
-
-    /// Create a new default configuration.
-    pub fn config(alias: Alias) -> profile::Config {
-        profile::Config {
-            node: node::Config::test(alias),
-            cli: cli::Config { hints: false },
-            public_explorer: explorer::Explorer::default(),
-            preferred_seeds: vec![],
-            web: web::Config::default(),
-        }
-    }
-
-    /// Create a new profile in this environment.
-    /// This should be used when a running node is not required.
-    pub fn profile(&mut self, config: profile::Config) -> Profile {
-        let alias = config.alias().clone();
-        let home = Home::new(
-            self.tmp()
-                .join("home")
-                .join(alias.to_string())
-                .join(".radicle"),
-        )
-        .unwrap();
-        let keystore = Keystore::new(&home.keys());
-        let keypair = KeyPair::from_seed(Seed::from([!(self.users as u8); 32]));
-        let policies_db = home.node().join(POLICIES_DB_FILE);
-        let cobs_db = home.cobs().join(COBS_DB_FILE);
-        let now = LocalTime::now();
-
-        config.write(&home.config()).unwrap();
-
-        let storage = Storage::open(
-            home.storage(),
-            git::UserInfo {
-                alias: alias.clone(),
-                key: keypair.pk.into(),
-            },
-        )
-        .unwrap();
-        let public_key = keypair.pk.into();
-
-        policy::Store::open(policies_db).unwrap();
-        cob::cache::Store::open(cobs_db).unwrap();
-        home.database_mut()
-            .unwrap()
-            .init(
-                &public_key,
-                config.node.features(),
-                &Alias::new(alias),
-                &UserAgent::default(),
-                now.into(),
-                config.node.external_addresses.iter(),
-            )
-            .unwrap();
-
-        transport::local::register(storage.clone());
-        keystore.store(keypair.clone(), "radicle", None).unwrap();
-
-        // Ensures that each user has a unique but deterministic public key.
-        self.users += 1;
-
-        Profile {
-            home,
-            storage,
-            keystore,
-            public_key,
-            config,
-        }
-    }
-}
-
-/// A node that can be run.
-pub struct Node<G> {
-    pub id: NodeId,
-    pub home: Home,
-    pub signer: G,
-    pub storage: Storage,
-    pub config: Config,
-    pub db: service::Stores<Database>,
-    pub policies: policy::Store<policy::Write>,
-}
-
-impl Node<MemorySigner> {
-    pub fn new(profile: Profile) -> Self {
-        let signer = MemorySigner::load(&profile.keystore, None).unwrap();
-        let id = *profile.id();
-        let policies_db = profile.home.node().join(POLICIES_DB_FILE);
-        let policies = policy::Store::open(policies_db).unwrap();
-        let db = profile.database_mut().unwrap();
-        let db = service::Stores::from(db);
-
-        Node {
-            id,
-            home: profile.home,
-            config: profile.config.node,
-            signer,
-            db,
-            policies,
-            storage: profile.storage,
-        }
-    }
-}
-
-/// Handle to a running node.
-pub struct NodeHandle<G: Signer + cyphernet::Ecdh + 'static> {
-    pub id: NodeId,
-    pub storage: Storage,
-    pub signer: G,
-    pub home: Home,
-    pub addr: net::SocketAddr,
-    pub thread: ManuallyDrop<thread::JoinHandle<Result<(), runtime::Error>>>,
-    pub handle: ManuallyDrop<Handle>,
-}
-
-impl<G: Signer + cyphernet::Ecdh + 'static> Drop for NodeHandle<G> {
-    fn drop(&mut self) {
-        log::debug!(target: "test", "Node {} shutting down..", self.id);
-
-        unsafe { ManuallyDrop::take(&mut self.handle) }
-            .shutdown()
-            .unwrap();
-        unsafe { ManuallyDrop::take(&mut self.thread) }
-            .join()
-            .unwrap()
-            .unwrap();
-    }
-}
-
-impl<G: Signer + cyphernet::Ecdh> NodeHandle<G> {
-    /// Connect this node to another node, and wait for the connection to be established both ways.
-    pub fn connect(&mut self, remote: &NodeHandle<G>) -> &mut Self {
-        let local_events = self.handle.events();
-        let remote_events = remote.handle.events();
-
-        self.handle
-            .connect(remote.id, remote.addr.into(), ConnectOptions::default())
-            .ok();
-
-        local_events
-            .iter()
-            .find(|e| {
-                matches!(
-                    e, Event::PeerConnected { nid } if nid == &remote.id
-                )
-            })
-            .unwrap();
-        remote_events
-            .iter()
-            .find(|e| {
-                matches!(
-                    e, Event::PeerConnected { nid } if nid == &self.id
-                )
-            })
-            .unwrap();
-
-        self
-    }
-
-    pub fn disconnect(&mut self, remote: &NodeHandle<G>) {
-        self.handle.disconnect(remote.id).unwrap();
-    }
-
-    /// Shutdown node.
-    pub fn shutdown(self) {
-        drop(self)
-    }
-
-    /// Get the full address of this node.
-    pub fn address(&self) -> ConnectAddress {
-        (self.id, node::Address::from(self.addr)).into()
-    }
-
-    /// Get routing table entries.
-    pub fn routing(&self) -> impl Iterator<Item = (RepoId, NodeId)> {
-        use node::routing::Store as _;
-
-        self.home.routing_mut().unwrap().entries().unwrap()
-    }
-
-    pub fn inventory(&self) -> impl Iterator<Item = RepoId> + '_ {
-        self.routing()
-            .filter(|(_, n)| *n == self.id)
-            .map(|(r, _)| r)
-    }
-
-    /// Get sync status of a repo.
-    pub fn synced_seeds(&self, rid: &RepoId) -> Vec<node::seed::SyncedSeed> {
-        let db = Database::reader(self.home.node().join(node::NODE_DB_FILE)).unwrap();
-        let seeds = db.seeds_for(rid).unwrap();
-
-        seeds.into_iter().collect::<Result<Vec<_>, _>>().unwrap()
-    }
-
-    /// Wait until this node's routing table matches the remotes.
-    pub fn converge<'a>(
-        &'a self,
-        remotes: impl IntoIterator<Item = &'a NodeHandle<G>>,
-    ) -> BTreeSet<(RepoId, NodeId)> {
-        converge(iter::once(self).chain(remotes))
-    }
-
-    /// Wait until this node's routing table contains the given routes.
-    #[track_caller]
-    pub fn routes_to(&self, routes: &[(RepoId, NodeId)]) {
-        log::debug!(target: "test", "Waiting for {} to route to {:?}", self.id, routes);
-        let events = self.handle.events();
-
-        loop {
-            let mut remaining: BTreeSet<_> = routes.iter().collect();
-
-            for (rid, nid) in self.routing() {
-                if !remaining.remove(&(rid, nid)) {
-                    log::debug!(target: "test", "Found unexpected route for {}: ({rid}, {nid})", self.id);
-                }
-            }
-            if remaining.is_empty() {
-                break;
-            }
-            events
-                .wait(
-                    |e| matches!(e, Event::SeedDiscovered { .. }).then_some(()),
-                    time::Duration::from_secs(6),
-                )
-                .unwrap();
-        }
-    }
-
-    /// Wait until this node is synced with another node, for the given repository.
-    #[track_caller]
-    pub fn is_synced_with(&mut self, rid: &RepoId, nid: &NodeId) {
-        log::debug!(target: "test", "Waiting for {} to be in sync with {nid} for {rid}", self.id);
-
-        loop {
-            let seeds = self.handle.seeds(*rid).unwrap();
-            if seeds.iter().any(|s| s.nid == *nid && s.is_synced()) {
-                break;
-            }
-            thread::sleep(Duration::from_millis(100));
-        }
-    }
-
-    /// Wait until this node has a repository.
-    #[track_caller]
-    pub fn has_repository(&self, rid: &RepoId) {
-        log::debug!(target: "test", "Waiting for {} to have {rid}", self.id);
-        let events = self.handle.events();
-
-        loop {
-            if self.storage.repository(*rid).is_ok() {
-                log::debug!(target: "test", "Node {} has {rid}", self.id);
-                break;
-            }
-            events
-                .wait(
-                    |e| matches!(e, Event::RefsFetched { .. }).then_some(()),
-                    time::Duration::from_secs(6),
-                )
-                .unwrap();
-        }
-    }
-
-    /// Wait until this node has the inventory of another node.
-    #[track_caller]
-    pub fn has_remote_of(&self, rid: &RepoId, nid: &NodeId) {
-        log::debug!(target: "test", "Waiting for {} to have {rid}/{nid}", self.id);
-        let events = self.handle.events();
-
-        loop {
-            if let Ok(repo) = self.storage.repository(*rid) {
-                if repo.remote(nid).is_ok() {
-                    log::debug!(target: "test", "Node {} has {rid}/{nid}", self.id);
-                    break;
-                }
-            }
-            events
-                .wait(
-                    |e| matches!(e, Event::RefsFetched { .. }).then_some(()),
-                    time::Duration::from_secs(6),
-                )
-                .unwrap();
-        }
-    }
-
-    /// Clone a repo into a directory.
-    pub fn clone<P: AsRef<Path>>(&self, rid: RepoId, cwd: P) -> io::Result<()> {
-        self.rad("clone", &[rid.to_string().as_str()], cwd)
-    }
-
-    /// Fork a repo.
-    pub fn fork<P: AsRef<Path>>(&self, rid: RepoId, cwd: P) -> io::Result<()> {
-        self.clone(rid, &cwd)?;
-        self.rad("fork", &[rid.to_string().as_str()], &cwd)?;
-        self.announce(rid, 1, &cwd)?;
-
-        Ok(())
-    }
-
-    /// Announce a repo.
-    pub fn announce<P: AsRef<Path>>(&self, rid: RepoId, replicas: usize, cwd: P) -> io::Result<()> {
-        self.rad(
-            "sync",
-            &[
-                rid.to_string().as_str(),
-                "--announce",
-                "--replicas",
-                replicas.to_string().as_str(),
-            ],
-            cwd,
-        )
-    }
-
-    /// Init a repo.
-    pub fn init<P: AsRef<Path>>(&self, name: &str, desc: &str, cwd: P) -> io::Result<()> {
-        self.rad(
-            "init",
-            &[
-                "--name",
-                name,
-                "--description",
-                desc,
-                "--default-branch",
-                "master",
-                "--public",
-            ],
-            cwd,
-        )
-    }
-
-    /// Run a `rad` CLI command.
-    pub fn rad<P: AsRef<Path>>(&self, cmd: &str, args: &[&str], cwd: P) -> io::Result<()> {
-        let cwd = cwd.as_ref();
-        log::debug!(target: "test", "Running `rad {cmd} {args:?}` in {}..", cwd.display());
-
-        fs::create_dir_all(cwd)?;
-
-        let result = process::Command::new(snapbox::cmd::cargo_bin("rad"))
-            .env_clear()
-            .envs(env::vars().filter(|(k, _)| k == "PATH"))
-            .env("GIT_AUTHOR_DATE", "1671125284")
-            .env("GIT_AUTHOR_EMAIL", "radicle@localhost")
-            .env("GIT_AUTHOR_NAME", "radicle")
-            .env("GIT_COMMITTER_DATE", "1671125284")
-            .env("GIT_COMMITTER_EMAIL", "radicle@localhost")
-            .env("GIT_COMMITTER_NAME", "radicle")
-            .env(
-                env::RAD_HOME,
-                self.home.path().to_string_lossy().to_string(),
-            )
-            .env(env::RAD_PASSPHRASE, "radicle")
-            .env(env::RAD_LOCAL_TIME, "1671125284")
-            .env("TZ", "UTC")
-            .env("LANG", "C")
-            .envs(git::env::GIT_DEFAULT_CONFIG)
-            .current_dir(cwd)
-            .arg(cmd)
-            .args(args)
-            .output()?;
-
-        for line in io::BufReader::new(io::Cursor::new(&result.stdout))
-            .lines()
-            .map_while(Result::ok)
-        {
-            log::debug!(target: "test", "rad {cmd}: {line}");
-        }
-
-        log::debug!(
-            target: "test",
-            "Ran command `rad {cmd}` (status={})", result.status.code().unwrap()
-        );
-
-        if !result.status.success() {
-            return Err(io::ErrorKind::Other.into());
-        }
-        Ok(())
-    }
-
-    /// Create an [`issue::Issue`] in the `NodeHandle`'s storage.
-    pub fn issue(&self, rid: RepoId, title: &str, desc: &str) -> cob::ObjectId {
-        let repo = self.storage.repository(rid).unwrap();
-        let mut issues = issue::Cache::no_cache(&repo).unwrap();
-        *issues
-            .create(title, desc, &[], &[], [], &self.signer)
-            .unwrap()
-            .id()
-    }
-}
-
-impl Node<MockSigner> {
-    /// Create a new node.
-    pub fn init(base: &Path, config: Config) -> Self {
-        let home = base.join(
-            iter::repeat_with(fastrand::alphanumeric)
-                .take(8)
-                .collect::<String>(),
-        );
-        let home = Home::new(home).unwrap();
-        let signer = MockSigner::default();
-        let storage = Storage::open(
-            home.storage(),
-            git::UserInfo {
-                alias: config.alias.clone(),
-                key: *signer.public_key(),
-            },
-        )
-        .unwrap();
-        let policies = home.policies_mut().unwrap();
-        let db = home.database_mut().unwrap();
-        let db = service::Stores::from(db);
-
-        log::debug!(target: "test", "Node::init {}: {}", config.alias, signer.public_key());
-        Self {
-            id: *signer.public_key(),
-            home,
-            signer,
-            storage,
-            config,
-            db,
-            policies,
-        }
-    }
-}
-
-impl<G: cyphernet::Ecdh<Pk = NodeId> + Signer + Clone> Node<G> {
-    /// Spawn a node in its own thread.
-    pub fn spawn(self) -> NodeHandle<G> {
-        let listen = vec![([0, 0, 0, 0], 0).into()];
-        let (_, signals) = chan::bounded(1);
-        let rt = Runtime::init(
-            self.home.clone(),
-            self.config,
-            listen,
-            signals,
-            self.signer.clone(),
-        )
-        .unwrap();
-        let addr = *rt.local_addrs.first().unwrap();
-        let id = *self.signer.public_key();
-        let handle = ManuallyDrop::new(rt.handle.clone());
-        let thread = ManuallyDrop::new(runtime::thread::spawn(&id, "runtime", move || rt.run()));
-
-        NodeHandle {
-            id,
-            storage: self.storage,
-            signer: self.signer,
-            home: self.home,
-            addr,
-            handle,
-            thread,
-        }
-    }
-
-    /// Populate a storage instance with a project from the given repository.
-    pub fn project_from(
-        &mut self,
-        name: &str,
-        description: &str,
-        repo: &git::raw::Repository,
-    ) -> RepoId {
-        transport::local::register(self.storage.clone());
-
-        let branch = refname!("master");
-        let id = rad::init(
-            repo,
-            name.try_into().unwrap(),
-            description,
-            branch.clone(),
-            Visibility::default(),
-            &self.signer,
-            &self.storage,
-        )
-        .map(|(id, _, _)| id)
-        .unwrap();
-
-        assert!(self.policies.seed(&id, node::policy::Scope::All).unwrap());
-
-        log::debug!(
-            target: "test",
-            "Initialized project {id} for node {}", self.signer.public_key()
-        );
-
-        // Push local branches to storage.
-        let mut refs = Vec::<(git::Qualified, git::Qualified)>::new();
-        for branch in repo.branches(Some(git::raw::BranchType::Local)).unwrap() {
-            let (branch, _) = branch.unwrap();
-            let name = git::RefString::try_from(branch.name().unwrap().unwrap()).unwrap();
-
-            refs.push((
-                git::lit::refs_heads(&name).into(),
-                git::lit::refs_heads(&name).into(),
-            ));
-        }
-        git::push(repo, "rad", refs.iter().map(|(a, b)| (a, b))).unwrap();
-
-        radicle::git::set_upstream(
-            repo,
-            &*radicle::rad::REMOTE_NAME,
-            branch.clone(),
-            radicle::git::refs::workdir::branch(&branch),
-        )
-        .unwrap();
-
-        self.storage
-            .repository(id)
-            .unwrap()
-            .sign_refs(&self.signer)
-            .unwrap();
-
-        id
-    }
-
-    /// Populate a storage instance with a project.
-    pub fn project(&mut self, name: &str, description: &str) -> RepoId {
-        let tmp = tempfile::tempdir().unwrap();
-        let (repo, _) = fixtures::repository(tmp.path());
-
-        self.project_from(name, description, &repo)
-    }
-}
-
-/// Checks whether the nodes have converged in their routing tables.
-#[track_caller]
-pub fn converge<'a, G: Signer + cyphernet::Ecdh + 'static>(
-    nodes: impl IntoIterator<Item = &'a NodeHandle<G>>,
-) -> BTreeSet<(RepoId, NodeId)> {
-    let nodes = nodes.into_iter().collect::<Vec<_>>();
-
-    let mut all_routes = BTreeSet::<(RepoId, NodeId)>::new();
-    let mut remaining = BTreeMap::from_iter(nodes.iter().map(|node| (node.id, node)));
-
-    // First build the set of all routes.
-    for node in &nodes {
-        // Routes from the routing table.
-        for (rid, seed_id) in node.routing() {
-            all_routes.insert((rid, seed_id));
-        }
-        // Routes from the local inventory.
-        for rid in node.inventory() {
-            all_routes.insert((rid, node.id));
-        }
-    }
-
-    // Then, while there are nodes remaining to converge, check each node to see if
-    // its routing table has all routes. If so, remove it from the remaining nodes.
-    while !remaining.is_empty() {
-        remaining.retain(|_, node| {
-            let routing = node.routing();
-            let routes = BTreeSet::from_iter(routing);
-
-            if routes.is_superset(&all_routes) {
-                log::debug!(target: "test", "Node {} has converged", node.id);
-                return false;
-            } else {
-                let diff = all_routes.symmetric_difference(&routes).collect::<Vec<_>>();
-                log::debug!(target: "test", "Node has missing routes: {diff:?}");
-            }
-            true
-        });
-        thread::sleep(Duration::from_millis(100));
-    }
-    all_routes
-}
diff --git a/radicle-node/src/test/gossip.rs b/radicle-node/src/test/gossip.rs
deleted file mode 100644
index 0184e0880..000000000
--- a/radicle-node/src/test/gossip.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-use std::str::FromStr;
-
-use radicle::crypto::test::signer::MockSigner;
-use radicle::node;
-use radicle::node::UserAgent;
-use radicle::test::fixtures::gen;
-
-use crate::test::arbitrary;
-use crate::{
-    prelude::{LocalDuration, LocalTime, Message},
-    service::message::{InventoryAnnouncement, NodeAnnouncement},
-    PROTOCOL_VERSION,
-};
-
-pub fn messages(count: usize, now: LocalTime, delta: LocalDuration) -> Vec<Message> {
-    let mut rng = fastrand::Rng::new();
-    let mut msgs = Vec::new();
-
-    for _ in 0..count {
-        let signer = MockSigner::new(&mut rng);
-        let time = if delta == LocalDuration::from_secs(0) {
-            now
-        } else {
-            let delta = LocalDuration::from_secs(rng.u64(0..delta.as_secs()));
-
-            if rng.bool() {
-                now + delta
-            } else {
-                now - delta
-            }
-        };
-
-        msgs.push(Message::node(
-            NodeAnnouncement {
-                version: PROTOCOL_VERSION,
-                features: node::Features::SEED,
-                timestamp: time.into(),
-                alias: node::Alias::new(gen::string(5)),
-                addresses: None.into(),
-                nonce: 0,
-                agent: UserAgent::from_str("/radicle:test/").unwrap(),
-            }
-            .solve(0)
-            .unwrap(),
-            &signer,
-        ));
-        msgs.push(Message::inventory(
-            InventoryAnnouncement {
-                inventory: arbitrary::vec(3).try_into().unwrap(),
-                timestamp: time.into(),
-            },
-            &signer,
-        ));
-    }
-    msgs
-}
diff --git a/radicle-node/src/test/handle.rs b/radicle-node/src/test/handle.rs
deleted file mode 100644
index 7b3247f13..000000000
--- a/radicle-node/src/test/handle.rs
+++ /dev/null
@@ -1,122 +0,0 @@
-use std::collections::HashSet;
-use std::str::FromStr;
-use std::sync::{Arc, Mutex};
-use std::time;
-
-use radicle::git;
-use radicle::storage::refs::RefsAt;
-
-use crate::identity::RepoId;
-use crate::node::{Alias, Config, ConnectOptions, ConnectResult, Event, FetchResult, Seeds};
-use crate::runtime::HandleError;
-use crate::service::policy;
-use crate::service::NodeId;
-
-#[derive(Default, Clone)]
-pub struct Handle {
-    pub updates: Arc<Mutex<Vec<RepoId>>>,
-    pub seeding: Arc<Mutex<HashSet<RepoId>>>,
-    pub following: Arc<Mutex<HashSet<NodeId>>>,
-}
-
-impl radicle::node::Handle for Handle {
-    type Error = HandleError;
-    type Sessions = Vec<radicle::node::Session>;
-    type Events = Vec<Self::Event>;
-    type Event = Result<Event, Self::Error>;
-
-    fn nid(&self) -> Result<NodeId, Self::Error> {
-        Ok(NodeId::from_str("z6MkhaXgBZDvotDkL5257faiztiGiC2QtKLGpbnnEGta2doK").unwrap())
-    }
-
-    fn is_running(&self) -> bool {
-        true
-    }
-
-    fn listen_addrs(&self) -> Result<Vec<std::net::SocketAddr>, Self::Error> {
-        Ok(vec![])
-    }
-
-    fn config(&self) -> Result<Config, Self::Error> {
-        Ok(Config::new(Alias::new("acme")))
-    }
-
-    fn connect(
-        &mut self,
-        _node: NodeId,
-        _addr: radicle::node::Address,
-        _opts: ConnectOptions,
-    ) -> Result<ConnectResult, Self::Error> {
-        unimplemented!();
-    }
-
-    fn disconnect(&mut self, _node: NodeId) -> Result<(), Self::Error> {
-        unimplemented!();
-    }
-
-    fn seeds(&mut self, _id: RepoId) -> Result<Seeds, Self::Error> {
-        unimplemented!();
-    }
-
-    fn fetch(
-        &mut self,
-        _id: RepoId,
-        _from: NodeId,
-        _timeout: time::Duration,
-    ) -> Result<FetchResult, Self::Error> {
-        Ok(FetchResult::Success {
-            updated: vec![],
-            namespaces: HashSet::new(),
-            clone: false,
-        })
-    }
-
-    fn seed(&mut self, id: RepoId, _scope: policy::Scope) -> Result<bool, Self::Error> {
-        Ok(self.seeding.lock().unwrap().insert(id))
-    }
-
-    fn unseed(&mut self, id: RepoId) -> Result<bool, Self::Error> {
-        Ok(self.seeding.lock().unwrap().remove(&id))
-    }
-
-    fn follow(&mut self, id: NodeId, _alias: Option<Alias>) -> Result<bool, Self::Error> {
-        Ok(self.following.lock().unwrap().insert(id))
-    }
-
-    fn subscribe(&self, _timeout: time::Duration) -> Result<Self::Events, Self::Error> {
-        Ok(vec![])
-    }
-
-    fn unfollow(&mut self, id: NodeId) -> Result<bool, Self::Error> {
-        Ok(self.following.lock().unwrap().remove(&id))
-    }
-
-    fn announce_refs(&mut self, id: RepoId) -> Result<RefsAt, Self::Error> {
-        self.updates.lock().unwrap().push(id);
-
-        Ok(RefsAt {
-            remote: self.nid()?,
-            at: git::raw::Oid::zero().into(),
-        })
-    }
-
-    fn announce_inventory(&mut self) -> Result<(), Self::Error> {
-        Ok(())
-    }
-
-    fn add_inventory(&mut self, _rid: RepoId) -> Result<bool, Self::Error> {
-        unimplemented!()
-    }
-
-    fn sessions(&self) -> Result<Self::Sessions, Self::Error> {
-        unimplemented!();
-    }
-
-    fn shutdown(self) -> Result<(), Self::Error> {
-        Ok(())
-    }
-
-    fn debug(&self) -> Result<serde_json::Value, Self::Error> {
-        Ok(serde_json::Value::Null)
-    }
-}
diff --git a/radicle-node/src/test/peer.rs b/radicle-node/src/test/peer.rs
deleted file mode 100644
index 88f372b23..000000000
--- a/radicle-node/src/test/peer.rs
+++ /dev/null
@@ -1,511 +0,0 @@
-#![allow(dead_code)]
-use std::collections::HashSet;
-use std::iter;
-use std::net;
-use std::ops::{Deref, DerefMut};
-use std::str::FromStr;
-
-use log::*;
-
-use radicle::identity::Visibility;
-use radicle::node::address::Store as _;
-use radicle::node::Database;
-use radicle::node::UserAgent;
-use radicle::node::{address, Alias, ConnectOptions};
-use radicle::rad;
-use radicle::storage::refs::{RefsAt, SignedRefsAt};
-use radicle::storage::{ReadRepository, RemoteRepository};
-use radicle::Storage;
-
-use crate::crypto::test::signer::MockSigner;
-use crate::crypto::Signer;
-use crate::identity::RepoId;
-use crate::node;
-use crate::node::routing::Store as _;
-use crate::prelude::*;
-use crate::runtime::Emitter;
-use crate::service;
-use crate::service::io::Io;
-use crate::service::message::*;
-use crate::service::policy::{Scope, SeedingPolicy};
-use crate::service::*;
-use crate::storage::git::transport::remote;
-use crate::storage::{RemoteId, WriteStorage};
-use crate::test::storage::MockStorage;
-use crate::test::{arbitrary, fixtures, simulator};
-use crate::wire::MessageType;
-use crate::{Link, LocalDuration, LocalTime, PROTOCOL_VERSION};
-
-/// Service instantiation used for testing.
-pub type Service<S, G> = service::Service<Database, S, G>;
-
-#[derive(Debug)]
-pub struct Peer<S, G> {
-    pub name: &'static str,
-    pub service: Service<S, G>,
-    pub id: NodeId,
-    pub ip: net::IpAddr,
-    pub local_time: LocalTime,
-    pub rng: fastrand::Rng,
-    pub local_addr: net::SocketAddr,
-    pub tempdir: tempfile::TempDir,
-
-    initialized: bool,
-}
-
-impl<S, G> simulator::Peer<S, G> for Peer<S, G>
-where
-    S: WriteStorage + 'static,
-    G: Signer + 'static,
-{
-    fn init(&mut self) {}
-
-    fn addr(&self) -> Address {
-        self.address()
-    }
-
-    fn id(&self) -> NodeId {
-        self.id
-    }
-}
-
-impl<S, G> Deref for Peer<S, G> {
-    type Target = Service<S, G>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.service
-    }
-}
-
-impl<S, G> DerefMut for Peer<S, G> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.service
-    }
-}
-
-impl Peer<MockStorage, MockSigner> {
-    pub fn new(name: &'static str, ip: impl Into<net::IpAddr>) -> Self {
-        Self::with_storage(name, ip, MockStorage::empty()).initialized()
-    }
-}
-
-impl<S> Peer<S, MockSigner>
-where
-    S: WriteStorage + 'static,
-{
-    pub fn with_storage(name: &'static str, ip: impl Into<net::IpAddr>, storage: S) -> Self {
-        Self::config(name, ip, storage, Config::default()).initialized()
-    }
-}
-
-pub struct Config<G: Signer + 'static> {
-    pub config: service::Config,
-    pub local_time: LocalTime,
-    pub policy: SeedingPolicy,
-    pub signer: G,
-    pub rng: fastrand::Rng,
-    pub tmp: tempfile::TempDir,
-}
-
-impl Default for Config<MockSigner> {
-    fn default() -> Self {
-        let mut rng = fastrand::Rng::new();
-        let signer = MockSigner::new(&mut rng);
-        let tmp = tempfile::TempDir::new().unwrap();
-        let config = service::Config::test(Alias::from_str("mocky").unwrap());
-
-        Config {
-            config,
-            local_time: LocalTime::now(),
-            policy: SeedingPolicy::default(),
-            signer,
-            rng,
-            tmp,
-        }
-    }
-}
-
-impl<G: Signer> Peer<Storage, G> {
-    pub fn project(&mut self, name: &str, description: &str) -> RepoId {
-        radicle::storage::git::transport::local::register(self.storage().clone());
-
-        let (repo, _) = fixtures::repository(self.tempdir.path().join(name));
-        let (rid, _, _) = rad::init(
-            &repo,
-            name.try_into().unwrap(),
-            description,
-            radicle::git::refname!("master"),
-            Visibility::default(),
-            self.signer(),
-            self.storage(),
-        )
-        .unwrap();
-
-        rid
-    }
-}
-
-impl<S, G> Peer<S, G>
-where
-    S: WriteStorage + 'static,
-    G: Signer + 'static,
-{
-    pub fn config(
-        name: &'static str,
-        ip: impl Into<net::IpAddr>,
-        storage: S,
-        mut config: Config<G>,
-    ) -> Self {
-        let policies = policy::Store::<policy::store::Write>::memory().unwrap();
-        let mut policies = policy::Config::new(config.policy, policies);
-        let id = *config.signer.public_key();
-        let ip = ip.into();
-        let local_addr = net::SocketAddr::new(ip, config.rng.u16(..));
-        let inventory = storage.repositories().unwrap();
-
-        // Make sure the peer address is advertized.
-        config.config.external_addresses.push(local_addr.into());
-        for repo in &inventory {
-            policies.seed(&repo.rid, Scope::Followed).unwrap();
-        }
-        // Initialize database.
-        let db = Database::open(config.tmp.path().join(node::NODE_DB_FILE))
-            .unwrap()
-            .init(
-                &id,
-                config.config.features(),
-                &config.config.alias,
-                &UserAgent::default(),
-                config.local_time.into(),
-                config.config.external_addresses.iter(),
-            )
-            .unwrap()
-            .into();
-
-        let announcement =
-            service::gossip::node(&config.config, Timestamp::from(config.local_time) + 1);
-        let emitter: Emitter<Event> = Default::default();
-        let service = Service::new(
-            config.config,
-            db,
-            storage,
-            policies,
-            config.signer,
-            config.rng.clone(),
-            announcement,
-            emitter,
-        );
-
-        Self {
-            name,
-            service,
-            id,
-            ip,
-            local_addr,
-            local_time: config.local_time,
-            rng: config.rng,
-            initialized: false,
-            tempdir: config.tmp,
-        }
-    }
-
-    pub fn initialize(&mut self) -> &mut Self {
-        if !self.initialized {
-            info!(
-                target: "test",
-                "{}: Initializing: id = {}, address = {}",
-                self.name, self.id, self.ip
-            );
-        }
-        assert_ne!(self.local_time, LocalTime::default());
-
-        self.initialized = true;
-        self.service.initialize(self.local_time).unwrap();
-        self
-    }
-
-    pub fn initialized(mut self) -> Self {
-        self.initialize();
-        self
-    }
-
-    pub fn restart(&mut self) {
-        assert!(self.initialized);
-        info!(
-            target: "test",
-            "{}: Restarting: id = {}, address = {}",
-            self.name, self.id, self.ip
-        );
-        self.service.initialize(*self.service.clock()).unwrap();
-    }
-
-    pub fn address(&self) -> Address {
-        Address::from(net::SocketAddr::from((self.ip, 8776)))
-    }
-
-    pub fn import_addresses<'a>(&mut self, peers: impl IntoIterator<Item = &'a Self>) {
-        let timestamp = self.timestamp();
-        for peer in peers.into_iter() {
-            let known_address = node::KnownAddress::new(peer.address(), address::Source::Peer);
-            self.service
-                .database_mut()
-                .addresses_mut()
-                .insert(
-                    &peer.node_id(),
-                    PROTOCOL_VERSION,
-                    radicle::node::Features::default(),
-                    &Alias::from_str(peer.name).unwrap(),
-                    0,
-                    &UserAgent::default(),
-                    timestamp,
-                    Some(known_address),
-                )
-                .unwrap();
-        }
-    }
-
-    pub fn timestamp(&self) -> Timestamp {
-        (*self.clock()).into()
-    }
-
-    pub fn inventory(&self) -> HashSet<RepoId> {
-        self.service
-            .database()
-            .routing()
-            .get_inventory(self.nid())
-            .unwrap()
-    }
-
-    pub fn git_url(&self, repo: RepoId, namespace: Option<RemoteId>) -> remote::Url {
-        remote::Url {
-            node: self.node_id(),
-            repo,
-            namespace,
-        }
-    }
-
-    pub fn node_id(&self) -> NodeId {
-        self.service.node_id()
-    }
-
-    pub fn receive(&mut self, peer: NodeId, msg: Message) -> &mut Self {
-        self.service.received_message(peer, msg);
-        self
-    }
-
-    pub fn inventory_announcement(&self) -> Message {
-        Message::inventory(
-            InventoryAnnouncement {
-                inventory: arbitrary::vec(3).try_into().unwrap(),
-                timestamp: self.timestamp(),
-            },
-            self.signer(),
-        )
-    }
-
-    pub fn node_announcement(&self) -> Message {
-        Message::node(
-            NodeAnnouncement {
-                version: PROTOCOL_VERSION,
-                features: node::Features::SEED,
-                timestamp: self.timestamp(),
-                alias: Alias::from_str(self.name).unwrap(),
-                addresses: Some(net::SocketAddr::from((self.ip, node::DEFAULT_PORT)).into()).into(),
-                nonce: 0,
-                agent: UserAgent::from_str("/radicle:test/").unwrap(),
-            }
-            .solve(0)
-            .unwrap(),
-            self.signer(),
-        )
-    }
-
-    pub fn refs_announcement(&self, rid: RepoId) -> Message {
-        let mut refs = BoundedVec::new();
-        if let Ok(repo) = self.storage().repository(rid) {
-            if let Ok(false) = repo.is_empty() {
-                if let Ok(remotes) = repo.remotes() {
-                    for (remote_id, _) in remotes.into_iter() {
-                        match RefsAt::new(&repo, remote_id) {
-                            Ok(refs_at) => {
-                                if let Err(e) = refs.push(refs_at) {
-                                    debug!(target: "test", "Failed to push {remote_id} to refs: {e}");
-                                    break;
-                                }
-                            }
-                            Err(e) => {
-                                debug!(target: "test", "Failed to get `rad/sigrefs` for {remote_id}: {e}")
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        self.announcement(RefsAnnouncement {
-            rid,
-            refs,
-            timestamp: self.timestamp(),
-        })
-    }
-
-    pub fn announcement(&self, ann: impl Into<AnnouncementMessage>) -> Message {
-        ann.into().signed(self.signer()).into()
-    }
-
-    pub fn signed_refs_at(&self, refs: Refs, at: radicle::git::Oid) -> SignedRefsAt {
-        SignedRefsAt {
-            sigrefs: refs.signed(self.signer()).unwrap(),
-            at,
-        }
-    }
-
-    pub fn connect_from(&mut self, peer: &Self) {
-        let remote_id = simulator::Peer::<S, G>::id(peer);
-
-        self.service
-            .connected(remote_id, peer.address(), Link::Inbound);
-        self.service
-            .received_message(remote_id, peer.node_announcement());
-
-        let mut msgs = self.messages(remote_id);
-        msgs.find(|m| {
-            matches!(
-                m,
-                Message::Announcement(Announcement {
-                    message: AnnouncementMessage::Inventory(_),
-                    ..
-                })
-            )
-        })
-        .expect("`inventory-announcement` must be sent");
-    }
-
-    pub fn connect_to<T: WriteStorage + 'static, H: Signer + 'static>(
-        &mut self,
-        peer: &Peer<T, H>,
-    ) {
-        let remote_id = simulator::Peer::<T, H>::id(peer);
-        let remote_addr = simulator::Peer::<T, H>::addr(peer);
-
-        self.service.command(Command::Connect(
-            remote_id,
-            remote_addr.clone(),
-            ConnectOptions::default(),
-        ));
-
-        self.outbox()
-            .find(|o| matches!(o, Io::Connect { .. }))
-            .unwrap();
-
-        self.service.attempted(remote_id, remote_addr.clone());
-        self.service
-            .connected(remote_id, remote_addr, Link::Outbound);
-        self.service
-            .received_message(remote_id, peer.node_announcement());
-
-        let mut msgs = self.messages(remote_id);
-        msgs.find(|m| {
-            matches!(
-                m,
-                Message::Announcement(Announcement {
-                    message: AnnouncementMessage::Inventory(_),
-                    ..
-                })
-            )
-        })
-        .expect("`inventory-announcement` must be sent");
-    }
-
-    pub fn elapse(&mut self, duration: LocalDuration) {
-        self.clock_mut().elapse(duration);
-        self.service.wake();
-    }
-
-    /// Drain outgoing messages sent from this peer to the remote peer.
-    pub fn messages(&mut self, remote: NodeId) -> impl Iterator<Item = Message> {
-        let mut msgs = Vec::new();
-
-        Service::outbox(&mut self.service)
-            .queue()
-            .retain(|o| match o {
-                Io::Write(a, messages) if *a == remote => {
-                    msgs.extend(messages.clone());
-                    false
-                }
-                _ => true,
-            });
-
-        msgs.into_iter()
-    }
-
-    /// Drain outgoing *relayed* announcements to the remote peer. This doesn't include messages
-    /// originating from our own node.
-    pub fn relayed(&mut self, remote: NodeId) -> impl Iterator<Item = Message> {
-        let mut filtered: Vec<Message> = Vec::new();
-        let nid = *self.nid();
-
-        for o in Service::outbox(&mut self.service).queue() {
-            match o {
-                Io::Write(a, messages) if *a == remote => {
-                    let (relayed, other): (Vec<Message>, _) =
-                        messages.iter().cloned().partition(|m| {
-                            matches!(
-                                m,
-                                Message::Announcement(Announcement { node, .. })
-                                if *node != nid
-                            )
-                        });
-                    *messages = other;
-                    filtered.extend(relayed);
-                }
-                _ => {}
-            }
-        }
-
-        filtered.into_iter()
-    }
-
-    /// Drain outgoing inventories sent from this peer to the remote peer.
-    pub fn inventory_announcements(&mut self, remote: NodeId) -> impl Iterator<Item = Message> {
-        let mut invs: Vec<Message> = Vec::new();
-
-        for o in Service::outbox(&mut self.service).queue() {
-            match o {
-                Io::Write(a, messages) if *a == remote => {
-                    let (inventories, other): (Vec<Message>, _) =
-                        messages.iter().cloned().partition(|m| {
-                            MessageType::try_from(m.type_id())
-                                == Ok(MessageType::InventoryAnnouncement)
-                        });
-                    *messages = other;
-                    invs.extend(inventories);
-                }
-                _ => {}
-            }
-        }
-
-        invs.into_iter()
-    }
-
-    /// Get a stream of the peer's emitted events.
-    pub fn events(&mut self) -> Events {
-        self.service.events()
-    }
-
-    /// Get a draining iterator over the peer's I/O outbox.
-    pub fn outbox(&mut self) -> impl Iterator<Item = Io> + '_ {
-        iter::from_fn(|| Service::outbox(&mut self.service).next())
-    }
-
-    /// Get a draining iterator over the peer's I/O outbox, which only returns fetches.
-    pub fn fetches(&mut self) -> impl Iterator<Item = (RepoId, NodeId)> + '_ {
-        iter::from_fn(|| Service::outbox(&mut self.service).next()).filter_map(|io| {
-            if let Io::Fetch { rid, remote, .. } = io {
-                Some((rid, remote))
-            } else {
-                None
-            }
-        })
-    }
-}
diff --git a/radicle-node/src/test/simulator.rs b/radicle-node/src/test/simulator.rs
deleted file mode 100644
index 5ce87a0d4..000000000
--- a/radicle-node/src/test/simulator.rs
+++ /dev/null
@@ -1,682 +0,0 @@
-//! A simple P2P network simulator. Acts as the _reactor_, but without doing any I/O.
-#![allow(clippy::collapsible_if)]
-#![allow(dead_code)]
-#![allow(clippy::type_complexity)]
-
-use std::cell::RefCell;
-use std::collections::{BTreeMap, BTreeSet, HashSet, VecDeque};
-use std::marker::PhantomData;
-use std::ops::{Deref, DerefMut, Range};
-use std::rc::Rc;
-use std::sync::Arc;
-use std::{fmt, io, net};
-
-use localtime::{LocalDuration, LocalTime};
-use log::*;
-
-use crate::crypto::Signer;
-use crate::prelude::{Address, RepoId};
-use crate::service::io::Io;
-use crate::service::{DisconnectReason, Event, Message, Metrics, NodeId};
-use crate::storage::Namespaces;
-use crate::storage::{ReadRepository, WriteStorage};
-use crate::test::arbitrary;
-use crate::test::peer::Service;
-use crate::worker::{fetch, FetchError};
-use crate::Link;
-
-/// Minimum latency between peers.
-pub const MIN_LATENCY: LocalDuration = LocalDuration::from_millis(1);
-/// Maximum number of events buffered per peer.
-pub const MAX_EVENTS: usize = 2048;
-
-/// A simulated peer. Service instances have to be wrapped in this type to be simulated.
-pub trait Peer<S, G>:
-    Deref<Target = Service<S, G>> + DerefMut<Target = Service<S, G>> + 'static
-{
-    /// Initialize the peer. This should at minimum initialize the service with the
-    /// current time.
-    fn init(&mut self);
-    /// Get the peer address.
-    fn addr(&self) -> Address;
-    /// Get the peer id.
-    fn id(&self) -> NodeId;
-}
-
-/// Simulated service input.
-#[derive(Debug, Clone)]
-pub enum Input {
-    /// Connection attempt underway.
-    Connecting {
-        /// Remote peer id.
-        id: NodeId,
-        /// Address used to connect.
-        addr: Address,
-    },
-    /// New connection with a peer.
-    Connected {
-        /// Remote peer id.
-        id: NodeId,
-        /// Remote peer address.
-        addr: Address,
-        /// Link direction.
-        link: Link,
-    },
-    /// Disconnected from peer.
-    Disconnected(NodeId, Rc<DisconnectReason>),
-    /// Received messages from a remote peer.
-    Received(NodeId, Vec<Message>),
-    /// Fetch completed for a node.
-    Fetched(RepoId, NodeId, Rc<Result<fetch::FetchResult, FetchError>>),
-    /// Used to advance the state machine after some wall time has passed.
-    Wake,
-}
-
-/// A scheduled service input.
-#[derive(Debug, Clone)]
-pub struct Scheduled {
-    /// The node for which this input is scheduled.
-    pub node: NodeId,
-    /// The remote peer from which this input originates.
-    /// If the input originates from the local node, this should be set to the zero address.
-    pub remote: NodeId,
-    /// The input being scheduled.
-    pub input: Input,
-}
-
-impl fmt::Display for Scheduled {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match &self.input {
-            Input::Received(from, msgs) => {
-                write!(f, "{} <- {} ({:?})", self.node, from, msgs)
-            }
-            Input::Connected {
-                id: addr,
-                link: Link::Inbound,
-                ..
-            } => write!(f, "{} <== {}: Connected", self.node, addr),
-            Input::Connected {
-                id: addr,
-                link: Link::Outbound,
-                ..
-            } => write!(f, "{} ==> {}: Connected", self.node, addr),
-            Input::Connecting { id, .. } => {
-                write!(f, "{} => {}: Connecting", self.node, id)
-            }
-            Input::Disconnected(addr, reason) => {
-                write!(f, "{} =/= {}: Disconnected: {}", self.node, addr, reason)
-            }
-            Input::Wake => {
-                write!(f, "{}: Tock", self.node)
-            }
-            Input::Fetched(rid, nid, _) => {
-                write!(f, "{} <<~ {} ({}): Fetched", self.node, nid, rid)
-            }
-        }
-    }
-}
-
-/// Inbox of scheduled state machine inputs to be delivered to the simulated nodes.
-#[derive(Debug)]
-pub struct Inbox {
-    /// The set of scheduled inputs. We use a `BTreeMap` to ensure inputs are always
-    /// ordered by scheduled delivery time.
-    messages: BTreeMap<LocalTime, Scheduled>,
-}
-
-impl Inbox {
-    /// Add a scheduled input to the inbox.
-    fn insert(&mut self, mut time: LocalTime, msg: Scheduled) {
-        // Make sure we don't overwrite an existing message by using the same time slot.
-        while self.messages.contains_key(&time) {
-            time = time + MIN_LATENCY;
-        }
-        self.messages.insert(time, msg);
-    }
-
-    /// Get the next scheduled input to be delivered.
-    fn next(&mut self) -> Option<(LocalTime, Scheduled)> {
-        self.messages
-            .iter()
-            .next()
-            .map(|(time, scheduled)| (*time, scheduled.clone()))
-    }
-
-    /// Get the last message sent between two peers. Only checks one direction.
-    fn last(&self, node: &NodeId, remote: &NodeId) -> Option<(&LocalTime, &Scheduled)> {
-        self.messages
-            .iter()
-            .rev()
-            .find(|(_, v)| &v.node == node && &v.remote == remote)
-    }
-}
-
-/// Simulation options.
-#[derive(Debug, Clone)]
-pub struct Options {
-    /// Minimum and maximum latency between nodes, in seconds.
-    pub latency: Range<u64>,
-    /// Probability that network I/O fails.
-    /// A rate of `1.0` means 100% of I/O fails.
-    pub failure_rate: f64,
-}
-
-impl Default for Options {
-    fn default() -> Self {
-        Self {
-            latency: Range::default(),
-            failure_rate: 0.,
-        }
-    }
-}
-
-/// A peer-to-peer node simulation.
-pub struct Simulation<S, G> {
-    /// Inbox of inputs to be delivered by the simulation.
-    inbox: Inbox,
-    /// Events emitted during simulation.
-    events: BTreeMap<NodeId, VecDeque<Event>>,
-    /// Messages received during simulation.
-    messages: Vec<(NodeId, NodeId, Message)>,
-    /// Priority events that should happen immediately.
-    priority: VecDeque<Scheduled>,
-    /// Simulated latencies between nodes.
-    latencies: BTreeMap<(NodeId, NodeId), LocalDuration>,
-    /// Network partitions between two nodes.
-    partitions: BTreeSet<(NodeId, NodeId)>,
-    /// Set of existing connections between nodes.
-    connections: BTreeSet<(NodeId, NodeId)>,
-    /// Set of connection attempts.
-    attempts: BTreeSet<(NodeId, NodeId)>,
-    /// Simulation options.
-    opts: Options,
-    /// Start time of simulation.
-    start_time: LocalTime,
-    /// Current simulation time. Updated when a scheduled message is processed.
-    time: LocalTime,
-    /// RNG.
-    rng: RefCell<fastrand::Rng>,
-    /// Storage type.
-    storage: PhantomData<S>,
-    /// Signer type.
-    signer: PhantomData<G>,
-}
-
-impl<S: WriteStorage + 'static, G: Signer> Simulation<S, G> {
-    /// Create a new simulation.
-    pub fn new(time: LocalTime, rng: fastrand::Rng, opts: Options) -> Self {
-        Self {
-            inbox: Inbox {
-                messages: BTreeMap::new(),
-            },
-            events: BTreeMap::new(),
-            messages: Vec::new(),
-            priority: VecDeque::new(),
-            partitions: BTreeSet::new(),
-            latencies: BTreeMap::new(),
-            connections: BTreeSet::new(),
-            attempts: BTreeSet::new(),
-            opts,
-            start_time: time,
-            time,
-            rng: RefCell::new(rng),
-            storage: PhantomData,
-            signer: PhantomData,
-        }
-    }
-
-    /// Check whether the simulation is done, ie. there are no more messages to process.
-    pub fn is_done(&self) -> bool {
-        self.inbox.messages.is_empty()
-    }
-
-    /// Total amount of simulated time elapsed.
-    #[allow(dead_code)]
-    pub fn elapsed(&self) -> LocalDuration {
-        self.time - self.start_time
-    }
-
-    /// Check whether the simulation has settled, ie. the only messages left to process
-    /// are (periodic) timeouts.
-    pub fn is_settled(&self) -> bool {
-        self.inbox
-            .messages
-            .iter()
-            .all(|(_, s)| matches!(s.input, Input::Wake))
-    }
-
-    /// Get a node's emitted events.
-    pub fn events(&mut self, node: &NodeId) -> impl Iterator<Item = Event> + '_ {
-        self.events.entry(*node).or_default().drain(..)
-    }
-
-    /// Get all messages received by nodes during the simulation.
-    pub fn messages(&mut self) -> &[(NodeId, NodeId, Message)] {
-        &self.messages
-    }
-
-    /// Get the latency between two nodes. The minimum latency between nodes is 1 millisecond.
-    pub fn latency(&self, from: NodeId, to: NodeId) -> LocalDuration {
-        self.latencies
-            .get(&(from, to))
-            .cloned()
-            .map(|l| if l < MIN_LATENCY { MIN_LATENCY } else { l })
-            .unwrap_or_else(|| MIN_LATENCY)
-    }
-
-    /// Initialize peers.
-    pub fn initialize<'a, P>(self, peers: impl IntoIterator<Item = &'a mut P>) -> Self
-    where
-        P: Peer<S, G>,
-    {
-        for peer in peers.into_iter() {
-            peer.init();
-        }
-        self
-    }
-
-    /// Run the simulation while the given predicate holds.
-    pub fn run_while<'a, P>(
-        &mut self,
-        peers: impl IntoIterator<Item = &'a mut P>,
-        pred: impl Fn(&Self) -> bool,
-    ) where
-        P: Peer<S, G>,
-    {
-        let mut nodes: BTreeMap<_, _> = peers.into_iter().map(|p| (p.id(), p)).collect();
-
-        self.messages.clear();
-        self.events.clear();
-        self.start_time = self.time;
-
-        while self.step_(&mut nodes) {
-            if !pred(self) {
-                break;
-            }
-        }
-    }
-
-    /// Process one scheduled input from the inbox, using the provided peers.
-    /// This function should be called until it returns `false`, or some desired state is reached.
-    /// Returns `true` if there are more messages to process.
-    pub fn step<'a, P: Peer<S, G>>(&mut self, peers: impl IntoIterator<Item = &'a mut P>) -> bool {
-        let mut nodes: BTreeMap<_, _> = peers.into_iter().map(|p| (p.id(), p)).collect();
-        self.step_(&mut nodes)
-    }
-
-    fn step_<P: Peer<S, G>>(&mut self, nodes: &mut BTreeMap<NodeId, &mut P>) -> bool {
-        if !self.opts.latency.is_empty() {
-            // Configure latencies.
-            for (i, from) in nodes.keys().enumerate() {
-                for to in nodes.keys().skip(i + 1) {
-                    let range = self.opts.latency.clone();
-                    let latency = LocalDuration::from_millis(
-                        self.rng
-                            .borrow_mut()
-                            .u128(range.start as u128 * 1_000..range.end as u128 * 1_000),
-                    );
-
-                    self.latencies.entry((*from, *to)).or_insert(latency);
-                    self.latencies.entry((*to, *from)).or_insert(latency);
-                }
-            }
-        }
-
-        // Create and heal partitions.
-        // TODO: These aren't really "network" partitions, as they are only
-        // between individual nodes. We need to think about more realistic
-        // scenarios. We should also think about creating various network
-        // topologies.
-        if self.time.as_secs() % 10 == 0 {
-            for (i, x) in nodes.keys().enumerate() {
-                for y in nodes.keys().skip(i + 1) {
-                    if self.is_fallible() {
-                        self.partitions.insert((*x, *y));
-                    } else {
-                        self.partitions.remove(&(*x, *y));
-                    }
-                }
-            }
-        }
-
-        // Schedule any messages in the pipes.
-        for peer in nodes.values_mut() {
-            let id = peer.id();
-
-            while let Some(o) = peer.next() {
-                self.schedule(&id, o);
-            }
-        }
-        // Next high-priority message.
-        let priority = self.priority.pop_front().map(|s| (self.time, s));
-
-        if let Some((time, next)) = priority.or_else(|| self.inbox.next()) {
-            let elapsed = (time - self.start_time).as_millis();
-            if matches!(next.input, Input::Wake) {
-                trace!(target: "sim", "{:05} {}", elapsed, next);
-            } else {
-                // TODO: This can be confusing, since this event may not actually be passed to
-                // the service. It would be best to only log the events that are being sent
-                // to the service, or to log when an input is being dropped.
-                info!(target: "sim", "{:05} {} ({})", elapsed, next, self.inbox.messages.len());
-            }
-            assert!(time >= self.time, "Time only moves forwards!");
-
-            self.time = time;
-            self.inbox.messages.remove(&time);
-
-            let Scheduled { input, node, .. } = next;
-
-            if let Some(ref mut p) = nodes.get_mut(&node) {
-                p.tick(time, &Metrics::default());
-
-                match input {
-                    Input::Connecting { id, addr } => {
-                        if self.attempts.insert((node, id)) {
-                            // TODO: Also call `inbound` for inbound attempts.
-                            p.attempted(id, addr);
-                        }
-                    }
-                    Input::Connected { id, addr, link } => {
-                        let conn = (node, id);
-
-                        let attempted = link.is_outbound() && self.attempts.remove(&conn);
-                        if attempted || link.is_inbound() {
-                            if self.connections.insert(conn) {
-                                p.connected(id, addr, link);
-                            }
-                        }
-                    }
-                    Input::Disconnected(id, reason) => {
-                        let conn = (node, id);
-                        let attempt = self.attempts.remove(&conn);
-                        let connection = self.connections.remove(&conn);
-
-                        // FIXME: This shouldn't happen, but it does when latency is introduced.
-                        if attempt && connection {
-                            log::error!(target: "sim", "Connection is attempted and connected at the same time");
-                        }
-                        if attempt || connection {
-                            p.disconnected(id, Link::Inbound, &reason);
-                            p.disconnected(id, Link::Outbound, &reason);
-                        }
-                    }
-                    Input::Wake => p.wake(),
-                    Input::Received(from, msgs) => {
-                        for msg in msgs.clone() {
-                            p.received_message(from, msg);
-                        }
-                        self.messages
-                            .extend(msgs.into_iter().map(|m| (from, p.node_id(), m)));
-                    }
-                    Input::Fetched(rid, nid, result) => {
-                        let mut result = Rc::try_unwrap(result).unwrap();
-                        let repo = match p.storage().repository_mut(rid) {
-                            Ok(repo) => repo,
-                            Err(e) if e.is_not_found() => p.storage().create(rid).unwrap(),
-                            Err(e) => panic!("Failed to open repository: {e}"),
-                        };
-
-                        match &mut result {
-                            Ok(fetch::FetchResult {
-                                namespaces,
-                                updated,
-                                doc,
-                                ..
-                            }) => {
-                                *updated =
-                                    radicle::test::fetch(&repo, &nid, Namespaces::All).unwrap();
-                                *namespaces = updated
-                                    .iter()
-                                    .map(|r| {
-                                        NodeId::from_namespaced(&r.name().to_namespaced().unwrap())
-                                            .unwrap()
-                                    })
-                                    .collect();
-                                *doc = repo.identity_doc().unwrap();
-                            }
-                            Err(err) => panic!("Error fetching: {err}"),
-                        }
-                        p.fetched(rid, nid, result);
-                    }
-                }
-                while let Some(o) = p.next() {
-                    self.schedule(&node, o);
-                }
-            } else {
-                panic!("Node {node} not found when attempting to schedule {input:?}",);
-            }
-        }
-        !self.is_done()
-    }
-
-    /// Process a service output event from a node.
-    pub fn schedule(&mut self, node: &NodeId, out: Io) {
-        let node = *node;
-
-        match out {
-            Io::Write(receiver, msgs) => {
-                if msgs.is_empty() {
-                    return;
-                }
-                // If the other end has disconnected the sender with some latency, there may not be
-                // a connection remaining to use.
-                if !self.connections.contains(&(node, receiver)) {
-                    return;
-                }
-                let sender = node;
-
-                if self.is_partitioned(sender, receiver) {
-                    // Drop message if nodes are partitioned.
-                    info!(
-                        target: "sim",
-                        "{} -> {} (DROPPED)",
-                         sender, receiver,
-                    );
-                    return;
-                }
-
-                // Schedule message in the future, ensuring messages don't arrive out-of-order
-                // between two peers.
-                let latency = self.latency(node, receiver);
-                let time = self
-                    .inbox
-                    .last(&receiver, &sender)
-                    .map(|(k, _)| *k)
-                    .unwrap_or_else(|| self.time);
-                let time = time + latency;
-                let elapsed = (time - self.start_time).as_millis();
-
-                for msg in &msgs {
-                    info!(
-                        target: "sim",
-                        "{:05} {} -> {} ({:?}) (+{})",
-                        elapsed, sender, receiver, msg, latency
-                    );
-                }
-
-                self.inbox.insert(
-                    time,
-                    Scheduled {
-                        remote: sender,
-                        node: receiver,
-                        input: Input::Received(sender, msgs),
-                    },
-                );
-            }
-            Io::Connect(remote, addr) => {
-                assert!(remote != node, "self-connections are not allowed");
-
-                self.inbox.insert(
-                    self.time + MIN_LATENCY,
-                    Scheduled {
-                        node,
-                        remote,
-                        input: Input::Connecting {
-                            id: remote,
-                            addr: addr.clone(),
-                        },
-                    },
-                );
-
-                // Fail to connect if the nodes are partitioned.
-                if self.is_partitioned(node, remote) {
-                    log::info!(target: "sim", "{} -/-> {} (partitioned)", node, remote);
-
-                    // Sometimes, the service gets a failure input, other times it just hangs.
-                    if self.rng.borrow_mut().bool() {
-                        self.inbox.insert(
-                            self.time + MIN_LATENCY,
-                            Scheduled {
-                                node,
-                                remote,
-                                input: Input::Disconnected(
-                                    remote,
-                                    Rc::new(DisconnectReason::Connection(Arc::new(
-                                        io::Error::from(io::ErrorKind::UnexpectedEof),
-                                    ))),
-                                ),
-                            },
-                        );
-                    }
-                    return;
-                }
-
-                let latency = MIN_LATENCY + self.latency(node, remote);
-
-                self.inbox.insert(
-                    // The remote will get the connection attempt with some latency.
-                    self.time + latency,
-                    Scheduled {
-                        node: remote,
-                        remote: node,
-                        input: Input::Connected {
-                            id: node,
-                            addr: Address::from(net::SocketAddr::from(([0, 0, 0, 0], 0))),
-                            link: Link::Inbound,
-                        },
-                    },
-                );
-                self.inbox.insert(
-                    // The local node will have established the connection after some latency.
-                    self.time + latency,
-                    Scheduled {
-                        remote,
-                        node,
-                        input: Input::Connected {
-                            id: remote,
-                            addr,
-                            link: Link::Outbound,
-                        },
-                    },
-                );
-            }
-            Io::Disconnect(remote, reason) => {
-                // The local node is immediately disconnected.
-                self.priority.push_back(Scheduled {
-                    remote,
-                    node,
-                    input: Input::Disconnected(remote, Rc::new(reason)),
-                });
-
-                // Nb. It's possible for disconnects to happen simultaneously from both ends, hence
-                // it can be that a node will try to disconnect a remote that is already
-                // disconnected from the other side.
-                //
-                // It's also possible that the connection was only attempted and never succeeded,
-                // in which case we would return here.
-                if !self.connections.contains(&(node, remote)) {
-                    debug!(target: "sim", "Ignoring disconnect of {remote} from {node}");
-                    return;
-                };
-                let latency = self.latency(node, remote);
-
-                // The remote node receives the disconnection with some delay.
-                self.inbox.insert(
-                    self.time + latency,
-                    Scheduled {
-                        node: remote,
-                        remote: node,
-                        input: Input::Disconnected(
-                            node,
-                            Rc::new(DisconnectReason::Connection(Arc::new(io::Error::from(
-                                io::ErrorKind::ConnectionReset,
-                            )))),
-                        ),
-                    },
-                );
-            }
-            Io::Wakeup(duration) => {
-                let time = self.time + duration;
-
-                if !matches!(
-                    self.inbox.messages.get(&time),
-                    Some(Scheduled {
-                        input: Input::Wake,
-                        ..
-                    })
-                ) {
-                    self.inbox.insert(
-                        time,
-                        Scheduled {
-                            node,
-                            // The remote is not applicable for this type of output.
-                            remote: [0; 32].into(),
-                            input: Input::Wake,
-                        },
-                    );
-                }
-            }
-            Io::Fetch { rid, remote, .. } => {
-                log::info!(
-                    target: "sim",
-                    "{:05} {} ~> {} ({}): Fetch outgoing",
-                    self.elapsed().as_millis(), node, remote, rid
-                );
-
-                if self.is_fallible() {
-                    self.inbox.insert(
-                        self.time + LocalDuration::from_secs(3),
-                        Scheduled {
-                            node,
-                            remote,
-                            input: Input::Fetched(
-                                rid,
-                                remote,
-                                Rc::new(Err(FetchError::Io(io::ErrorKind::Other.into()))),
-                            ),
-                        },
-                    );
-                } else {
-                    self.inbox.insert(
-                        self.time + LocalDuration::from_secs(3),
-                        Scheduled {
-                            node,
-                            remote,
-                            input: Input::Fetched(
-                                rid,
-                                remote,
-                                Rc::new(Ok(fetch::FetchResult {
-                                    updated: vec![],
-                                    namespaces: HashSet::new(),
-                                    clone: true,
-                                    doc: arbitrary::gen(1),
-                                })),
-                            ),
-                        },
-                    );
-                }
-            }
-        }
-    }
-
-    /// Check whether we should fail the next operation.
-    fn is_fallible(&self) -> bool {
-        self.rng.borrow_mut().f64() % 1.0 < self.opts.failure_rate
-    }
-
-    /// Check whether two nodes are partitioned.
-    fn is_partitioned(&self, a: NodeId, b: NodeId) -> bool {
-        self.partitions.contains(&(a, b)) || self.partitions.contains(&(b, a))
-    }
-}
diff --git a/radicle-node/src/tests.rs b/radicle-node/src/tests.rs
deleted file mode 100644
index da243612e..000000000
--- a/radicle-node/src/tests.rs
+++ /dev/null
@@ -1,1986 +0,0 @@
-mod e2e;
-
-use std::collections::BTreeSet;
-use std::default::*;
-use std::env;
-use std::io;
-use std::sync::Arc;
-use std::time;
-
-use crossbeam_channel as chan;
-use netservices::Direction as Link;
-use once_cell::sync::Lazy;
-use radicle::identity::Visibility;
-use radicle::node::address::Store as _;
-use radicle::node::refs::Store as _;
-use radicle::node::routing::Store as _;
-use radicle::node::{ConnectOptions, DEFAULT_TIMEOUT};
-use radicle::storage::refs::RefsAt;
-use radicle::storage::RefUpdate;
-use radicle::test::arbitrary::gen;
-use radicle::test::storage::MockRepository;
-
-use crate::collections::{RandomMap, RandomSet};
-use crate::crypto::test::signer::MockSigner;
-use crate::identity::RepoId;
-use crate::node;
-use crate::node::config::*;
-use crate::prelude::*;
-use crate::prelude::{LocalDuration, Timestamp};
-use crate::service::filter::Filter;
-use crate::service::io::Io;
-use crate::service::message::*;
-use crate::service::ServiceState as _;
-use crate::service::*;
-use crate::storage::git::transport::{local, remote};
-use crate::storage::git::Storage;
-use crate::storage::refs::SIGREFS_BRANCH;
-use crate::storage::ReadStorage;
-use crate::test::arbitrary;
-use crate::test::assert_matches;
-use crate::test::fixtures;
-#[allow(unused)]
-use crate::test::logger;
-use crate::test::peer;
-use crate::test::peer::Peer;
-use crate::test::simulator;
-use crate::test::simulator::{Peer as _, Simulation};
-
-use crate::test::storage::MockStorage;
-use crate::wire::Decode;
-use crate::wire::Encode;
-use crate::worker;
-use crate::worker::fetch;
-use crate::LocalTime;
-use crate::{git, identity, rad, runtime, service, test};
-
-/// Default number of tests to run when testing things with high variance.
-pub const DEFAULT_TEST_CASES: usize = 10;
-/// Test cases to run when testing things with high variance.
-pub static TEST_CASES: Lazy<usize> = Lazy::new(|| {
-    env::var("RAD_TEST_CASES")
-        .ok()
-        .and_then(|s| s.parse::<usize>().ok())
-        .unwrap_or(DEFAULT_TEST_CASES)
-});
-
-// NOTE
-//
-// If you wish to see the logs for a running test, simply add the following line to your test:
-//
-//      logger::init(log::Level::Debug);
-//
-// You may then run the test with eg. `cargo test -- --nocapture` to always show output.
-
-#[test]
-fn test_inventory_decode() {
-    let inventory: Vec<RepoId> = arbitrary::gen(300);
-    let timestamp: Timestamp = LocalTime::now().into();
-
-    let mut buf = Vec::new();
-    inventory.as_slice().encode(&mut buf).unwrap();
-    timestamp.encode(&mut buf).unwrap();
-
-    let m = InventoryAnnouncement::decode(&mut buf.as_slice()).expect("message decodes");
-    assert_eq!(inventory.as_slice(), m.inventory.as_slice());
-    assert_eq!(timestamp, m.timestamp);
-}
-
-#[test]
-fn test_ping_response() {
-    let mut alice = Peer::new("alice", [8, 8, 8, 8]);
-    let bob = Peer::new("bob", [9, 9, 9, 9]);
-    let eve = Peer::new("eve", [7, 7, 7, 7]);
-
-    alice.connect_to(&bob);
-    alice.receive(
-        bob.id(),
-        Message::Ping(Ping {
-            ponglen: Ping::MAX_PONG_ZEROES,
-            zeroes: ZeroBytes::new(42),
-        }),
-    );
-    assert_matches!(
-        alice.messages(bob.id()).next(),
-        Some(Message::Pong { zeroes }) if zeroes.len() == Ping::MAX_PONG_ZEROES as usize,
-        "respond with correctly formatted pong",
-    );
-
-    alice.connect_to(&eve);
-    alice.receive(
-        eve.id(),
-        Message::Ping(Ping {
-            ponglen: Ping::MAX_PONG_ZEROES + 1,
-            zeroes: ZeroBytes::new(42),
-        }),
-    );
-    assert_matches!(
-        alice.messages(eve.id()).next(),
-        None,
-        "ignore unsupported ping message",
-    );
-}
-
-#[test]
-fn test_disconnecting_unresponsive_peer() {
-    let mut alice = Peer::new("alice", [8, 8, 8, 8]);
-    let bob = Peer::new("bob", [9, 9, 9, 9]);
-
-    alice.connect_to(&bob);
-    assert_eq!(1, alice.sessions().connected().count(), "bob connects");
-    alice.elapse(STALE_CONNECTION_TIMEOUT + LocalDuration::from_secs(1));
-    alice
-        .outbox()
-        .find(|m| matches!(m, &Io::Disconnect(addr, _) if addr == bob.id()))
-        .expect("disconnect an unresponsive bob");
-}
-
-#[test]
-fn test_redundant_connect() {
-    let mut alice = Peer::new("alice", [8, 8, 8, 8]);
-    let bob = Peer::new("bob", [9, 9, 9, 9]);
-    let opts = ConnectOptions::default();
-
-    alice.command(Command::Connect(bob.id(), bob.address(), opts.clone()));
-    alice.command(Command::Connect(bob.id(), bob.address(), opts.clone()));
-    alice.command(Command::Connect(bob.id(), bob.address(), opts));
-
-    // Only one connection attempt is made.
-    assert_matches!(
-        alice.outbox().filter(|o| matches!(o, Io::Connect { .. })).collect::<Vec<_>>().as_slice(),
-        [Io::Connect(id, addr)]
-        if *id == bob.id() && *addr == bob.addr()
-    );
-}
-
-#[test]
-fn test_connection_kept_alive() {
-    let mut alice = Peer::new("alice", [8, 8, 8, 8]);
-    let mut bob = Peer::new("bob", [9, 9, 9, 9]);
-
-    let mut sim = Simulation::new(
-        LocalTime::now(),
-        alice.rng.clone(),
-        simulator::Options::default(),
-    )
-    .initialize([&mut alice, &mut bob]);
-
-    alice.command(service::Command::Connect(
-        bob.id(),
-        bob.address(),
-        ConnectOptions::default(),
-    ));
-    sim.run_while([&mut alice, &mut bob], |s| !s.is_settled());
-    assert_eq!(1, alice.sessions().connected().count(), "bob connects");
-
-    let mut elapsed: LocalDuration = LocalDuration::from_secs(0);
-    let step: LocalDuration = STALE_CONNECTION_TIMEOUT / 10;
-    while elapsed < STALE_CONNECTION_TIMEOUT + step {
-        alice.elapse(step);
-        bob.elapse(step);
-        sim.run_while([&mut alice, &mut bob], |s| !s.is_settled());
-
-        elapsed = elapsed + step;
-    }
-
-    assert_eq!(1, alice.sessions().len(), "alice remains connected to Bob");
-    assert_eq!(1, bob.sessions().len(), "bob remains connected to Alice");
-}
-
-#[test]
-fn test_outbound_connection() {
-    let mut alice = Peer::new("alice", [8, 8, 8, 8]);
-    let bob = Peer::new("bob", [9, 9, 9, 9]);
-    let eve = Peer::new("eve", [7, 7, 7, 7]);
-
-    alice.connect_to(&bob);
-    alice.connect_to(&eve);
-
-    let peers = alice
-        .service
-        .sessions()
-        .connected()
-        .map(|(id, _)| *id)
-        .collect::<Vec<_>>();
-
-    assert!(peers.contains(&eve.id()));
-    assert!(peers.contains(&bob.id()));
-}
-
-#[test]
-fn test_inbound_connection() {
-    let mut alice = Peer::new("alice", [8, 8, 8, 8]);
-    let bob = Peer::new("bob", [9, 9, 9, 9]);
-    let eve = Peer::new("eve", [7, 7, 7, 7]);
-
-    alice.connect_from(&bob);
-    alice.connect_from(&eve);
-
-    let peers = alice
-        .service
-        .sessions()
-        .connected()
-        .map(|(id, _)| *id)
-        .collect::<Vec<_>>();
-
-    assert!(peers.contains(&eve.id()));
-    assert!(peers.contains(&bob.id()));
-}
-
-#[test]
-fn test_persistent_peer_connect() {
-    use std::collections::HashSet;
-
-    let bob = Peer::new("bob", [8, 8, 8, 8]);
-    let eve = Peer::new("eve", [9, 9, 9, 9]);
-    let connect = HashSet::<ConnectAddress>::from_iter([
-        (bob.id(), bob.address()).into(),
-        (eve.id(), eve.address()).into(),
-    ]);
-    let mut alice = Peer::config(
-        "alice",
-        [7, 7, 7, 7],
-        MockStorage::empty(),
-        peer::Config {
-            config: Config {
-                connect,
-                ..Config::new(node::Alias::new("alice"))
-            },
-            ..peer::Config::default()
-        },
-    )
-    .initialized();
-
-    let outbox = alice.outbox().collect::<Vec<_>>();
-    outbox
-        .iter()
-        .find(|o| matches!(o, Io::Connect(a, _) if *a == bob.id()))
-        .unwrap();
-    outbox
-        .iter()
-        .find(|o| matches!(o, Io::Connect(a, _) if *a == eve.id()))
-        .unwrap();
-}
-
-#[test]
-fn test_inventory_sync() {
-    let tmp = tempfile::tempdir().unwrap();
-    let mut alice = Peer::with_storage(
-        "alice",
-        [7, 7, 7, 7],
-        Storage::open(tmp.path().join("alice"), fixtures::user()).unwrap(),
-    );
-    let bob_signer = MockSigner::default();
-    let bob_storage = fixtures::storage(tmp.path().join("bob"), &bob_signer).unwrap();
-    let bob = Peer::with_storage("bob", [8, 8, 8, 8], bob_storage);
-    let now = LocalTime::now().into();
-    let repos = bob.inventory().into_iter().collect::<Vec<_>>();
-
-    alice.connect_to(&bob);
-    alice.receive(
-        bob.id(),
-        Message::inventory(
-            InventoryAnnouncement {
-                inventory: repos.clone().try_into().unwrap(),
-                timestamp: now,
-            },
-            bob.signer(),
-        ),
-    );
-
-    for proj in &repos {
-        let seeds = alice.database().routing().get(proj).unwrap();
-        assert!(seeds.contains(&bob.node_id()));
-    }
-}
-
-#[test]
-fn test_inventory_pruning() {
-    struct Test {
-        limits: Limits,
-        /// Number of projects by peer
-        peer_projects: Vec<usize>,
-        wait_time: LocalDuration,
-        expected_routing_table_size: usize,
-    }
-    let tests = [
-        // All zero
-        Test {
-            limits: Limits {
-                routing_max_size: 0,
-                routing_max_age: LocalDuration::from_secs(0),
-                ..Limits::default()
-            },
-            peer_projects: vec![10; 5],
-            wait_time: LocalDuration::from_mins(7 * 24 * 60) + LocalDuration::from_secs(1),
-            expected_routing_table_size: 0,
-        },
-        // All entries are too young to expire.
-        Test {
-            limits: Limits {
-                routing_max_size: 0,
-                routing_max_age: LocalDuration::from_mins(7 * 24 * 60),
-                ..Limits::default()
-            },
-            peer_projects: vec![10; 5],
-            wait_time: LocalDuration::from_mins(7 * 24 * 60) + LocalDuration::from_secs(1),
-            expected_routing_table_size: 0,
-        },
-        // All entries remain because the table is unconstrained.
-        Test {
-            limits: Limits {
-                routing_max_size: 50,
-                routing_max_age: LocalDuration::from_mins(0),
-                ..Limits::default()
-            },
-            peer_projects: vec![10; 5],
-            wait_time: LocalDuration::from_mins(7 * 24 * 60) + LocalDuration::from_secs(1),
-            expected_routing_table_size: 50,
-        },
-        // Some entries are pruned because the table is constrained.
-        Test {
-            limits: Limits {
-                routing_max_size: 25,
-                routing_max_age: LocalDuration::from_mins(7 * 24 * 60),
-                ..Limits::default()
-            },
-            peer_projects: vec![10; 5],
-            wait_time: LocalDuration::from_mins(7 * 24 * 60) + LocalDuration::from_secs(1),
-            expected_routing_table_size: 25,
-        },
-    ];
-
-    for test in tests {
-        let mut alice = Peer::config(
-            "alice",
-            [7, 7, 7, 7],
-            MockStorage::empty(),
-            peer::Config {
-                config: Config {
-                    limits: test.limits,
-                    ..Config::new(node::Alias::new("alice"))
-                },
-                ..peer::Config::default()
-            },
-        )
-        .initialized();
-
-        let bob = Peer::config(
-            "bob",
-            [8, 8, 8, 8],
-            MockStorage::empty(),
-            peer::Config {
-                local_time: alice.local_time(),
-                ..peer::Config::default()
-            },
-        )
-        .initialized();
-
-        // Tell Alice about the amazing projects available
-        alice.connect_to(&bob);
-        for num_projs in test.peer_projects {
-            let peer = Peer::new("other", [9, 9, 9, 9]);
-
-            alice.receive(bob.id(), peer.node_announcement());
-            alice.receive(
-                bob.id(),
-                Message::inventory(
-                    InventoryAnnouncement {
-                        inventory: test::arbitrary::vec::<RepoId>(num_projs)
-                            .try_into()
-                            .unwrap(),
-                        timestamp: bob.local_time().into(),
-                    },
-                    peer.signer(),
-                ),
-            );
-        }
-
-        // Wait for things to happen
-        assert!(test.wait_time > PRUNE_INTERVAL, "pruning must be triggered");
-        alice.elapse(test.wait_time);
-
-        assert_eq!(
-            test.expected_routing_table_size,
-            alice.database().routing().len().unwrap()
-        );
-    }
-}
-
-#[test]
-fn test_seeding() {
-    let mut alice = Peer::new("alice", [7, 7, 7, 7]);
-    let proj_id: identity::RepoId = test::arbitrary::gen(1);
-
-    let (sender, receiver) = chan::bounded(1);
-    alice.command(Command::Seed(proj_id, policy::Scope::default(), sender));
-    let policy_change = receiver.recv().map_err(runtime::HandleError::from).unwrap();
-    assert!(policy_change);
-    assert!(alice.policies().is_seeding(&proj_id).unwrap());
-
-    let (sender, receiver) = chan::bounded(1);
-    alice.command(Command::Unseed(proj_id, sender));
-    let policy_change = receiver.recv().map_err(runtime::HandleError::from).unwrap();
-    assert!(policy_change);
-    assert!(!alice.policies().is_seeding(&proj_id).unwrap());
-}
-
-#[test]
-fn test_inventory_relay_bad_timestamp() {
-    let mut alice = Peer::new("alice", [7, 7, 7, 7]);
-    let bob = Peer::new("bob", [8, 8, 8, 8]);
-    let two_hours = 3600 * 1000 * 2;
-    let timestamp = alice.timestamp() + two_hours;
-
-    alice.connect_to(&bob);
-    alice.receive(
-        bob.id(),
-        Message::inventory(
-            InventoryAnnouncement {
-                inventory: BoundedVec::new(),
-                timestamp,
-            },
-            bob.signer(),
-        ),
-    );
-    assert_matches!(
-        alice.outbox().next(),
-        Some(Io::Disconnect(addr, DisconnectReason::Session(session::Error::InvalidTimestamp(t))))
-        if addr == bob.id() && t == timestamp
-    );
-}
-
-#[test]
-fn test_announcement_rebroadcast() {
-    let mut alice = Peer::new("alice", [7, 7, 7, 7]);
-    let bob = Peer::new("bob", [8, 8, 8, 8]);
-    let eve = Peer::new("eve", [9, 9, 9, 9]);
-
-    alice.connect_to(&bob);
-    alice.connect_from(&eve);
-    alice.outbox().for_each(drop);
-
-    log::debug!(target: "test", "Receiving gossips..");
-
-    let received = test::gossip::messages(6, alice.local_time(), MAX_TIME_DELTA);
-    for msg in received.iter().cloned() {
-        alice.receive(bob.id(), msg);
-    }
-
-    alice.receive(
-        eve.id(),
-        Message::Subscribe(Subscribe {
-            filter: Filter::default(),
-            since: Timestamp::MIN,
-            until: Timestamp::MAX,
-        }),
-    );
-
-    let relayed = alice.messages(eve.id()).collect::<BTreeSet<_>>();
-    let received = received
-        .into_iter()
-        .chain(Some(bob.node_announcement()))
-        .collect::<BTreeSet<_>>();
-
-    assert_eq!(relayed.len(), received.len());
-    assert_eq!(relayed, received);
-}
-
-#[test]
-fn test_announcement_rebroadcast_duplicates() {
-    let mut carol = Peer::new("carol", [4, 4, 4, 4]);
-    let mut alice = Peer::new("alice", [7, 7, 7, 7]);
-    let bob = Peer::new("bob", [8, 8, 8, 8]);
-    let eve = Peer::new("eve", [9, 9, 9, 9]);
-    let rids = arbitrary::set::<RepoId>(3..=3);
-
-    carol.init();
-    alice.connect_to(&bob);
-    alice.receive(bob.id, carol.node_announcement());
-
-    // These are not expected to be relayed.
-    let stale = {
-        let mut anns = BTreeSet::new();
-
-        for _ in 0..5 {
-            carol.elapse(LocalDuration::from_mins(1));
-
-            anns.insert(carol.inventory_announcement());
-            anns.insert(carol.node_announcement());
-        }
-        anns
-    };
-
-    // These are expected to be relayed.
-    let expected = {
-        let mut anns = BTreeSet::new();
-
-        carol.elapse(LocalDuration::from_mins(1));
-        anns.insert(carol.inventory_announcement());
-        anns.insert(carol.node_announcement());
-        anns.insert(bob.node_announcement());
-
-        for rid in rids {
-            alice.seed(&rid, policy::Scope::All).unwrap();
-            anns.insert(carol.refs_announcement(rid));
-            anns.insert(bob.refs_announcement(rid));
-        }
-        anns
-    };
-
-    let mut all = stale.iter().chain(expected.iter()).collect::<Vec<_>>();
-    fastrand::shuffle(&mut all);
-
-    // Alice receives all messages out of order.
-    for ann in all {
-        alice.receive(bob.id, ann.clone());
-    }
-
-    // Alice relays just the expected ones back to Eve.
-    alice.connect_from(&eve);
-    alice.receive(
-        eve.id(),
-        Message::Subscribe(Subscribe {
-            filter: Filter::default(),
-            since: Timestamp::MIN,
-            until: Timestamp::MAX,
-        }),
-    );
-
-    let relayed = alice.messages(eve.id()).collect::<BTreeSet<_>>();
-
-    assert_eq!(relayed.len(), 9);
-    assert_eq!(relayed, expected);
-}
-
-#[test]
-fn test_announcement_rebroadcast_timestamp_filtered() {
-    let mut alice = Peer::new("alice", [7, 7, 7, 7]);
-    let bob = Peer::new("bob", [8, 8, 8, 8]);
-    let eve = Peer::new("eve", [9, 9, 9, 9]);
-
-    alice.connect_to(&bob);
-
-    let delta = LocalDuration::from_mins(10);
-    let first = test::gossip::messages(3, alice.local_time() - delta, LocalDuration::from_secs(0));
-    let second = test::gossip::messages(3, alice.local_time(), LocalDuration::from_secs(0));
-    let third = test::gossip::messages(3, alice.local_time() + delta, LocalDuration::from_secs(0));
-
-    // Alice receives three batches of messages.
-    for msg in first
-        .iter()
-        .chain(second.iter())
-        .chain(third.iter())
-        .cloned()
-    {
-        alice.receive(bob.id(), msg);
-    }
-
-    // Eve subscribes to messages within the period of the second batch only.
-    alice.connect_from(&eve);
-    alice.receive(
-        eve.id(),
-        Message::Subscribe(Subscribe {
-            filter: Filter::default(),
-            since: alice.local_time().into(),
-            until: (alice.local_time() + delta).into(),
-        }),
-    );
-
-    let relayed = alice.relayed(eve.id()).collect::<BTreeSet<_>>();
-    let second = second
-        .into_iter()
-        .chain(Some(bob.node_announcement()))
-        .collect::<BTreeSet<_>>();
-
-    assert_eq!(relayed.len(), second.len());
-    assert_eq!(relayed, second);
-}
-
-#[test]
-fn test_announcement_relay() {
-    let mut alice = Peer::new("alice", [7, 7, 7, 7]);
-    let mut bob = Peer::new("bob", [8, 8, 8, 8]);
-    let mut eve = Peer::new("eve", [9, 9, 9, 9]);
-
-    alice.connect_to(&bob);
-    alice.connect_to(&eve);
-    alice
-        .receive(bob.id(), bob.inventory_announcement())
-        .elapse(service::GOSSIP_INTERVAL);
-    assert_matches!(
-        alice.messages(eve.id()).next(),
-        Some(Message::Announcement(_))
-    );
-
-    alice.receive(bob.id(), bob.inventory_announcement());
-    assert!(
-        alice.messages(eve.id()).next().is_none(),
-        "Another inventory with the same timestamp is ignored"
-    );
-
-    bob.elapse(LocalDuration::from_mins(1));
-    alice
-        .receive(bob.id(), bob.inventory_announcement())
-        .elapse(service::GOSSIP_INTERVAL);
-    assert_matches!(
-        alice.messages(eve.id()).next(),
-        Some(Message::Announcement(_)),
-        "Another inventory with a fresher timestamp is relayed"
-    );
-
-    alice
-        .receive(bob.id(), bob.node_announcement())
-        .elapse(service::GOSSIP_INTERVAL);
-    assert_matches!(
-        alice.messages(eve.id()).next(),
-        Some(Message::Announcement(_)),
-        "A node announcement with the same timestamp as the inventory is relayed"
-    );
-
-    alice
-        .receive(bob.id(), bob.node_announcement())
-        .elapse(service::GOSSIP_INTERVAL);
-    assert!(alice.messages(eve.id()).next().is_none(), "Only once");
-
-    alice
-        .receive(eve.id(), eve.node_announcement())
-        .elapse(service::GOSSIP_INTERVAL);
-    assert_matches!(
-        alice.messages(bob.id()).next(),
-        Some(Message::Announcement(_)),
-        "A node announcement from Eve is relayed to Bob"
-    );
-    assert!(
-        alice.messages(eve.id()).next().is_none(),
-        "But not back to Eve"
-    );
-
-    eve.elapse(LocalDuration::from_mins(1));
-    alice
-        .receive(bob.id(), eve.node_announcement())
-        .elapse(service::GOSSIP_INTERVAL);
-    assert!(
-        alice.messages(bob.id()).next().is_none(),
-        "Bob already know about this message, since he sent it"
-    );
-    assert!(
-        alice.messages(eve.id()).next().is_none(),
-        "Eve already know about this message, since she signed it"
-    );
-}
-
-#[test]
-fn test_refs_announcement_relay() {
-    let tmp = tempfile::tempdir().unwrap();
-    let mut alice = Peer::with_storage(
-        "alice",
-        [7, 7, 7, 7],
-        Storage::open(tmp.path().join("alice"), fixtures::user()).unwrap(),
-    );
-    let eve = Peer::with_storage(
-        "eve",
-        [8, 8, 8, 8],
-        Storage::open(tmp.path().join("eve"), fixtures::user()).unwrap(),
-    );
-
-    let bob = {
-        let mut rng = fastrand::Rng::new();
-        let signer = MockSigner::new(&mut rng);
-        let storage = fixtures::storage(tmp.path().join("bob"), &signer).unwrap();
-
-        Peer::config(
-            "bob",
-            [9, 9, 9, 9],
-            storage,
-            peer::Config {
-                signer,
-                rng,
-                ..peer::Config::default()
-            },
-        )
-        .initialized()
-    };
-    let bob_inv = bob.inventory().into_iter().collect::<Vec<_>>();
-
-    alice.seed(&bob_inv[0], policy::Scope::All).unwrap();
-    alice.seed(&bob_inv[1], policy::Scope::All).unwrap();
-    alice.seed(&bob_inv[2], policy::Scope::All).unwrap();
-    alice.connect_to(&bob);
-    alice.connect_to(&eve);
-    alice.receive(eve.id(), Message::Subscribe(Subscribe::all()));
-    alice
-        .receive(bob.id(), bob.refs_announcement(bob_inv[0]))
-        .elapse(service::GOSSIP_INTERVAL);
-
-    assert_matches!(
-        alice.messages(eve.id()).next(),
-        Some(Message::Announcement(_)),
-        "A refs announcement from Bob is relayed to Eve"
-    );
-
-    alice
-        .receive(bob.id(), bob.refs_announcement(bob_inv[0]))
-        .elapse(service::GOSSIP_INTERVAL);
-    assert!(
-        alice.messages(eve.id()).next().is_none(),
-        "The same ref announement is not relayed"
-    );
-
-    alice
-        .receive(bob.id(), bob.refs_announcement(bob_inv[1]))
-        .elapse(service::GOSSIP_INTERVAL);
-    assert_matches!(
-        alice.messages(eve.id()).next(),
-        Some(Message::Announcement(_)),
-        "But a different one is"
-    );
-
-    alice
-        .receive(bob.id(), bob.refs_announcement(bob_inv[2]))
-        .elapse(service::GOSSIP_INTERVAL);
-    assert_matches!(
-        alice.messages(eve.id()).next(),
-        Some(Message::Announcement(_)),
-        "And a third one is as well"
-    );
-}
-
-/// Even if Alice is not tracking Bob, Alice will fetch Bob's refs for a repo she doesn't have.
-#[test]
-fn test_refs_announcement_fetch_trusted_no_inventory() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-    let mut alice = Peer::with_storage(
-        "alice",
-        [7, 7, 7, 7],
-        Storage::open(tmp.path().join("alice"), fixtures::user()).unwrap(),
-    );
-    let bob = {
-        let mut rng = fastrand::Rng::new();
-        let signer = MockSigner::new(&mut rng);
-        let storage = fixtures::storage(tmp.path().join("bob"), &signer).unwrap();
-
-        Peer::config(
-            "bob",
-            [9, 9, 9, 9],
-            storage,
-            peer::Config {
-                signer,
-                rng,
-                ..peer::Config::default()
-            },
-        )
-        .initialized()
-    };
-    let bob_inv = bob.inventory();
-    let rid = bob_inv.iter().next().unwrap();
-
-    alice.seed(rid, policy::Scope::Followed).unwrap();
-    alice.connect_to(&bob);
-
-    // Alice receives Bob's refs.
-    alice.receive(bob.id(), bob.refs_announcement(*rid));
-
-    // Alice fetches Bob's refs as this is a new repo.
-    assert_matches!(alice.outbox().next(), Some(Io::Fetch { .. }));
-}
-
-/// Alice and Bob both have the same repo.
-///
-/// First, Alice will not fetch from Bob's `RefsAnnouncement` as Alice does not
-/// track Bob as `Followed`.
-///
-/// Later Alice follows Bob, and will be able to fetch Bob's refs.
-#[test]
-fn test_refs_announcement_followed() {
-    logger::init(log::Level::Debug);
-
-    // Create MockStorage for Alice and Bob. Both will have repo with `rid`.
-    let storage_alice = arbitrary::nonempty_storage(1);
-    let rid = *storage_alice.repos.keys().next().unwrap();
-    let storage_bob = storage_alice.clone();
-    let mut alice = Peer::with_storage("alice", [7, 7, 7, 7], storage_alice);
-    let mut bob = Peer::with_storage("bob", [8, 8, 8, 8], storage_bob);
-
-    let node_id = alice.id;
-    alice.storage_mut().repo_mut(&rid).remotes.insert(
-        node_id,
-        bob.signed_refs_at(arbitrary::gen::<Refs>(8), arbitrary::oid()),
-    );
-
-    // Generate some refs for Bob under their own node_id.
-    let sigrefs = bob.signed_refs_at(arbitrary::gen::<Refs>(8), arbitrary::oid());
-    let node_id = bob.id;
-    bob.init();
-    bob.storage_mut()
-        .repo_mut(&rid)
-        .remotes
-        .insert(node_id, sigrefs);
-
-    // Alice uses Scope::Followed, and did not track Bob yet.
-    alice.connect_to(&bob);
-    alice.seed(&rid, policy::Scope::Followed).unwrap();
-
-    // Alice receives Bob's refs
-    alice.receive(bob.id(), bob.refs_announcement(rid));
-
-    // Alice does not fetch as Alice is not tracking Bob.
-    assert!(
-        alice.messages(bob.id()).next().is_none(),
-        "Alice is not tracking bob yet."
-    );
-
-    // Alice starts to track Bob.
-    let (sender, receiver) = chan::bounded(1);
-    alice.command(Command::Follow(
-        bob.id,
-        Some(node::Alias::new("bob")),
-        sender,
-    ));
-    let policy_change = receiver.recv().map_err(runtime::HandleError::from).unwrap();
-    assert!(policy_change);
-
-    // Bob announces refs again.
-    bob.elapse(LocalDuration::from_mins(1)); // Make sure our announcement is fresh.
-    alice.receive(bob.id(), bob.refs_announcement(rid));
-    assert_matches!(alice.outbox().next(), Some(Io::Fetch { .. }));
-}
-
-#[test]
-fn test_refs_announcement_no_subscribe() {
-    let storage = arbitrary::nonempty_storage(1);
-    let rid = *storage.repos.keys().next().unwrap();
-    let mut alice = Peer::with_storage("alice", [7, 7, 7, 7], storage);
-    let bob = Peer::new("bob", [8, 8, 8, 8]);
-    let eve = Peer::new("eve", [9, 9, 9, 9]);
-    let id = arbitrary::gen(1);
-
-    alice.seed(&id, policy::Scope::All).unwrap();
-    alice.connect_to(&bob);
-    alice.connect_to(&eve);
-    alice.receive(bob.id(), bob.refs_announcement(rid));
-
-    assert!(alice.messages(eve.id()).next().is_none());
-}
-
-#[test]
-fn test_refs_announcement_offline() {
-    let tmp = tempfile::tempdir().unwrap();
-    let mut alice = {
-        let signer = MockSigner::default();
-        let storage = fixtures::storage(tmp.path().join("alice"), &signer).unwrap();
-
-        Peer::config(
-            "alice",
-            [7, 7, 7, 7],
-            storage,
-            peer::Config {
-                signer,
-                ..peer::Config::default()
-            },
-        )
-    };
-    let mut bob = Peer::new("bob", [8, 8, 8, 8]);
-
-    // Make sure alice's service wasn't initialized before.
-    assert_eq!(*alice.clock(), LocalTime::default());
-
-    alice.initialize();
-    alice.connect_to(&bob);
-    alice.receive(bob.id, Message::Subscribe(Subscribe::all()));
-
-    let mut inv = alice.inventory();
-    let rid = *inv.iter().next().unwrap();
-
-    bob.seed(&rid, policy::Scope::All).unwrap();
-
-    // Alice announces the refs of all projects since she hasn't announced refs for these projects
-    // yet.
-    for msg in alice.messages(bob.id()) {
-        assert_matches!(
-            msg,
-            Message::Announcement(Announcement {
-                node,
-                message: AnnouncementMessage::Refs(RefsAnnouncement {
-                    rid,
-                    ..
-                }),
-                ..
-            })
-            if node == alice.id && inv.remove(&rid)
-        );
-    }
-
-    // Create an issue without telling the node.
-    let repo = alice.storage().repository(rid).unwrap();
-    let old_refs = RefsAt::new(&repo, alice.id).unwrap();
-    let mut issues = radicle::issue::Cache::no_cache(&repo).unwrap();
-    issues
-        .create("Issue while offline!", "", &[], &[], [], alice.signer())
-        .unwrap();
-    let new_refs = RefsAt::new(&repo, alice.id).unwrap();
-    assert_ne!(old_refs, new_refs);
-
-    // Now we restart Alice's node. It should pick up that something's changed in storage.
-    alice.elapse(LocalDuration::from_secs(60));
-    alice
-        .database_mut()
-        .addresses_mut()
-        .remove(&bob.id)
-        .unwrap(); // Make sure we don't reconnect automatically.
-    alice.disconnected(
-        bob.id,
-        Link::Outbound,
-        &DisconnectReason::Session(session::Error::Timeout),
-    );
-    alice.outbox().for_each(drop);
-    alice.restart();
-    alice.connect_to(&bob);
-    alice.receive(
-        bob.id,
-        Message::Subscribe(Subscribe {
-            filter: Filter::default(),
-            since: alice.timestamp(),
-            until: Timestamp::MAX,
-        }),
-    );
-
-    let anns = alice
-        .messages(bob.id())
-        .filter_map(|m| {
-            if let Message::Announcement(Announcement {
-                message: AnnouncementMessage::Refs(ann),
-                ..
-            }) = m
-            {
-                Some(ann)
-            } else {
-                None
-            }
-        })
-        .collect::<Vec<_>>();
-
-    assert_eq!(anns.len(), 1);
-    assert_eq!(anns.first().unwrap().rid, rid);
-    assert_eq!(anns.first().unwrap().refs.first().unwrap().at, new_refs.at);
-}
-
-#[test]
-fn test_inventory_relay() {
-    logger::init(log::Level::Debug);
-
-    // Topology is eve <-> alice <-> bob
-    let mut alice = Peer::new("alice", [7, 7, 7, 7]);
-    let bob = Peer::new("bob", [8, 8, 8, 8]);
-    let eve = Peer::new("eve", [9, 9, 9, 9]);
-    let inv = BoundedVec::try_from(arbitrary::vec(1)).unwrap();
-    let now = LocalTime::now().into();
-
-    // Inventory from Bob relayed to Eve.
-    alice.init();
-    alice.wake(); // Run all periodic tasks now so they don't trigger later.
-    alice.connect_to(&bob);
-    alice.connect_from(&eve);
-    alice
-        .receive(
-            bob.id(),
-            Message::inventory(
-                InventoryAnnouncement {
-                    inventory: inv.clone(),
-                    timestamp: now,
-                },
-                bob.signer(),
-            ),
-        )
-        .elapse(service::GOSSIP_INTERVAL);
-
-    assert_matches!(
-        alice.inventory_announcements(eve.id()).next(),
-        Some(Message::Announcement(Announcement {
-            node,
-            message: AnnouncementMessage::Inventory(InventoryAnnouncement { timestamp, .. }),
-            ..
-        }))
-        if node == bob.node_id() && timestamp == now
-    );
-    assert_matches!(
-        alice.inventory_announcements(bob.id()).next(),
-        None,
-        "The inventory is not sent back to Bob"
-    );
-
-    alice
-        .receive(
-            bob.id(),
-            Message::inventory(
-                InventoryAnnouncement {
-                    inventory: inv.clone(),
-                    timestamp: now,
-                },
-                bob.signer(),
-            ),
-        )
-        .elapse(service::GOSSIP_INTERVAL);
-
-    assert_matches!(
-        alice.inventory_announcements(eve.id()).next(),
-        None,
-        "Sending the same inventory again doesn't trigger a relay"
-    );
-
-    alice
-        .receive(
-            bob.id(),
-            Message::inventory(
-                InventoryAnnouncement {
-                    inventory: inv.clone(),
-                    timestamp: now + 1,
-                },
-                bob.signer(),
-            ),
-        )
-        .elapse(service::GOSSIP_INTERVAL);
-
-    assert_matches!(
-        alice.inventory_announcements(eve.id()).next(),
-        Some(Message::Announcement(Announcement {
-            node,
-            message: AnnouncementMessage::Inventory(InventoryAnnouncement { timestamp, .. }),
-            ..
-        }))
-        if node == bob.node_id() && timestamp == now + 1,
-        "Sending a new inventory does trigger the relay"
-    );
-
-    // Inventory from Eve relayed to Bob.
-    alice
-        .receive(
-            eve.id(),
-            Message::inventory(
-                InventoryAnnouncement {
-                    inventory: inv,
-                    timestamp: now,
-                },
-                eve.signer(),
-            ),
-        )
-        .elapse(service::GOSSIP_INTERVAL);
-
-    assert_matches!(
-        alice.inventory_announcements(bob.id()).next(),
-        Some(Message::Announcement(Announcement {
-            node,
-            message: AnnouncementMessage::Inventory(InventoryAnnouncement { timestamp, .. }),
-            ..
-        }))
-        if node == eve.node_id() && timestamp == now
-    );
-}
-
-#[test]
-fn test_persistent_peer_reconnect_attempt() {
-    use std::collections::HashSet;
-
-    let mut bob = Peer::new("bob", [8, 8, 8, 8]);
-    let mut eve = Peer::new("eve", [9, 9, 9, 9]);
-    let mut alice = Peer::config(
-        "alice",
-        [7, 7, 7, 7],
-        MockStorage::empty(),
-        peer::Config {
-            config: Config {
-                connect: HashSet::from_iter([
-                    (bob.id(), bob.address()).into(),
-                    (eve.id(), eve.address()).into(),
-                ]),
-                ..Config::new(node::Alias::new("alice"))
-            },
-            ..peer::Config::default()
-        },
-    )
-    .initialized();
-
-    let mut sim = Simulation::new(
-        LocalTime::now(),
-        alice.rng.clone(),
-        simulator::Options::default(),
-    )
-    .initialize([&mut alice, &mut bob, &mut eve]);
-
-    sim.run_while([&mut alice, &mut bob, &mut eve], |s| !s.is_settled());
-
-    let ips = alice
-        .sessions()
-        .connected()
-        .map(|(id, _)| *id)
-        .collect::<Vec<_>>();
-    assert!(ips.contains(&bob.id()));
-    assert!(ips.contains(&eve.id()));
-
-    // ... Negotiated ...
-    //
-    // Now let's disconnect a peer.
-
-    // A non-transient disconnect, such as one due to peer misbehavior will still trigger a
-    // a reconnection, since this is a persistent peer.
-    let reason = DisconnectReason::Session(session::Error::Misbehavior);
-
-    for _ in 0..3 {
-        alice.disconnected(bob.id(), Link::Outbound, &reason);
-        alice.elapse(service::MAX_RECONNECTION_DELTA);
-        alice
-            .outbox()
-            .find(|io| matches!(io, Io::Connect(a, _) if a == &bob.id()))
-            .unwrap();
-
-        alice.attempted(bob.id(), bob.address());
-    }
-}
-
-#[test]
-fn test_persistent_peer_reconnect_success() {
-    use std::collections::HashSet;
-
-    let bob = Peer::with_storage("bob", [9, 9, 9, 9], MockStorage::empty());
-    let mut alice = Peer::config(
-        "alice",
-        [7, 7, 7, 7],
-        MockStorage::empty(),
-        peer::Config {
-            config: Config {
-                connect: HashSet::from_iter([(bob.id, bob.addr()).into()]),
-                ..Config::new(node::Alias::new("alice"))
-            },
-            ..peer::Config::default()
-        },
-    )
-    .initialized();
-    alice.connect_to(&bob);
-
-    // A transient error such as this will cause Alice to attempt a reconnection.
-    let error = Arc::new(io::Error::from(io::ErrorKind::ConnectionReset));
-    alice.disconnected(
-        bob.id(),
-        Link::Outbound,
-        &DisconnectReason::Connection(error),
-    );
-    alice.elapse(service::MIN_RECONNECTION_DELTA);
-    alice.elapse(service::MIN_RECONNECTION_DELTA); // Trigger a second wakeup to test idempotence.
-
-    alice
-        .outbox()
-        .find_map(|o| match o {
-            Io::Connect(id, _) => Some(id),
-            _ => None,
-        })
-        .expect("Alice attempts a re-connection");
-
-    alice.attempted(bob.id(), bob.addr());
-    alice.connected(bob.id(), bob.addr(), Link::Outbound);
-}
-
-#[test]
-fn test_maintain_connections() {
-    // Peers alice starts out connected to.
-    let connected = vec![
-        Peer::new("connected", [8, 8, 8, 1]),
-        Peer::new("connected", [8, 8, 8, 2]),
-        Peer::new("connected", [8, 8, 8, 3]),
-    ];
-    // Peers alice will connect to once the others disconnect.
-    let mut unconnected = vec![
-        Peer::new("unconnected", [9, 9, 9, 1]),
-        Peer::new("unconnected", [9, 9, 9, 2]),
-        Peer::new("unconnected", [9, 9, 9, 3]),
-    ];
-
-    let mut alice = Peer::new("alice", [7, 7, 7, 7]);
-
-    for peer in connected.iter() {
-        alice.connect_to(peer);
-    }
-    assert_eq!(
-        connected.len(),
-        alice.sessions().len(),
-        "alice should be connected to the first set of peers"
-    );
-    // We now import the other addresses.
-    alice.import_addresses(&unconnected);
-
-    // A non-transient error such as this will cause Alice to attempt a different peer.
-    let error = session::Error::Misbehavior;
-    for peer in connected.iter() {
-        alice.disconnected(peer.id(), Link::Outbound, &DisconnectReason::Session(error));
-
-        let id = alice
-            .outbox()
-            .find_map(|o| match o {
-                Io::Connect(id, _) => Some(id),
-                _ => None,
-            })
-            .expect("Alice connects to a new peer");
-        assert_ne!(id, peer.id());
-        unconnected.retain(|p| p.id() != id);
-    }
-    assert!(
-        unconnected.is_empty(),
-        "alice should connect to all unconnected peers"
-    );
-}
-
-#[test]
-fn test_maintain_connections_transient() {
-    // Peers alice starts out connected to.
-    let connected = vec![
-        Peer::new("connected", [8, 8, 8, 1]),
-        Peer::new("connected", [8, 8, 8, 2]),
-        Peer::new("connected", [8, 8, 8, 3]),
-    ];
-    let mut alice = Peer::new("alice", [7, 7, 7, 7]);
-
-    for peer in connected.iter() {
-        alice.connect_to(peer);
-    }
-    // A transient error such as this will cause Alice to attempt a reconnection.
-    let error = Arc::new(io::Error::from(io::ErrorKind::ConnectionReset));
-    for peer in connected.iter() {
-        alice.disconnected(
-            peer.id(),
-            Link::Outbound,
-            &DisconnectReason::Connection(error.clone()),
-        );
-        alice
-            .outbox()
-            .find(|o| matches!(o, Io::Connect(id, _) if id == &peer.id()))
-            .unwrap();
-    }
-}
-
-#[test]
-fn test_maintain_connections_failed_attempt() {
-    let eve = Peer::new("eve", [9, 9, 9, 9]);
-    let mut alice = Peer::new("alice", [7, 7, 7, 7]);
-    let reason =
-        DisconnectReason::Connection(Arc::new(io::Error::from(io::ErrorKind::ConnectionReset)));
-
-    // Make sure Alice knows about Eve.
-    alice.connect_to(&eve);
-    alice.disconnected(eve.id(), Link::Outbound, &reason);
-    alice
-        .outbox()
-        .find(|o| matches!(o, Io::Connect(id, _) if id == &eve.id))
-        .expect("Alice attempts Eve");
-    alice.attempted(eve.id, eve.addr());
-
-    // Disconnect Eve and make sure Alice doesn't try to re-connect immediately.
-    alice.disconnected(eve.id(), Link::Outbound, &reason);
-    assert_matches!(
-        alice.outbox().find(|o| matches!(o, Io::Connect(_, _))),
-        None
-    );
-
-    // Now pass some time and try again.
-    alice.elapse(MAX_RECONNECTION_DELTA);
-    alice
-        .outbox()
-        .find(|o| matches!(o, Io::Connect(id, _) if id == &eve.id))
-        .expect("Alice attempts Eve again");
-
-    // Disconnect Eve and make sure Alice doesn't try to re-connect immediately.
-    alice.disconnected(eve.id(), Link::Outbound, &reason);
-    assert!(!alice.outbox().any(|o| matches!(o, Io::Connect(_, _))));
-    // Or even after some short time..
-    alice.elapse(MIN_RECONNECTION_DELTA);
-    assert!(!alice.outbox().any(|o| matches!(o, Io::Connect(_, _))));
-}
-
-#[test]
-fn test_seed_repo_subscribe() {
-    let mut alice = Peer::new("alice", [7, 7, 7, 7]);
-    let bob = Peer::new("bob", [8, 8, 8, 8]);
-    let rid = arbitrary::gen::<RepoId>(1);
-    let (send, recv) = chan::bounded(1);
-
-    alice.connect_to(&bob);
-    alice.command(Command::Seed(rid, policy::Scope::default(), send));
-    assert!(recv.recv().unwrap());
-
-    assert_matches!(
-        alice.messages(bob.id).next(),
-        Some(Message::Subscribe(Subscribe {
-            filter,
-            since,
-            ..
-        })) if since == alice.timestamp() && filter.contains(&rid)
-    );
-}
-
-#[test]
-fn test_fetch_missing_inventory_on_gossip() {
-    let rid = arbitrary::gen::<RepoId>(1);
-    let mut alice = Peer::new("alice", [7, 7, 7, 7]);
-    let bob = Peer::new("bob", [8, 8, 8, 8]);
-    let now = LocalTime::now();
-
-    alice.seed(&rid, node::policy::Scope::All).unwrap();
-    alice.connect_to(&bob);
-    alice.receive(
-        bob.id(),
-        Message::inventory(
-            InventoryAnnouncement {
-                inventory: vec![rid].try_into().unwrap(),
-                timestamp: now.into(),
-            },
-            bob.signer(),
-        ),
-    );
-    alice
-        .outbox()
-        .find(|m| matches!(m, Io::Fetch { rid: other, .. } if other == &rid))
-        .unwrap();
-}
-
-#[test]
-fn test_fetch_missing_inventory_on_schedule() {
-    let rid = arbitrary::gen::<RepoId>(1);
-    let mut alice = Peer::new("alice", [7, 7, 7, 7]);
-    let bob = Peer::new("bob", [8, 8, 8, 8]);
-    let now = LocalTime::now();
-
-    alice.seed(&rid, node::policy::Scope::All).unwrap();
-    alice.connect_to(&bob);
-    alice.receive(
-        bob.id(),
-        Message::inventory(
-            InventoryAnnouncement {
-                inventory: vec![rid].try_into().unwrap(),
-                timestamp: now.into(),
-            },
-            bob.signer(),
-        ),
-    );
-    alice.fetched(
-        rid,
-        bob.id,
-        Err(worker::FetchError::Io(
-            io::ErrorKind::ConnectionReset.into(),
-        )),
-    );
-    alice.outbox().for_each(drop);
-    alice.elapse(service::SYNC_INTERVAL);
-    alice
-        .outbox()
-        .find(|m| matches!(m, Io::Fetch { rid: other, .. } if other == &rid))
-        .unwrap();
-}
-
-#[test]
-fn test_queued_fetch_max_capacity() {
-    let storage = arbitrary::nonempty_storage(3);
-    let mut repo_keys = storage.repos.keys();
-    let rid1 = *repo_keys.next().unwrap();
-    let rid2 = *repo_keys.next().unwrap();
-    let rid3 = *repo_keys.next().unwrap();
-    let doc = storage.repos.get(&rid1).unwrap().doc.clone();
-    let mut alice = Peer::with_storage("alice", [7, 7, 7, 7], storage);
-    let bob = Peer::new("bob", [8, 8, 8, 8]);
-
-    logger::init(log::Level::Debug);
-
-    alice.connect_to(&bob);
-
-    // Send the first fetch.
-    let (send, _recv1) = chan::bounded::<node::FetchResult>(1);
-    alice.command(Command::Fetch(rid1, bob.id, DEFAULT_TIMEOUT, send));
-
-    // Send the 2nd fetch that will be queued.
-    let (send2, _recv2) = chan::bounded::<node::FetchResult>(1);
-    alice.command(Command::Fetch(rid2, bob.id, DEFAULT_TIMEOUT, send2));
-
-    // Send the 3rd fetch that will be queued.
-    let (send3, _recv3) = chan::bounded::<node::FetchResult>(1);
-    alice.command(Command::Fetch(rid3, bob.id, DEFAULT_TIMEOUT, send3));
-
-    // The first fetch is initiated.
-    assert_matches!(alice.fetches().next(), Some((rid, _)) if rid == rid1);
-    // We shouldn't send out the 2nd, 3rd fetch while we're doing the 1st fetch.
-    assert_matches!(alice.outbox().next(), None);
-
-    // Have enough time pass that Alice sends a "ping" to Bob.
-    alice.elapse(KEEP_ALIVE_DELTA);
-
-    // Finish the 1st fetch.
-    alice.fetched(rid1, bob.id, Ok(fetch::FetchResult::new(doc.clone())));
-    // Now the 1st fetch is done, the 2nd fetch is dequeued.
-    assert_matches!(alice.fetches().next(), Some((rid, _)) if rid == rid2);
-    // ... but not the third.
-    assert_matches!(alice.fetches().next(), None);
-
-    // Finish the 2nd fetch.
-    alice.fetched(rid2, bob.id, Ok(fetch::FetchResult::new(doc)));
-    // Now the 2nd fetch is done, the 3rd fetch is dequeued.
-    assert_matches!(alice.fetches().next(), Some((rid, _)) if rid == rid3);
-}
-
-#[test]
-fn test_queued_fetch_from_ann_same_rid() {
-    let storage = arbitrary::nonempty_storage(1); // We're testing both public and private repos.
-    let mut repo_keys = storage.repos.keys();
-    let rid = *repo_keys.next().unwrap();
-    let mut alice = Peer::with_storage("alice", [7, 7, 7, 7], storage);
-    let bob = Peer::new("bob", [8, 8, 8, 8]);
-    let eve = Peer::new("eve", [9, 9, 9, 9]);
-    let carol = Peer::new("carol", [10, 10, 10, 10]);
-    let oid = arbitrary::oid();
-    let ann = RefsAnnouncement {
-        rid,
-        refs: vec![RefsAt {
-            remote: carol.id(),
-            at: oid,
-        }]
-        .try_into()
-        .unwrap(),
-        timestamp: bob.timestamp(),
-    };
-
-    alice.seed(&rid, policy::Scope::All).unwrap();
-    alice.connect_to(&bob);
-    alice.connect_to(&eve);
-    alice.connect_to(&carol);
-
-    // Send the first announcement.
-    alice.receive(bob.id, bob.announcement(ann.clone()));
-    // Send the 2nd announcement that will be queued.
-    alice.receive(eve.id, eve.announcement(ann.clone()));
-    // Send the 3rd announcement that will be queued.
-    alice.receive(carol.id, carol.announcement(ann));
-
-    // The first fetch is initiated.
-    assert_matches!(alice.fetches().next(), Some((rid_, nid_)) if rid_ == rid && nid_ == bob.id);
-    // We shouldn't send out the 2nd, 3rd fetch while we're doing the 1st fetch.
-    assert_matches!(alice.fetches().next(), None);
-
-    // Have enough time pass that Alice sends a "ping" to Bob.
-    alice.elapse(KEEP_ALIVE_DELTA);
-
-    let refname = carol
-        .id()
-        .to_namespace()
-        .join(git::refname!("refs/sigrefs"));
-
-    // Finish the 1st fetch.
-    // Ensure the ref is in the storage and cache.
-    alice.storage_mut().repo_mut(&rid).remotes.insert(
-        carol.id(),
-        carol.signed_refs_at(arbitrary::gen::<Refs>(1), oid),
-    );
-    alice
-        .database_mut()
-        .refs_mut()
-        .set(&rid, &carol.id, &SIGREFS_BRANCH, oid, LocalTime::now())
-        .unwrap();
-    alice.fetched(
-        rid,
-        bob.id,
-        Ok(fetch::FetchResult {
-            updated: vec![RefUpdate::Created {
-                name: refname.clone(),
-                oid,
-            }],
-            namespaces: [carol.id()].into_iter().collect(),
-            clone: false,
-            doc: arbitrary::gen(1),
-        }),
-    );
-    // Now the 1st fetch is done, but the 2nd and 3rd fetches are redundant.
-    assert_matches!(alice.fetches().next(), None);
-}
-
-#[test]
-fn test_queued_fetch_from_command_same_rid() {
-    let storage = arbitrary::nonempty_storage(3);
-    let mut repo_keys = storage.repos.keys();
-    let rid1 = *repo_keys.next().unwrap();
-    let mut alice = Peer::with_storage("alice", [7, 7, 7, 7], storage);
-    let bob = Peer::new("bob", [8, 8, 8, 8]);
-    let eve = Peer::new("eve", [9, 9, 9, 9]);
-    let carol = Peer::new("carol", [10, 10, 10, 10]);
-
-    logger::init(log::Level::Debug);
-
-    alice.connect_to(&bob);
-    alice.connect_to(&eve);
-    alice.connect_to(&carol);
-
-    // Send the first fetch.
-    let (send, _recv1) = chan::bounded::<node::FetchResult>(1);
-    alice.command(Command::Fetch(rid1, bob.id, DEFAULT_TIMEOUT, send));
-
-    // Send the 2nd fetch that will be queued.
-    let (send2, _recv2) = chan::bounded::<node::FetchResult>(1);
-    alice.command(Command::Fetch(rid1, eve.id, DEFAULT_TIMEOUT, send2));
-
-    // Send the 3rd fetch that will be queued.
-    let (send3, _recv3) = chan::bounded::<node::FetchResult>(1);
-    alice.command(Command::Fetch(rid1, carol.id, DEFAULT_TIMEOUT, send3));
-
-    // Peers Alice will fetch from.
-    let mut peers = [bob.id, eve.id, carol.id]
-        .into_iter()
-        .collect::<BTreeSet<_>>();
-
-    // The first fetch is initiated.
-    let (rid, nid) = alice.fetches().next().unwrap();
-    assert_eq!(rid, rid1);
-    assert!(peers.remove(&nid));
-
-    // We shouldn't send out the 2nd, 3rd fetch while we're doing the 1st fetch.
-    assert_matches!(alice.outbox().next(), None);
-
-    // Have enough time pass that Alice sends a "ping" to Bob.
-    alice.elapse(KEEP_ALIVE_DELTA);
-
-    // Finish the 1st fetch.
-    alice.fetched(rid1, nid, Ok(arbitrary::gen::<fetch::FetchResult>(1)));
-    // Now the 1st fetch is done, the 2nd fetch is dequeued.
-    let (rid, nid) = alice.fetches().next().unwrap();
-    assert_eq!(rid, rid1);
-    assert!(peers.remove(&nid));
-
-    // ... but not the third.
-    assert_matches!(alice.fetches().next(), None);
-
-    // Finish the 2nd fetch.
-    alice.fetched(rid1, nid, Ok(arbitrary::gen::<fetch::FetchResult>(1)));
-    // Now the 2nd fetch is done, the 3rd fetch is dequeued.
-    assert_matches!(alice.fetches().next(), Some((rid, nid)) if rid == rid1 && peers.remove(&nid));
-    // All fetches were initiated.
-    assert!(peers.is_empty());
-}
-
-#[test]
-fn test_refs_synced_event() {
-    let temp = tempfile::tempdir().unwrap();
-    let storage = Storage::open(temp.path(), fixtures::user()).unwrap();
-    let mut alice = Peer::with_storage("alice", [8, 8, 8, 8], storage.clone());
-    let bob = Peer::new("bob", [9, 9, 9, 9]);
-    let eve = Peer::with_storage("eve", [7, 7, 7, 7], storage);
-    let acme = alice.project("acme", "");
-    let events = alice.events();
-    let ann = AnnouncementMessage::from(RefsAnnouncement {
-        rid: acme,
-        refs: vec![RefsAt::new(&alice.storage().repository(acme).unwrap(), alice.id).unwrap()]
-            .try_into()
-            .unwrap(),
-        timestamp: bob.timestamp(),
-    });
-    let msg = ann.signed(bob.signer());
-
-    alice.seed(&acme, policy::Scope::All).unwrap();
-    alice.connect_to(&bob);
-    alice.receive(bob.id, Message::Announcement(msg));
-
-    events
-        .wait(
-            |e| {
-                matches!(
-                    e,
-                    Event::RefsSynced { remote, rid, .. }
-                    if rid == &acme && remote == &bob.id
-                )
-                .then_some(())
-            },
-            time::Duration::from_secs(3),
-        )
-        .unwrap();
-
-    // Now a relayed announcement.
-    alice.receive(bob.id, eve.node_announcement());
-    alice.receive(bob.id, eve.refs_announcement(acme));
-
-    events
-        .wait(
-            |e| matches!(e, Event::RefsSynced { remote, .. } if remote == &eve.id).then_some(()),
-            time::Duration::from_secs(3),
-        )
-        .unwrap();
-}
-
-#[test]
-fn test_init_and_seed() {
-    let tempdir = tempfile::tempdir().unwrap();
-
-    let storage_alice = Storage::open(
-        tempdir.path().join("alice").join("storage"),
-        fixtures::user(),
-    )
-    .unwrap();
-    let (repo, _) = fixtures::repository(tempdir.path().join("working"));
-    let mut alice = Peer::with_storage("alice", [7, 7, 7, 7], storage_alice);
-
-    let storage_bob =
-        Storage::open(tempdir.path().join("bob").join("storage"), fixtures::user()).unwrap();
-    let mut bob = Peer::with_storage("bob", [8, 8, 8, 8], storage_bob);
-
-    let storage_eve =
-        Storage::open(tempdir.path().join("eve").join("storage"), fixtures::user()).unwrap();
-    let mut eve = Peer::with_storage("eve", [9, 9, 9, 9], storage_eve);
-
-    remote::mock::register(&alice.node_id(), alice.storage().path());
-    remote::mock::register(&eve.node_id(), eve.storage().path());
-    remote::mock::register(&bob.node_id(), bob.storage().path());
-    local::register(alice.storage().clone());
-
-    // Alice and Bob connect to Eve.
-    alice.command(service::Command::Connect(
-        eve.id(),
-        eve.address(),
-        ConnectOptions::default(),
-    ));
-    bob.command(service::Command::Connect(
-        eve.id(),
-        eve.address(),
-        ConnectOptions::default(),
-    ));
-
-    // Alice creates a new project.
-    let (proj_id, _, _) = rad::init(
-        &repo,
-        "alice".try_into().unwrap(),
-        "alice's repo",
-        git::refname!("master"),
-        Visibility::default(),
-        alice.signer(),
-        alice.storage(),
-    )
-    .unwrap();
-
-    let mut sim = Simulation::new(
-        LocalTime::now(),
-        alice.rng.clone(),
-        simulator::Options::default(),
-    )
-    .initialize([&mut alice, &mut bob, &mut eve]);
-
-    let bob_events = bob.events();
-
-    // Neither Eve nor Bob have Alice's project for now.
-    assert!(eve.get(proj_id).unwrap().is_none());
-    assert!(bob.get(proj_id).unwrap().is_none());
-
-    // Bob seeds Alice's project.
-    let (sender, receiver) = chan::bounded(1);
-    bob.command(service::Command::Seed(
-        proj_id,
-        policy::Scope::default(),
-        sender,
-    ));
-    assert!(receiver.recv().unwrap());
-
-    // Eve seeds Alice's project.
-    let (sender, receiver) = chan::bounded(1);
-    eve.command(service::Command::Seed(
-        proj_id,
-        policy::Scope::default(),
-        sender,
-    ));
-    assert!(receiver.recv().unwrap());
-
-    let (send, _) = chan::bounded(1);
-    // Alice announces her inventory.
-    // We now expect Eve to fetch Alice's project from Alice.
-    // Then we expect Bob to fetch Alice's project from Eve.
-    alice.elapse(LocalDuration::from_secs(1)); // Make sure our announcement is fresh.
-    alice.command(service::Command::AddInventory(proj_id, send));
-
-    sim.run_while([&mut alice, &mut bob, &mut eve], |s| !s.is_settled());
-
-    log::debug!(target: "test", "Simulation is over");
-
-    // TODO: Refs should be compared between the two peers.
-
-    log::debug!(target: "test", "Waiting for {} to fetch {} from {}..", bob.id, proj_id,eve.id);
-    bob_events
-        .iter()
-        .find(|e| {
-            matches!(
-                e,
-                service::Event::RefsFetched { remote, .. }
-                if *remote == eve.node_id()
-            )
-        })
-        .expect("Bob fetched from Eve");
-
-    assert!(eve.storage().get(proj_id).unwrap().is_some());
-    assert!(bob.storage().get(proj_id).unwrap().is_some());
-}
-
-#[test]
-fn prop_inventory_exchange_dense() {
-    fn property(alice_inv: MockStorage, bob_inv: MockStorage, eve_inv: MockStorage) {
-        let rng = fastrand::Rng::new();
-        let alice = Peer::with_storage(
-            "alice",
-            [7, 7, 7, 7],
-            alice_inv
-                .clone()
-                .map(|doc| doc.visibility = Visibility::Public),
-        );
-        let mut bob = Peer::with_storage(
-            "bob",
-            [8, 8, 8, 8],
-            bob_inv
-                .clone()
-                .map(|doc| doc.visibility = Visibility::Public),
-        );
-        let mut eve = Peer::with_storage(
-            "eve",
-            [9, 9, 9, 9],
-            eve_inv
-                .clone()
-                .map(|doc| doc.visibility = Visibility::Public),
-        );
-        let mut routing = RandomMap::with_hasher(rng.clone().into());
-
-        for (inv, peer) in &[
-            (alice_inv.repos, alice.node_id()),
-            (bob_inv.repos, bob.node_id()),
-            (eve_inv.repos, eve.node_id()),
-        ] {
-            for id in inv.keys() {
-                routing
-                    .entry(*id)
-                    .or_insert_with(|| RandomSet::with_hasher(rng.clone().into()))
-                    .insert(*peer);
-            }
-        }
-
-        // Fully-connected.
-        bob.command(Command::Connect(
-            alice.id(),
-            alice.address(),
-            ConnectOptions::default(),
-        ));
-        bob.command(Command::Connect(
-            eve.id(),
-            eve.address(),
-            ConnectOptions::default(),
-        ));
-        eve.command(Command::Connect(
-            alice.id(),
-            alice.address(),
-            ConnectOptions::default(),
-        ));
-
-        let mut peers: RandomMap<_, _> = [
-            (alice.node_id(), alice),
-            (bob.node_id(), bob),
-            (eve.node_id(), eve),
-        ]
-        .into_iter()
-        .collect();
-        let mut simulator = Simulation::new(LocalTime::now(), rng, simulator::Options::default())
-            .initialize(peers.values_mut());
-
-        simulator.run_while(peers.values_mut(), |s| !s.is_settled());
-
-        for (proj_id, remotes) in &routing {
-            for peer in peers.values() {
-                let lookup = peer.lookup(*proj_id).unwrap();
-
-                if lookup.local.is_some() {
-                    peer.get(*proj_id)
-                        .expect("There are no errors querying storage")
-                        .expect("The project is available locally");
-                } else {
-                    for remote in &lookup.remote {
-                        peers[remote]
-                            .get(*proj_id)
-                            .expect("There are no errors querying storage")
-                            .expect("The project is available remotely");
-                    }
-                    assert!(
-                        !lookup.remote.is_empty(),
-                        "There are remote locations for the project"
-                    );
-                    assert_eq!(
-                        &lookup.remote.into_iter().collect::<RandomSet<_>>(),
-                        remotes,
-                        "The remotes match the global routing table"
-                    );
-                }
-            }
-        }
-    }
-    qcheck::QuickCheck::new()
-        .gen(qcheck::Gen::new(5))
-        .tests(20)
-        .quickcheck(property as fn(MockStorage, MockStorage, MockStorage));
-}
-
-#[test]
-fn test_announcement_message_amplification() {
-    let mut results = Vec::new();
-    let mut rng = fastrand::Rng::new();
-
-    while results.len() < *TEST_CASES {
-        let mut alice = Peer::new("alice", [7, 7, 7, 7]);
-        let mut bob = Peer::new("bob", [8, 8, 8, 8]);
-        let mut eve = Peer::new("eve", [9, 9, 9, 9]);
-        let mut zod = Peer::new("zod", [5, 5, 5, 5]);
-        let mut tom = Peer::new("tom", [4, 4, 4, 4]);
-        let mut sim = Simulation::new(
-            LocalTime::now(),
-            alice.rng.clone(),
-            simulator::Options {
-                latency: 0..1, // 0 - 1s
-                failure_rate: 0.,
-            },
-        );
-        let rid = gen::<RepoId>(1);
-
-        // Make sure the node gossip intervals are not accidentally synchronized.
-        alice.elapse(LocalDuration::from_millis(
-            rng.u128(0..=service::GOSSIP_INTERVAL.as_millis()),
-        ));
-        bob.elapse(LocalDuration::from_millis(
-            rng.u128(0..=service::GOSSIP_INTERVAL.as_millis()),
-        ));
-        eve.elapse(LocalDuration::from_millis(
-            rng.u128(0..=service::GOSSIP_INTERVAL.as_millis()),
-        ));
-        zod.elapse(LocalDuration::from_millis(
-            rng.u128(0..=service::GOSSIP_INTERVAL.as_millis()),
-        ));
-        tom.elapse(LocalDuration::from_millis(
-            rng.u128(0..=service::GOSSIP_INTERVAL.as_millis()),
-        ));
-
-        // Fully-connected network.
-        alice.command(Command::Connect(
-            bob.id,
-            bob.address(),
-            ConnectOptions::default(),
-        ));
-        alice.command(Command::Connect(
-            eve.id,
-            eve.address(),
-            ConnectOptions::default(),
-        ));
-        alice.command(Command::Connect(
-            zod.id,
-            zod.address(),
-            ConnectOptions::default(),
-        ));
-        alice.command(Command::Connect(
-            tom.id,
-            tom.address(),
-            ConnectOptions::default(),
-        ));
-        bob.command(Command::Connect(
-            eve.id,
-            eve.address(),
-            ConnectOptions::default(),
-        ));
-        bob.command(Command::Connect(
-            zod.id,
-            zod.address(),
-            ConnectOptions::default(),
-        ));
-        bob.command(Command::Connect(
-            tom.id,
-            tom.address(),
-            ConnectOptions::default(),
-        ));
-        eve.command(Command::Connect(
-            zod.id,
-            zod.address(),
-            ConnectOptions::default(),
-        ));
-        eve.command(Command::Connect(
-            tom.id,
-            tom.address(),
-            ConnectOptions::default(),
-        ));
-        zod.command(Command::Connect(
-            tom.id,
-            tom.address(),
-            ConnectOptions::default(),
-        ));
-
-        // Let the nodes connect to each other.
-        sim.run_while([&mut alice, &mut bob, &mut eve, &mut zod, &mut tom], |s| {
-            s.elapsed() < LocalDuration::from_mins(3)
-        });
-
-        // Ensure nodes are all connected, otherwise skip this test run.
-        if alice.sessions().connected().count() != 4 {
-            continue;
-        }
-        if bob.sessions().connected().count() != 4 {
-            continue;
-        }
-        if eve.sessions().connected().count() != 4 {
-            continue;
-        }
-        if zod.sessions().connected().count() != 4 {
-            continue;
-        }
-        if tom.sessions().connected().count() != 4 {
-            continue;
-        }
-
-        let (tx, _) = chan::bounded(1);
-        let timestamp = (*alice.clock()).into();
-        alice
-            .storage_mut()
-            .repos
-            .insert(rid, gen::<MockRepository>(1));
-        alice.command(Command::AddInventory(rid, tx));
-
-        sim.run_while([&mut alice, &mut bob, &mut eve, &mut zod, &mut tom], |s| {
-            s.elapsed() < LocalDuration::from_mins(3)
-        });
-
-        // Make sure they have the routing table entry.
-        for node in [&bob, &eve, &zod, &tom] {
-            assert!(node
-                .service
-                .database()
-                .routing()
-                .get(&rid)
-                .unwrap()
-                .contains(&alice.id));
-        }
-
-        // Count how many copies of Alice's inventory message have been received by peers.
-        let received = sim.messages().iter().filter(|m| {
-            matches!(
-                m,
-                (_, _, Message::Announcement(Announcement {
-                    node,
-                    message: AnnouncementMessage::Inventory(i),
-                    ..
-                }))
-                if node == &alice.id && i.inventory.to_vec() == vec![rid] && i.timestamp == timestamp
-            )
-        });
-        results.push(received.count());
-    }
-    // Calculate the average amplification factor based on all simulation runs.
-    let avg = results.iter().sum::<usize>() as f64 / results.len() as f64;
-    // Amplification is total divided by minimum, ie. it's a relative metric.
-    let amp = avg / 4.;
-
-    // The worse case scenario is (n - 1)^2 messages received for one message announced.
-    // In the above case of 5 nodes, this is 4 * 4 = 16 messages. This is an amplification of 4.0.
-    // The best case is an amplification of 1.0, ie. each node receives the message once only.
-    //
-    // By using delayed message propagation though, we can bring this down closer to the minimum.
-    log::debug!(target: "test", "Average message amplification: {amp}");
-
-    assert!(amp < 2., "Amplification factor of {amp} is too high");
-    assert!(amp >= 1., "Amplification can't be lower than 1");
-}
diff --git a/radicle-node/src/tests/e2e.rs b/radicle-node/src/tests/e2e.rs
deleted file mode 100644
index 33d4afd1d..000000000
--- a/radicle-node/src/tests/e2e.rs
+++ /dev/null
@@ -1,1365 +0,0 @@
-use std::{collections::HashSet, thread, time};
-
-use radicle::crypto::{test::signer::MockSigner, Signer};
-use radicle::node::{Alias, ConnectResult, FetchResult, Handle as _, DEFAULT_TIMEOUT};
-use radicle::storage::{
-    ReadRepository, ReadStorage, RefUpdate, RemoteRepository, SignRepository, ValidateRepository,
-    WriteRepository, WriteStorage,
-};
-use radicle::test::fixtures;
-use radicle::{assert_matches, rad};
-use radicle::{git, issue};
-
-use crate::node::config::Limits;
-use crate::node::{Config, ConnectOptions};
-use crate::service;
-use crate::service::policy::Scope;
-use crate::storage::git::transport;
-use crate::test::environment::{converge, Environment, Node};
-use crate::test::logger;
-
-mod config {
-    use super::*;
-    use radicle::node::config::{Config, Relay};
-
-    /// Relay node config.
-    pub fn relay(alias: &'static str) -> Config {
-        Config {
-            relay: Relay::Always,
-            ..Config::test(Alias::new(alias))
-        }
-    }
-}
-
-#[test]
-//
-//     alice -- bob
-//
-fn test_inventory_sync_basic() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-
-    let mut alice = Node::init(tmp.path(), config::relay("alice"));
-    let mut bob = Node::init(tmp.path(), config::relay("bob"));
-
-    alice.project("alice", "");
-    bob.project("bob", "");
-
-    let mut alice = alice.spawn();
-    let bob = bob.spawn();
-
-    alice.connect(&bob);
-
-    let routes = converge([&alice, &bob]);
-    assert_eq!(routes.len(), 2);
-}
-
-#[test]
-//
-//     alice -- bob -- eve
-//
-fn test_inventory_sync_bridge() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-
-    let mut alice = Node::init(tmp.path(), config::relay("alice"));
-    let mut bob = Node::init(tmp.path(), config::relay("bob"));
-    let mut eve = Node::init(tmp.path(), config::relay("eve"));
-
-    alice.project("alice", "");
-    bob.project("bob", "");
-    eve.project("eve", "");
-
-    let mut alice = alice.spawn();
-    let mut eve = eve.spawn();
-    let bob = bob.spawn();
-
-    alice.connect(&bob);
-    eve.connect(&bob);
-
-    let routes = converge([&alice, &bob, &eve]);
-    assert_eq!(routes.len(), 3);
-}
-
-#[test]
-//
-//     alice -- bob
-//       |       |
-//     carol -- eve
-//
-fn test_inventory_sync_ring() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-
-    let mut alice = Node::init(tmp.path(), config::relay("alice"));
-    let mut bob = Node::init(tmp.path(), config::relay("bob"));
-    let mut eve = Node::init(tmp.path(), config::relay("eve"));
-    let mut carol = Node::init(tmp.path(), Config::test(Alias::new("carol")));
-
-    alice.project("alice", "");
-    bob.project("bob", "");
-    eve.project("eve", "");
-    carol.project("carol", "");
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-    let mut eve = eve.spawn();
-    let mut carol = carol.spawn();
-
-    alice.connect(&bob);
-    bob.connect(&eve);
-    eve.connect(&carol);
-    carol.connect(&alice);
-
-    let routes = converge([&alice, &bob, &eve, &carol]);
-    assert_eq!(routes.len(), 4);
-}
-
-#[test]
-//
-//             dave
-//              |
-//     eve -- alice -- bob
-//              |
-//            carol
-//
-fn test_inventory_sync_star() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-
-    let mut alice = Node::init(tmp.path(), config::relay("alice"));
-    let mut bob = Node::init(tmp.path(), config::relay("bob"));
-    let mut eve = Node::init(tmp.path(), config::relay("eve"));
-    let mut carol = Node::init(tmp.path(), Config::test(Alias::new("carol")));
-    let mut dave = Node::init(tmp.path(), Config::test(Alias::new("dave")));
-
-    alice.project("alice", "");
-    bob.project("bob", "");
-    eve.project("eve", "");
-    carol.project("carol", "");
-    dave.project("dave", "");
-
-    let alice = alice.spawn();
-    let mut bob = bob.spawn();
-    let mut eve = eve.spawn();
-    let mut carol = carol.spawn();
-    let mut dave = dave.spawn();
-
-    bob.connect(&alice);
-    eve.connect(&alice);
-    carol.connect(&alice);
-    dave.connect(&alice);
-
-    let routes = converge([&alice, &bob, &eve, &carol, &dave]);
-    assert_eq!(routes.len(), 5);
-}
-
-#[test]
-fn test_replication() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-    let alice = Node::init(tmp.path(), config::relay("alice"));
-    let mut bob = Node::init(tmp.path(), config::relay("bob"));
-    let acme = bob.project("acme", "");
-
-    let mut alice = alice.spawn();
-    let bob = bob.spawn();
-
-    alice.connect(&bob);
-    converge([&alice, &bob]);
-
-    let inventory = alice.storage.repositories().unwrap();
-    assert!(inventory.is_empty());
-
-    let updated = alice.handle.seed(acme, Scope::All).unwrap();
-    assert!(updated);
-
-    let seeds = alice.handle.seeds(acme).unwrap();
-    assert!(seeds.is_connected(&bob.id));
-
-    let result = alice.handle.fetch(acme, bob.id, DEFAULT_TIMEOUT).unwrap();
-    assert!(result.is_success());
-
-    let updated = match result {
-        FetchResult::Success { updated, .. } => updated,
-        FetchResult::Failed { reason } => {
-            panic!("Fetch failed from {}: {reason}", bob.id);
-        }
-    };
-    assert!(!updated.is_empty());
-
-    log::debug!(target: "test", "Fetch complete with {}", bob.id);
-
-    let inventory = alice.storage.repositories().unwrap();
-    let alice_repo = alice.storage.repository(acme).unwrap();
-    let bob_repo = bob.storage.repository(acme).unwrap();
-
-    let alice_refs = alice_repo
-        .references()
-        .unwrap()
-        .collect::<Result<Vec<_>, _>>()
-        .unwrap();
-    let bob_refs = bob_repo
-        .references()
-        .unwrap()
-        .collect::<Result<Vec<_>, _>>()
-        .unwrap();
-
-    assert_eq!(inventory.first().map(|r| r.rid), Some(acme));
-    assert_eq!(alice_refs, bob_refs);
-    assert_matches!(
-        alice.storage.repository(acme).unwrap().validate(),
-        Ok(validations) if validations.is_empty()
-    );
-
-    // Ensure that .keep files are deleted upon replication
-    {
-        let repo = alice.storage.repository(acme).unwrap();
-        let pack_dir = repo.path().join("objects").join("pack");
-        for entry in std::fs::read_dir(pack_dir).unwrap() {
-            let entry = entry.unwrap();
-            let path = entry.path();
-            assert_ne!(
-                path.extension(),
-                Some("keep".as_ref()),
-                "found .keep file after fetch: {path:?}"
-            );
-        }
-    }
-}
-
-#[test]
-fn test_replication_ref_in_sigrefs() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-    let alice = Node::init(tmp.path(), config::relay("alice"));
-    let mut bob = Node::init(tmp.path(), config::relay("bob"));
-
-    let acme = bob.project("acme", "");
-    // Delete one of the signed refs.
-    bob.storage
-        .repository_mut(acme)
-        .unwrap()
-        .reference(&bob.id, &git::qualified!("refs/heads/master"))
-        .unwrap()
-        .delete()
-        .unwrap();
-
-    let mut alice = alice.spawn();
-    let bob = bob.spawn();
-
-    alice.connect(&bob);
-    converge([&alice, &bob]);
-
-    alice.handle.seed(acme, Scope::All).unwrap();
-    let result = alice.handle.fetch(acme, bob.id, DEFAULT_TIMEOUT).unwrap();
-
-    assert_matches!(result, FetchResult::Success { .. });
-
-    // alice still sees bob's master branch since it was in his
-    // sigrefs.
-    assert!(
-        alice
-            .storage
-            .repository(acme)
-            .unwrap()
-            .reference(&bob.id, &git::qualified!("refs/heads/master"))
-            .is_ok(),
-        "refs/namespaces/{}/refs/heads/master does not exist",
-        bob.id
-    );
-}
-
-#[test]
-fn test_replication_invalid() {
-    let tmp = tempfile::tempdir().unwrap();
-    let alice = Node::init(tmp.path(), config::relay("alice"));
-    let mut bob = Node::init(tmp.path(), config::relay("bob"));
-    let carol = MockSigner::default();
-    let acme = bob.project("acme", "");
-    let repo = bob.storage.repository_mut(acme).unwrap();
-    let (_, head) = repo.head().unwrap();
-    let id = repo.identity_head().unwrap();
-
-    // Create some unsigned refs for Carol in Bob's storage.
-    repo.raw()
-        .reference(
-            &git::qualified!("refs/heads/carol").with_namespace(carol.public_key().into()),
-            *head,
-            true,
-            &String::default(),
-        )
-        .unwrap();
-    repo.raw()
-        .reference(
-            &git::refs::storage::id(carol.public_key()),
-            id.into(),
-            true,
-            &String::default(),
-        )
-        .unwrap();
-
-    let mut alice = alice.spawn();
-    let bob = bob.spawn();
-
-    alice.connect(&bob);
-    converge([&alice, &bob]);
-
-    alice.handle.follow(*carol.public_key(), None).unwrap();
-    alice.handle.seed(acme, Scope::Followed).unwrap();
-    let result = alice.handle.fetch(acme, bob.id, DEFAULT_TIMEOUT).unwrap();
-
-    // Fetch is successful despite not fetching Carol's refs, since she isn't a delegate.
-    assert!(result.is_success());
-
-    let repo = alice.storage.repository(acme).unwrap();
-    let mut remotes = repo.remote_ids().unwrap();
-
-    assert_eq!(remotes.next().unwrap().unwrap(), bob.id);
-    assert!(remotes.next().is_none());
-
-    assert!(repo.validate().unwrap().is_empty());
-}
-
-#[test]
-fn test_migrated_clone() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-    let mut alice = Node::init(tmp.path(), config::relay("alice"));
-    let bob = Node::init(tmp.path(), config::relay("bob"));
-    let acme = alice.project("acme", "");
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    alice.connect(&bob);
-    converge([&alice, &bob]);
-
-    let updated = bob.handle.seed(acme, Scope::All).unwrap();
-    assert!(updated);
-
-    let result = bob.handle.fetch(acme, alice.id, DEFAULT_TIMEOUT).unwrap();
-    assert!(result.is_success());
-
-    log::debug!(target: "test", "Fetch complete with {}", alice.id);
-
-    // Simulate alice deleting the project and cloning it again
-    {
-        let path = alice.storage.path().join(acme.canonical());
-        std::fs::remove_dir_all(path).unwrap();
-    }
-    assert!(!alice.storage.contains(&acme).unwrap());
-    let result = alice.handle.fetch(acme, bob.id, DEFAULT_TIMEOUT).unwrap();
-    assert!(result.is_success());
-
-    let alice_repo = alice.storage.repository(acme).unwrap();
-    let bob_repo = bob.storage.repository(acme).unwrap();
-
-    let alice_refs = alice_repo
-        .references()
-        .unwrap()
-        .collect::<Result<Vec<_>, _>>()
-        .unwrap();
-    let bob_refs = bob_repo
-        .references()
-        .unwrap()
-        .collect::<Result<Vec<_>, _>>()
-        .unwrap();
-
-    assert_eq!(alice_refs, bob_refs);
-    assert_matches!(
-        alice.storage.repository(acme).unwrap().validate(),
-        Ok(validations) if validations.is_empty()
-    );
-}
-
-#[test]
-fn test_dont_fetch_owned_refs() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-    let mut alice = Node::init(tmp.path(), config::relay("alice"));
-    let bob = Node::init(tmp.path(), config::relay("bob"));
-    let acme = alice.project("acme", "");
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    alice.connect(&bob);
-    converge([&alice, &bob]);
-
-    assert!(bob.handle.seed(acme, Scope::Followed).unwrap());
-
-    let result = bob.handle.fetch(acme, alice.id, DEFAULT_TIMEOUT).unwrap();
-    assert!(result.is_success());
-
-    log::debug!(target: "test", "Fetch complete with {}", bob.id);
-
-    alice.issue(acme, "Don't fetch self", "Use ^");
-    let result = alice.handle.fetch(acme, bob.id, DEFAULT_TIMEOUT).unwrap();
-    assert!(result.is_success())
-}
-
-#[test]
-fn test_fetch_followed_remotes() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-    let mut alice = Node::init(tmp.path(), config::relay("alice"));
-    let bob = Node::init(tmp.path(), config::relay("bob"));
-    let acme = alice.project("acme", "");
-    let mut signers = Vec::with_capacity(5);
-    {
-        for _ in 0..5 {
-            let signer = MockSigner::default();
-            rad::fork_remote(acme, &alice.id, &signer, &alice.storage).unwrap();
-            signers.push(signer);
-        }
-    }
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    alice.connect(&bob);
-    converge([&alice, &bob]);
-
-    let followed = signers
-        .iter()
-        .map(|s| *s.public_key())
-        .take(2)
-        .collect::<HashSet<_>>();
-
-    assert!(
-        followed.len() < signers.len(),
-        "Bob is only trusting a subset of peers"
-    );
-    assert!(bob.handle.seed(acme, Scope::Followed).unwrap());
-    for nid in &followed {
-        assert!(bob.handle.follow(*nid, None).unwrap());
-    }
-
-    let result = bob.handle.fetch(acme, alice.id, DEFAULT_TIMEOUT).unwrap();
-    assert!(result.is_success());
-
-    log::debug!(target: "test", "Fetch complete with {}", bob.id);
-
-    let bob_repo = bob.storage.repository(acme).unwrap();
-    let bob_remotes = bob_repo
-        .remote_ids()
-        .unwrap()
-        .collect::<Result<HashSet<_>, _>>()
-        .unwrap();
-
-    assert!(bob_remotes.len() == followed.len() + 1);
-    assert!(bob_remotes.is_superset(&followed));
-    assert!(bob_remotes.contains(&alice.id));
-}
-
-#[test]
-fn test_missing_remote() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-    let mut alice = Node::init(tmp.path(), config::relay("alice"));
-    let bob = Node::init(tmp.path(), config::relay("bob"));
-    let acme = alice.project("acme", "");
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-    let carol = MockSigner::default();
-
-    alice.connect(&bob);
-    converge([&alice, &bob]);
-
-    assert!(bob.handle.seed(acme, Scope::Followed).unwrap());
-    assert!(bob.handle.follow(*carol.public_key(), None).unwrap());
-    let result = bob.handle.fetch(acme, alice.id, DEFAULT_TIMEOUT).unwrap();
-    assert!(result.is_success());
-    log::debug!(target: "test", "Fetch complete with {}", bob.id);
-    rad::fork_remote(acme, &alice.id, &carol, &bob.storage).unwrap();
-
-    alice.issue(acme, "Missing Remote", "Fixing the missing remote issue");
-    let result = bob.handle.fetch(acme, alice.id, DEFAULT_TIMEOUT).unwrap();
-    assert!(result.is_success());
-    log::debug!(target: "test", "Fetch complete with {}", bob.id);
-}
-
-#[test]
-fn test_fetch_preserve_owned_refs() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-    let mut alice = Node::init(tmp.path(), config::relay("alice"));
-    let bob = Node::init(tmp.path(), config::relay("bob"));
-    let acme = alice.project("acme", "");
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    alice.connect(&bob);
-    converge([&alice, &bob]);
-
-    assert!(bob.handle.seed(acme, Scope::Followed).unwrap());
-    assert!(bob.handle.follow(alice.id, None).unwrap());
-
-    let result = bob.handle.fetch(acme, alice.id, DEFAULT_TIMEOUT).unwrap();
-    assert!(result.is_success());
-
-    log::debug!(target: "test", "Fetch complete with {}", bob.id);
-
-    alice.issue(acme, "Bug", "Bugs, bugs, bugs");
-
-    let before = alice
-        .storage
-        .repository(acme)
-        .unwrap()
-        .references_of(&alice.id)
-        .unwrap();
-
-    // Fetch shouldn't prune any of our own refs.
-    let result = alice.handle.fetch(acme, bob.id, DEFAULT_TIMEOUT).unwrap();
-    let (updated, _) = result.success().unwrap();
-    assert_eq!(updated, vec![]);
-
-    let after = alice
-        .storage
-        .repository(acme)
-        .unwrap()
-        .references_of(&alice.id)
-        .unwrap();
-
-    assert_eq!(before, after);
-}
-
-#[test]
-fn test_clone() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-    let alice = Node::init(tmp.path(), config::relay("alice"));
-    let mut bob = Node::init(tmp.path(), config::relay("bob"));
-    let acme = bob.project("acme", "");
-
-    let mut alice = alice.spawn();
-    let bob = bob.spawn();
-
-    alice.connect(&bob);
-    converge([&alice, &bob]);
-
-    transport::local::register(alice.storage.clone());
-
-    let _ = alice.handle.seed(acme, Scope::All).unwrap();
-    let seeds = alice.handle.seeds(acme).unwrap();
-    assert!(seeds.is_connected(&bob.id));
-
-    let result = alice.handle.fetch(acme, bob.id, DEFAULT_TIMEOUT).unwrap();
-    assert!(result.is_success());
-
-    rad::fork(acme, &alice.signer, &alice.storage).unwrap();
-
-    let working = rad::checkout(
-        acme,
-        alice.signer.public_key(),
-        tmp.path().join("clone"),
-        &alice.storage,
-    )
-    .unwrap();
-
-    // Makes test finish faster.
-    drop(alice);
-
-    let head = working.head().unwrap();
-    let oid = head.target().unwrap();
-
-    let (_, canonical) = bob
-        .storage
-        .repository(acme)
-        .unwrap()
-        .canonical_head()
-        .unwrap();
-
-    assert_eq!(oid, *canonical);
-
-    // Make sure that bob has refs/rad/id set
-    assert!(bob
-        .storage
-        .repository(acme)
-        .unwrap()
-        .identity_head()
-        .is_ok());
-}
-
-#[test]
-fn test_fetch_up_to_date() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-    let alice = Node::init(tmp.path(), config::relay("alice"));
-    let mut bob = Node::init(tmp.path(), config::relay("bob"));
-    let acme = bob.project("acme", "");
-
-    let mut alice = alice.spawn();
-    let bob = bob.spawn();
-
-    alice.connect(&bob);
-    converge([&alice, &bob]);
-
-    transport::local::register(alice.storage.clone());
-
-    let _ = alice.handle.seed(acme, Scope::All).unwrap();
-    let result = alice.handle.fetch(acme, bob.id, DEFAULT_TIMEOUT).unwrap();
-    assert!(result.is_success());
-
-    // Fetch again! This time, everything's up to date.
-    let result = alice.handle.fetch(acme, bob.id, DEFAULT_TIMEOUT).unwrap();
-    assert_matches!(
-        result.success(),
-        Some((updates, _fetched)) if updates.iter().all(|update| matches!(update, RefUpdate::Skipped { .. }))
-    );
-}
-
-#[test]
-fn test_fetch_unseeded() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-    let alice = Node::init(tmp.path(), config::relay("alice"));
-    let mut bob = Node::init(tmp.path(), config::relay("bob"));
-    let acme = bob.project("acme", "");
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    alice.connect(&bob);
-    converge([&alice, &bob]);
-
-    transport::local::register(alice.storage.clone());
-
-    let _ = alice.handle.seed(acme, Scope::All).unwrap();
-    let result = alice.handle.fetch(acme, bob.id, DEFAULT_TIMEOUT).unwrap();
-    assert!(result.is_success());
-
-    // Bob stops seeding the repository
-    assert!(bob.handle.unseed(acme).unwrap());
-
-    // Alice attempts to fetch but is unauthorized
-    let result = alice.handle.fetch(acme, bob.id, DEFAULT_TIMEOUT).unwrap();
-    assert_matches!(result, FetchResult::Failed { .. });
-}
-
-#[test]
-fn test_large_fetch() {
-    logger::init(log::Level::Debug);
-
-    let env = Environment::new();
-    let scale = env.scale();
-    let mut alice = Node::init(&env.tmp(), config::relay("alice"));
-    let bob = Node::init(&env.tmp(), config::relay("bob"));
-
-    let tmp = tempfile::tempdir().unwrap();
-    let (repo, _) = fixtures::repository(tmp.path());
-    fixtures::populate(&repo, scale.max(3));
-
-    let rid = alice.project_from("acme", "", &repo);
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-    let bob_events = bob.handle.events();
-
-    bob.handle.seed(rid, Scope::All).unwrap();
-    alice.connect(&bob);
-
-    bob_events
-        .wait(
-            |e| {
-                matches!(e, service::Event::RefsFetched { updated, .. } if !updated.is_empty())
-                    .then_some(())
-            },
-            time::Duration::from_secs(9 * scale as u64),
-        )
-        .unwrap();
-
-    let doc = bob.storage.repository(rid).unwrap().identity_doc().unwrap();
-    let proj = doc.project().unwrap();
-
-    assert_eq!(proj.name(), "acme");
-}
-
-#[test]
-fn test_concurrent_fetches() {
-    logger::init(log::Level::Debug);
-
-    let env = Environment::new();
-    let scale = env.scale();
-    let repos = scale.max(4);
-    let limits = Limits {
-        // Have one fetch be queued.
-        fetch_concurrency: repos - 1,
-        ..Limits::default()
-    };
-    let mut bob_repos = HashSet::new();
-    let mut alice_repos = HashSet::new();
-    let mut alice = Node::init(
-        &env.tmp(),
-        service::Config {
-            limits: limits.clone(),
-            relay: radicle::node::config::Relay::Always,
-            ..config::relay("alice")
-        },
-    );
-    let mut bob = Node::init(
-        &env.tmp(),
-        service::Config {
-            limits,
-            relay: radicle::node::config::Relay::Always,
-            ..config::relay("bob")
-        },
-    );
-
-    for i in 0..repos {
-        // Create a repo for Alice.
-        let tmp = tempfile::tempdir().unwrap();
-        let (repo, _) = fixtures::repository(tmp.path());
-        fixtures::populate(&repo, scale);
-
-        let rid = alice.project_from(&format!("alice-{i}"), "", &repo);
-        alice_repos.insert(rid);
-
-        // Create a repo for Bob.
-        let tmp = tempfile::tempdir().unwrap();
-        let (repo, _) = fixtures::repository(tmp.path());
-        fixtures::populate(&repo, scale);
-
-        let rid = bob.project_from(&format!("bob-{i}"), "", &repo);
-        bob_repos.insert(rid);
-    }
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    let alice_events = alice.handle.events();
-    let bob_events = bob.handle.events();
-
-    for rid in &bob_repos {
-        alice.handle.seed(*rid, Scope::All).unwrap();
-    }
-    for rid in &alice_repos {
-        bob.handle.seed(*rid, Scope::All).unwrap();
-    }
-    alice.connect(&bob);
-
-    while !bob_repos.is_empty() {
-        match alice_events.recv().unwrap() {
-            service::Event::RefsFetched { rid, updated, .. } if !updated.is_empty() => {
-                bob_repos.remove(&rid);
-                log::debug!(target: "test", "{} fetched {rid} ({} left)",alice.id, bob_repos.len());
-            }
-            _ => {}
-        }
-    }
-
-    while !alice_repos.is_empty() {
-        match bob_events.recv().unwrap() {
-            service::Event::RefsFetched { rid, updated, .. } if !updated.is_empty() => {
-                alice_repos.remove(&rid);
-                log::debug!(target: "test", "{} fetched {rid} ({} left)", bob.id, alice_repos.len());
-            }
-            _ => {}
-        }
-    }
-
-    for rid in &bob_repos {
-        let doc = alice
-            .storage
-            .repository(*rid)
-            .unwrap()
-            .identity_doc()
-            .unwrap();
-        let proj = doc.project().unwrap();
-
-        assert!(proj.name().starts_with("bob"));
-    }
-    for rid in &alice_repos {
-        let doc = bob
-            .storage
-            .repository(*rid)
-            .unwrap()
-            .identity_doc()
-            .unwrap();
-        let proj = doc.project().unwrap();
-
-        assert!(proj.name().starts_with("alice"));
-    }
-}
-
-#[test]
-fn test_connection_crossing() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-    let alice = Node::init(tmp.path(), config::relay("alice"));
-    let bob = Node::init(tmp.path(), config::relay("bob"));
-
-    let alice = alice.spawn();
-    let bob = bob.spawn();
-    let preferred = alice.id.max(bob.id);
-
-    log::debug!(target: "test", "Preferred peer is {preferred}");
-
-    let t1 = thread::spawn({
-        let mut alice = alice.handle.clone();
-
-        move || {
-            alice
-                .connect(bob.id, bob.addr.into(), ConnectOptions::default())
-                .unwrap()
-        }
-    });
-    let t2 = thread::spawn({
-        let mut bob = bob.handle.clone();
-        move || {
-            bob.connect(alice.id, alice.addr.into(), ConnectOptions::default())
-                .unwrap()
-        }
-    });
-
-    let r1 = t1.join().unwrap();
-    let r2 = t2.join().unwrap();
-
-    // Note that the non-preferred peer will have their outbound connection fail, and this
-    // could already show up as the result of the call here (but not always).
-    if preferred == alice.id {
-        assert_matches!(r1, ConnectResult::Connected);
-    } else {
-        assert_matches!(r2, ConnectResult::Connected);
-    }
-
-    thread::sleep(time::Duration::from_secs(1));
-
-    let alice_s = alice.handle.sessions().unwrap();
-    let bob_s = bob.handle.sessions().unwrap();
-
-    // Both sessions are established.
-    let s1 = alice_s.iter().find(|s| s.nid == bob.id).unwrap();
-    let s2 = bob_s.iter().find(|s| s.nid == alice.id).unwrap();
-
-    log::debug!(target: "test", "{:?}", alice.handle.sessions());
-    log::debug!(target: "test", "{:?}", bob.handle.sessions());
-
-    if preferred == alice.id {
-        assert_eq!(s1.link, radicle::node::Link::Outbound);
-        assert_eq!(s2.link, radicle::node::Link::Inbound);
-    } else {
-        assert_eq!(s1.link, radicle::node::Link::Inbound);
-        assert_eq!(s2.link, radicle::node::Link::Outbound);
-    }
-    assert_eq!(alice_s.len(), 1);
-    assert_eq!(bob_s.len(), 1);
-}
-
-#[test]
-/// Alice is going to try to fetch outdated refs of Bob, from Eve. This is a non-fastfoward fetch
-/// on the sigrefs branch.
-fn test_non_fastforward_sigrefs() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-
-    let alice = Node::init(tmp.path(), config::relay("alice"));
-    let mut bob = Node::init(tmp.path(), config::relay("bob"));
-    let eve = Node::init(tmp.path(), config::relay("eve"));
-
-    let rid = bob.project("acme", "");
-
-    let mut alice = alice.spawn();
-    let bob = bob.spawn();
-    let mut eve = eve.spawn();
-
-    alice.handle.seed(rid, Scope::All).unwrap();
-    eve.handle.seed(rid, Scope::All).unwrap();
-
-    alice.connect(&bob);
-    alice.connect(&eve);
-    eve.connect(&bob);
-
-    converge([&alice, &bob, &eve]);
-
-    // Eve fetches the inital project from Bob.
-    eve.handle.fetch(rid, bob.id, DEFAULT_TIMEOUT).unwrap();
-    // Alice fetches it too.
-    let old_bob = alice.handle.fetch(rid, bob.id, DEFAULT_TIMEOUT).unwrap();
-    let bob_sigrefs = bob
-        .storage
-        .repository(rid)
-        .unwrap()
-        .reference_oid(&bob.id, &radicle::storage::refs::SIGREFS_BRANCH)
-        .unwrap();
-    let up = old_bob
-        .find_updated(
-            &(*radicle::storage::refs::Special::SignedRefs.namespaced(&bob.id)).to_ref_string(),
-        )
-        .unwrap();
-    let old_bob = match up {
-        RefUpdate::Created { oid, .. } => oid,
-        RefUpdate::Skipped { oid, .. } => oid,
-        _ => panic!("rad/sigrefs should have been created or skipped: {:?}", up),
-    };
-    assert_eq!(bob_sigrefs, old_bob);
-
-    // Log the before Oid value of bob's 'rad/sigrefs', for debugging purposes.
-    {
-        let before = alice
-            .storage
-            .repository(rid)
-            .unwrap()
-            .reference_oid(&bob.id, &radicle::storage::refs::SIGREFS_BRANCH)
-            .unwrap();
-        log::debug!(target: "test", "bob's old 'rad/sigrefs': {}", before);
-    }
-
-    // Now Eve disconnects from Bob so she doesn't fetch his update.
-    eve.handle
-        .command(service::Command::Disconnect(bob.id))
-        .unwrap();
-
-    // Bob updates his refs.
-    bob.issue(
-        rid,
-        "Updated Sigrefs",
-        "Updated sigrefs are harshing my vibes",
-    );
-    // Alice fetches from Bob.
-    let new_bob = alice.handle.fetch(rid, bob.id, DEFAULT_TIMEOUT).unwrap();
-    let bob_sigrefs = bob
-        .storage
-        .repository(rid)
-        .unwrap()
-        .reference_oid(&bob.id, &radicle::storage::refs::SIGREFS_BRANCH)
-        .unwrap();
-    let up = new_bob
-        .find_updated(
-            &(*radicle::storage::refs::Special::SignedRefs.namespaced(&bob.id)).to_ref_string(),
-        )
-        .unwrap();
-    let new_bob = match up {
-        RefUpdate::Updated { new, .. } => new,
-        // FIXME: Really it shouldn't be skipped but let's see what happens
-        RefUpdate::Skipped { oid, .. } => oid,
-        _ => panic!("rad/sigrefs should have been updated {:?}", up),
-    };
-    assert_eq!(bob_sigrefs, new_bob);
-
-    // Log the after Oid value of bob's 'rad/sigrefs', for debugging purposes.
-    {
-        let after = alice
-            .storage
-            .repository(rid)
-            .unwrap()
-            .reference_oid(&bob.id, &radicle::storage::refs::SIGREFS_BRANCH)
-            .unwrap();
-        log::debug!(target: "test", "bob's new 'rad/sigrefs': {}", after);
-    }
-
-    assert_matches!(
-        alice.handle.fetch(rid, eve.id, DEFAULT_TIMEOUT).unwrap(),
-        FetchResult::Success { updated, .. }
-        if updated.iter().all(|u| u.is_skipped())
-    );
-}
-
-#[test]
-fn test_outdated_sigrefs() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-
-    let mut alice = Node::init(tmp.path(), config::relay("alice"));
-    let bob = Node::init(tmp.path(), config::relay("bob"));
-    let eve = Node::init(tmp.path(), config::relay("eve"));
-
-    let rid = alice.project("acme", "");
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-    let mut eve = eve.spawn();
-
-    bob.handle.seed(rid, Scope::All).unwrap();
-    eve.handle.seed(rid, Scope::All).unwrap();
-    alice.connect(&bob);
-    bob.connect(&eve);
-    eve.connect(&alice);
-    converge([&alice, &bob, &eve]);
-
-    bob.handle.fetch(rid, alice.id, DEFAULT_TIMEOUT).unwrap();
-    assert!(bob.storage.contains(&rid).unwrap());
-    rad::fork(rid, &bob.signer, &bob.storage).unwrap();
-
-    eve.handle.fetch(rid, alice.id, DEFAULT_TIMEOUT).unwrap();
-    assert!(eve.storage.contains(&rid).unwrap());
-    rad::fork(rid, &eve.signer, &eve.storage).unwrap();
-
-    alice
-        .handle
-        .follow(eve.id, Some(Alias::new("eve")))
-        .unwrap();
-    alice.handle.fetch(rid, eve.id, DEFAULT_TIMEOUT).unwrap();
-    let repo = alice.storage.repository(rid).unwrap();
-    assert!(repo.remote(&eve.id).is_ok());
-
-    log::debug!(target: "test", "Bob fetches from Eve..");
-    assert_matches!(
-        bob.handle.fetch(rid, eve.id, DEFAULT_TIMEOUT).unwrap(),
-        FetchResult::Success { .. }
-    );
-    let repo = bob.storage.repository(rid).unwrap();
-    let eve_remote = repo.remote(&eve.id).unwrap();
-    let old_refs = eve_remote.refs;
-
-    // At this stage, Alice and Bob have Eve's fork and Eve does not
-    // have Bob's fork
-
-    let issue_id = eve.issue(
-        rid,
-        "Outdated Sigrefs",
-        "Outdated sigrefs are harshing my vibes",
-    );
-    let repo = eve.storage.repository(rid).unwrap();
-    let eves_refs = repo.remote(&eve.id).unwrap().refs;
-
-    // Get the current state of eve's refs in alice's storage
-    log::debug!(target: "test", "Alice fetches from Eve..");
-    assert_matches!(
-        alice.handle.fetch(rid, eve.id, DEFAULT_TIMEOUT).unwrap(),
-        FetchResult::Success { .. }
-    );
-    let repo = alice.storage.repository(rid).unwrap();
-    let issues = issue::Issues::open(&repo).unwrap();
-    assert!(
-        issues.get(&issue_id).unwrap().is_some(),
-        "Alice did not fetch issue {issue_id}"
-    );
-    let eve_remote = repo.remote(&eve.id).unwrap();
-    let eves_refs_expected = eve_remote.refs;
-    assert_ne!(eves_refs_expected, old_refs);
-    assert_eq!(eves_refs_expected, eves_refs);
-
-    log::debug!(target: "test", "Alice fetches from Bob..");
-
-    alice
-        .handle
-        .follow(bob.id, Some(Alias::new("bob")))
-        .unwrap();
-    assert_matches!(
-        alice.handle.fetch(rid, bob.id, DEFAULT_TIMEOUT).unwrap(),
-        FetchResult::Success { .. }
-    );
-
-    // Ensure that Eve's refs have not changed after fetching the old refs from Bob.
-    let repo = alice.storage.repository(rid).unwrap();
-    let eve_remote = repo.remote(&eve.id).unwrap();
-    let eves_refs = eve_remote.refs;
-
-    assert_ne!(eves_refs, old_refs);
-    assert_eq!(eves_refs_expected, eves_refs);
-}
-
-#[test]
-fn test_outdated_delegate_sigrefs() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-
-    let mut alice = Node::init(tmp.path(), config::relay("alice"));
-    let bob = Node::init(tmp.path(), config::relay("bob"));
-    let eve = Node::init(tmp.path(), config::relay("eve"));
-
-    let rid = alice.project("acme", "");
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-    let mut eve = eve.spawn();
-
-    bob.handle.seed(rid, Scope::All).unwrap();
-    eve.handle.seed(rid, Scope::All).unwrap();
-    alice.connect(&bob);
-    bob.connect(&eve);
-    eve.connect(&alice);
-    converge([&alice, &bob, &eve]);
-
-    bob.handle.fetch(rid, alice.id, DEFAULT_TIMEOUT).unwrap();
-    assert!(bob.storage.contains(&rid).unwrap());
-    rad::fork(rid, &bob.signer, &bob.storage).unwrap();
-
-    eve.handle.fetch(rid, alice.id, DEFAULT_TIMEOUT).unwrap();
-    assert!(eve.storage.contains(&rid).unwrap());
-    rad::fork(rid, &eve.signer, &eve.storage).unwrap();
-
-    alice
-        .handle
-        .follow(eve.id, Some(Alias::new("eve")))
-        .unwrap();
-    alice.handle.fetch(rid, eve.id, DEFAULT_TIMEOUT).unwrap();
-    let repo = alice.storage.repository(rid).unwrap();
-    assert!(repo.remote(&eve.id).is_ok());
-
-    log::debug!(target: "test", "Bob fetches from Eve..");
-    assert_matches!(
-        bob.handle.fetch(rid, eve.id, DEFAULT_TIMEOUT).unwrap(),
-        FetchResult::Success { .. }
-    );
-    let repo = bob.storage.repository(rid).unwrap();
-    let alice_remote = repo.remote(&alice.id).unwrap();
-    let old_refs = alice_remote.refs;
-
-    // At this stage, Alice and Bob have Eve's fork and Eve does not
-    // have Bob's fork
-
-    alice.issue(
-        rid,
-        "Outdated Sigrefs",
-        "Outdated sigrefs are harshing my vibes",
-    );
-    let repo = alice.storage.repository(rid).unwrap();
-    let alice_refs = repo.remote(&alice.id).unwrap().refs;
-
-    // Get the current state of eve's refs in alice's storage
-    log::debug!(target: "test", "Alice fetches from Eve..");
-    assert_matches!(
-        eve.handle.fetch(rid, alice.id, DEFAULT_TIMEOUT).unwrap(),
-        FetchResult::Success { .. }
-    );
-    let repo = eve.storage.repository(rid).unwrap();
-    let alice_remote = repo.remote(&alice.id).unwrap();
-    let alice_refs_expected = alice_remote.refs;
-    assert_ne!(alice_refs_expected, old_refs);
-    assert_eq!(alice_refs_expected, alice_refs);
-
-    log::debug!(target: "test", "Alice fetches from Bob..");
-
-    eve.handle.follow(bob.id, Some(Alias::new("bob"))).unwrap();
-    assert_matches!(
-        eve.handle.fetch(rid, bob.id, DEFAULT_TIMEOUT).unwrap(),
-        FetchResult::Success { .. }
-    );
-
-    // Ensure that Eve's refs have not changed after fetching the old refs from Bob.
-    let repo = eve.storage.repository(rid).unwrap();
-    let alice_remote = repo.remote(&alice.id).unwrap();
-    let alice_refs = alice_remote.refs;
-
-    assert_ne!(alice_refs, old_refs);
-    assert_eq!(alice_refs_expected, alice_refs);
-}
-
-#[test]
-fn missing_default_branch() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-
-    let mut alice = Node::init(tmp.path(), config::relay("alice"));
-    let bob = Node::init(tmp.path(), config::relay("bob"));
-
-    let rid = alice.project("acme", "");
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    alice.handle.seed(rid, Scope::All).unwrap();
-    bob.handle.seed(rid, Scope::All).unwrap();
-    alice.connect(&bob);
-    converge([&alice, &bob]);
-
-    bob.handle.fetch(rid, alice.id, DEFAULT_TIMEOUT).unwrap();
-    assert!(bob.storage.contains(&rid).unwrap());
-
-    // Fetching from still works despite not having
-    // `refs/heads/master`, but has `rad/sigrefs`.
-    bob.issue(rid, "Hello, Acme", "Popping in to say hello");
-    alice.handle.fetch(rid, bob.id, DEFAULT_TIMEOUT).unwrap();
-
-    {
-        let repo = bob.storage.repository(rid).unwrap();
-        assert!(repo.canonical_head().is_ok());
-        assert!(repo.canonical_identity_doc().is_ok());
-        assert!(repo.head().is_ok());
-    }
-
-    // If for some reason Alice managed to delete her master reference
-    {
-        let repo = alice.storage.repository_mut(rid).unwrap();
-        let mut r = repo
-            .backend
-            .find_reference(&format!("refs/namespaces/{}/refs/heads/master", alice.id))
-            .unwrap();
-        r.delete().unwrap();
-        repo.sign_refs(&alice.signer).unwrap();
-    }
-
-    // Then fetching from her will fail
-    assert_matches!(
-        bob.handle.fetch(rid, alice.id, DEFAULT_TIMEOUT).unwrap(),
-        FetchResult::Failed { .. }
-    );
-}
-
-#[test]
-fn test_background_foreground_fetch() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-
-    let mut alice = Node::init(tmp.path(), config::relay("alice"));
-    let bob = Node::init(tmp.path(), config::relay("bob"));
-    let eve = Node::init(tmp.path(), config::relay("eve"));
-
-    let rid = alice.project("acme", "");
-
-    let mut alice = alice.spawn();
-    let alice_events = alice.handle.events();
-    let mut bob = bob.spawn();
-    let mut eve = eve.spawn();
-
-    bob.handle.seed(rid, Scope::Followed).unwrap();
-    eve.handle.seed(rid, Scope::Followed).unwrap();
-    alice.connect(&bob);
-    alice.connect(&eve);
-    converge([&alice, &bob, &eve]);
-
-    bob.handle.fetch(rid, alice.id, DEFAULT_TIMEOUT).unwrap();
-    assert!(bob.storage.contains(&rid).unwrap());
-    rad::fork(rid, &bob.signer, &bob.storage).unwrap();
-
-    eve.handle.fetch(rid, alice.id, DEFAULT_TIMEOUT).unwrap();
-    assert!(eve.storage.contains(&rid).unwrap());
-    rad::fork(rid, &eve.signer, &eve.storage).unwrap();
-
-    // Alice fetches Eve's fork and we make note of the sigrefs
-    alice
-        .handle
-        .follow(eve.id, Some(Alias::new("eve")))
-        .unwrap();
-    alice.handle.fetch(rid, eve.id, DEFAULT_TIMEOUT).unwrap();
-    let repo = alice.storage.repository(rid).unwrap();
-    assert!(repo.remote(&eve.id).is_ok());
-    let repo = alice.storage.repository(rid).unwrap();
-    let eve_remote = repo.remote(&eve.id).unwrap();
-    let old_refs = eve_remote.refs;
-
-    // Eve creates an issue, updating their refs, and we make note of
-    // the new refs
-    eve.issue(
-        rid,
-        "Outdated Sigrefs",
-        "Outdated sigrefs are harshing my vibes",
-    );
-    let repo = eve.storage.repository(rid).unwrap();
-    let eves_refs = repo.remote(&eve.id).unwrap().refs;
-
-    // Alice follows Bob and they make a new change and announce it,
-    // this initiates a background fetch for Alice from Bob
-    alice
-        .handle
-        .follow(bob.id, Some(Alias::new("bob")))
-        .unwrap();
-    bob.issue(
-        rid,
-        "Concurrent fetches",
-        "Concurrent fetches are harshing my vibes",
-    );
-    bob.handle.announce_refs(rid).unwrap();
-    alice_events
-        .wait(
-            |e| matches!(e, service::Event::RefsAnnounced { .. }).then_some(()),
-            DEFAULT_TIMEOUT,
-        )
-        .unwrap();
-
-    // Alice initiates a fetch from Eve and we ensure that we get the
-    // updated refs from Eve, and the fetch from Bob should not
-    // interfere
-    log::debug!(target: "test", "Alice fetches from Eve..");
-    assert_matches!(
-        alice.handle.fetch(rid, eve.id, DEFAULT_TIMEOUT).unwrap(),
-        FetchResult::Success { .. }
-    );
-    let repo = alice.storage.repository(rid).unwrap();
-    let eve_remote = repo.remote(&eve.id).unwrap();
-    let eves_refs_expected = eve_remote.refs;
-    assert_ne!(eves_refs_expected, old_refs);
-    assert_eq!(eves_refs_expected, eves_refs);
-}
-
-#[test]
-/// Alice is offline while Bob pushes some changes to the repo. When Alice reconnects,
-/// she is made aware of the changes via the `subscribe` message, and fetches from the seed.
-fn test_catchup_on_refs_announcements() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-    let mut alice = Node::init(tmp.path(), config::relay("alice"));
-    let bob = Node::init(tmp.path(), config::relay("bob"));
-    let bob_id = bob.id;
-    let seed = Node::init(tmp.path(), config::relay("seed"));
-    let acme = alice.project("acme", "");
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-    let mut seed = seed.spawn();
-
-    bob.handle.seed(acme, Scope::All).unwrap();
-    seed.handle.seed(acme, Scope::All).unwrap();
-
-    alice.connect(&seed);
-    seed.has_repository(&acme);
-    alice.disconnect(&seed);
-    bob.connect(&seed);
-    bob.has_repository(&acme);
-
-    log::debug!(target: "test", "Bob creating his issue..");
-    bob.issue(acme, "Bob's issue", "[..]");
-    bob.handle.announce_refs(acme).unwrap();
-
-    log::debug!(target: "test", "Waiting for seed to fetch Bob's refs from Bob..");
-    seed.has_remote_of(&acme, &bob.id); // Seed fetches Bob's refs.
-    bob.disconnect(&seed);
-    bob.shutdown();
-
-    log::debug!(target: "test", "Alice re-connects to the seed..");
-    alice.connect(&seed);
-    alice.has_remote_of(&acme, &bob_id);
-}
-
-#[test]
-fn test_multiple_offline_inits() {
-    logger::init(log::Level::Debug);
-
-    let tmp = tempfile::tempdir().unwrap();
-
-    let mut alice = Node::init(tmp.path(), config::relay("alice"));
-    let bob = Node::init(tmp.path(), config::relay("bob"));
-
-    let acme = alice.project("acme", "");
-    let radcliffe = alice.project("radcliffe", "");
-    let cobs = alice.project("cobs", "");
-    let projects = [acme, radcliffe, cobs];
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-
-    for rid in &projects {
-        bob.handle.seed(*rid, Scope::All).unwrap();
-    }
-
-    alice.connect(&bob).converge([&bob]);
-
-    for repo in bob.storage.repositories().unwrap() {
-        assert!(projects.contains(&repo.rid), "Bob is missing {}", repo.rid);
-    }
-}
diff --git a/radicle-node/src/wire.rs b/radicle-node/src/wire.rs
deleted file mode 100644
index c400ea0c2..000000000
--- a/radicle-node/src/wire.rs
+++ /dev/null
@@ -1,717 +0,0 @@
-mod frame;
-mod message;
-mod protocol;
-mod varint;
-
-pub use frame::StreamId;
-pub use message::{AddressType, MessageType};
-pub use protocol::{Control, Wire, WireReader, WireSession, WireWriter};
-use radicle::node::UserAgent;
-
-use std::collections::BTreeMap;
-use std::convert::TryFrom;
-use std::ops::Deref;
-use std::str::FromStr;
-use std::string::FromUtf8Error;
-use std::{io, mem};
-
-use byteorder::{NetworkEndian, ReadBytesExt, WriteBytesExt};
-use cyphernet::addr::tor;
-
-use crate::crypto::{PublicKey, Signature, Unverified};
-use crate::git;
-use crate::git::fmt;
-use crate::identity::RepoId;
-use crate::node;
-use crate::node::Alias;
-use crate::prelude::*;
-use crate::service::filter;
-use crate::storage::refs::Refs;
-use crate::storage::refs::RefsAt;
-use crate::storage::refs::SignedRefs;
-use crate::Timestamp;
-
-/// The default type we use to represent sizes on the wire.
-///
-/// Since wire messages are limited to 64KB by the transport layer,
-/// two bytes is enough to represent any message.
-///
-/// Note that in certain cases, we may use a smaller type.
-pub type Size = u16;
-
-#[derive(thiserror::Error, Debug)]
-pub enum Error {
-    #[error("i/o: {0}")]
-    Io(#[from] io::Error),
-    #[error("UTF-8 error: {0}")]
-    FromUtf8(#[from] FromUtf8Error),
-    #[error("invalid size: expected {expected}, got {actual}")]
-    InvalidSize { expected: usize, actual: usize },
-    #[error("invalid filter size: {0}")]
-    InvalidFilterSize(usize),
-    #[error("invalid channel type {0:x}")]
-    InvalidStreamKind(u8),
-    #[error(transparent)]
-    InvalidRefName(#[from] fmt::Error),
-    #[error(transparent)]
-    InvalidAlias(#[from] node::AliasError),
-    #[error("invalid user agent string: {0:?}")]
-    InvalidUserAgent(String),
-    #[error("invalid control message with type `{0}`")]
-    InvalidControlMessage(u8),
-    #[error("invalid protocol version header `{0:x?}`")]
-    InvalidProtocolVersion([u8; 4]),
-    #[error("invalid onion address: {0}")]
-    InvalidOnionAddr(#[from] tor::OnionAddrDecodeError),
-    #[error("invalid timestamp: {0}")]
-    InvalidTimestamp(u64),
-    #[error("wrong protocol version `{0}`")]
-    WrongProtocolVersion(u8),
-    #[error("unknown address type `{0}`")]
-    UnknownAddressType(u8),
-    #[error("unknown message type `{0}`")]
-    UnknownMessageType(u16),
-    #[error("unknown info type `{0}`")]
-    UnknownInfoType(u16),
-    #[error("unexpected bytes")]
-    UnexpectedBytes,
-}
-
-impl Error {
-    /// Whether we've reached the end of file. This will be true when we fail to decode
-    /// a message because there's not enough data in the stream.
-    pub fn is_eof(&self) -> bool {
-        matches!(self, Self::Io(err) if err.kind() == io::ErrorKind::UnexpectedEof)
-    }
-}
-
-/// Things that can be encoded as binary.
-pub trait Encode {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error>;
-}
-
-/// Things that can be decoded from binary.
-pub trait Decode: Sized {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error>;
-}
-
-/// Encode an object into a byte vector.
-///
-/// # Panics
-///
-/// If the encoded object exceeds [`Size::MAX`].
-pub fn serialize<T: Encode + ?Sized>(data: &T) -> Vec<u8> {
-    let mut buffer = Vec::new();
-    // SAFETY: We expect this to panic if the user passes
-    // in data that exceeds the maximum allowed size.
-    #[allow(clippy::unwrap_used)]
-    let len = data.encode(&mut buffer).unwrap();
-
-    debug_assert_eq!(len, buffer.len());
-
-    buffer
-}
-
-/// Decode an object from a vector.
-pub fn deserialize<T: Decode>(data: &[u8]) -> Result<T, Error> {
-    let mut cursor = io::Cursor::new(data);
-    let obj = T::decode(&mut cursor)?;
-
-    if cursor.position() as usize != cursor.get_ref().len() {
-        return Err(Error::UnexpectedBytes);
-    }
-    Ok(obj)
-}
-
-impl Encode for u8 {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        writer.write_u8(*self)?;
-
-        Ok(mem::size_of::<Self>())
-    }
-}
-
-impl Encode for u16 {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        writer.write_u16::<NetworkEndian>(*self)?;
-
-        Ok(mem::size_of::<Self>())
-    }
-}
-
-impl Encode for u32 {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        writer.write_u32::<NetworkEndian>(*self)?;
-
-        Ok(mem::size_of::<Self>())
-    }
-}
-
-impl Encode for u64 {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        writer.write_u64::<NetworkEndian>(*self)?;
-
-        Ok(mem::size_of::<Self>())
-    }
-}
-
-impl Encode for PublicKey {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        self.deref().encode(writer)
-    }
-}
-
-impl<const T: usize> Encode for &[u8; T] {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        writer.write_all(&**self)?;
-        Ok(mem::size_of::<Self>())
-    }
-}
-
-impl<const T: usize> Encode for [u8; T] {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        writer.write_all(self)?;
-
-        Ok(mem::size_of::<Self>())
-    }
-}
-
-impl<T> Encode for &[T]
-where
-    T: Encode,
-{
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        let mut n = (self.len() as Size).encode(writer)?;
-
-        for item in self.iter() {
-            n += item.encode(writer)?;
-        }
-        Ok(n)
-    }
-}
-
-impl<T, const N: usize> Encode for BoundedVec<T, N>
-where
-    T: Encode,
-{
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        self.as_slice().encode(writer)
-    }
-}
-
-impl Encode for &str {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        assert!(self.len() <= u8::MAX as usize);
-
-        let n = (self.len() as u8).encode(writer)?;
-        let bytes = self.as_bytes();
-
-        // Nb. Don't use the [`Encode`] instance here for &[u8], because we are prefixing the
-        // length ourselves.
-        writer.write_all(bytes)?;
-
-        Ok(n + bytes.len())
-    }
-}
-
-impl Encode for String {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        self.as_str().encode(writer)
-    }
-}
-
-impl Encode for git::Url {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        self.to_string().encode(writer)
-    }
-}
-
-impl Encode for RepoId {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        self.deref().encode(writer)
-    }
-}
-
-impl Encode for Refs {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        let len: Size = self
-            .len()
-            .try_into()
-            .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))?;
-        let mut n = len.encode(writer)?;
-
-        for (name, oid) in self.iter() {
-            n += name.as_str().encode(writer)?;
-            n += oid.encode(writer)?;
-        }
-        Ok(n)
-    }
-}
-
-impl Encode for cyphernet::addr::tor::OnionAddrV3 {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        self.into_raw_bytes().encode(writer)
-    }
-}
-
-impl Encode for UserAgent {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        self.as_ref().encode(writer)
-    }
-}
-
-impl Encode for Alias {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        self.as_ref().encode(writer)
-    }
-}
-
-impl<A, B> Encode for (A, B)
-where
-    A: Encode,
-    B: Encode,
-{
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        let mut n = self.0.encode(writer)?;
-        n += self.1.encode(writer)?;
-        Ok(n)
-    }
-}
-
-impl Encode for git::RefString {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        self.as_str().encode(writer)
-    }
-}
-
-impl Encode for Signature {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        self.deref().encode(writer)
-    }
-}
-
-impl Encode for git::Oid {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        // Nb. We use length-encoding here to support future SHA-2 object ids.
-        self.as_bytes().encode(writer)
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-impl Decode for PublicKey {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        let buf: [u8; 32] = Decode::decode(reader)?;
-
-        Ok(PublicKey::from(buf))
-    }
-}
-
-impl Decode for Refs {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        let len = Size::decode(reader)?;
-        let mut refs = BTreeMap::new();
-
-        for _ in 0..len {
-            let name = String::decode(reader)?;
-            let name = git::RefString::try_from(name).map_err(Error::from)?;
-            let oid = git::Oid::decode(reader)?;
-
-            refs.insert(name, oid);
-        }
-        Ok(refs.into())
-    }
-}
-
-impl Decode for git::RefString {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        let ref_str = String::decode(reader)?;
-        git::RefString::try_from(ref_str).map_err(Error::from)
-    }
-}
-
-impl Decode for UserAgent {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        String::decode(reader)
-            .and_then(|s| UserAgent::from_str(&s).map_err(Error::InvalidUserAgent))
-    }
-}
-
-impl Decode for Alias {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        String::decode(reader).and_then(|s| Alias::from_str(&s).map_err(Error::from))
-    }
-}
-
-impl<A, B> Decode for (A, B)
-where
-    A: Decode,
-    B: Decode,
-{
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        let a = A::decode(reader)?;
-        let b = B::decode(reader)?;
-        Ok((a, b))
-    }
-}
-
-impl Decode for git::Oid {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        let len = Size::decode(reader)? as usize;
-        #[allow(non_upper_case_globals)]
-        const expected: usize = mem::size_of::<git::raw::Oid>();
-
-        if len != expected {
-            return Err(Error::InvalidSize {
-                expected,
-                actual: len,
-            });
-        }
-
-        let buf: [u8; expected] = Decode::decode(reader)?;
-        let oid = git::raw::Oid::from_bytes(&buf).expect("the buffer is exactly the right size");
-        let oid = git::Oid::from(oid);
-
-        Ok(oid)
-    }
-}
-
-impl Decode for Signature {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        let bytes: [u8; 64] = Decode::decode(reader)?;
-
-        Ok(Signature::from(bytes))
-    }
-}
-
-impl Decode for u8 {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        reader.read_u8().map_err(Error::from)
-    }
-}
-
-impl Decode for u16 {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        reader.read_u16::<NetworkEndian>().map_err(Error::from)
-    }
-}
-
-impl Decode for u32 {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        reader.read_u32::<NetworkEndian>().map_err(Error::from)
-    }
-}
-
-impl Decode for u64 {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        reader.read_u64::<NetworkEndian>().map_err(Error::from)
-    }
-}
-
-impl<const N: usize> Decode for [u8; N] {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        let mut ary = [0; N];
-        reader.read_exact(&mut ary)?;
-
-        Ok(ary)
-    }
-}
-
-impl<T, const N: usize> Decode for BoundedVec<T, N>
-where
-    T: Decode,
-{
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        let len: usize = Size::decode(reader)? as usize;
-        let mut items = Self::with_capacity(len).map_err(|_| Error::InvalidSize {
-            expected: Self::max(),
-            actual: len,
-        })?;
-
-        for _ in 0..items.capacity() {
-            let item = T::decode(reader)?;
-            items.push(item).ok();
-        }
-        Ok(items)
-    }
-}
-
-impl Decode for String {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        let len = u8::decode(reader)?;
-        let mut bytes = vec![0; len as usize];
-
-        reader.read_exact(&mut bytes)?;
-
-        let string = String::from_utf8(bytes)?;
-
-        Ok(string)
-    }
-}
-
-impl Decode for RepoId {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        let oid: git::Oid = Decode::decode(reader)?;
-
-        Ok(Self::from(oid))
-    }
-}
-
-impl Encode for filter::Filter {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        let mut n = 0;
-
-        n += self.deref().as_bytes().encode(writer)?;
-
-        Ok(n)
-    }
-}
-
-impl Decode for filter::Filter {
-    fn decode<R: std::io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        let size: usize = Size::decode(reader)? as usize;
-        if !filter::FILTER_SIZES.contains(&size) {
-            return Err(Error::InvalidFilterSize(size));
-        }
-
-        let mut bytes = vec![0; size];
-        reader.read_exact(&mut bytes[..])?;
-
-        let f = filter::BloomFilter::from(bytes);
-        debug_assert_eq!(f.hashes(), filter::FILTER_HASHES);
-
-        Ok(Self::from(f))
-    }
-}
-
-impl<V> Encode for SignedRefs<V> {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        let mut n = 0;
-
-        n += self.id.encode(writer)?;
-        n += self.refs.encode(writer)?;
-        n += self.signature.encode(writer)?;
-
-        Ok(n)
-    }
-}
-
-impl Decode for SignedRefs<Unverified> {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        let id = NodeId::decode(reader)?;
-        let refs = Refs::decode(reader)?;
-        let signature = Signature::decode(reader)?;
-
-        Ok(Self::new(refs, id, signature))
-    }
-}
-
-impl Encode for RefsAt {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        let mut n = 0;
-
-        n += self.remote.encode(writer)?;
-        n += self.at.encode(writer)?;
-
-        Ok(n)
-    }
-}
-
-impl Decode for RefsAt {
-    fn decode<R: std::io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        let remote = NodeId::decode(reader)?;
-        let at = git::Oid::decode(reader)?;
-        Ok(Self { remote, at })
-    }
-}
-
-impl Encode for node::Features {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        self.deref().encode(writer)
-    }
-}
-
-impl Decode for node::Features {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        let features = u64::decode(reader)?;
-
-        Ok(Self::from(features))
-    }
-}
-
-impl Decode for tor::OnionAddrV3 {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        let bytes: [u8; tor::ONION_V3_RAW_LEN] = Decode::decode(reader)?;
-        let addr = tor::OnionAddrV3::from_raw_bytes(bytes)?;
-
-        Ok(addr)
-    }
-}
-
-impl Encode for Timestamp {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        self.deref().encode(writer)
-    }
-}
-
-impl Decode for Timestamp {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, Error> {
-        let millis = u64::decode(reader)?;
-        let ts = Timestamp::try_from(millis).map_err(Error::InvalidTimestamp)?;
-
-        Ok(ts)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use qcheck;
-    use qcheck_macros::quickcheck;
-
-    use crate::crypto::Unverified;
-    use crate::storage::refs::SignedRefs;
-    use crate::test::assert_matches;
-
-    #[quickcheck]
-    fn prop_u8(input: u8) {
-        assert_eq!(deserialize::<u8>(&serialize(&input)).unwrap(), input);
-    }
-
-    #[quickcheck]
-    fn prop_u16(input: u16) {
-        assert_eq!(deserialize::<u16>(&serialize(&input)).unwrap(), input);
-    }
-
-    #[quickcheck]
-    fn prop_u32(input: u32) {
-        assert_eq!(deserialize::<u32>(&serialize(&input)).unwrap(), input);
-    }
-
-    #[quickcheck]
-    fn prop_u64(input: u64) {
-        assert_eq!(deserialize::<u64>(&serialize(&input)).unwrap(), input);
-    }
-
-    #[quickcheck]
-    fn prop_string(input: String) -> qcheck::TestResult {
-        if input.len() > u8::MAX as usize {
-            return qcheck::TestResult::discard();
-        }
-        assert_eq!(deserialize::<String>(&serialize(&input)).unwrap(), input);
-
-        qcheck::TestResult::passed()
-    }
-
-    #[quickcheck]
-    fn prop_vec(input: BoundedVec<String, 16>) {
-        assert_eq!(
-            deserialize::<BoundedVec<String, 16>>(&serialize(&input.as_slice())).unwrap(),
-            input
-        );
-    }
-
-    #[quickcheck]
-    fn prop_pubkey(input: PublicKey) {
-        assert_eq!(deserialize::<PublicKey>(&serialize(&input)).unwrap(), input);
-    }
-
-    #[quickcheck]
-    fn prop_filter(input: filter::Filter) {
-        assert_eq!(
-            deserialize::<filter::Filter>(&serialize(&input)).unwrap(),
-            input
-        );
-    }
-
-    #[quickcheck]
-    fn prop_id(input: RepoId) {
-        assert_eq!(deserialize::<RepoId>(&serialize(&input)).unwrap(), input);
-    }
-
-    #[quickcheck]
-    fn prop_refs(input: Refs) {
-        assert_eq!(deserialize::<Refs>(&serialize(&input)).unwrap(), input);
-    }
-
-    #[quickcheck]
-    fn prop_tuple(input: (String, String)) {
-        assert_eq!(
-            deserialize::<(String, String)>(&serialize(&input)).unwrap(),
-            input
-        );
-    }
-
-    #[quickcheck]
-    fn prop_signature(input: [u8; 64]) {
-        let signature = Signature::from(input);
-
-        assert_eq!(
-            deserialize::<Signature>(&serialize(&signature)).unwrap(),
-            signature
-        );
-    }
-
-    #[quickcheck]
-    fn prop_oid(input: [u8; 20]) {
-        let oid = git::Oid::try_from(input.as_slice()).unwrap();
-
-        assert_eq!(deserialize::<git::Oid>(&serialize(&oid)).unwrap(), oid);
-    }
-
-    #[quickcheck]
-    fn prop_signed_refs(input: SignedRefs<Unverified>) {
-        assert_eq!(
-            deserialize::<SignedRefs<Unverified>>(&serialize(&input)).unwrap(),
-            input
-        );
-    }
-
-    #[test]
-    fn test_string() {
-        assert_eq!(
-            serialize(&String::from("hello")),
-            vec![5, b'h', b'e', b'l', b'l', b'o']
-        );
-    }
-
-    #[test]
-    fn test_alias() {
-        assert_eq!(
-            serialize(&Alias::from_str("hello").unwrap()),
-            vec![5, b'h', b'e', b'l', b'l', b'o']
-        );
-    }
-
-    #[test]
-    fn test_filter_invalid() {
-        let b = bloomy::BloomFilter::with_size(filter::FILTER_SIZE_M / 3);
-        let f = filter::Filter::from(b);
-        let bytes = serialize(&f);
-
-        assert_matches!(
-            deserialize::<filter::Filter>(&bytes).unwrap_err(),
-            Error::InvalidFilterSize(_)
-        );
-    }
-
-    #[test]
-    fn test_bounded_vec_limit() {
-        let v: BoundedVec<u8, 2> = vec![1, 2].try_into().unwrap();
-        let buf = serialize(&v);
-
-        assert_matches!(
-            deserialize::<BoundedVec<u8, 1>>(&buf),
-            Err(Error::InvalidSize {
-                expected: 1,
-                actual: 2
-            }),
-            "fail when vector is too small for buffer",
-        );
-
-        assert!(
-            deserialize::<BoundedVec<u8, 2>>(&buf).is_ok(),
-            "successfully decode vector of same size",
-        );
-    }
-}
diff --git a/radicle-node/src/wire/frame.rs b/radicle-node/src/wire/frame.rs
deleted file mode 100644
index e753339d8..000000000
--- a/radicle-node/src/wire/frame.rs
+++ /dev/null
@@ -1,395 +0,0 @@
-//! Framing protocol.
-#![warn(clippy::missing_docs_in_private_items)]
-use std::{fmt, io};
-
-use crate::{wire, wire::varint, wire::varint::VarInt, wire::Message, Link, PROTOCOL_VERSION};
-
-/// Protocol version strings all start with the magic sequence `rad`, followed
-/// by a version number.
-pub const PROTOCOL_VERSION_STRING: Version = Version([b'r', b'a', b'd', PROTOCOL_VERSION]);
-
-/// Control open byte.
-const CONTROL_OPEN: u8 = 0;
-/// Control close byte.
-const CONTROL_CLOSE: u8 = 1;
-/// Control EOF byte.
-const CONTROL_EOF: u8 = 2;
-
-/// Protocol version.
-#[derive(Debug, PartialEq, Eq)]
-pub struct Version([u8; 4]);
-
-impl Version {
-    /// Version number.
-    pub fn number(&self) -> u8 {
-        self.0[3]
-    }
-}
-
-impl wire::Encode for Version {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        writer.write_all(&PROTOCOL_VERSION_STRING.0)?;
-
-        Ok(PROTOCOL_VERSION_STRING.0.len())
-    }
-}
-
-impl wire::Decode for Version {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, wire::Error> {
-        let mut version = [0u8; 4];
-        reader.read_exact(&mut version[..])?;
-
-        if version != PROTOCOL_VERSION_STRING.0 {
-            return Err(wire::Error::InvalidProtocolVersion(version));
-        }
-        Ok(Self(version))
-    }
-}
-
-/// Identifies a (multiplexed) stream.
-///
-/// Stream IDs are variable-length integers with the least significant 3 bits
-/// denoting the stream type and initiator.
-///
-/// The first bit denotes the initiator (outbound or inbound), while the second
-/// and third bit denote the stream type. See `StreamKind`.
-///
-/// In a situation where Alice connects to Bob, Alice will have the initiator
-/// bit set to `1` for all streams she creates, while Bob will have it set to `0`.
-///
-/// This ensures that Stream IDs never collide.
-/// Additionally, Stream IDs must never be re-used within a connection.
-///
-/// +=======+==================================+
-/// | Bits  | Stream Type                      |
-/// +=======+==================================+
-/// | 0b000 | Outbound Control stream          |
-/// +-------+----------------------------------+
-/// | 0b001 | Inbound Control stream           |
-/// +-------+----------------------------------+
-/// | 0b010 | Outbound Gossip stream           |
-/// +-------+----------------------------------+
-/// | 0b011 | Inbound Gossip stream            |
-/// +-------+----------------------------------+
-/// | 0b100 | Outbound Git stream              |
-/// +-------+----------------------------------+
-/// | 0b101 | Inbound Git stream               |
-/// +-------+----------------------------------+
-///
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub struct StreamId(VarInt);
-
-impl StreamId {
-    /// Get the initiator of this stream.
-    pub fn link(&self) -> Link {
-        let n = *self.0;
-        if 0b1 & n == 0 {
-            Link::Outbound
-        } else {
-            Link::Inbound
-        }
-    }
-
-    /// Get the kind of stream this is.
-    pub fn kind(&self) -> Result<StreamKind, u8> {
-        let id = *self.0;
-        let kind = ((id >> 1) & 0b11) as u8;
-
-        StreamKind::try_from(kind)
-    }
-
-    /// Create a control identifier.
-    pub fn control(link: Link) -> Self {
-        let link = if link.is_outbound() { 0 } else { 1 };
-        Self(VarInt::from((StreamKind::Control as u8) << 1 | link))
-    }
-
-    /// Create a gossip identifier.
-    pub fn gossip(link: Link) -> Self {
-        let link = if link.is_outbound() { 0 } else { 1 };
-        Self(VarInt::from((StreamKind::Gossip as u8) << 1 | link))
-    }
-
-    /// Create a git identifier.
-    pub fn git(link: Link) -> Self {
-        let link = if link.is_outbound() { 0 } else { 1 };
-        Self(VarInt::from((StreamKind::Git as u8) << 1 | link))
-    }
-
-    /// Get the nth identifier while preserving the stream type and initiator.
-    pub fn nth(self, n: u64) -> Result<Self, varint::BoundsExceeded> {
-        let id = *self.0 + (n << 3);
-        VarInt::new(id).map(Self)
-    }
-}
-
-impl From<StreamId> for u64 {
-    fn from(value: StreamId) -> Self {
-        *value.0
-    }
-}
-
-impl From<StreamId> for VarInt {
-    fn from(value: StreamId) -> Self {
-        value.0
-    }
-}
-
-impl fmt::Display for StreamId {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", *self.0)
-    }
-}
-
-impl wire::Decode for StreamId {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, wire::Error> {
-        let id = VarInt::decode(reader)?;
-        Ok(Self(id))
-    }
-}
-
-impl wire::Encode for StreamId {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        self.0.encode(writer)
-    }
-}
-
-/// Type of stream.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-#[repr(u8)]
-pub enum StreamKind {
-    /// Control stream, used to open and close streams.
-    Control = 0b00,
-    /// Gossip stream, used to exchange messages.
-    Gossip = 0b01,
-    /// Git stream, used for replication.
-    Git = 0b10,
-}
-
-impl TryFrom<u8> for StreamKind {
-    type Error = u8;
-
-    fn try_from(value: u8) -> Result<Self, Self::Error> {
-        match value {
-            0b00 => Ok(StreamKind::Control),
-            0b01 => Ok(StreamKind::Gossip),
-            0b10 => Ok(StreamKind::Git),
-            n => Err(n),
-        }
-    }
-}
-
-/// Protocol frame.
-///
-///  0                   1                   2                   3
-///  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-/// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-/// |      'r'      |      'a'      |      'd'      |      0x1      | Version
-/// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-/// |                     Stream ID                           |TTT|I| Stream ID with Stream [T]ype and [I]nitiator bits
-/// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-/// |                     Data                                   ...| Data (variable size)
-/// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-#[derive(Debug, PartialEq, Eq)]
-pub struct Frame<M = Message> {
-    /// The protocol version.
-    pub version: Version,
-    /// The stream identifier.
-    pub stream: StreamId,
-    /// The frame payload.
-    pub data: FrameData<M>,
-}
-
-impl<M> Frame<M> {
-    /// Create a 'git' protocol frame.
-    pub fn git(stream: StreamId, data: Vec<u8>) -> Self {
-        Self {
-            version: PROTOCOL_VERSION_STRING,
-            stream,
-            data: FrameData::Git(data),
-        }
-    }
-
-    /// Create a 'control' protocol frame.
-    pub fn control(link: Link, ctrl: Control) -> Self {
-        Self {
-            version: PROTOCOL_VERSION_STRING,
-            stream: StreamId::control(link),
-            data: FrameData::Control(ctrl),
-        }
-    }
-
-    /// Create a 'gossip' protocol frame.
-    pub fn gossip(link: Link, msg: M) -> Self {
-        Self {
-            version: PROTOCOL_VERSION_STRING,
-            stream: StreamId::gossip(link),
-            data: FrameData::Gossip(msg),
-        }
-    }
-}
-
-impl<M: wire::Encode> Frame<M> {
-    /// Serialize frame to bytes.
-    pub fn to_bytes(&self) -> Vec<u8> {
-        wire::serialize(self)
-    }
-}
-
-/// Frame payload.
-#[derive(Debug, PartialEq, Eq)]
-pub enum FrameData<M> {
-    /// Control frame payload.
-    Control(Control),
-    /// Gossip frame payload.
-    Gossip(M),
-    /// Git frame payload. May contain packet-lines as well as packfile data.
-    Git(Vec<u8>),
-}
-
-/// A control message sent over a control stream.
-#[derive(Debug, PartialEq, Eq)]
-pub enum Control {
-    /// Open a new stream.
-    Open {
-        /// The stream to open.
-        stream: StreamId,
-    },
-    /// Close an existing stream.
-    Close {
-        /// The stream to close.
-        stream: StreamId,
-    },
-    /// Signal an end-of-file. This can be used to simulate connections terminating
-    /// without having to close the connection. These control messages are turned into
-    /// [`io::ErrorKind::UnexpectedEof`] errors on read.
-    Eof {
-        /// The stream to send an EOF on.
-        stream: StreamId,
-    },
-}
-
-impl wire::Decode for Control {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, wire::Error> {
-        let command = u8::decode(reader)?;
-        match command {
-            CONTROL_OPEN => {
-                let stream = StreamId::decode(reader)?;
-                Ok(Control::Open { stream })
-            }
-            CONTROL_CLOSE => {
-                let stream = StreamId::decode(reader)?;
-                Ok(Control::Close { stream })
-            }
-            CONTROL_EOF => {
-                let stream = StreamId::decode(reader)?;
-                Ok(Control::Eof { stream })
-            }
-            other => Err(wire::Error::InvalidControlMessage(other)),
-        }
-    }
-}
-
-impl wire::Encode for Control {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        let mut n = 0;
-
-        match self {
-            Self::Open { stream: id } => {
-                n += CONTROL_OPEN.encode(writer)?;
-                n += id.encode(writer)?;
-            }
-            Self::Eof { stream: id } => {
-                n += CONTROL_EOF.encode(writer)?;
-                n += id.encode(writer)?;
-            }
-            Self::Close { stream: id } => {
-                n += CONTROL_CLOSE.encode(writer)?;
-                n += id.encode(writer)?;
-            }
-        }
-        Ok(n)
-    }
-}
-
-impl<M: wire::Decode> wire::Decode for Frame<M> {
-    fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, wire::Error> {
-        let version = Version::decode(reader)?;
-        if version.number() != PROTOCOL_VERSION {
-            return Err(wire::Error::WrongProtocolVersion(version.number()));
-        }
-        let stream = StreamId::decode(reader)?;
-
-        match stream.kind() {
-            Ok(StreamKind::Control) => {
-                let ctrl = Control::decode(reader)?;
-                let frame = Frame {
-                    version,
-                    stream,
-                    data: FrameData::Control(ctrl),
-                };
-                Ok(frame)
-            }
-            Ok(StreamKind::Gossip) => {
-                let data = varint::payload::decode(reader)?;
-                let mut cursor = io::Cursor::new(data);
-                let msg = M::decode(&mut cursor)?;
-                let frame = Frame {
-                    version,
-                    stream,
-                    data: FrameData::Gossip(msg),
-                };
-
-                // Nb. If there is data after the `Message` that is not decoded,
-                // it is simply dropped here.
-
-                Ok(frame)
-            }
-            Ok(StreamKind::Git { .. }) => {
-                let data = varint::payload::decode(reader)?;
-                Ok(Frame::git(stream, data))
-            }
-            Err(n) => Err(wire::Error::InvalidStreamKind(n)),
-        }
-    }
-}
-
-impl<M: wire::Encode> wire::Encode for Frame<M> {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        let mut n = 0;
-
-        n += self.version.encode(writer)?;
-        n += self.stream.encode(writer)?;
-        n += match &self.data {
-            FrameData::Control(ctrl) => ctrl.encode(writer)?,
-            FrameData::Git(data) => varint::payload::encode(data, writer)?,
-            FrameData::Gossip(msg) => varint::payload::encode(&wire::serialize(msg), writer)?,
-        };
-
-        Ok(n)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_stream_id() {
-        assert_eq!(StreamId(VarInt(0b000)).kind().unwrap(), StreamKind::Control);
-        assert_eq!(StreamId(VarInt(0b010)).kind().unwrap(), StreamKind::Gossip);
-        assert_eq!(StreamId(VarInt(0b100)).kind().unwrap(), StreamKind::Git);
-        assert_eq!(StreamId(VarInt(0b001)).link(), Link::Inbound);
-        assert_eq!(StreamId(VarInt(0b000)).link(), Link::Outbound);
-        assert_eq!(StreamId(VarInt(0b101)).link(), Link::Inbound);
-        assert_eq!(StreamId(VarInt(0b100)).link(), Link::Outbound);
-
-        assert_eq!(StreamId::git(Link::Outbound), StreamId(VarInt(0b100)));
-        assert_eq!(StreamId::control(Link::Outbound), StreamId(VarInt(0b000)));
-        assert_eq!(StreamId::gossip(Link::Outbound), StreamId(VarInt(0b010)));
-
-        assert_eq!(StreamId::git(Link::Inbound), StreamId(VarInt(0b101)));
-        assert_eq!(StreamId::control(Link::Inbound), StreamId(VarInt(0b001)));
-        assert_eq!(StreamId::gossip(Link::Inbound), StreamId(VarInt(0b011)));
-    }
-}
diff --git a/radicle-node/src/wire/message.rs b/radicle-node/src/wire/message.rs
deleted file mode 100644
index 69e54fd99..000000000
--- a/radicle-node/src/wire/message.rs
+++ /dev/null
@@ -1,600 +0,0 @@
-use std::{io, mem, net};
-
-use byteorder::{NetworkEndian, ReadBytesExt};
-use cyphernet::addr::{tor, Addr, HostName, NetAddr};
-use radicle::git::Oid;
-use radicle::node::Address;
-
-use crate::prelude::*;
-use crate::service::message::*;
-use crate::wire;
-use crate::wire::{Decode, Encode};
-
-/// Message type.
-#[repr(u16)]
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum MessageType {
-    NodeAnnouncement = 2,
-    InventoryAnnouncement = 4,
-    RefsAnnouncement = 6,
-    Subscribe = 8,
-    Ping = 10,
-    Pong = 12,
-    Info = 14,
-}
-
-impl From<MessageType> for u16 {
-    fn from(other: MessageType) -> Self {
-        other as u16
-    }
-}
-
-impl TryFrom<u16> for MessageType {
-    type Error = u16;
-
-    fn try_from(other: u16) -> Result<Self, Self::Error> {
-        match other {
-            2 => Ok(MessageType::NodeAnnouncement),
-            4 => Ok(MessageType::InventoryAnnouncement),
-            6 => Ok(MessageType::RefsAnnouncement),
-            8 => Ok(MessageType::Subscribe),
-            10 => Ok(MessageType::Ping),
-            12 => Ok(MessageType::Pong),
-            14 => Ok(MessageType::Info),
-            _ => Err(other),
-        }
-    }
-}
-
-impl Message {
-    /// The maximum supported message size in bytes.
-    pub const MAX_SIZE: wire::Size =
-        wire::Size::MAX - (mem::size_of::<MessageType>() as wire::Size);
-
-    pub fn type_id(&self) -> u16 {
-        match self {
-            Self::Subscribe { .. } => MessageType::Subscribe,
-            Self::Announcement(Announcement { message, .. }) => match message {
-                AnnouncementMessage::Node(_) => MessageType::NodeAnnouncement,
-                AnnouncementMessage::Inventory(_) => MessageType::InventoryAnnouncement,
-                AnnouncementMessage::Refs(_) => MessageType::RefsAnnouncement,
-            },
-            Self::Info(_) => MessageType::Info,
-            Self::Ping { .. } => MessageType::Ping,
-            Self::Pong { .. } => MessageType::Pong,
-        }
-        .into()
-    }
-}
-
-impl netservices::Frame for Message {
-    type Error = wire::Error;
-
-    fn unmarshall(mut reader: impl io::Read) -> Result<Option<Self>, Self::Error> {
-        match Message::decode(&mut reader) {
-            Ok(msg) => Ok(Some(msg)),
-            Err(wire::Error::Io(_)) => Ok(None),
-            Err(err) => Err(err),
-        }
-    }
-
-    fn marshall(&self, mut writer: impl io::Write) -> Result<usize, Self::Error> {
-        self.encode(&mut writer).map_err(wire::Error::from)
-    }
-}
-
-/// Address type.
-#[repr(u8)]
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum AddressType {
-    Ipv4 = 1,
-    Ipv6 = 2,
-    Dns = 3,
-    Onion = 4,
-}
-
-impl From<AddressType> for u8 {
-    fn from(other: AddressType) -> Self {
-        other as u8
-    }
-}
-
-impl From<&Address> for AddressType {
-    fn from(a: &Address) -> Self {
-        match a.host {
-            HostName::Ip(net::IpAddr::V4(_)) => AddressType::Ipv4,
-            HostName::Ip(net::IpAddr::V6(_)) => AddressType::Ipv6,
-            HostName::Dns(_) => AddressType::Dns,
-            HostName::Tor(_) => AddressType::Onion,
-            _ => todo!(), // FIXME(cloudhead): Maxim will remove `non-exhaustive`
-        }
-    }
-}
-
-impl TryFrom<u8> for AddressType {
-    type Error = u8;
-
-    fn try_from(other: u8) -> Result<Self, Self::Error> {
-        match other {
-            1 => Ok(AddressType::Ipv4),
-            2 => Ok(AddressType::Ipv6),
-            3 => Ok(AddressType::Dns),
-            4 => Ok(AddressType::Onion),
-            _ => Err(other),
-        }
-    }
-}
-
-impl wire::Encode for AnnouncementMessage {
-    fn encode<W: std::io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, std::io::Error> {
-        match self {
-            Self::Node(ann) => ann.encode(writer),
-            Self::Inventory(ann) => ann.encode(writer),
-            Self::Refs(ann) => ann.encode(writer),
-        }
-    }
-}
-
-impl wire::Encode for RefsAnnouncement {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        let mut n = 0;
-
-        n += self.rid.encode(writer)?;
-        n += self.refs.encode(writer)?;
-        n += self.timestamp.encode(writer)?;
-
-        Ok(n)
-    }
-}
-
-impl wire::Decode for RefsAnnouncement {
-    fn decode<R: std::io::Read + ?Sized>(reader: &mut R) -> Result<Self, wire::Error> {
-        let rid = RepoId::decode(reader)?;
-        let refs = BoundedVec::<_, REF_REMOTE_LIMIT>::decode(reader)?;
-        let timestamp = Timestamp::decode(reader)?;
-
-        Ok(Self {
-            rid,
-            refs,
-            timestamp,
-        })
-    }
-}
-
-impl wire::Encode for InventoryAnnouncement {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        let mut n = 0;
-
-        n += self.inventory.encode(writer)?;
-        n += self.timestamp.encode(writer)?;
-
-        Ok(n)
-    }
-}
-
-impl wire::Decode for InventoryAnnouncement {
-    fn decode<R: std::io::Read + ?Sized>(reader: &mut R) -> Result<Self, wire::Error> {
-        let inventory = BoundedVec::decode(reader)?;
-        let timestamp = Timestamp::decode(reader)?;
-
-        Ok(Self {
-            inventory,
-            timestamp,
-        })
-    }
-}
-
-/// The type tracking the different variants of [`Info`] for encoding and
-/// decoding purposes.
-#[repr(u8)]
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum InfoType {
-    RefsAlreadySynced = 1,
-}
-
-impl From<InfoType> for u16 {
-    fn from(other: InfoType) -> Self {
-        other as u16
-    }
-}
-
-impl TryFrom<u16> for InfoType {
-    type Error = u16;
-
-    fn try_from(other: u16) -> Result<Self, Self::Error> {
-        match other {
-            1 => Ok(Self::RefsAlreadySynced),
-            n => Err(n),
-        }
-    }
-}
-
-impl From<Info> for InfoType {
-    fn from(info: Info) -> Self {
-        (&info).into()
-    }
-}
-
-impl From<&Info> for InfoType {
-    fn from(info: &Info) -> Self {
-        match info {
-            Info::RefsAlreadySynced { .. } => Self::RefsAlreadySynced,
-        }
-    }
-}
-
-impl wire::Encode for Info {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        let mut n = 0;
-        n += u16::from(InfoType::from(self)).encode(writer)?;
-        match self {
-            Info::RefsAlreadySynced { rid, at } => {
-                n += rid.encode(writer)?;
-                n += at.encode(writer)?;
-            }
-        }
-
-        Ok(n)
-    }
-}
-
-impl wire::Decode for Info {
-    fn decode<R: std::io::Read + ?Sized>(reader: &mut R) -> Result<Self, wire::Error> {
-        let info_type = reader.read_u16::<NetworkEndian>()?;
-
-        match InfoType::try_from(info_type) {
-            Ok(InfoType::RefsAlreadySynced) => {
-                let rid = RepoId::decode(reader)?;
-                let at = Oid::decode(reader)?;
-
-                Ok(Self::RefsAlreadySynced { rid, at })
-            }
-            Err(other) => Err(wire::Error::UnknownInfoType(other)),
-        }
-    }
-}
-
-impl wire::Encode for Message {
-    fn encode<W: std::io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, std::io::Error> {
-        let mut n = self.type_id().encode(writer)?;
-
-        match self {
-            Self::Subscribe(Subscribe {
-                filter,
-                since,
-                until,
-            }) => {
-                n += filter.encode(writer)?;
-                n += since.encode(writer)?;
-                n += until.encode(writer)?;
-            }
-            Self::Announcement(Announcement {
-                node,
-                message,
-                signature,
-            }) => {
-                n += node.encode(writer)?;
-                n += signature.encode(writer)?;
-                n += message.encode(writer)?;
-            }
-            Self::Info(info) => {
-                n += info.encode(writer)?;
-            }
-            Self::Ping(Ping { ponglen, zeroes }) => {
-                n += ponglen.encode(writer)?;
-                n += zeroes.encode(writer)?;
-            }
-            Self::Pong { zeroes } => {
-                n += zeroes.encode(writer)?;
-            }
-        }
-
-        if n > wire::Size::MAX as usize {
-            return Err(io::Error::new(
-                io::ErrorKind::InvalidData,
-                "Message exceeds maximum size",
-            ));
-        }
-        Ok(n)
-    }
-}
-
-impl wire::Decode for Message {
-    fn decode<R: std::io::Read + ?Sized>(reader: &mut R) -> Result<Self, wire::Error> {
-        let type_id = reader.read_u16::<NetworkEndian>()?;
-
-        match MessageType::try_from(type_id) {
-            Ok(MessageType::Subscribe) => {
-                let filter = Filter::decode(reader)?;
-                let since = Timestamp::decode(reader)?;
-                let until = Timestamp::decode(reader)?;
-
-                Ok(Self::Subscribe(Subscribe {
-                    filter,
-                    since,
-                    until,
-                }))
-            }
-            Ok(MessageType::NodeAnnouncement) => {
-                let node = NodeId::decode(reader)?;
-                let signature = Signature::decode(reader)?;
-                let message = NodeAnnouncement::decode(reader)?.into();
-
-                Ok(Announcement {
-                    node,
-                    message,
-                    signature,
-                }
-                .into())
-            }
-            Ok(MessageType::InventoryAnnouncement) => {
-                let node = NodeId::decode(reader)?;
-                let signature = Signature::decode(reader)?;
-                let message = InventoryAnnouncement::decode(reader)?.into();
-
-                Ok(Announcement {
-                    node,
-                    message,
-                    signature,
-                }
-                .into())
-            }
-            Ok(MessageType::RefsAnnouncement) => {
-                let node = NodeId::decode(reader)?;
-                let signature = Signature::decode(reader)?;
-                let message = RefsAnnouncement::decode(reader)?.into();
-
-                Ok(Announcement {
-                    node,
-                    message,
-                    signature,
-                }
-                .into())
-            }
-            Ok(MessageType::Info) => {
-                let info = Info::decode(reader)?;
-                Ok(Self::Info(info))
-            }
-            Ok(MessageType::Ping) => {
-                let ponglen = u16::decode(reader)?;
-                let zeroes = ZeroBytes::decode(reader)?;
-                Ok(Self::Ping(Ping { ponglen, zeroes }))
-            }
-            Ok(MessageType::Pong) => {
-                let zeroes = ZeroBytes::decode(reader)?;
-                Ok(Self::Pong { zeroes })
-            }
-            Err(other) => Err(wire::Error::UnknownMessageType(other)),
-        }
-    }
-}
-
-impl wire::Encode for Address {
-    fn encode<W: std::io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, std::io::Error> {
-        let mut n = 0;
-
-        match self.host {
-            HostName::Ip(net::IpAddr::V4(ip)) => {
-                n += u8::from(AddressType::Ipv4).encode(writer)?;
-                n += ip.octets().encode(writer)?;
-            }
-            HostName::Ip(net::IpAddr::V6(ip)) => {
-                n += u8::from(AddressType::Ipv6).encode(writer)?;
-                n += ip.octets().encode(writer)?;
-            }
-            HostName::Dns(ref dns) => {
-                n += u8::from(AddressType::Dns).encode(writer)?;
-                n += dns.encode(writer)?;
-            }
-            HostName::Tor(addr) => {
-                n += u8::from(AddressType::Onion).encode(writer)?;
-                n += addr.encode(writer)?;
-            }
-            _ => {
-                return Err(io::ErrorKind::Unsupported.into());
-            }
-        }
-        n += self.port().encode(writer)?;
-
-        Ok(n)
-    }
-}
-
-impl wire::Decode for Address {
-    fn decode<R: std::io::Read + ?Sized>(reader: &mut R) -> Result<Self, wire::Error> {
-        let addrtype = reader.read_u8()?;
-        let host = match AddressType::try_from(addrtype) {
-            Ok(AddressType::Ipv4) => {
-                let octets: [u8; 4] = wire::Decode::decode(reader)?;
-                let ip = net::Ipv4Addr::from(octets);
-
-                HostName::Ip(net::IpAddr::V4(ip))
-            }
-            Ok(AddressType::Ipv6) => {
-                let octets: [u8; 16] = wire::Decode::decode(reader)?;
-                let ip = net::Ipv6Addr::from(octets);
-
-                HostName::Ip(net::IpAddr::V6(ip))
-            }
-            Ok(AddressType::Dns) => {
-                let dns: String = wire::Decode::decode(reader)?;
-
-                HostName::Dns(dns)
-            }
-            Ok(AddressType::Onion) => {
-                let onion: tor::OnionAddrV3 = wire::Decode::decode(reader)?;
-
-                HostName::Tor(onion)
-            }
-            Err(other) => return Err(wire::Error::UnknownAddressType(other)),
-        };
-        let port = u16::decode(reader)?;
-
-        Ok(Self::from(NetAddr { host, port }))
-    }
-}
-
-impl wire::Encode for ZeroBytes {
-    fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-        let mut n = (self.len() as u16).encode(writer)?;
-        for _ in 0..self.len() {
-            n += 0u8.encode(writer)?;
-        }
-        Ok(n)
-    }
-}
-
-impl wire::Decode for ZeroBytes {
-    fn decode<R: std::io::Read + ?Sized>(reader: &mut R) -> Result<Self, wire::Error> {
-        let zeroes = u16::decode(reader)?;
-        for _ in 0..zeroes {
-            _ = u8::decode(reader)?;
-        }
-        Ok(ZeroBytes::new(zeroes))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use qcheck_macros::quickcheck;
-    use radicle::node::UserAgent;
-    use radicle::storage::refs::RefsAt;
-    use radicle_crypto::test::signer::MockSigner;
-
-    use crate::deserializer::Deserializer;
-    use crate::test::arbitrary;
-    use crate::wire::{self, Encode};
-
-    #[test]
-    fn test_refs_ann_max_size() {
-        let signer = MockSigner::default();
-        let refs: [RefsAt; REF_REMOTE_LIMIT] = arbitrary::gen(1);
-        let ann = AnnouncementMessage::Refs(RefsAnnouncement {
-            rid: arbitrary::gen(1),
-            refs: BoundedVec::collect_from(&mut refs.into_iter()),
-            timestamp: arbitrary::gen(1),
-        });
-        let ann = ann.signed(&signer);
-        let msg = Message::Announcement(ann);
-        let data = wire::serialize(&msg);
-
-        assert!(data.len() < wire::Size::MAX as usize);
-    }
-
-    #[test]
-    fn test_inv_ann_max_size() {
-        let signer = MockSigner::default();
-        let inv: [RepoId; INVENTORY_LIMIT] = arbitrary::gen(1);
-        let ann = AnnouncementMessage::Inventory(InventoryAnnouncement {
-            inventory: BoundedVec::collect_from(&mut inv.into_iter()),
-            timestamp: arbitrary::gen(1),
-        });
-        let ann = ann.signed(&signer);
-        let msg = Message::Announcement(ann);
-        let data = wire::serialize(&msg);
-
-        assert!(data.len() < wire::Size::MAX as usize);
-    }
-
-    #[test]
-    fn test_node_ann_max_size() {
-        let signer = MockSigner::default();
-        let addrs: [Address; ADDRESS_LIMIT] = arbitrary::gen(1);
-        let alias = ['@'; radicle::node::MAX_ALIAS_LENGTH];
-        let ann = AnnouncementMessage::Node(NodeAnnouncement {
-            version: 1,
-            features: Default::default(),
-            alias: radicle::node::Alias::new(String::from_iter(alias)),
-            addresses: BoundedVec::collect_from(&mut addrs.into_iter()),
-            timestamp: arbitrary::gen(1),
-            nonce: u64::MAX,
-            agent: UserAgent::default(),
-        });
-        let ann = ann.signed(&signer);
-        let msg = Message::Announcement(ann);
-        let data = wire::serialize(&msg);
-
-        assert!(data.len() < wire::Size::MAX as usize);
-    }
-
-    #[test]
-    fn test_pingpong_encode_max_size() {
-        let mut buf = Vec::new();
-
-        let ping = Message::Ping(Ping {
-            ponglen: 0,
-            zeroes: ZeroBytes::new(Ping::MAX_PING_ZEROES),
-        });
-        ping.encode(&mut buf)
-            .expect("ping should be within max message size");
-
-        let pong = Message::Pong {
-            zeroes: ZeroBytes::new(Ping::MAX_PONG_ZEROES),
-        };
-        pong.encode(&mut buf)
-            .expect("pong should be within max message size");
-    }
-
-    #[test]
-    fn test_pingpong_encode_size_overflow() {
-        let ping = Message::Ping(Ping {
-            ponglen: 0,
-            zeroes: ZeroBytes::new(Ping::MAX_PING_ZEROES + 1),
-        });
-
-        let mut buf = Vec::new();
-        ping.encode(&mut buf)
-            .expect_err("ping should exceed max message size");
-
-        let pong = Message::Pong {
-            zeroes: ZeroBytes::new(Ping::MAX_PONG_ZEROES + 1),
-        };
-
-        let mut buf = Vec::new();
-        pong.encode(&mut buf)
-            .expect_err("pong should exceed max message size");
-    }
-
-    #[quickcheck]
-    fn prop_message_encode_decode(message: Message) {
-        let encoded = &wire::serialize(&message);
-        let decoded = wire::deserialize::<Message>(encoded).unwrap();
-
-        assert_eq!(message, decoded);
-    }
-
-    #[test]
-    fn prop_message_decoder() {
-        fn property(items: Vec<Message>) {
-            let mut decoder = Deserializer::<1048576, Message>::new(8);
-
-            for item in &items {
-                item.encode(&mut decoder).unwrap();
-            }
-            for item in items {
-                assert_eq!(decoder.next().unwrap().unwrap(), item);
-            }
-        }
-
-        qcheck::QuickCheck::new()
-            .gen(qcheck::Gen::new(16))
-            .quickcheck(property as fn(items: Vec<Message>));
-    }
-
-    #[quickcheck]
-    fn prop_zero_bytes_encode_decode(zeroes: ZeroBytes) {
-        assert_eq!(
-            wire::deserialize::<ZeroBytes>(&wire::serialize(&zeroes)).unwrap(),
-            zeroes
-        );
-    }
-
-    #[quickcheck]
-    fn prop_addr(addr: Address) {
-        assert_eq!(
-            wire::deserialize::<Address>(&wire::serialize(&addr)).unwrap(),
-            addr
-        );
-    }
-}
diff --git a/radicle-node/src/wire/protocol.rs b/radicle-node/src/wire/protocol.rs
deleted file mode 100644
index b4f903f25..000000000
--- a/radicle-node/src/wire/protocol.rs
+++ /dev/null
@@ -1,1371 +0,0 @@
-//! Implementation of the transport protocol.
-//!
-//! We use the Noise XK handshake pattern to establish an encrypted stream with a remote peer.
-//! The handshake itself is implemented in the external [`cyphernet`] and [`netservices`] crates.
-use std::collections::hash_map::Entry;
-use std::collections::VecDeque;
-use std::os::unix::io::{AsRawFd, RawFd};
-use std::sync::Arc;
-use std::{io, net, time};
-
-use amplify::Wrapper as _;
-use crossbeam_channel as chan;
-use cyphernet::addr::{HostName, InetHost, NetAddr};
-use cyphernet::encrypt::noise::{HandshakePattern, Keyset, NoiseState};
-use cyphernet::proxy::socks5;
-use cyphernet::{Digest, EcSk, Ecdh, Sha256};
-use localtime::LocalTime;
-use netservices::resource::{ListenerEvent, NetAccept, NetTransport, SessionEvent};
-use netservices::session::{NoiseSession, ProtocolArtifact, Socks5Session};
-use netservices::{NetConnection, NetReader, NetWriter};
-use reactor::{ResourceId, ResourceType, Timestamp};
-
-use radicle::collections::RandomMap;
-use radicle::node::config::AddressConfig;
-use radicle::node::NodeId;
-use radicle::storage::WriteStorage;
-
-use crate::crypto::Signer;
-use crate::prelude::Deserializer;
-use crate::service;
-use crate::service::io::Io;
-use crate::service::FETCH_TIMEOUT;
-use crate::service::{session, DisconnectReason, Metrics, Service};
-use crate::wire::frame;
-use crate::wire::frame::{Frame, FrameData, StreamId};
-use crate::wire::Encode;
-use crate::worker;
-use crate::worker::{ChannelEvent, FetchRequest, FetchResult, Task, TaskResult};
-use crate::Link;
-
-/// NoiseXK handshake pattern.
-pub const NOISE_XK: HandshakePattern = HandshakePattern {
-    initiator: cyphernet::encrypt::noise::InitiatorPattern::Xmitted,
-    responder: cyphernet::encrypt::noise::OneWayPattern::Known,
-};
-
-/// Default time to wait until a network connection is considered inactive.
-pub const DEFAULT_CONNECTION_TIMEOUT: time::Duration = time::Duration::from_secs(6);
-
-/// Default time to wait when dialing a connection, before the remote is considered unreachable.
-pub const DEFAULT_DIAL_TIMEOUT: time::Duration = time::Duration::from_secs(6);
-
-/// Maximum size of a peer inbox, in bytes.
-pub const MAX_INBOX_SIZE: usize = 1024 * 1024 * 2;
-
-/// Control message used internally between workers, users, and the service.
-#[allow(clippy::large_enum_variant)]
-#[derive(Debug)]
-pub enum Control {
-    /// Message from the user to the service.
-    User(service::Command),
-    /// Message from a worker to the service.
-    Worker(TaskResult),
-    /// Flush data in the given stream to the remote.
-    Flush { remote: NodeId, stream: StreamId },
-}
-
-/// Peer session type.
-pub type WireSession<G> = NoiseSession<G, Sha256, Socks5Session<net::TcpStream>>;
-/// Peer session type (read-only).
-pub type WireReader = NetReader<Socks5Session<net::TcpStream>>;
-/// Peer session type (write-only).
-pub type WireWriter<G> = NetWriter<NoiseState<G, Sha256>, Socks5Session<net::TcpStream>>;
-
-/// Reactor action.
-type Action<G> = reactor::Action<NetAccept<WireSession<G>>, NetTransport<WireSession<G>>>;
-
-/// A worker stream.
-struct Stream {
-    /// Channels.
-    channels: worker::Channels,
-    /// Data sent.
-    sent_bytes: usize,
-    /// Data received.
-    received_bytes: usize,
-}
-
-impl Stream {
-    fn new(channels: worker::Channels) -> Self {
-        Self {
-            channels,
-            sent_bytes: 0,
-            received_bytes: 0,
-        }
-    }
-}
-
-/// Streams associated with a connected peer.
-struct Streams {
-    /// Active streams and their associated worker channels.
-    /// Note that the gossip and control streams are not included here as they are always
-    /// implied to exist.
-    streams: RandomMap<StreamId, Stream>,
-    /// Connection direction.
-    link: Link,
-    /// Sequence number used to compute the next stream id.
-    seq: u64,
-}
-
-impl Streams {
-    /// Create a new [`Streams`] object, passing the connection link.
-    fn new(link: Link) -> Self {
-        Self {
-            streams: RandomMap::default(),
-            link,
-            seq: 0,
-        }
-    }
-
-    /// Get a known stream.
-    fn get(&self, stream: &StreamId) -> Option<&Stream> {
-        self.streams.get(stream)
-    }
-
-    /// Get a known stream, mutably.
-    fn get_mut(&mut self, stream: &StreamId) -> Option<&mut Stream> {
-        self.streams.get_mut(stream)
-    }
-
-    /// Open a new stream.
-    fn open(&mut self, timeout: time::Duration) -> (StreamId, worker::Channels) {
-        self.seq += 1;
-
-        let id = StreamId::git(self.link)
-            .nth(self.seq)
-            .expect("Streams::open: too many streams");
-        let channels = self
-            .register(id, timeout)
-            .expect("Streams::open: stream was already open");
-
-        (id, channels)
-    }
-
-    /// Register an open stream.
-    fn register(&mut self, stream: StreamId, timeout: time::Duration) -> Option<worker::Channels> {
-        let (wire, worker) = worker::Channels::pair(timeout)
-            .expect("Streams::register: fatal: unable to create channels");
-
-        match self.streams.entry(stream) {
-            Entry::Vacant(e) => {
-                e.insert(Stream::new(worker));
-                Some(wire)
-            }
-            Entry::Occupied(_) => None,
-        }
-    }
-
-    /// Unregister an open stream.
-    fn unregister(&mut self, stream: &StreamId) -> Option<Stream> {
-        self.streams.remove(stream)
-    }
-
-    /// Close all streams.
-    fn shutdown(&mut self) {
-        for (sid, stream) in self.streams.drain() {
-            log::debug!(target: "wire", "Closing worker stream {sid}");
-            stream.channels.close().ok();
-        }
-    }
-}
-
-/// The initial state of an outbound peer before handshake is completed.
-#[derive(Debug)]
-struct Outbound {
-    /// Resource ID, if registered.
-    id: Option<ResourceId>,
-    /// Remote address.
-    addr: NetAddr<HostName>,
-    /// Remote Node ID.
-    nid: NodeId,
-}
-
-/// The initial state of an inbound peer before handshake is completed.
-#[derive(Debug)]
-struct Inbound {
-    /// Resource ID, if registered.
-    id: Option<ResourceId>,
-    /// Remote address.
-    addr: NetAddr<HostName>,
-}
-
-/// Peer connection state machine.
-enum Peer {
-    /// The state after handshake is completed.
-    /// Peers in this state are handled by the underlying service.
-    Connected {
-        #[allow(dead_code)]
-        addr: NetAddr<HostName>,
-        link: Link,
-        nid: NodeId,
-        inbox: Deserializer<MAX_INBOX_SIZE, Frame>,
-        streams: Streams,
-    },
-    /// The peer was scheduled for disconnection. Once the transport is handed over
-    /// by the reactor, we can consider it disconnected.
-    Disconnecting {
-        link: Link,
-        nid: Option<NodeId>,
-        reason: DisconnectReason,
-    },
-}
-
-impl std::fmt::Debug for Peer {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Connected { link, nid, .. } => write!(f, "Connected({link:?}, {nid})"),
-            Self::Disconnecting { .. } => write!(f, "Disconnecting"),
-        }
-    }
-}
-
-impl Peer {
-    /// Return the peer's id, if any.
-    fn id(&self) -> Option<&NodeId> {
-        match self {
-            Peer::Connected { nid, .. } | Peer::Disconnecting { nid: Some(nid), .. } => Some(nid),
-            Peer::Disconnecting { nid: None, .. } => None,
-        }
-    }
-
-    fn link(&self) -> Link {
-        match self {
-            Peer::Connected { link, .. } => *link,
-            Peer::Disconnecting { link, .. } => *link,
-        }
-    }
-
-    /// Connected peer.
-    fn connected(nid: NodeId, addr: NetAddr<HostName>, link: Link) -> Self {
-        Self::Connected {
-            link,
-            addr,
-            nid,
-            inbox: Deserializer::default(),
-            streams: Streams::new(link),
-        }
-    }
-}
-
-/// Holds connected peers.
-struct Peers(RandomMap<ResourceId, Peer>);
-
-impl Peers {
-    fn get_mut(&mut self, id: &ResourceId) -> Option<&mut Peer> {
-        self.0.get_mut(id)
-    }
-
-    fn entry(&mut self, id: ResourceId) -> Entry<ResourceId, Peer> {
-        self.0.entry(id)
-    }
-
-    fn insert(&mut self, id: ResourceId, peer: Peer) {
-        if self.0.insert(id, peer).is_some() {
-            log::warn!(target: "wire", "Replacing existing peer id={id}");
-        }
-    }
-
-    fn remove(&mut self, id: &ResourceId) -> Option<Peer> {
-        self.0.remove(id)
-    }
-
-    fn lookup(&self, node_id: &NodeId) -> Option<(ResourceId, &Peer)> {
-        self.0
-            .iter()
-            .find(|(_, peer)| peer.id() == Some(node_id))
-            .map(|(fd, peer)| (*fd, peer))
-    }
-
-    fn lookup_mut(&mut self, node_id: &NodeId) -> Option<(ResourceId, &mut Peer)> {
-        self.0
-            .iter_mut()
-            .find(|(_, peer)| peer.id() == Some(node_id))
-            .map(|(fd, peer)| (*fd, peer))
-    }
-
-    fn active(&self) -> impl Iterator<Item = (ResourceId, &NodeId, Link)> {
-        self.0.iter().filter_map(|(id, peer)| match peer {
-            Peer::Connected { nid, link, .. } => Some((*id, nid, *link)),
-            Peer::Disconnecting { .. } => None,
-        })
-    }
-
-    fn connected(&self) -> impl Iterator<Item = (ResourceId, &NodeId)> {
-        self.0.iter().filter_map(|(id, peer)| {
-            if let Peer::Connected { nid, .. } = peer {
-                Some((*id, nid))
-            } else {
-                None
-            }
-        })
-    }
-
-    fn iter(&self) -> impl Iterator<Item = &Peer> {
-        self.0.values()
-    }
-}
-
-/// Wire protocol implementation for a set of peers.
-pub struct Wire<D, S, G: Signer + Ecdh> {
-    /// Backing service instance.
-    service: Service<D, S, G>,
-    /// Worker pool interface.
-    worker: chan::Sender<Task>,
-    /// Used for authentication.
-    signer: G,
-    /// Node metrics.
-    metrics: service::Metrics,
-    /// Internal queue of actions to send to the reactor.
-    actions: VecDeque<Action<G>>,
-    /// Outbound attempted peers without a session.
-    outbound: RandomMap<RawFd, Outbound>,
-    /// Inbound peers without a session.
-    inbound: RandomMap<RawFd, Inbound>,
-    /// Listening addresses that are not yet registered.
-    listening: RandomMap<RawFd, net::SocketAddr>,
-    /// Peer (established) sessions.
-    peers: Peers,
-}
-
-impl<D, S, G> Wire<D, S, G>
-where
-    D: service::Store,
-    S: WriteStorage + 'static,
-    G: Signer + Ecdh<Pk = NodeId>,
-{
-    pub fn new(service: Service<D, S, G>, worker: chan::Sender<Task>, signer: G) -> Self {
-        assert!(service.started().is_some(), "Service must be initialized");
-
-        Self {
-            service,
-            worker,
-            signer,
-            metrics: Metrics::default(),
-            actions: VecDeque::new(),
-            inbound: RandomMap::default(),
-            outbound: RandomMap::default(),
-            listening: RandomMap::default(),
-            peers: Peers(RandomMap::default()),
-        }
-    }
-
-    pub fn listen(&mut self, socket: NetAccept<WireSession<G>>) {
-        self.listening
-            .insert(socket.as_raw_fd(), socket.local_addr());
-        self.actions.push_back(Action::RegisterListener(socket));
-    }
-
-    fn disconnect(&mut self, id: ResourceId, reason: DisconnectReason) -> Option<(NodeId, Link)> {
-        match self.peers.entry(id) {
-            Entry::Vacant(_) => {
-                // Connecting peer with no session.
-                log::debug!(target: "wire", "Disconnecting pending peer with id={id}: {reason}");
-                self.actions.push_back(Action::UnregisterTransport(id));
-
-                // Check for attempted outbound connections. Unestablished inbound connections don't
-                // have an NID yet.
-                self.outbound
-                    .values()
-                    .find(|o| o.id == Some(id))
-                    .map(|o| (o.nid, Link::Outbound))
-            }
-            Entry::Occupied(mut e) => match e.get_mut() {
-                Peer::Disconnecting { nid, link, .. } => {
-                    log::error!(target: "wire", "Peer with id={id} is already disconnecting");
-
-                    nid.map(|n| (n, *link))
-                }
-                Peer::Connected {
-                    nid, streams, link, ..
-                } => {
-                    log::debug!(target: "wire", "Disconnecting peer with id={id}: {reason}");
-                    let nid = *nid;
-                    let link = *link;
-
-                    streams.shutdown();
-                    e.insert(Peer::Disconnecting {
-                        nid: Some(nid),
-                        link,
-                        reason,
-                    });
-                    self.actions.push_back(Action::UnregisterTransport(id));
-
-                    Some((nid, link))
-                }
-            },
-        }
-    }
-
-    fn worker_result(&mut self, task: TaskResult) {
-        log::debug!(
-            target: "wire",
-            "Received fetch result from worker for stream {}, remote {}: {:?}",
-            task.stream, task.remote, task.result
-        );
-
-        let nid = task.remote;
-        let Some((fd, peer)) = self.peers.lookup_mut(&nid) else {
-            log::warn!(target: "wire", "Peer {nid} not found; ignoring fetch result");
-            return;
-        };
-
-        if let Peer::Connected { link, streams, .. } = peer {
-            // Nb. It's possible that the stream would already be unregistered if we received an
-            // early "close" from the remote. Otherwise, we unregister it here and send the "close"
-            // ourselves.
-            if let Some(s) = streams.unregister(&task.stream) {
-                log::debug!(
-                    target: "wire", "Stream {} of {} closing with {} byte(s) sent and {} byte(s) received",
-                    task.stream, task.remote, s.sent_bytes, s.received_bytes
-                );
-                let frame = Frame::<service::Message>::control(
-                    *link,
-                    frame::Control::Close {
-                        stream: task.stream,
-                    },
-                );
-                self.actions.push_back(Action::Send(fd, frame.to_bytes()));
-            }
-        } else {
-            // If the peer disconnected, we'll get here, but we still want to let the service know
-            // about the fetch result, so we don't return here.
-            log::warn!(target: "wire", "Peer {nid} is not connected; ignoring fetch result");
-            return;
-        };
-
-        // Only call into the service if we initiated this fetch.
-        match task.result {
-            FetchResult::Initiator { rid, result } => {
-                self.service.fetched(rid, nid, result);
-            }
-            FetchResult::Responder { rid, result } => {
-                if let Some(rid) = rid {
-                    if let Some(err) = result.err() {
-                        log::info!(target: "wire", "Peer {nid} failed to fetch {rid} from us: {err}");
-                    } else {
-                        log::info!(target: "wire", "Peer {nid} fetched {rid} from us successfully");
-                    }
-                }
-            }
-        }
-    }
-
-    fn flush(&mut self, remote: NodeId, stream: StreamId) {
-        let Some((fd, peer)) = self.peers.lookup_mut(&remote) else {
-            log::warn!(target: "wire", "Peer {remote} is not known; ignoring flush");
-            return;
-        };
-        let Peer::Connected { streams, link, .. } = peer else {
-            log::warn!(target: "wire", "Peer {remote} is not connected; ignoring flush");
-            return;
-        };
-        let Some(s) = streams.get_mut(&stream) else {
-            log::debug!(target: "wire", "Stream {stream} cannot be found; ignoring flush");
-            return;
-        };
-        let metrics = self.metrics.peer(remote);
-
-        for data in s.channels.try_iter() {
-            let frame = match data {
-                ChannelEvent::Data(data) => {
-                    metrics.sent_git_bytes += data.len();
-                    metrics.sent_bytes += data.len();
-                    Frame::<service::Message>::git(stream, data)
-                }
-                ChannelEvent::Close => Frame::control(*link, frame::Control::Close { stream }),
-                ChannelEvent::Eof => Frame::control(*link, frame::Control::Eof { stream }),
-            };
-            self.actions
-                .push_back(reactor::Action::Send(fd, frame.to_bytes()));
-        }
-    }
-
-    fn cleanup(&mut self, id: ResourceId, fd: RawFd) {
-        if self.inbound.remove(&fd).is_some() {
-            log::debug!(target: "wire", "Cleaning up inbound peer state with id={id} (fd={fd})");
-        } else if let Some(outbound) = self.outbound.remove(&fd) {
-            log::debug!(target: "wire", "Cleaning up outbound peer state with id={id} (fd={fd})");
-            self.service.disconnected(
-                outbound.nid,
-                Link::Outbound,
-                &DisconnectReason::connection(),
-            );
-        } else {
-            log::debug!(target: "wire", "Tried to cleanup unknown peer with id={id} (fd={fd})");
-        }
-    }
-}
-
-impl<D, S, G> reactor::Handler for Wire<D, S, G>
-where
-    D: service::Store + Send,
-    S: WriteStorage + Send + 'static,
-    G: Signer + Ecdh<Pk = NodeId> + Clone + Send,
-{
-    type Listener = NetAccept<WireSession<G>>;
-    type Transport = NetTransport<WireSession<G>>;
-    type Command = Control;
-
-    fn tick(&mut self, time: Timestamp) {
-        self.metrics.open_channels = self
-            .peers
-            .iter()
-            .filter_map(|p| {
-                if let Peer::Connected { streams, .. } = p {
-                    Some(streams.streams.len())
-                } else {
-                    None
-                }
-            })
-            .sum();
-        self.metrics.worker_queue_size = self.worker.len();
-        self.service.tick(
-            LocalTime::from_millis(time.as_millis() as u128),
-            &self.metrics,
-        );
-    }
-
-    fn handle_timer(&mut self) {
-        self.service.wake();
-    }
-
-    fn handle_listener_event(
-        &mut self,
-        _: ResourceId, // Nb. This is the ID of the listener socket.
-        event: ListenerEvent<WireSession<G>>,
-        _: Timestamp,
-    ) {
-        match event {
-            ListenerEvent::Accepted(connection) => {
-                let Ok(remote) = connection.remote_addr() else {
-                    log::warn!(target: "wire", "Accepted connection doesn't have remote address; dropping..");
-                    drop(connection);
-
-                    return;
-                };
-                let InetHost::Ip(ip) = remote.host else {
-                    log::error!(target: "wire", "Unexpected host type for inbound connection {remote}; dropping..");
-                    drop(connection);
-
-                    return;
-                };
-                let fd = connection.as_raw_fd();
-                log::debug!(target: "wire", "Inbound connection from {remote} (fd={fd})..");
-
-                // If the service doesn't want to accept this connection,
-                // we drop the connection here, which disconnects the socket.
-                if !self.service.accepted(ip) {
-                    log::debug!(target: "wire", "Rejecting inbound connection from {ip} (fd={fd})..");
-                    drop(connection);
-
-                    return;
-                }
-
-                let session =
-                    match accept::<G>(remote.clone().into(), connection, self.signer.clone()) {
-                        Ok(s) => s,
-                        Err(e) => {
-                            log::error!(target: "wire", "Error creating session for {ip}: {e}");
-                            return;
-                        }
-                    };
-                let transport = match NetTransport::with_session(session, Link::Inbound) {
-                    Ok(transport) => transport,
-                    Err(err) => {
-                        log::error!(target: "wire", "Failed to create transport for accepted connection: {err}");
-                        return;
-                    }
-                };
-                log::debug!(target: "wire", "Accepted inbound connection from {remote} (fd={fd})..");
-
-                self.inbound.insert(
-                    fd,
-                    Inbound {
-                        id: None,
-                        addr: remote.into(),
-                    },
-                );
-                self.actions
-                    .push_back(reactor::Action::RegisterTransport(transport))
-            }
-            ListenerEvent::Failure(err) => {
-                log::error!(target: "wire", "Error listening for inbound connections: {err}");
-            }
-        }
-    }
-
-    fn handle_registered(&mut self, fd: RawFd, id: ResourceId, typ: ResourceType) {
-        match typ {
-            ResourceType::Listener => {
-                if let Some(local_addr) = self.listening.remove(&fd) {
-                    self.service.listening(local_addr);
-                }
-            }
-            ResourceType::Transport => {
-                if let Some(outbound) = self.outbound.get_mut(&fd) {
-                    log::debug!(target: "wire", "Outbound peer resource registered for {} with id={id} (fd={fd})", outbound.nid);
-                    outbound.id = Some(id);
-                } else if let Some(inbound) = self.inbound.get_mut(&fd) {
-                    log::debug!(target: "wire", "Inbound peer resource registered with id={id} (fd={fd})");
-                    inbound.id = Some(id);
-                } else {
-                    log::warn!(target: "wire", "Unknown peer registered with fd={fd} and id={id}");
-                }
-            }
-        }
-    }
-
-    fn handle_transport_event(
-        &mut self,
-        id: ResourceId,
-        event: SessionEvent<WireSession<G>>,
-        _: Timestamp,
-    ) {
-        match event {
-            SessionEvent::Established(fd, ProtocolArtifact { state, .. }) => {
-                // SAFETY: With the NoiseXK protocol, there is always a remote static key.
-                let nid: NodeId = state.remote_static_key.unwrap();
-                // Make sure we don't try to connect to ourselves by mistake.
-                if &nid == self.signer.public_key() {
-                    log::error!(target: "wire", "Self-connection detected, disconnecting..");
-                    self.disconnect(id, DisconnectReason::SelfConnection);
-
-                    return;
-                }
-                let (addr, link) = if let Some(peer) = self.inbound.remove(&fd) {
-                    self.metrics.peer(nid).inbound_connection_attempts += 1;
-                    (peer.addr, Link::Inbound)
-                } else if let Some(peer) = self.outbound.remove(&fd) {
-                    assert_eq!(nid, peer.nid);
-                    (peer.addr, Link::Outbound)
-                } else {
-                    log::error!(target: "wire", "Session for {nid} (id={id}) not found");
-                    return;
-                };
-                log::debug!(
-                    target: "wire",
-                    "Session established with {nid} (id={id}) (fd={fd}) ({})",
-                    if link.is_inbound() { "inbound" } else { "outbound" }
-                );
-
-                // Connections to close.
-                let mut disconnect = Vec::new();
-
-                // Handle conflicting connections.
-                // This is typical when nodes have mutually configured their nodes to connect to
-                // each other on startup. We handle this by deterministically choosing one node
-                // whos outbound connection is the one that is kept. The other connections are
-                // dropped.
-                {
-                    // Whether we have precedence in case of conflicting connections.
-                    // Having precedence means that our outbound connection will win over
-                    // the other node's outbound connection.
-                    let precedence = *self.signer.public_key() > nid;
-
-                    // Pre-existing connections that conflict with this newly established session.
-                    // Note that we can't know whether a connection is conflicting before we get the
-                    // remote static key.
-                    let mut conflicting = Vec::new();
-
-                    // Active sessions with the same NID but a different Resource ID are conflicting.
-                    conflicting.extend(
-                        self.peers
-                            .active()
-                            .filter(|(c_id, d, _)| **d == nid && *c_id != id)
-                            .map(|(c_id, _, link)| (c_id, link)),
-                    );
-
-                    // Outbound connection attempts with the same remote key but a different file
-                    // descriptor are conflicting.
-                    conflicting.extend(self.outbound.iter().filter_map(|(c_fd, other)| {
-                        if other.nid == nid && *c_fd != fd {
-                            other.id.map(|c_id| (c_id, Link::Outbound))
-                        } else {
-                            None
-                        }
-                    }));
-
-                    for (c_id, c_link) in conflicting {
-                        // If we have precedence, the inbound connection is closed.
-                        // In the case where both connections are inbound or outbound,
-                        // we close the newer connection, ie. the one with the higher
-                        // resource id.
-                        let close = match (link, c_link) {
-                            (Link::Inbound, Link::Outbound) => {
-                                if precedence {
-                                    id
-                                } else {
-                                    c_id
-                                }
-                            }
-                            (Link::Outbound, Link::Inbound) => {
-                                if precedence {
-                                    c_id
-                                } else {
-                                    id
-                                }
-                            }
-                            (Link::Inbound, Link::Inbound) => id.max(c_id),
-                            (Link::Outbound, Link::Outbound) => id.max(c_id),
-                        };
-
-                        log::warn!(
-                            target: "wire", "Established session (id={id}) conflicts with existing session for {nid} (id={c_id})"
-                        );
-                        disconnect.push(close);
-                    }
-                }
-                for id in &disconnect {
-                    log::warn!(
-                        target: "wire", "Closing conflicting session (id={id}) with {nid}.."
-                    );
-                    // Disconnect and return the associated NID of the peer, if available.
-                    if let Some((nid, link)) = self.disconnect(*id, DisconnectReason::Conflict) {
-                        // We disconnect the session eagerly because otherwise we will get the new
-                        // `connected` event before the `disconnect`, resulting in a duplicate
-                        // connection.
-                        self.service
-                            .disconnected(nid, link, &DisconnectReason::Conflict);
-                    }
-                }
-                if !disconnect.contains(&id) {
-                    self.peers
-                        .insert(id, Peer::connected(nid, addr.clone(), link));
-                    self.service.connected(nid, addr.into(), link);
-                }
-            }
-            SessionEvent::Data(data) => {
-                if let Some(Peer::Connected {
-                    nid,
-                    inbox,
-                    streams,
-                    ..
-                }) = self.peers.get_mut(&id)
-                {
-                    let metrics = self.metrics.peer(*nid);
-                    metrics.received_bytes += data.len();
-
-                    if inbox.input(&data).is_err() {
-                        log::error!(target: "wire", "Maximum inbox size ({MAX_INBOX_SIZE}) reached for peer {nid}");
-                        log::error!(target: "wire", "Unable to process messages fast enough for peer {nid}; disconnecting..");
-                        self.disconnect(id, DisconnectReason::Session(session::Error::Misbehavior));
-
-                        return;
-                    }
-
-                    loop {
-                        match inbox.deserialize_next() {
-                            Ok(Some(Frame {
-                                data: FrameData::Control(frame::Control::Open { stream }),
-                                ..
-                            })) => {
-                                log::debug!(target: "wire", "Received `open` command for stream {stream} from {nid}");
-                                metrics.streams_opened += 1;
-                                metrics.received_fetch_requests += 1;
-
-                                let Some(channels) = streams.register(stream, FETCH_TIMEOUT) else {
-                                    log::warn!(target: "wire", "Peer attempted to open already-open stream stream {stream}");
-                                    continue;
-                                };
-
-                                let task = Task {
-                                    fetch: FetchRequest::Responder {
-                                        remote: *nid,
-                                        emitter: self.service.emitter(),
-                                    },
-                                    stream,
-                                    channels,
-                                };
-                                if let Err(e) = self.worker.try_send(task) {
-                                    log::error!(
-                                        target: "wire",
-                                        "Worker pool failed to accept incoming fetch request: {e}"
-                                    );
-                                }
-                            }
-                            Ok(Some(Frame {
-                                data: FrameData::Control(frame::Control::Eof { stream }),
-                                ..
-                            })) => {
-                                if let Some(s) = streams.get(&stream) {
-                                    log::debug!(target: "wire", "Received `end-of-file` on stream {stream} from {nid}");
-
-                                    if s.channels.send(ChannelEvent::Eof).is_err() {
-                                        log::error!(target: "wire", "Worker is disconnected; cannot send `EOF`");
-                                    }
-                                } else {
-                                    log::debug!(target: "wire", "Ignoring frame on closed or unknown stream {stream}");
-                                }
-                            }
-                            Ok(Some(Frame {
-                                data: FrameData::Control(frame::Control::Close { stream }),
-                                ..
-                            })) => {
-                                log::debug!(target: "wire", "Received `close` command for stream {stream} from {nid}");
-
-                                if let Some(s) = streams.unregister(&stream) {
-                                    log::debug!(
-                                        target: "wire",
-                                        "Stream {stream} of {nid} closed with {} byte(s) sent and {} byte(s) received",
-                                        s.sent_bytes, s.received_bytes
-                                    );
-                                    s.channels.close().ok();
-                                }
-                            }
-                            Ok(Some(Frame {
-                                data: FrameData::Gossip(msg),
-                                ..
-                            })) => {
-                                metrics.received_gossip_messages += 1;
-                                self.service.received_message(*nid, msg);
-                            }
-                            Ok(Some(Frame {
-                                stream,
-                                data: FrameData::Git(data),
-                                ..
-                            })) => {
-                                if let Some(s) = streams.get_mut(&stream) {
-                                    metrics.received_git_bytes += data.len();
-
-                                    if s.channels.send(ChannelEvent::Data(data)).is_err() {
-                                        log::error!(target: "wire", "Worker is disconnected; cannot send data");
-                                    }
-                                } else {
-                                    log::debug!(target: "wire", "Ignoring frame on closed or unknown stream {stream}");
-                                }
-                            }
-                            Ok(None) => {
-                                // Buffer is empty, or message isn't complete.
-                                break;
-                            }
-                            Err(e) => {
-                                log::error!(target: "wire", "Invalid gossip message from {nid}: {e}");
-
-                                if !inbox.is_empty() {
-                                    log::debug!(target: "wire", "Dropping read buffer for {nid} with {} bytes", inbox.len());
-                                }
-                                self.disconnect(
-                                    id,
-                                    DisconnectReason::Session(session::Error::Misbehavior),
-                                );
-                                break;
-                            }
-                        }
-                    }
-                } else {
-                    log::warn!(target: "wire", "Dropping message from unconnected peer (id={id})");
-                }
-            }
-            SessionEvent::Terminated(err) => {
-                self.disconnect(id, DisconnectReason::Connection(Arc::new(err)));
-            }
-        }
-    }
-
-    fn handle_command(&mut self, cmd: Self::Command) {
-        match cmd {
-            Control::User(cmd) => self.service.command(cmd),
-            Control::Worker(result) => self.worker_result(result),
-            Control::Flush { remote, stream } => self.flush(remote, stream),
-        }
-    }
-
-    fn handle_error(
-        &mut self,
-        err: reactor::Error<NetAccept<WireSession<G>>, NetTransport<WireSession<G>>>,
-    ) {
-        match err {
-            reactor::Error::Poll(err) => {
-                // TODO: This should be a fatal error, there's nothing we can do here.
-                log::error!(target: "wire", "Can't poll connections: {err}");
-            }
-            reactor::Error::ListenerDisconnect(id, _) => {
-                // TODO: This should be a fatal error, there's nothing we can do here.
-                log::error!(target: "wire", "Listener {id} disconnected");
-            }
-            reactor::Error::TransportDisconnect(id, transport) => {
-                let fd = transport.as_raw_fd();
-                log::error!(target: "wire", "Peer id={id} (fd={fd}) disconnected");
-
-                // We're dropping the TCP connection here.
-                drop(transport);
-
-                // The peer transport is already disconnected and removed from the reactor;
-                // therefore there is no need to initiate a disconnection. We simply remove
-                // the peer from the map.
-                match self.peers.remove(&id) {
-                    Some(mut peer) => {
-                        if let Peer::Connected { streams, .. } = &mut peer {
-                            streams.shutdown();
-                        }
-
-                        if let Some(id) = peer.id() {
-                            self.service.disconnected(
-                                *id,
-                                peer.link(),
-                                &DisconnectReason::connection(),
-                            );
-                        } else {
-                            log::debug!(target: "wire", "Inbound disconnection before handshake; ignoring..")
-                        }
-                    }
-                    None => self.cleanup(id, fd),
-                }
-            }
-        }
-    }
-
-    fn handover_listener(&mut self, id: ResourceId, _listener: Self::Listener) {
-        log::error!(target: "wire", "Listener handover is not supported (id={id})");
-    }
-
-    fn handover_transport(&mut self, id: ResourceId, transport: Self::Transport) {
-        let fd = transport.as_raw_fd();
-
-        match self.peers.entry(id) {
-            Entry::Occupied(e) => {
-                match e.get() {
-                    Peer::Disconnecting {
-                        nid, reason, link, ..
-                    } => {
-                        log::debug!(target: "wire", "Transport handover for disconnecting peer with id={id} (fd={fd})");
-
-                        // Disconnect TCP stream.
-                        drop(transport);
-
-                        // If there is no NID, the service is not aware of the peer.
-                        if let Some(nid) = nid {
-                            // In the case of a conflicting connection, there will be two resources
-                            // for the peer. However, at the service level, there is only one, and
-                            // it is identified by NID.
-                            //
-                            // Therefore, we specify which of the connections we're closing by
-                            // passing the `link`.
-                            self.service.disconnected(*nid, *link, reason);
-                        }
-                        e.remove();
-                    }
-                    Peer::Connected { nid, .. } => {
-                        panic!("Wire::handover_transport: Unexpected handover of connected peer {} with id={id} (fd={fd})", nid);
-                    }
-                }
-            }
-            Entry::Vacant(_) => self.cleanup(id, fd),
-        }
-    }
-}
-
-impl<D, S, G> Iterator for Wire<D, S, G>
-where
-    D: service::Store,
-    S: WriteStorage + 'static,
-    G: Signer + Ecdh<Pk = NodeId>,
-{
-    type Item = Action<G>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        while let Some(ev) = self.service.next() {
-            match ev {
-                Io::Write(node_id, msgs) => {
-                    let (fd, link) = match self.peers.lookup(&node_id) {
-                        Some((fd, Peer::Connected { link, .. })) => (fd, *link),
-                        Some((_, peer)) => {
-                            // If the peer is disconnected by the wire protocol, the service may
-                            // not be aware of this yet, and may continue to write messages to it.
-                            log::debug!(target: "wire", "Dropping {} message(s) to {node_id} ({peer:?})", msgs.len());
-                            continue;
-                        }
-                        None => {
-                            log::error!(target: "wire", "Dropping {} message(s) to {node_id}: unknown peer", msgs.len());
-                            continue;
-                        }
-                    };
-                    log::trace!(
-                        target: "wire", "Writing {} message(s) to {}", msgs.len(), node_id
-                    );
-                    let mut data = Vec::new();
-                    let metrics = self.metrics.peer(node_id);
-                    metrics.sent_gossip_messages += msgs.len();
-
-                    for msg in msgs {
-                        Frame::gossip(link, msg)
-                            .encode(&mut data)
-                            .expect("in-memory writes never fail");
-                    }
-                    metrics.sent_bytes += data.len();
-
-                    self.actions.push_back(reactor::Action::Send(fd, data));
-                }
-                Io::Connect(node_id, addr) => {
-                    if self.peers.connected().any(|(_, id)| id == &node_id) {
-                        log::error!(
-                            target: "wire",
-                            "Attempt to connect to already connected peer {node_id}"
-                        );
-                        // FIXME: The problem here is the session will stay in "initial" state,
-                        // because it can't transition to attempted.
-                        continue;
-                    }
-                    self.service.attempted(node_id, addr.clone());
-                    self.metrics.peer(node_id).outbound_connection_attempts += 1;
-
-                    match dial::<G>(
-                        addr.to_inner(),
-                        node_id,
-                        self.signer.clone(),
-                        self.service.config(),
-                    )
-                    .and_then(|session| {
-                        NetTransport::<WireSession<G>>::with_session(session, Link::Outbound)
-                    }) {
-                        Ok(transport) => {
-                            self.outbound.insert(
-                                transport.as_raw_fd(),
-                                Outbound {
-                                    id: None,
-                                    nid: node_id,
-                                    addr: addr.to_inner(),
-                                },
-                            );
-                            log::debug!(
-                                target: "wire",
-                                "Registering outbound transport for {node_id} (fd={})..",
-                                transport.as_raw_fd()
-                            );
-                            self.actions
-                                .push_back(reactor::Action::RegisterTransport(transport));
-                        }
-                        Err(err) => {
-                            log::error!(target: "wire", "Error establishing connection to {addr}: {err}");
-
-                            self.service.disconnected(
-                                node_id,
-                                Link::Outbound,
-                                &DisconnectReason::Dial(Arc::new(err)),
-                            );
-                        }
-                    }
-                }
-                Io::Disconnect(nid, reason) => {
-                    if let Some((id, Peer::Connected { .. })) = self.peers.lookup(&nid) {
-                        if let Some((nid, _)) = self.disconnect(id, reason) {
-                            self.metrics.peer(nid).disconnects += 1;
-                        }
-                    } else {
-                        log::warn!(target: "wire", "Peer {nid} is not connected: ignoring disconnect");
-                    }
-                }
-                Io::Wakeup(d) => {
-                    self.actions.push_back(reactor::Action::SetTimer(d.into()));
-                }
-                Io::Fetch {
-                    rid,
-                    remote,
-                    timeout,
-                    refs_at,
-                } => {
-                    log::trace!(target: "wire", "Processing fetch for {rid} from {remote}..");
-
-                    let Some((fd, Peer::Connected { link, streams, .. })) =
-                        self.peers.lookup_mut(&remote)
-                    else {
-                        // Nb. It's possible that a peer is disconnected while an `Io::Fetch`
-                        // is in the service's i/o buffer. Since the service may not purge the
-                        // buffer on disconnect, we should just ignore i/o actions that don't
-                        // have a connected peer.
-                        log::error!(target: "wire", "Peer {remote} is not connected: dropping fetch");
-                        continue;
-                    };
-                    let (stream, channels) = streams.open(timeout);
-
-                    log::debug!(target: "wire", "Opened new stream with id {stream} for {rid} and remote {remote}");
-
-                    let link = *link;
-                    let task = Task {
-                        fetch: FetchRequest::Initiator {
-                            rid,
-                            remote,
-                            refs_at,
-                        },
-                        stream,
-                        channels,
-                    };
-
-                    if !self.worker.is_empty() {
-                        log::warn!(
-                            target: "wire",
-                            "Worker pool is busy: {} tasks pending, fetch requests may be delayed", self.worker.len()
-                        );
-                    }
-                    if let Err(e) = self.worker.try_send(task) {
-                        log::error!(
-                            target: "wire",
-                            "Worker pool failed to accept outgoing fetch request: {e}"
-                        );
-                    }
-                    let metrics = self.metrics.peer(remote);
-                    metrics.streams_opened += 1;
-                    metrics.sent_fetch_requests += 1;
-
-                    self.actions.push_back(Action::Send(
-                        fd,
-                        Frame::<service::Message>::control(link, frame::Control::Open { stream })
-                            .to_bytes(),
-                    ));
-                }
-            }
-        }
-        self.actions.pop_front()
-    }
-}
-
-/// Establish a new outgoing connection.
-pub fn dial<G: Signer + Ecdh<Pk = NodeId>>(
-    remote_addr: NetAddr<HostName>,
-    remote_id: <G as EcSk>::Pk,
-    signer: G,
-    config: &service::Config,
-) -> io::Result<WireSession<G>> {
-    // Determine what address to establish a TCP connection with, given the remote peer
-    // address and our node configuration.
-    let inet_addr: NetAddr<InetHost> = match (&remote_addr.host, config.proxy) {
-        // For IP and DNS addresses, use the global proxy if set, otherwise use the address as-is.
-        (HostName::Ip(_), Some(proxy)) => proxy.into(),
-        (HostName::Ip(ip), None) => NetAddr::new(InetHost::Ip(*ip), remote_addr.port),
-        (HostName::Dns(_), Some(proxy)) => proxy.into(),
-        (HostName::Dns(dns), None) => NetAddr::new(InetHost::Dns(dns.clone()), remote_addr.port),
-        // For onion addresses, handle with care.
-        (HostName::Tor(onion), proxy) => match config.onion {
-            // In onion proxy mode, simply use the configured proxy address.
-            // This takes precedence over any global proxy.
-            Some(AddressConfig::Proxy { address }) => address.into(),
-            // In "forward" mode, if a global proxy is set, we use that, otherwise
-            // we treat `.onion` addresses as regular DNS names.
-            Some(AddressConfig::Forward) => {
-                if let Some(proxy) = proxy {
-                    proxy.into()
-                } else {
-                    NetAddr::new(InetHost::Dns(onion.to_string()), remote_addr.port)
-                }
-            }
-            // If onion address support isn't configured, refuse to connect.
-            None => {
-                return Err(io::Error::new(
-                    io::ErrorKind::Unsupported,
-                    "no configuration found for .onion addresses",
-                ));
-            }
-        },
-        _ => {
-            return Err(io::Error::new(
-                io::ErrorKind::Unsupported,
-                "unsupported remote address type",
-            ));
-        }
-    };
-    // Nb. This timeout is currently not used by the underlying library due to the
-    // `socket2` library not supporting non-blocking connect with timeout.
-    let connection = net::TcpStream::connect_nonblocking(inet_addr, DEFAULT_DIAL_TIMEOUT)?;
-    // Whether to tunnel regular connections through the proxy.
-    let force_proxy = config.proxy.is_some();
-
-    session::<G>(
-        remote_addr,
-        Some(remote_id),
-        connection,
-        force_proxy,
-        signer,
-    )
-}
-
-/// Accept a new connection.
-pub fn accept<G: Signer + Ecdh<Pk = NodeId>>(
-    remote_addr: NetAddr<HostName>,
-    connection: net::TcpStream,
-    signer: G,
-) -> io::Result<WireSession<G>> {
-    session::<G>(remote_addr, None, connection, false, signer)
-}
-
-/// Create a new [`WireSession`].
-fn session<G: Signer + Ecdh<Pk = NodeId>>(
-    remote_addr: NetAddr<HostName>,
-    remote_id: Option<NodeId>,
-    connection: net::TcpStream,
-    force_proxy: bool,
-    signer: G,
-) -> io::Result<WireSession<G>> {
-    // There are issues with setting TCP_NODELAY on WSL. Not a big deal.
-    if let Err(e) = connection.set_nodelay(true) {
-        log::warn!(target: "wire", "Unable to set TCP_NODELAY on fd {}: {e}", connection.as_raw_fd());
-    }
-    connection.set_read_timeout(Some(DEFAULT_CONNECTION_TIMEOUT))?;
-    connection.set_write_timeout(Some(DEFAULT_CONNECTION_TIMEOUT))?;
-
-    let sock = socket2::Socket::from(connection);
-    let ka = socket2::TcpKeepalive::new()
-        .with_time(time::Duration::from_secs(30))
-        .with_interval(time::Duration::from_secs(10))
-        .with_retries(3);
-    if let Err(e) = sock.set_tcp_keepalive(&ka) {
-        log::warn!(target: "wire", "Unable to set TCP_KEEPALIVE on fd {}: {e}", sock.as_raw_fd());
-    }
-
-    let socks5 = socks5::Socks5::with(remote_addr, force_proxy);
-    let proxy = Socks5Session::with(sock.into(), socks5);
-    let pair = G::generate_keypair();
-    let keyset = Keyset {
-        e: pair.0,
-        s: Some(signer),
-        re: None,
-        rs: remote_id,
-    };
-    let noise = NoiseState::initialize::<{ Sha256::OUTPUT_LEN }>(
-        NOISE_XK,
-        remote_id.is_some(),
-        &[],
-        keyset,
-    );
-    Ok(WireSession::with(proxy, noise))
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::service::{Message, ZeroBytes};
-    use crate::wire;
-    use crate::wire::varint;
-
-    #[test]
-    fn test_pong_message_with_extension() {
-        use crate::deserializer;
-
-        let mut stream = Vec::new();
-        let pong = Message::Pong {
-            zeroes: ZeroBytes::new(42),
-        };
-        frame::PROTOCOL_VERSION_STRING.encode(&mut stream).unwrap();
-        frame::StreamId::gossip(Link::Outbound)
-            .encode(&mut stream)
-            .unwrap();
-
-        // Serialize gossip message with some extension fields.
-        let mut gossip = wire::serialize(&pong);
-        String::from("extra").encode(&mut gossip).unwrap();
-        48u8.encode(&mut gossip).unwrap();
-
-        // Encode gossip message using the varint-prefix format into the stream.
-        varint::payload::encode(&gossip, &mut stream).unwrap();
-
-        let mut de = deserializer::Deserializer::<1024, Frame>::new(1024);
-        de.input(&stream).unwrap();
-
-        // The "pong" message decodes successfully, even though there is trailing data.
-        assert_eq!(
-            de.deserialize_next().unwrap().unwrap(),
-            Frame::gossip(Link::Outbound, pong)
-        );
-        assert!(de.deserialize_next().unwrap().is_none());
-        assert!(de.is_empty());
-    }
-
-    #[test]
-    fn test_inventory_ann_with_extension() {
-        use crate::deserializer;
-
-        #[derive(Debug)]
-        struct MessageWithExt {
-            msg: Message,
-            ext: String,
-        }
-
-        impl wire::Encode for MessageWithExt {
-            fn encode<W: io::Write + ?Sized>(&self, writer: &mut W) -> Result<usize, io::Error> {
-                let mut n = self.msg.encode(writer)?;
-                n += self.ext.encode(writer)?;
-
-                Ok(n)
-            }
-        }
-
-        impl wire::Decode for MessageWithExt {
-            fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Self, wire::Error> {
-                let msg = Message::decode(reader)?;
-                let ext = String::decode(reader).unwrap_or_default();
-
-                Ok(MessageWithExt { msg, ext })
-            }
-        }
-
-        let rid = radicle::test::arbitrary::gen(1);
-        let pk = radicle::test::arbitrary::gen(1);
-        let sig: [u8; 64] = radicle::test::arbitrary::gen(1);
-
-        // Message with extension.
-        let mut stream = Vec::new();
-        let ann = Message::announcement(
-            pk,
-            service::gossip::inventory(radicle::node::Timestamp::MAX, [rid]),
-            radicle::crypto::Signature::from(sig),
-        );
-        let pong = Message::Pong {
-            zeroes: ZeroBytes::new(42),
-        };
-        // Framed message with extension.
-        frame::Frame::gossip(
-            Link::Outbound,
-            MessageWithExt {
-                msg: ann.clone(),
-                ext: String::from("extra"),
-            },
-        )
-        .encode(&mut stream)
-        .unwrap();
-        // Pong message that comes after, without extension.
-        frame::Frame::gossip(Link::Outbound, pong.clone())
-            .encode(&mut stream)
-            .unwrap();
-
-        // First test deserializing using the message with extension type.
-        {
-            let mut de = deserializer::Deserializer::<1024, Frame<MessageWithExt>>::new(1024);
-            de.input(&stream).unwrap();
-
-            radicle::assert_matches!(
-                de.deserialize_next().unwrap().unwrap().data,
-                FrameData::Gossip(MessageWithExt {
-                    msg,
-                    ext,
-                }) if msg == ann && ext == *"extra"
-            );
-            radicle::assert_matches!(
-                de.deserialize_next().unwrap().unwrap().data,
-                FrameData::Gossip(MessageWithExt {
-                    msg,
-                    ext,
-                }) if msg == pong && ext.is_empty()
-            );
-            assert!(de.deserialize_next().unwrap().is_none());
-            assert!(de.is_empty());
-        }
-
-        // Then test deserializing using the current message type without the extension.
-        {
-            let mut de = deserializer::Deserializer::<1024, Frame<Message>>::new(1024);
-            de.input(&stream).unwrap();
-
-            radicle::assert_matches!(
-                de.deserialize_next().unwrap().unwrap().data,
-                FrameData::Gossip(msg)
-                if msg == ann
-            );
-            radicle::assert_matches!(
-                de.deserialize_next().unwrap().unwrap().data,
-                FrameData::Gossip(msg)
-                if msg == pong
-            );
-            assert!(de.deserialize_next().unwrap().is_none());
-            assert!(de.is_empty());
-        }
-    }
-}
diff --git a/radicle-node/src/wire/varint.rs b/radicle-node/src/wire/varint.rs
deleted file mode 100644
index ca534bfa3..000000000
--- a/radicle-node/src/wire/varint.rs
+++ /dev/null
@@ -1,254 +0,0 @@
-//! Variable-length integer implementation based on QUIC.
-#![warn(clippy::missing_docs_in_private_items)]
-
-// This implementation is largely based on the `quinn` crate.
-// Copyright (c) 2018 The quinn developers.
-use std::{fmt, io, ops};
-
-use byteorder::ReadBytesExt;
-use thiserror::Error;
-
-use crate::wire;
-use crate::wire::{Decode, Encode};
-
-/// An integer less than 2^62
-///
-/// Based on QUIC variable-length integers (RFC 9000).
-///
-/// > The QUIC variable-length integer encoding reserves the two most significant bits of the first
-/// > byte to encode the base-2 logarithm of the integer encoding length in bytes. The integer value is
-/// > encoded on the remaining bits, in network byte order. This means that integers are encoded on 1,
-/// > 2, 4, or 8 bytes and can encode 6-, 14-, 30-, or 62-bit values, respectively. Table 4 summarizes
-/// > the encoding properties.
-///
-/// ```text
-/// MSB   Length   Usable Bits   Range
-/// ----------------------------------------------------
-/// 00    1        6             0 - 63
-/// 01    2        14            0 - 16383
-/// 10    4        30            0 - 1073741823
-/// 11    8        62            0 - 4611686018427387903
-/// ```
-#[derive(Default, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
-pub struct VarInt(pub(crate) u64);
-
-impl VarInt {
-    /// The largest representable value.
-    pub const MAX: VarInt = VarInt((1 << 62) - 1);
-
-    /// Succeeds iff `x` < 2^62.
-    pub fn new(x: u64) -> Result<Self, BoundsExceeded> {
-        if x <= Self::MAX.0 {
-            Ok(Self(x))
-        } else {
-            Err(BoundsExceeded)
-        }
-    }
-}
-
-impl ops::Deref for VarInt {
-    type Target = u64;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl From<u8> for VarInt {
-    fn from(x: u8) -> Self {
-        VarInt(x.into())
-    }
-}
-
-impl From<u16> for VarInt {
-    fn from(x: u16) -> Self {
-        VarInt(x.into())
-    }
-}
-
-impl From<u32> for VarInt {
-    fn from(x: u32) -> Self {
-        VarInt(x.into())
-    }
-}
-
-impl std::convert::TryFrom<u64> for VarInt {
-    type Error = BoundsExceeded;
-    /// Succeeds iff `x` < 2^62.
-    fn try_from(x: u64) -> Result<Self, BoundsExceeded> {
-        VarInt::new(x)
-    }
-}
-
-impl fmt::Debug for VarInt {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-impl fmt::Display for VarInt {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-/// Error returned when constructing a `VarInt` from a value >= 2^62.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Error)]
-#[error("value too large for varint encoding")]
-pub struct BoundsExceeded;
-
-impl Decode for VarInt {
-    fn decode<R: io::Read + ?Sized>(r: &mut R) -> Result<Self, wire::Error> {
-        let mut buf = [0; 8];
-        buf[0] = r.read_u8()?;
-
-        // Integer length.
-        let tag = buf[0] >> 6;
-        buf[0] &= 0b0011_1111;
-
-        let x = match tag {
-            0b00 => u64::from(buf[0]),
-            0b01 => {
-                r.read_exact(&mut buf[1..2])?;
-                u64::from(u16::from_be_bytes([buf[0], buf[1]]))
-            }
-            0b10 => {
-                r.read_exact(&mut buf[1..4])?;
-                u64::from(u32::from_be_bytes([buf[0], buf[1], buf[2], buf[3]]))
-            }
-            0b11 => {
-                r.read_exact(&mut buf[1..8])?;
-                u64::from_be_bytes(buf)
-            }
-            // SAFETY: It should be obvious that we can't have any other bit pattern
-            // than the above, since all other bits are zeroed.
-            _ => unreachable! {},
-        };
-        Ok(Self(x))
-    }
-}
-
-impl Encode for VarInt {
-    fn encode<W: io::Write + ?Sized>(&self, w: &mut W) -> io::Result<usize> {
-        let x: u64 = self.0;
-
-        if x < 2u64.pow(6) {
-            (x as u8).encode(w)
-        } else if x < 2u64.pow(14) {
-            (0b01 << 14 | x as u16).encode(w)
-        } else if x < 2u64.pow(30) {
-            (0b10 << 30 | x as u32).encode(w)
-        } else if x < 2u64.pow(62) {
-            (0b11 << 62 | x).encode(w)
-        } else {
-            panic!("VarInt::encode: integer overflow");
-        }
-    }
-}
-
-/// Encoding and decoding varint-prefixed payloads.
-pub mod payload {
-    use super::*;
-
-    /// Encode varint-prefixed data payload.
-    pub fn encode<W: io::Write + ?Sized>(payload: &[u8], writer: &mut W) -> io::Result<usize> {
-        let mut n = 0;
-        let len = payload.len();
-        let varint =
-            VarInt::new(len as u64).map_err(|_| io::Error::from(io::ErrorKind::InvalidInput))?;
-
-        n += varint.encode(writer)?; // The length of the payload length.
-        n += len; // The length of the data payload itself.
-
-        writer.write_all(payload)?;
-
-        Ok(n)
-    }
-
-    /// Decode varint-prefixed data payload.
-    pub fn decode<R: io::Read + ?Sized>(reader: &mut R) -> Result<Vec<u8>, wire::Error> {
-        let size = VarInt::decode(reader)?;
-        let mut data = vec![0; *size as usize];
-        reader.read_exact(&mut data[..])?;
-
-        Ok(data)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use qcheck_macros::quickcheck;
-
-    impl qcheck::Arbitrary for VarInt {
-        fn arbitrary(g: &mut qcheck::Gen) -> Self {
-            let a = u16::arbitrary(g) as u64;
-            let b = u32::arbitrary(g) as u64;
-            let n = g
-                .choose(&[
-                    0,
-                    1,
-                    3,
-                    7,
-                    13,
-                    37,
-                    255,
-                    4931,
-                    54019,
-                    69149,
-                    151288809941952652,
-                    u8::MAX as u64,
-                    u16::MAX as u64,
-                    u16::MAX as u64 - 1,
-                    u32::MAX as u64,
-                    u32::MAX as u64 - 1,
-                    *Self::MAX,
-                    a,
-                    b,
-                ])
-                .copied()
-                .unwrap();
-
-            Self(n)
-        }
-    }
-
-    #[quickcheck]
-    fn prop_encode_decode(input: VarInt) {
-        let encoded = wire::serialize(&input);
-        let decoded: VarInt = wire::deserialize(&encoded).unwrap();
-
-        assert_eq!(decoded, input);
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_encode_overflow() {
-        wire::serialize(&VarInt(u64::MAX));
-    }
-
-    #[test]
-    fn test_encoding() {
-        assert_eq!(wire::serialize(&VarInt(0)), vec![0x0]);
-        assert_eq!(wire::serialize(&VarInt(1)), vec![0x01]);
-        assert_eq!(wire::serialize(&VarInt(10)), vec![0x0a]);
-        assert_eq!(wire::serialize(&VarInt(37)), vec![0x25]);
-        assert_eq!(
-            wire::deserialize::<VarInt>(&[0x40, 0x25]).unwrap(),
-            VarInt(37)
-        );
-        assert_eq!(wire::serialize(&VarInt(15293)), vec![0x7b, 0xbd]);
-        assert_eq!(
-            wire::serialize(&VarInt(494878333)),
-            vec![0x9d, 0x7f, 0x3e, 0x7d],
-        );
-        assert_eq!(
-            wire::serialize(&VarInt(151288809941952652)),
-            vec![0xc2, 0x19, 0x7c, 0x5e, 0xff, 0x14, 0xe8, 0x8c]
-        );
-        assert_eq!(
-            wire::serialize(&VarInt(10000000000)),
-            vec![0xc0, 0x00, 0x00, 0x02, 0x54, 0x0b, 0xe4, 0x00],
-        );
-    }
-}
diff --git a/radicle-node/src/worker.rs b/radicle-node/src/worker.rs
deleted file mode 100644
index f84e02e5d..000000000
--- a/radicle-node/src/worker.rs
+++ /dev/null
@@ -1,396 +0,0 @@
-#![allow(clippy::too_many_arguments)]
-mod channels;
-mod upload_pack;
-
-pub mod fetch;
-pub mod garbage;
-
-use std::io;
-use std::path::PathBuf;
-
-use crossbeam_channel as chan;
-
-use radicle::identity::RepoId;
-use radicle::node::{notifications, Event};
-use radicle::prelude::NodeId;
-use radicle::storage::refs::RefsAt;
-use radicle::storage::{ReadRepository, ReadStorage};
-use radicle::{cob, crypto, Storage};
-use radicle_fetch::FetchLimit;
-
-use crate::runtime::{thread, Emitter, Handle};
-use crate::service::policy;
-use crate::service::policy::SeedingPolicy;
-use crate::wire::StreamId;
-
-pub use channels::{ChannelEvent, Channels};
-
-/// Worker pool configuration.
-pub struct Config {
-    /// Number of worker threads.
-    pub capacity: usize,
-    /// Git storage.
-    pub storage: Storage,
-    /// Configuration for performing fetched.
-    pub fetch: FetchConfig,
-    /// Default policy, if a policy for a specific node or repository was not found.
-    pub policy: SeedingPolicy,
-    /// Path to the policies database.
-    pub policies_db: PathBuf,
-}
-
-/// Error returned by fetch.
-#[derive(thiserror::Error, Debug)]
-pub enum FetchError {
-    #[error("the 'git fetch' command failed with exit code '{code}'")]
-    CommandFailed { code: i32 },
-    #[error(transparent)]
-    Io(#[from] io::Error),
-    #[error(transparent)]
-    Fetch(#[from] fetch::error::Fetch),
-    #[error(transparent)]
-    Handle(#[from] fetch::error::Handle),
-    #[error(transparent)]
-    Storage(#[from] radicle::storage::Error),
-    #[error(transparent)]
-    PolicyStore(#[from] radicle::node::policy::store::Error),
-    #[error(transparent)]
-    Policy(#[from] radicle_fetch::policy::error::Policy),
-    #[error(transparent)]
-    Blocked(#[from] radicle_fetch::policy::error::Blocked),
-}
-
-impl FetchError {
-    /// Check if it's a timeout error.
-    pub fn is_timeout(&self) -> bool {
-        matches!(self, FetchError::Io(e) if e.kind() == io::ErrorKind::TimedOut)
-    }
-}
-
-/// Error returned by fetch responder.
-#[derive(thiserror::Error, Debug)]
-pub enum UploadError {
-    #[error("error parsing git command packet-line: {0}")]
-    PacketLine(io::Error),
-    #[error(transparent)]
-    Io(#[from] io::Error),
-    #[error("{0} is not authorized to fetch {1}")]
-    Unauthorized(NodeId, RepoId),
-    #[error(transparent)]
-    Storage(#[from] radicle::storage::Error),
-    #[error(transparent)]
-    Identity(#[from] radicle::identity::DocError),
-    #[error(transparent)]
-    Repository(#[from] radicle::storage::RepositoryError),
-    #[error(transparent)]
-    PolicyStore(#[from] radicle::node::policy::store::Error),
-}
-
-impl UploadError {
-    /// Check if it's an end-of-file error.
-    pub fn is_eof(&self) -> bool {
-        matches!(self, UploadError::Io(e) if e.kind() == io::ErrorKind::UnexpectedEof)
-    }
-}
-
-/// Fetch job sent to worker thread.
-#[derive(Debug, Clone)]
-pub enum FetchRequest {
-    /// Client is initiating a fetch for the repository identified by
-    /// `rid` from the peer identified by `remote`.
-    Initiator {
-        /// Repo to fetch.
-        rid: RepoId,
-        /// Remote peer we are interacting with.
-        remote: NodeId,
-        /// If this fetch is for a particular set of `rad/sigrefs`.
-        refs_at: Option<Vec<RefsAt>>,
-    },
-    /// Server is responding to a fetch request by uploading the
-    /// specified `refspecs` sent by the client.
-    Responder {
-        /// Remote peer we are interacting with.
-        remote: NodeId,
-        /// Reporter for upload-pack progress.
-        emitter: Emitter<Event>,
-    },
-}
-
-impl FetchRequest {
-    pub fn remote(&self) -> NodeId {
-        match self {
-            Self::Initiator { remote, .. } | Self::Responder { remote, .. } => *remote,
-        }
-    }
-}
-
-/// Fetch result of an upload or fetch.
-#[derive(Debug)]
-pub enum FetchResult {
-    Initiator {
-        /// Repo fetched.
-        rid: RepoId,
-        /// Fetch result, including remotes fetched.
-        result: Result<fetch::FetchResult, FetchError>,
-    },
-    Responder {
-        /// Repo requested.
-        rid: Option<RepoId>,
-        /// Upload result.
-        result: Result<(), UploadError>,
-    },
-}
-
-/// Task to be accomplished on a worker thread.
-/// This is either going to be an outgoing or incoming fetch.
-pub struct Task {
-    pub fetch: FetchRequest,
-    pub stream: StreamId,
-    pub channels: Channels,
-}
-
-/// Worker response.
-#[derive(Debug)]
-pub struct TaskResult {
-    pub remote: NodeId,
-    pub result: FetchResult,
-    pub stream: StreamId,
-}
-
-#[derive(Debug, Clone)]
-pub struct FetchConfig {
-    /// Data limits when fetching from a remote.
-    pub limit: FetchLimit,
-    /// Public key of the local peer.
-    pub local: crypto::PublicKey,
-    /// Configuration for `git gc` garbage collection. Defaults to `1
-    /// hour ago`.
-    pub expiry: garbage::Expiry,
-}
-
-/// A worker that replicates git objects.
-struct Worker {
-    nid: NodeId,
-    storage: Storage,
-    fetch_config: FetchConfig,
-    tasks: chan::Receiver<Task>,
-    handle: Handle,
-    policies: policy::Config<policy::store::Read>,
-    notifications: notifications::StoreWriter,
-    cache: cob::cache::StoreWriter,
-    db: radicle::node::Database,
-}
-
-impl Worker {
-    /// Waits for tasks and runs them. Blocks indefinitely unless there is an error receiving
-    /// the next task.
-    fn run(mut self) -> Result<(), chan::RecvError> {
-        loop {
-            let task = self.tasks.recv()?;
-            self.process(task);
-        }
-    }
-
-    fn process(&mut self, task: Task) {
-        let Task {
-            fetch,
-            channels,
-            stream,
-        } = task;
-        let remote = fetch.remote();
-        let channels = channels::ChannelsFlush::new(self.handle.clone(), channels, remote, stream);
-        let result = self._process(fetch, stream, channels, self.notifications.clone());
-
-        log::trace!(target: "worker", "Sending response back to service..");
-
-        if self
-            .handle
-            .worker_result(TaskResult {
-                remote,
-                stream,
-                result,
-            })
-            .is_err()
-        {
-            log::error!(target: "worker", "Unable to report fetch result: worker channel disconnected");
-        }
-    }
-
-    fn _process(
-        &mut self,
-        fetch: FetchRequest,
-        stream: StreamId,
-        mut channels: channels::ChannelsFlush,
-        notifs: notifications::StoreWriter,
-    ) -> FetchResult {
-        match fetch {
-            FetchRequest::Initiator {
-                rid,
-                remote,
-                refs_at,
-            } => {
-                log::debug!(target: "worker", "Worker processing outgoing fetch for {rid}");
-                let result = self.fetch(rid, remote, refs_at, channels, notifs);
-                FetchResult::Initiator { rid, result }
-            }
-            FetchRequest::Responder { remote, emitter } => {
-                log::debug!(target: "worker", "Worker processing incoming fetch for {remote} on stream {stream}..");
-
-                let timeout = channels.timeout();
-                let (mut stream_r, stream_w) = channels.split();
-                let header = match upload_pack::pktline::git_request(&mut stream_r) {
-                    Ok(header) => header,
-                    Err(e) => {
-                        return FetchResult::Responder {
-                            rid: None,
-                            result: Err(e.into()),
-                        }
-                    }
-                };
-                log::debug!(target: "worker", "Spawning upload-pack process for {} on stream {stream}..", header.repo);
-
-                if let Err(e) = self.is_authorized(remote, header.repo) {
-                    return FetchResult::Responder {
-                        rid: Some(header.repo),
-                        result: Err(e),
-                    };
-                }
-
-                let result = upload_pack::upload_pack(
-                    &self.nid,
-                    remote,
-                    &self.storage,
-                    &emitter,
-                    &header,
-                    stream_r,
-                    stream_w,
-                    timeout,
-                )
-                .map(|_| ())
-                .map_err(|e| e.into());
-                log::debug!(target: "worker", "Upload process on stream {stream} exited with result {result:?}");
-
-                FetchResult::Responder {
-                    rid: Some(header.repo),
-                    result,
-                }
-            }
-        }
-    }
-
-    fn is_authorized(&self, remote: NodeId, rid: RepoId) -> Result<(), UploadError> {
-        let policy = self.policies.seed_policy(&rid)?.policy;
-        // Check policy first, since if we're blocking then we likely don't have
-        // the repository.
-        if policy.is_block() {
-            return Err(UploadError::Unauthorized(remote, rid));
-        }
-        let repo = self.storage.repository(rid)?;
-        let doc = repo.identity_doc()?;
-        if !doc.is_visible_to(&remote) {
-            Err(UploadError::Unauthorized(remote, rid))
-        } else {
-            Ok(())
-        }
-    }
-
-    fn fetch(
-        &mut self,
-        rid: RepoId,
-        remote: NodeId,
-        refs_at: Option<Vec<RefsAt>>,
-        channels: channels::ChannelsFlush,
-        notifs: notifications::StoreWriter,
-    ) -> Result<fetch::FetchResult, FetchError> {
-        let FetchConfig {
-            limit,
-            local,
-            expiry,
-        } = &self.fetch_config;
-        // N.b. if the `rid` is blocked this will return an error, so
-        // we won't continue with any further set up of the fetch.
-        let allowed = radicle_fetch::Allowed::from_config(rid, &self.policies)?;
-        let blocked = radicle_fetch::BlockList::from_config(&self.policies)?;
-
-        let mut cache = self.cache.clone();
-        let handle = fetch::Handle::new(
-            rid,
-            *local,
-            &self.storage,
-            allowed,
-            blocked,
-            channels,
-            notifs,
-        )?;
-        let result = handle.fetch(
-            rid,
-            &self.storage,
-            &mut cache,
-            &mut self.db,
-            *limit,
-            remote,
-            refs_at,
-        )?;
-
-        if let Err(e) = garbage::collect(&self.storage, rid, *expiry) {
-            // N.b. ensure that `git gc` works in debug mode.
-            debug_assert!(false, "`git gc` failed: {e}");
-
-            log::warn!(target: "worker", "Failed to run `git gc`: {e}");
-        }
-        Ok(result)
-    }
-}
-
-/// A pool of workers. One thread is allocated for each worker.
-pub struct Pool {
-    pool: Vec<thread::JoinHandle<Result<(), chan::RecvError>>>,
-}
-
-impl Pool {
-    /// Create a new worker pool with the given parameters.
-    pub fn with(
-        tasks: chan::Receiver<Task>,
-        nid: NodeId,
-        handle: Handle,
-        notifications: notifications::StoreWriter,
-        cache: cob::cache::StoreWriter,
-        db: radicle::node::Database,
-        config: Config,
-    ) -> Result<Self, policy::Error> {
-        let mut pool = Vec::with_capacity(config.capacity);
-        for i in 0..config.capacity {
-            let policies =
-                policy::Config::new(config.policy, policy::Store::reader(&config.policies_db)?);
-            let worker = Worker {
-                nid,
-                tasks: tasks.clone(),
-                handle: handle.clone(),
-                storage: config.storage.clone(),
-                fetch_config: config.fetch.clone(),
-                policies,
-                notifications: notifications.clone(),
-                cache: cache.clone(),
-                db: db.clone(),
-            };
-            let thread = thread::spawn(&nid, format!("worker#{i}"), || worker.run());
-
-            pool.push(thread);
-        }
-        Ok(Self { pool })
-    }
-
-    /// Run the worker pool.
-    ///
-    /// Blocks until all worker threads have exited.
-    pub fn run(self) -> thread::Result<()> {
-        for (i, worker) in self.pool.into_iter().enumerate() {
-            if let Err(err) = worker.join()? {
-                log::trace!(target: "pool", "Worker {i} exited: {err}");
-            }
-        }
-        log::debug!(target: "pool", "Worker pool shutting down..");
-
-        Ok(())
-    }
-}
diff --git a/radicle-node/src/worker/channels.rs b/radicle-node/src/worker/channels.rs
deleted file mode 100644
index 298408ec5..000000000
--- a/radicle-node/src/worker/channels.rs
+++ /dev/null
@@ -1,239 +0,0 @@
-use std::convert::Infallible;
-use std::io::{Read, Write};
-use std::ops::Deref;
-use std::{fmt, io, time};
-
-use crossbeam_channel as chan;
-use radicle::node::NodeId;
-
-use crate::runtime::Handle;
-use crate::wire::StreamId;
-
-/// Maximum size of channel used to communicate with a worker.
-/// Note that as long as we're using [`std::io::copy`] to copy data from the
-/// upload-pack's stdout, the data chunks are of a maximum size of 8192 bytes.
-pub const MAX_WORKER_CHANNEL_SIZE: usize = 64;
-
-/// A reader and writer pair that can be used in the fetch protocol.
-///
-/// It implements [`radicle::fetch::transport::ConnectionStream`] to
-/// provide its underlying channels for reading and writing.
-pub struct ChannelsFlush {
-    receiver: ChannelReader,
-    sender: ChannelFlushWriter,
-}
-
-impl ChannelsFlush {
-    pub fn new(handle: Handle, channels: Channels, remote: NodeId, stream: StreamId) -> Self {
-        Self {
-            receiver: channels.receiver,
-            sender: ChannelFlushWriter {
-                writer: channels.sender,
-                stream,
-                handle,
-                remote,
-            },
-        }
-    }
-
-    pub fn split(&mut self) -> (&mut ChannelReader, &mut ChannelFlushWriter) {
-        (&mut self.receiver, &mut self.sender)
-    }
-
-    pub fn timeout(&self) -> time::Duration {
-        self.sender.writer.timeout.max(self.receiver.timeout)
-    }
-}
-
-impl radicle_fetch::transport::ConnectionStream for ChannelsFlush {
-    type Read = ChannelReader;
-    type Write = ChannelFlushWriter;
-    type Error = Infallible;
-
-    fn open(&mut self) -> Result<(&mut Self::Read, &mut Self::Write), Self::Error> {
-        Ok((&mut self.receiver, &mut self.sender))
-    }
-}
-
-/// Data that can be sent and received on worker channels.
-pub enum ChannelEvent<T = Vec<u8>> {
-    /// Git protocol data.
-    Data(T),
-    /// A request to close the channel.
-    Close,
-    /// A signal that the git protocol has ended, eg. when the remote fetch closes the
-    /// connection.
-    Eof,
-}
-
-impl<T> From<T> for ChannelEvent<T> {
-    fn from(value: T) -> Self {
-        Self::Data(value)
-    }
-}
-
-impl<T> fmt::Debug for ChannelEvent<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Data(_) => write!(f, "ChannelEvent::Data(..)"),
-            Self::Close => write!(f, "ChannelEvent::Close"),
-            Self::Eof => write!(f, "ChannelEvent::Eof"),
-        }
-    }
-}
-
-/// Worker channels for communicating through the git stream with the remote.
-pub struct Channels<T = Vec<u8>> {
-    sender: ChannelWriter<T>,
-    receiver: ChannelReader<T>,
-}
-
-impl<T: AsRef<[u8]>> Channels<T> {
-    pub fn new(
-        sender: chan::Sender<ChannelEvent<T>>,
-        receiver: chan::Receiver<ChannelEvent<T>>,
-        timeout: time::Duration,
-    ) -> Self {
-        let sender = ChannelWriter { sender, timeout };
-        let receiver = ChannelReader::new(receiver, timeout);
-
-        Self { sender, receiver }
-    }
-
-    pub fn pair(timeout: time::Duration) -> io::Result<(Channels<T>, Channels<T>)> {
-        let (l_send, r_recv) = chan::bounded::<ChannelEvent<T>>(MAX_WORKER_CHANNEL_SIZE);
-        let (r_send, l_recv) = chan::bounded::<ChannelEvent<T>>(MAX_WORKER_CHANNEL_SIZE);
-
-        let l = Channels::new(l_send, l_recv, timeout);
-        let r = Channels::new(r_send, r_recv, timeout);
-
-        Ok((l, r))
-    }
-
-    pub fn try_iter(&self) -> impl Iterator<Item = ChannelEvent<T>> + '_ {
-        self.receiver.try_iter()
-    }
-
-    pub fn send(&self, event: ChannelEvent<T>) -> io::Result<()> {
-        self.sender.send(event)
-    }
-
-    pub fn close(self) -> Result<(), chan::SendError<ChannelEvent<T>>> {
-        self.sender.close()
-    }
-}
-
-/// Wraps a [`chan::Receiver`] and provides it with [`io::Read`].
-#[derive(Clone)]
-pub struct ChannelReader<T = Vec<u8>> {
-    buffer: io::Cursor<Vec<u8>>,
-    receiver: chan::Receiver<ChannelEvent<T>>,
-    timeout: time::Duration,
-}
-
-impl<T> Deref for ChannelReader<T> {
-    type Target = chan::Receiver<ChannelEvent<T>>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.receiver
-    }
-}
-
-impl<T: AsRef<[u8]>> ChannelReader<T> {
-    pub fn new(receiver: chan::Receiver<ChannelEvent<T>>, timeout: time::Duration) -> Self {
-        Self {
-            buffer: io::Cursor::new(Vec::new()),
-            receiver,
-            timeout,
-        }
-    }
-}
-
-impl Read for ChannelReader<Vec<u8>> {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        let read = self.buffer.read(buf)?;
-        if read > 0 {
-            return Ok(read);
-        }
-
-        match self.receiver.recv_timeout(self.timeout) {
-            Ok(ChannelEvent::Data(data)) => {
-                self.buffer = io::Cursor::new(data);
-                self.buffer.read(buf)
-            }
-            Ok(ChannelEvent::Eof) => Err(io::ErrorKind::UnexpectedEof.into()),
-            Ok(ChannelEvent::Close) => Err(io::ErrorKind::ConnectionReset.into()),
-
-            Err(chan::RecvTimeoutError::Timeout) => Err(io::Error::new(
-                io::ErrorKind::TimedOut,
-                "error reading from stream: channel timed out",
-            )),
-            Err(chan::RecvTimeoutError::Disconnected) => Err(io::Error::new(
-                io::ErrorKind::BrokenPipe,
-                "error reading from stream: channel is disconnected",
-            )),
-        }
-    }
-}
-
-/// Wraps a [`chan::Sender`] and provides it with [`io::Write`].
-#[derive(Clone)]
-struct ChannelWriter<T = Vec<u8>> {
-    sender: chan::Sender<ChannelEvent<T>>,
-    timeout: time::Duration,
-}
-
-/// Wraps a [`ChannelWriter`] alongside the associated [`Handle`] and [`NodeId`].
-///
-/// This allows the channel to [`Write::flush`] when calling
-/// [`Write::write`], which is necessary to signal to the
-/// controller to send the wire data.
-pub struct ChannelFlushWriter<T = Vec<u8>> {
-    writer: ChannelWriter<T>,
-    handle: Handle,
-    stream: StreamId,
-    remote: NodeId,
-}
-
-impl radicle_fetch::transport::SignalEof for ChannelFlushWriter<Vec<u8>> {
-    type Error = io::Error;
-
-    fn eof(&mut self) -> io::Result<()> {
-        self.writer.send(ChannelEvent::Eof)?;
-        self.flush()
-    }
-}
-
-impl Write for ChannelFlushWriter<Vec<u8>> {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        let n = buf.len();
-        self.writer.send(buf.to_vec())?;
-        self.flush()?;
-        Ok(n)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        self.handle.flush(self.remote, self.stream)
-    }
-}
-
-impl<T: AsRef<[u8]>> ChannelWriter<T> {
-    pub fn send(&self, event: impl Into<ChannelEvent<T>>) -> io::Result<()> {
-        match self.sender.send_timeout(event.into(), self.timeout) {
-            Ok(()) => Ok(()),
-            Err(chan::SendTimeoutError::Timeout(_)) => Err(io::Error::new(
-                io::ErrorKind::TimedOut,
-                "error writing to stream: channel timed out",
-            )),
-            Err(chan::SendTimeoutError::Disconnected(_)) => Err(io::Error::new(
-                io::ErrorKind::BrokenPipe,
-                "error writing to stream: channel is disconnected",
-            )),
-        }
-    }
-
-    /// Permanently close this stream.
-    pub fn close(self) -> Result<(), chan::SendError<ChannelEvent<T>>> {
-        self.sender.send(ChannelEvent::Close)
-    }
-}
diff --git a/radicle-node/src/worker/fetch.rs b/radicle-node/src/worker/fetch.rs
deleted file mode 100644
index 0d4853eb0..000000000
--- a/radicle-node/src/worker/fetch.rs
+++ /dev/null
@@ -1,357 +0,0 @@
-pub mod error;
-
-use std::collections::HashSet;
-use std::str::FromStr;
-
-use localtime::LocalTime;
-
-use radicle::cob::TypedId;
-use radicle::crypto::PublicKey;
-use radicle::identity::DocAt;
-use radicle::prelude::RepoId;
-use radicle::storage::refs::RefsAt;
-use radicle::storage::{
-    ReadRepository, ReadStorage as _, RefUpdate, RemoteRepository, WriteRepository as _,
-};
-use radicle::{cob, git, node, Storage};
-use radicle_fetch::{Allowed, BlockList, FetchLimit};
-
-use super::channels::ChannelsFlush;
-
-#[derive(Debug, Clone)]
-pub struct FetchResult {
-    /// The set of updated references.
-    pub updated: Vec<RefUpdate>,
-    /// The set of remote namespaces that were updated.
-    pub namespaces: HashSet<PublicKey>,
-    /// The fetch was a full clone.
-    pub clone: bool,
-    /// Identity doc of fetched repo.
-    pub doc: DocAt,
-}
-
-impl FetchResult {
-    pub fn new(doc: DocAt) -> Self {
-        Self {
-            updated: vec![],
-            namespaces: HashSet::new(),
-            clone: false,
-            doc,
-        }
-    }
-}
-
-pub enum Handle {
-    Clone {
-        handle: radicle_fetch::Handle<ChannelsFlush>,
-        tmp: tempfile::TempDir,
-    },
-    Pull {
-        handle: radicle_fetch::Handle<ChannelsFlush>,
-        notifications: node::notifications::StoreWriter,
-    },
-}
-
-impl Handle {
-    pub fn new(
-        rid: RepoId,
-        local: PublicKey,
-        storage: &Storage,
-        follow: Allowed,
-        blocked: BlockList,
-        channels: ChannelsFlush,
-        notifications: node::notifications::StoreWriter,
-    ) -> Result<Self, error::Handle> {
-        let exists = storage.contains(&rid)?;
-        if exists {
-            let repo = storage.repository(rid)?;
-            let handle = radicle_fetch::Handle::new(local, repo, follow, blocked, channels)?;
-            Ok(Handle::Pull {
-                handle,
-                notifications,
-            })
-        } else {
-            let (repo, tmp) = storage.lock_repository(rid)?;
-            let handle = radicle_fetch::Handle::new(local, repo, follow, blocked, channels)?;
-            Ok(Handle::Clone { handle, tmp })
-        }
-    }
-
-    pub fn fetch<D: node::refs::Store>(
-        self,
-        rid: RepoId,
-        storage: &Storage,
-        cache: &mut cob::cache::StoreWriter,
-        refsdb: &mut D,
-        limit: FetchLimit,
-        remote: PublicKey,
-        refs_at: Option<Vec<RefsAt>>,
-    ) -> Result<FetchResult, error::Fetch> {
-        let (result, clone, notifs) = match self {
-            Self::Clone { mut handle, tmp } => {
-                log::debug!(target: "worker", "{} cloning from {remote}", handle.local());
-                let result = radicle_fetch::clone(&mut handle, limit, remote)?;
-                mv(tmp, storage, &rid)?;
-                (result, true, None)
-            }
-            Self::Pull {
-                mut handle,
-                notifications,
-            } => {
-                log::debug!(target: "worker", "{} pulling from {remote}", handle.local());
-                let result = radicle_fetch::pull(&mut handle, limit, remote, refs_at)?;
-                (result, false, Some(notifications))
-            }
-        };
-
-        for rejected in result.rejected() {
-            log::warn!(target: "worker", "Rejected update for {}", rejected.refname())
-        }
-
-        match result {
-            radicle_fetch::FetchResult::Failed {
-                threshold,
-                delegates,
-                validations,
-            } => {
-                for fail in validations.iter() {
-                    log::error!(target: "worker", "Validation error: {}", fail);
-                }
-                Err(error::Fetch::Validation {
-                    threshold,
-                    delegates: delegates.into_iter().map(|key| key.to_string()).collect(),
-                })
-            }
-            radicle_fetch::FetchResult::Success {
-                applied,
-                remotes,
-                validations,
-            } => {
-                for warn in validations {
-                    log::warn!(target: "worker", "Validation error: {}", warn);
-                }
-
-                // N.b. We do not go through handle for this since the cloning handle
-                // points to a repository that is temporary and gets moved by [`mv`].
-                let repo = storage.repository(rid)?;
-                repo.set_identity_head()?;
-                repo.set_head()?;
-
-                // Notifications are only posted for pulls, not clones.
-                if let Some(mut store) = notifs {
-                    // Only create notifications for repos that we have
-                    // contributed to in some way, otherwise our inbox will
-                    // be flooded by all the repos we are seeding.
-                    if repo.remote(&storage.info().key).is_ok() {
-                        notify(&rid, &applied, &mut store)?;
-                    }
-                }
-
-                cache_cobs(&rid, &applied.updated, &repo, cache)?;
-                cache_refs(&rid, &applied.updated, refsdb)?;
-
-                Ok(FetchResult {
-                    updated: applied.updated,
-                    namespaces: remotes.into_iter().collect(),
-                    doc: repo.identity_doc()?,
-                    clone,
-                })
-            }
-        }
-    }
-}
-
-/// In the case of cloning, we have performed the fetch into a
-/// temporary directory -- ensuring that no concurrent operations
-/// see an empty repository.
-///
-/// At the end of the clone, we perform a rename of the temporary
-/// directory to the storage repository.
-///
-/// # Errors
-///   - Will fail if `storage` contains `rid` already.
-fn mv(tmp: tempfile::TempDir, storage: &Storage, rid: &RepoId) -> Result<(), error::Fetch> {
-    use std::io::{Error, ErrorKind};
-
-    let from = tmp.path();
-    let to = storage.path_of(rid);
-
-    if !to.exists() {
-        std::fs::rename(from, to)?;
-    } else {
-        log::warn!(target: "worker", "Refusing to move cloned repository {rid} already exists");
-        return Err(Error::new(
-            ErrorKind::AlreadyExists,
-            format!("repository already exists {:?}", to),
-        )
-        .into());
-    }
-
-    Ok(())
-}
-
-// Post notifications for the given refs.
-fn notify(
-    rid: &RepoId,
-    refs: &radicle_fetch::git::refs::Applied<'static>,
-    store: &mut node::notifications::StoreWriter,
-) -> Result<(), error::Fetch> {
-    let now = LocalTime::now();
-
-    for update in refs.updated.iter() {
-        if let Some(r) = update.name().to_namespaced() {
-            let r = r.strip_namespace();
-            if r == *git::refs::storage::SIGREFS_BRANCH {
-                // Don't notify about signed refs.
-                continue;
-            }
-            if r == *git::refs::storage::IDENTITY_BRANCH {
-                // Don't notify about the peers's identity branch pointer, since there will
-                // be a separate notification on the identity COB itself.
-                continue;
-            }
-            if let Some(rest) = r.strip_prefix(git::refname!("refs/heads/patches")) {
-                if radicle::cob::ObjectId::from_str(rest.as_str()).is_ok() {
-                    // Don't notify about patch branches, since we already get
-                    // notifications about patch updates.
-                    continue;
-                }
-            }
-        }
-        if let RefUpdate::Skipped { .. } = update {
-            // Don't notify about skipped refs.
-        } else if let Err(e) = store.insert(rid, update, now) {
-            log::error!(
-                target: "worker",
-                "Failed to update notification store for {rid}: {e}"
-            );
-        }
-    }
-    Ok(())
-}
-
-/// Cache certain ref updates in our database.
-fn cache_refs<D>(repo: &RepoId, refs: &[RefUpdate], db: &mut D) -> Result<(), node::refs::Error>
-where
-    D: node::refs::Store,
-{
-    let time = LocalTime::now();
-
-    for r in refs {
-        let name = r.name();
-        let (namespace, qualified) = match radicle::git::parse_ref_namespaced(name) {
-            Err(e) => {
-                log::error!(target: "worker", "Git reference is invalid: {name:?}: {e}");
-                log::warn!(target: "worker", "Skipping refs caching for fetch of {repo}");
-                break;
-            }
-            Ok((n, q)) => (n, q),
-        };
-        if qualified != *git::refs::storage::SIGREFS_BRANCH {
-            // Only cache `rad/sigrefs`.
-            continue;
-        }
-        log::trace!(target: "node", "Updating cache for {name} in {repo}");
-
-        let result = match r {
-            RefUpdate::Updated { new, .. } => db.set(repo, &namespace, &qualified, *new, time),
-            RefUpdate::Created { oid, .. } => db.set(repo, &namespace, &qualified, *oid, time),
-            RefUpdate::Deleted { .. } => db.delete(repo, &namespace, &qualified),
-            RefUpdate::Skipped { .. } => continue,
-        };
-
-        if let Err(e) = result {
-            log::error!(target: "worker", "Error updating git refs cache for {name:?}: {e}");
-            log::warn!(target: "worker", "Skipping refs caching for fetch of {repo}");
-            break;
-        }
-    }
-    Ok(())
-}
-
-/// Write new `RefUpdate`s that are related a `Patch` or an `Issue`
-/// COB to the COB cache.
-fn cache_cobs<S, C>(
-    rid: &RepoId,
-    refs: &[RefUpdate],
-    storage: &S,
-    cache: &mut C,
-) -> Result<(), error::Cache>
-where
-    S: ReadRepository + cob::Store,
-    C: cob::cache::Update<cob::issue::Issue> + cob::cache::Update<cob::patch::Patch>,
-    C: cob::cache::Remove<cob::issue::Issue> + cob::cache::Remove<cob::patch::Patch>,
-{
-    let mut issues = cob::store::Store::<cob::issue::Issue, _>::open(storage)?;
-    let mut patches = cob::store::Store::<cob::patch::Patch, _>::open(storage)?;
-
-    for update in refs {
-        match update {
-            RefUpdate::Updated { name, .. }
-            | RefUpdate::Created { name, .. }
-            | RefUpdate::Deleted { name, .. } => match name.to_namespaced() {
-                Some(name) => {
-                    let Some(identifier) = cob::TypedId::from_namespaced(&name)? else {
-                        continue;
-                    };
-                    if identifier.is_issue() {
-                        update_or_remove(&mut issues, cache, rid, identifier)?;
-                    } else if identifier.is_patch() {
-                        update_or_remove(&mut patches, cache, rid, identifier)?;
-                    } else {
-                        // Unknown COB, don't cache.
-                        continue;
-                    }
-                }
-                None => continue,
-            },
-            RefUpdate::Skipped { .. } => { /* Do nothing */ }
-        }
-    }
-
-    Ok(())
-}
-
-/// Update or remove a cache entry.
-fn update_or_remove<R, C, T>(
-    store: &mut cob::store::Store<T, R>,
-    cache: &mut C,
-    rid: &RepoId,
-    tid: TypedId,
-) -> Result<(), error::Cache>
-where
-    R: cob::Store + ReadRepository,
-    T: cob::Evaluate<R> + cob::store::Cob,
-    C: cob::cache::Update<T> + cob::cache::Remove<T>,
-{
-    match store.get(&tid.id) {
-        Ok(Some(obj)) => {
-            // Object loaded correctly, update cache.
-            return cache.update(rid, &tid.id, &obj).map(|_| ()).map_err(|e| {
-                error::Cache::Update {
-                    id: tid.id,
-                    type_name: tid.type_name,
-                    err: e.into(),
-                }
-            });
-        }
-        Ok(None) => {
-            // Object was not found. Fall-through.
-        }
-        Err(e) => {
-            // Object was found, but failed to load. Fall-through.
-            log::error!(target: "fetch", "Error loading COB {tid} from storage: {e}");
-        }
-    }
-    // The object has either been removed entirely from the repository,
-    // or it failed to load. So we also remove it from the cache.
-    cob::cache::Remove::<T>::remove(cache, &tid.id)
-        .map(|_| ())
-        .map_err(|e| error::Cache::Remove {
-            id: tid.id,
-            type_name: tid.type_name,
-            err: Box::new(e),
-        })?;
-
-    Ok(())
-}
diff --git a/radicle-node/src/worker/fetch/error.rs b/radicle-node/src/worker/fetch/error.rs
deleted file mode 100644
index 406b1e234..000000000
--- a/radicle-node/src/worker/fetch/error.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-use std::io;
-
-use thiserror::Error;
-
-use radicle::{cob, git, identity, storage};
-use radicle_fetch as fetch;
-
-#[derive(Debug, Error)]
-pub enum Fetch {
-    #[error(transparent)]
-    Run(#[from] fetch::Error),
-    #[error(transparent)]
-    Git(#[from] git::raw::Error),
-    #[error(transparent)]
-    Storage(#[from] storage::Error),
-    #[error(transparent)]
-    StorageCopy(#[from] io::Error),
-    #[error(transparent)]
-    Repository(#[from] radicle::storage::RepositoryError),
-    #[error(transparent)]
-    RefsDb(#[from] radicle::node::refs::Error),
-    #[error("validation of the storage repository failed: the delegates {delegates:?} failed to validate to meet a threshold of {threshold}")]
-    Validation {
-        threshold: usize,
-        delegates: Vec<String>,
-    },
-    #[error(transparent)]
-    Cache(#[from] Cache),
-}
-
-#[derive(Debug, Error)]
-pub enum Cache {
-    #[error(transparent)]
-    Parse(#[from] cob::ParseIdentifierError),
-    #[error(transparent)]
-    Repository(#[from] storage::RepositoryError),
-    #[error("failed to remove {type_name} '{id}' from cache: {err}")]
-    Remove {
-        id: cob::ObjectId,
-        type_name: cob::TypeName,
-        #[source]
-        err: Box<dyn std::error::Error + Send + Sync + 'static>,
-    },
-    #[error(transparent)]
-    Store(#[from] cob::store::Error),
-    #[error("failed to update {type_name} '{id}' in cache: {err}")]
-    Update {
-        id: cob::ObjectId,
-        type_name: cob::TypeName,
-        #[source]
-        err: Box<dyn std::error::Error + Send + Sync + 'static>,
-    },
-}
-
-#[derive(Debug, Error)]
-pub enum Handle {
-    #[error(transparent)]
-    Doc(#[from] identity::DocError),
-    #[error(transparent)]
-    Io(#[from] io::Error),
-    #[error(transparent)]
-    Init(#[from] fetch::handle::error::Init),
-    #[error(transparent)]
-    Storage(#[from] storage::Error),
-    #[error(transparent)]
-    Repository(#[from] radicle::storage::RepositoryError),
-}
diff --git a/radicle-node/src/worker/garbage.rs b/radicle-node/src/worker/garbage.rs
deleted file mode 100644
index d8e3ea018..000000000
--- a/radicle-node/src/worker/garbage.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use std::process::{Command, ExitStatus, Stdio};
-use std::{fmt, io};
-
-use radicle::prelude::RepoId;
-use radicle::storage::ReadStorage;
-
-/// Default expiry time for objects.
-pub const EXPIRY_DEFAULT: Expiry = Expiry::Hours(1);
-
-/// Expiry of objects for garbage collector.
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub enum Expiry {
-    Now,
-    Seconds(usize),
-    Hours(usize),
-    Days(usize),
-    Weeks(usize),
-}
-
-impl Default for Expiry {
-    fn default() -> Self {
-        EXPIRY_DEFAULT
-    }
-}
-
-impl fmt::Display for Expiry {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Now => f.write_str("now"),
-            Self::Seconds(s) => write!(f, "{s}.seconds.ago"),
-            Self::Hours(s) => write!(f, "{s}.hours.ago"),
-            Self::Days(s) => write!(f, "{s}.days.ago"),
-            Self::Weeks(s) => write!(f, "{s}.weeks.ago"),
-        }
-    }
-}
-
-/// Run Git garbage collector.
-pub fn collect(storage: &impl ReadStorage, rid: RepoId, expiry: Expiry) -> io::Result<ExitStatus> {
-    let git_dir = storage.path_of(&rid);
-    let mut gc = Command::new("git");
-    gc.current_dir(git_dir)
-        .env_clear()
-        .envs(std::env::vars().filter(|(key, _)| key == "PATH" || key.starts_with("GIT_TRACE")))
-        .args(["gc", &format!("--prune={expiry}"), "--auto"])
-        .stdout(Stdio::piped())
-        .stdin(Stdio::piped())
-        .stderr(Stdio::inherit());
-    let mut child = gc.spawn()?;
-    let status = child.wait()?;
-
-    Ok(status)
-}
diff --git a/radicle-node/src/worker/upload_pack.rs b/radicle-node/src/worker/upload_pack.rs
deleted file mode 100644
index 1914a31dd..000000000
--- a/radicle-node/src/worker/upload_pack.rs
+++ /dev/null
@@ -1,329 +0,0 @@
-use std::io;
-use std::io::Write;
-use std::process::{Command, ExitStatus, Stdio};
-use std::time::{Duration, Instant};
-
-use radicle_fetch::{ByteSlice as _, RemoteProgress};
-
-use radicle::identity::RepoId;
-use radicle::node::events;
-use radicle::node::events::Emitter;
-use radicle::node::{Event, NodeId};
-use radicle::storage::git::paths;
-use radicle::Storage;
-
-use crate::runtime::thread;
-
-/// Perform the Git upload-pack process, given that the Git request
-/// `header` has already been read and parsed.
-///
-/// N.b. The upload-pack process itself is strict, i.e. it will read
-/// requests from the client indefinitely, and so the client side MUST
-/// send the EOF file message.
-pub fn upload_pack<R, W>(
-    nid: &NodeId,
-    remote: NodeId,
-    storage: &Storage,
-    emitter: &Emitter<Event>,
-    header: &pktline::GitRequest,
-    mut recv: R,
-    send: W,
-    timeout: Duration,
-) -> io::Result<ExitStatus>
-where
-    R: io::Read + Send,
-    W: io::Write + Send,
-{
-    let timer = Instant::now();
-    let protocol_version = header
-        .extra
-        .iter()
-        .find_map(|kv| match kv {
-            (ref k, Some(v)) if k == "version" => {
-                let version = match v.as_str() {
-                    "2" => 2,
-                    "1" => 1,
-                    _ => 0,
-                };
-                Some(version)
-            }
-            _ => None,
-        })
-        .unwrap_or(0);
-
-    if protocol_version != 2 {
-        return Err(io::Error::new(
-            io::ErrorKind::InvalidData,
-            "only Git protocol version 2 is supported",
-        ));
-    }
-
-    let git_dir = paths::repository(storage, &header.repo);
-    let mut child = {
-        let mut cmd = Command::new("git");
-        cmd.current_dir(git_dir)
-            .env_clear()
-            .envs(std::env::vars().filter(|(key, _)| key == "PATH" || key.starts_with("GIT_TRACE")))
-            .env("GIT_PROTOCOL", format!("version={protocol_version}"))
-            .args([
-                "-c",
-                "uploadpack.allowAnySha1InWant=true",
-                "-c",
-                "uploadpack.allowRefInWant=true",
-                "-c",
-                "lsrefs.unborn=ignore",
-                "upload-pack",
-                "--strict",
-                format!("--timeout={}", timeout.as_secs()).as_str(),
-                ".",
-            ])
-            .stdout(Stdio::piped())
-            .stdin(Stdio::piped())
-            .stderr(Stdio::inherit());
-
-        cmd.spawn()?
-    };
-
-    let mut stdin = child.stdin.take().unwrap();
-    let mut stdout = io::BufReader::new(child.stdout.take().unwrap());
-    let mut reporter = Reporter::new(header.repo, remote, emitter.clone(), send);
-
-    thread::scope(|s| {
-        thread::spawn_scoped(nid, "upload-pack", s, || {
-            // N.b. we indefinitely copy stdout to the sender,
-            // i.e. there's no need for a loop.
-            match io::copy(&mut stdout, &mut reporter) {
-                Ok(_) => {}
-                Err(e) => {
-                    log::error!(target: "worker", "Worker channel disconnected for {}; aborting: {e}", header.repo);
-                    emitter.emit(events::UploadPack::error(header.repo, remote, e).into());
-                }
-            }
-        });
-
-        let reader = thread::spawn_scoped(nid, "upload-pack", s, || {
-            let mut buffer = [0; u16::MAX as usize + 1];
-            loop {
-                match recv.read(&mut buffer) {
-                    Ok(0) => break,
-                    Ok(n) => {
-                        if let Err(e) = stdin.write_all(&buffer[..n]) {
-                            log::warn!(target: "worker", "Error writing to upload-pack stdin: {e}");
-                            break;
-                        }
-                    }
-                    Err(e) if e.kind() == io::ErrorKind::UnexpectedEof => {
-                        log::debug!(target: "worker", "Exiting upload-pack reader thread for {}", header.repo);
-                        break;
-                    }
-                    // N.b. if the read timed out, ensure that the sender isn't
-                    // still sending messages.
-                    Err(e) if e.kind() == io::ErrorKind::TimedOut => {
-                        log::warn!(target: "worker", "Read channel timed out for upload-pack {}", header.repo);
-                        break;
-                    }
-                    Err(e) => {
-                        log::error!(target: "worker", "Error on upload-pack channel read for {}: {e}", header.repo);
-                        emitter.emit(events::UploadPack::error(header.repo, remote, e).into());
-                        break;
-                    }
-                }
-            }
-        });
-
-        // N.b. we only care if the `reader` is finished. We then kill
-        // the child which will end the thread for the sender.
-        if let Err(e) = reader.join() {
-            log::warn!(target: "worker", "Upload pack thread panicked: {e:?}");
-        }
-        child.kill()?;
-        Ok::<_, io::Error>(())
-    })?;
-
-    let status = child.wait()?;
-    emitter.emit(events::UploadPack::done(header.repo, remote, status).into());
-    log::debug!(target: "worker", "Upload pack finished ({}ms)", timer.elapsed().as_millis());
-    Ok(status)
-}
-
-/// A combination of the upload-pack sender with an [`Emitter`] for reporting
-/// the progress events to subscribers.
-struct Reporter<W> {
-    rid: RepoId,
-    remote: NodeId,
-    emitter: Emitter<Event>,
-    send: W,
-    total: usize,
-}
-
-impl<W> Reporter<W> {
-    fn new(rid: RepoId, remote: NodeId, emitter: Emitter<Event>, send: W) -> Self {
-        Self {
-            rid,
-            remote,
-            emitter,
-            send,
-            total: 0,
-        }
-    }
-
-    fn emit(&mut self, buf: &[u8]) {
-        let event = match Self::as_upload_pack_progress(buf) {
-            Some(progress) => events::UploadPack::write(self.rid, self.remote, progress),
-            None => {
-                self.total += buf.len();
-                events::UploadPack::pack_progress(self.rid, self.remote, self.total)
-            }
-        };
-        log::trace!(target: "worker", "upload-pack progress: {event:?}");
-        self.emitter.emit(event.into());
-    }
-
-    fn as_upload_pack_progress(buf: &[u8]) -> Option<events::upload_pack::Progress> {
-        use events::upload_pack::Progress::*;
-        let RemoteProgress {
-            action, step, max, ..
-        } = RemoteProgress::from_bytes(buf)?;
-        if action.contains_str("Counting objects") {
-            step.and_then(|processed| max.map(|total| Counting { processed, total }))
-        } else if action.contains_str("Compressing objects") {
-            step.and_then(|processed| max.map(|total| Compressing { processed, total }))
-        } else if action.contains_str("Enumerating objects") {
-            max.map(|total| Enumerating { total })
-        } else {
-            None
-        }
-    }
-}
-
-impl<W> io::Write for Reporter<W>
-where
-    W: io::Write,
-{
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        let n = self.send.write(buf)?;
-        self.emit(buf);
-        Ok(n)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        self.send.flush()
-    }
-}
-
-pub(super) mod pktline {
-    use std::io;
-    use std::io::Read;
-    use std::str;
-
-    use radicle::prelude::RepoId;
-
-    pub const HEADER_LEN: usize = 4;
-
-    /// Read and parse the `GitRequest` data from the client side.
-    pub fn git_request<R>(reader: &mut R) -> io::Result<GitRequest>
-    where
-        R: io::Read,
-    {
-        let mut reader = Reader::new(reader);
-        let (header, _) = reader.read_request_pktline()?;
-        Ok(header)
-    }
-
-    struct Reader<'a, R> {
-        stream: &'a mut R,
-    }
-
-    impl<'a, R: io::Read> Reader<'a, R> {
-        /// Create a new packet-line reader.
-        pub fn new(stream: &'a mut R) -> Self {
-            Self { stream }
-        }
-
-        /// Parse a Git request packet-line.
-        ///
-        /// Example: `0032git-upload-pack /project.git\0host=myserver.com\0`
-        ///
-        fn read_request_pktline(&mut self) -> io::Result<(GitRequest, Vec<u8>)> {
-            let mut pktline = [0u8; 1024];
-            let length = self.read_pktline(&mut pktline)?;
-            let Some(cmd) = GitRequest::parse(&pktline[4..length]) else {
-                return Err(io::ErrorKind::InvalidInput.into());
-            };
-            Ok((cmd, Vec::from(&pktline[..length])))
-        }
-
-        /// Parse a Git packet-line.
-        fn read_pktline(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-            self.read_exact(&mut buf[..HEADER_LEN])?;
-
-            let length = str::from_utf8(&buf[..HEADER_LEN])
-                .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e.to_string()))?;
-            let length = usize::from_str_radix(length, 16)
-                .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e.to_string()))?;
-
-            self.read_exact(&mut buf[HEADER_LEN..length])?;
-
-            Ok(length)
-        }
-    }
-
-    impl<'a, R: io::Read> io::Read for Reader<'a, R> {
-        fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-            self.stream.read(buf)
-        }
-    }
-
-    /// The Git request packet-line for a Heartwood repository.
-    ///
-    /// Example: `0032git-upload-pack /rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5.git\0host=myserver.com\0`
-    #[derive(Debug)]
-    pub struct GitRequest {
-        pub repo: RepoId,
-        #[allow(dead_code)]
-        pub path: String,
-        #[allow(dead_code)]
-        pub host: Option<(String, Option<u16>)>,
-        pub extra: Vec<(String, Option<String>)>,
-    }
-
-    impl GitRequest {
-        /// Parse a Git command from a packet-line.
-        fn parse(input: &[u8]) -> Option<Self> {
-            let input = str::from_utf8(input).ok()?;
-            let mut parts = input
-                .strip_prefix("git-upload-pack ")?
-                .split_terminator('\0');
-
-            let path = parts.next()?.to_owned();
-            let repo = path.strip_prefix('/')?.parse().ok()?;
-            let host = match parts.next() {
-                None | Some("") => None,
-                Some(host) => {
-                    let host = host.strip_prefix("host=")?;
-                    match host.split_once(':') {
-                        None => Some((host.to_owned(), None)),
-                        Some((host, port)) => {
-                            let port = port.parse::<u16>().ok()?;
-                            Some((host.to_owned(), Some(port)))
-                        }
-                    }
-                }
-            };
-            let extra = parts
-                .skip_while(|part| part.is_empty())
-                .map(|part| match part.split_once('=') {
-                    None => (part.to_owned(), None),
-                    Some((k, v)) => (k.to_owned(), Some(v.to_owned())),
-                })
-                .collect();
-
-            Some(Self {
-                repo,
-                path,
-                host,
-                extra,
-            })
-        }
-    }
-}
diff --git a/radicle-remote-helper/Cargo.toml b/radicle-remote-helper/Cargo.toml
deleted file mode 100644
index 91251fb45..000000000
--- a/radicle-remote-helper/Cargo.toml
+++ /dev/null
@@ -1,30 +0,0 @@
-[package]
-name = "radicle-remote-helper"
-description = "Radicle git remote helper"
-homepage = "https://radicle.xyz"
-license = "MIT OR Apache-2.0"
-version = "0.10.0"
-authors = ["cloudhead <cloudhead@radicle.xyz>"]
-edition = "2021"
-build = "build.rs"
-
-[dependencies]
-thiserror = { version = "1" }
-log = { version = "0.4.17" }
-radicle-git-ext = { version = "0.8.0" }
-
-[dependencies.radicle]
-path = "../radicle"
-version = "0"
-
-[dependencies.radicle-crypto]
-path = "../radicle-crypto"
-version = "0"
-
-[dependencies.radicle-cli]
-path = "../radicle-cli"
-version = "0"
-
-[[bin]]
-name = "git-remote-rad"
-path = "src/git-remote-rad.rs"
diff --git a/radicle-remote-helper/build.rs b/radicle-remote-helper/build.rs
deleted file mode 120000
index 10238032f..000000000
--- a/radicle-remote-helper/build.rs
+++ /dev/null
@@ -1 +0,0 @@
-../build.rs
\ No newline at end of file
diff --git a/radicle-remote-helper/src/fetch.rs b/radicle-remote-helper/src/fetch.rs
deleted file mode 100644
index d8b625ac1..000000000
--- a/radicle-remote-helper/src/fetch.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-use std::io;
-use std::path::Path;
-use std::str::FromStr;
-
-use thiserror::Error;
-
-use radicle::git;
-use radicle::storage::ReadRepository;
-
-use crate::read_line;
-
-#[derive(Debug, Error)]
-pub enum Error {
-    /// Invalid command received.
-    #[error("invalid command `{0}`")]
-    InvalidCommand(String),
-    /// I/O error.
-    #[error("i/o error: {0}")]
-    Io(#[from] io::Error),
-    /// Invalid reference name.
-    #[error("invalid ref: {0}")]
-    InvalidRef(#[from] radicle::git::fmt::Error),
-    /// Git error.
-    #[error("git: {0}")]
-    Git(#[from] git::raw::Error),
-}
-
-/// Run a git fetch command.
-pub fn run<R: ReadRepository>(
-    mut refs: Vec<(git::Oid, git::RefString)>,
-    working: &Path,
-    stored: R,
-    stdin: &io::Stdin,
-) -> Result<(), Error> {
-    // Read all the `fetch` lines.
-    let mut line = String::new();
-    loop {
-        let tokens = read_line(stdin, &mut line)?;
-        match tokens.as_slice() {
-            ["fetch", oid, refstr] => {
-                let oid = git::Oid::from_str(oid)?;
-                let refstr = git::RefString::try_from(*refstr)?;
-
-                refs.push((oid, refstr));
-            }
-            // An empty line means end of input.
-            [] => break,
-            // Once the first `fetch` command is received, we don't expect anything else.
-            _ => return Err(Error::InvalidCommand(line.trim().to_owned())),
-        }
-    }
-
-    // Verify them and prepare the final refspecs.
-    let oids = refs.into_iter().map(|(oid, _)| oid);
-
-    // N.b. we shell out to `git`, avoiding using `git2`. This is to
-    // avoid an issue where somewhere within the fetch there is an
-    // attempt to lookup a `rad/sigrefs` object, which says that the
-    // object is missing. We suspect that this is due to the object
-    // being localised in the same packfile as other objects we are
-    // fetching. Since the `rad/sigrefs` object is never needed nor
-    // used in the working copy, this will always result in the object
-    // missing. This seems to only be an issue with `libgit2`/`git2`
-    // and not `git` itself.
-    git::process::fetch_local(working, &stored, oids)?;
-
-    // Nb. An empty line means we're done.
-    println!();
-
-    Ok(())
-}
diff --git a/radicle-remote-helper/src/git-remote-rad.rs b/radicle-remote-helper/src/git-remote-rad.rs
deleted file mode 100644
index 95a74fcbc..000000000
--- a/radicle-remote-helper/src/git-remote-rad.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use std::env;
-use std::process;
-
-use radicle::version::Version;
-
-pub const VERSION: Version = Version {
-    name: "git-remote-rad",
-    commit: env!("GIT_HEAD"),
-    version: env!("RADICLE_VERSION"),
-    timestamp: env!("SOURCE_DATE_EPOCH"),
-};
-
-fn main() {
-    let mut args = env::args();
-
-    if let Some(lvl) = radicle::logger::env_level() {
-        radicle::logger::set(radicle::logger::StderrLogger::new(lvl), lvl).ok();
-    }
-    if args.nth(1).as_deref() == Some("--version") {
-        if let Err(e) = VERSION.write(std::io::stdout()) {
-            eprintln!("error: {e}");
-            process::exit(1);
-        };
-        process::exit(0);
-    }
-
-    let profile = match radicle::Profile::load() {
-        Ok(profile) => profile,
-        Err(err) => {
-            eprintln!("error: couldn't load profile: {err}");
-            process::exit(1);
-        }
-    };
-
-    if let Err(err) = radicle_remote_helper::run(profile) {
-        eprintln!("error: {err}");
-        process::exit(1);
-    }
-}
diff --git a/radicle-remote-helper/src/lib.rs b/radicle-remote-helper/src/lib.rs
deleted file mode 100644
index 62748fb65..000000000
--- a/radicle-remote-helper/src/lib.rs
+++ /dev/null
@@ -1,260 +0,0 @@
-#![warn(clippy::unwrap_used)]
-//! The Radicle Git remote helper.
-//!
-//! Communication with the user is done via `stderr` (`eprintln`).
-//! Communication with Git tooling is done via `stdout` (`println`).
-mod fetch;
-mod list;
-mod push;
-
-use std::path::PathBuf;
-use std::str::FromStr;
-use std::{env, fmt, io};
-
-use radicle_cli::git::Rev;
-use thiserror::Error;
-
-use radicle::git;
-use radicle::storage::git::transport::local::{Url, UrlError};
-use radicle::storage::{ReadRepository, WriteStorage};
-use radicle_cli::terminal as cli;
-
-#[derive(Debug, Error)]
-pub enum Error {
-    /// Failed to parse `base`.
-    #[error("failed to parse base revision: {0}")]
-    Base(Box<dyn std::error::Error>),
-    /// Remote repository not found (or empty).
-    #[error("remote repository `{0}` not found")]
-    RepositoryNotFound(PathBuf),
-    /// Invalid command received.
-    #[error("invalid command `{0}`")]
-    InvalidCommand(String),
-    /// Invalid arguments received.
-    #[error("invalid arguments: {0:?}")]
-    InvalidArguments(Vec<String>),
-    /// Unknown push option received.
-    #[error("unknown push option {0:?}")]
-    UnsupportedPushOption(String),
-    /// Error with the remote url.
-    #[error("invalid remote url: {0}")]
-    RemoteUrl(#[from] UrlError),
-    /// I/O error.
-    #[error("i/o error: {0}")]
-    Io(#[from] io::Error),
-    /// The `GIT_DIR` env var is not set.
-    #[error("the `GIT_DIR` environment variable is not set")]
-    NoGitDir,
-    /// No parent of `GIT_DIR` was found.
-    #[error("expected parent of .git but found {path:?}")]
-    NoWorkingCopy { path: PathBuf },
-    /// Git error.
-    #[error("git: {0}")]
-    Git(#[from] git::raw::Error),
-    /// Invalid reference name.
-    #[error("invalid ref: {0}")]
-    InvalidRef(#[from] radicle::git::fmt::Error),
-    /// Repository error.
-    #[error(transparent)]
-    Repository(#[from] radicle::storage::RepositoryError),
-    /// Fetch error.
-    #[error(transparent)]
-    Fetch(#[from] fetch::Error),
-    /// Push error.
-    #[error(transparent)]
-    Push(#[from] push::Error),
-    /// List error.
-    #[error(transparent)]
-    List(#[from] list::Error),
-}
-
-#[derive(Debug, Default, Clone)]
-pub struct Options {
-    /// Don't sync after push.
-    no_sync: bool,
-    /// Sync debugging.
-    sync_debug: bool,
-    /// Enable hints.
-    hints: bool,
-    /// Open patch in draft mode.
-    draft: bool,
-    /// Patch base to use, when opening or updating a patch.
-    base: Option<Rev>,
-    /// Patch message.
-    message: cli::patch::Message,
-}
-
-/// Run the radicle remote helper using the given profile.
-pub fn run(profile: radicle::Profile) -> Result<(), Error> {
-    // Since we're going to be writing user output to `stderr`, make sure the paint
-    // module is aware of that.
-    cli::Paint::set_terminal(io::stderr());
-
-    let (remote, url): (Option<git::RefString>, Url) = {
-        let args = env::args().skip(1).take(2).collect::<Vec<_>>();
-
-        match args.as_slice() {
-            [url] => (None, url.parse()?),
-            [remote, url] => (git::RefString::try_from(remote.as_str()).ok(), url.parse()?),
-
-            _ => {
-                return Err(Error::InvalidArguments(args));
-            }
-        }
-    };
-
-    let stored = profile.storage.repository_mut(url.repo)?;
-    if stored.is_empty()? {
-        return Err(Error::RepositoryNotFound(stored.path().to_path_buf()));
-    }
-
-    // `GIT_DIR` is expected to be set by Git tooling, and points to the working copy.
-    let working = env::var("GIT_DIR")
-        .map(PathBuf::from)
-        .map_err(|_| Error::NoGitDir)?;
-    // Whether we should output debug logs.
-    let debug = radicle::profile::env::debug();
-
-    let stdin = io::stdin();
-    let mut line = String::new();
-    let mut opts = Options::default();
-
-    if let Err(e) = radicle::io::set_file_limit(4096) {
-        if debug {
-            eprintln!("git-remote-rad: unable to set open file limit: {e}");
-        }
-    }
-
-    loop {
-        let tokens = read_line(&stdin, &mut line)?;
-
-        if debug {
-            eprintln!("git-remote-rad: {:?}", &tokens);
-        }
-
-        match tokens.as_slice() {
-            ["capabilities"] => {
-                println!("option");
-                println!("push"); // Implies `list` command.
-                println!("fetch");
-                println!();
-            }
-            ["option", "verbosity"] => {
-                println!("ok");
-            }
-            ["option", "push-option", args @ ..] => {
-                // Nb. Git documentation says that we can print `error <msg>` or `unsupported`
-                // for options that are not supported, but this results in Git saying that
-                // "push-option" itself is an unsupported option, which is not helpful or correct.
-                // Hence, we just exit with an error in this case.
-                push_option(args, &mut opts)?;
-                println!("ok");
-            }
-            ["option", "progress", ..] => {
-                println!("unsupported");
-            }
-            ["option", ..] => {
-                println!("unsupported");
-            }
-            ["fetch", oid, refstr] => {
-                let oid = git::Oid::from_str(oid)?;
-                let refstr = git::RefString::try_from(*refstr)?;
-
-                // N.b. `working` is the `.git` folder and `fetch::run`
-                // requires the working directory.
-                let working = working.canonicalize()?;
-                let working = working.parent().ok_or_else(|| Error::NoWorkingCopy {
-                    path: working.clone(),
-                })?;
-
-                return fetch::run(vec![(oid, refstr)], working, stored, &stdin)
-                    .map_err(Error::from);
-            }
-            ["push", refspec] => {
-                return push::run(
-                    vec![refspec.to_string()],
-                    &working,
-                    // N.b. assume the default remote if there was no remote
-                    remote.unwrap_or((*radicle::rad::REMOTE_NAME).clone()),
-                    url,
-                    &stored,
-                    &profile,
-                    &stdin,
-                    opts,
-                )
-                .map_err(Error::from);
-            }
-            ["list"] => {
-                list::for_fetch(&url, &profile, &stored)?;
-            }
-            ["list", "for-push"] => {
-                list::for_push(&profile, &stored)?;
-            }
-            [] => {
-                return Ok(());
-            }
-            _ => {
-                return Err(Error::InvalidCommand(line.trim().to_owned()));
-            }
-        }
-    }
-}
-
-/// Parse a single push option. Returns `Ok` if it was successful.
-/// Note that some push options can contain spaces, eg. `patch.message="Hello World!"`,
-/// hence the arguments are passed as a slice.
-fn push_option(args: &[&str], opts: &mut Options) -> Result<(), Error> {
-    match args {
-        ["hints"] => opts.hints = true,
-        ["sync"] => opts.no_sync = false,
-        ["sync.debug"] => opts.sync_debug = true,
-        ["no-sync"] => opts.no_sync = true,
-        ["patch.draft"] => opts.draft = true,
-        _ => {
-            let args = args.join(" ");
-
-            if let Some((key, val)) = args.split_once('=') {
-                match key {
-                    "patch.message" => {
-                        opts.message.append(val);
-                    }
-                    "patch.base" => {
-                        let base =
-                            cli::args::rev(&val.into()).map_err(|e| Error::Base(e.into()))?;
-                        opts.base = Some(base);
-                    }
-                    other => {
-                        return Err(Error::UnsupportedPushOption(other.to_owned()));
-                    }
-                }
-            } else {
-                return Err(Error::UnsupportedPushOption(args.to_owned()));
-            }
-        }
-    }
-    Ok(())
-}
-
-/// Read one line from stdin, and split it into tokens.
-pub(crate) fn read_line<'a>(stdin: &io::Stdin, line: &'a mut String) -> io::Result<Vec<&'a str>> {
-    line.clear();
-
-    let read = stdin.read_line(line)?;
-    if read == 0 {
-        return Ok(vec![]);
-    }
-    let line = line.trim();
-    let tokens = line.split(' ').filter(|t| !t.is_empty()).collect();
-
-    Ok(tokens)
-}
-
-/// Write a hint to the user.
-pub(crate) fn hint(s: impl fmt::Display) {
-    eprintln!("{}", cli::format::hint(format!("hint: {s}")));
-}
-
-/// Write a warning to the user.
-pub(crate) fn warn(s: impl fmt::Display) {
-    eprintln!("{}", cli::format::hint(format!("warn: {s}")));
-}
diff --git a/radicle-remote-helper/src/list.rs b/radicle-remote-helper/src/list.rs
deleted file mode 100644
index fd8c35d33..000000000
--- a/radicle-remote-helper/src/list.rs
+++ /dev/null
@@ -1,103 +0,0 @@
-use radicle::patch::cache::Patches as _;
-use radicle::profile;
-use thiserror::Error;
-
-use radicle::cob;
-use radicle::git;
-use radicle::storage::git::transport::local::Url;
-use radicle::storage::ReadRepository;
-use radicle::Profile;
-
-#[derive(Debug, Error)]
-pub enum Error {
-    /// Storage error.
-    #[error(transparent)]
-    Storage(#[from] radicle::storage::Error),
-    /// Identity error.
-    #[error(transparent)]
-    Identity(#[from] radicle::identity::DocError),
-    /// Git error.
-    #[error(transparent)]
-    Git(#[from] radicle::git::ext::Error),
-    /// Profile error.
-    #[error(transparent)]
-    Profile(#[from] profile::Error),
-    /// COB store error.
-    #[error(transparent)]
-    CobStore(#[from] cob::store::Error),
-    /// Patch COB cache error.
-    #[error(transparent)]
-    PatchCache(#[from] radicle::patch::cache::Error),
-    /// General repository error.
-    #[error(transparent)]
-    Repository(#[from] radicle::storage::RepositoryError),
-}
-
-/// List refs for fetching (`git fetch` and `git ls-remote`).
-pub fn for_fetch<R: ReadRepository + cob::Store + 'static>(
-    url: &Url,
-    profile: &Profile,
-    stored: &R,
-) -> Result<(), Error> {
-    if let Some(namespace) = url.namespace {
-        // Listing namespaced refs.
-        for (name, oid) in stored.references_of(&namespace)? {
-            println!("{oid} {name}");
-        }
-    } else {
-        // Listing canonical refs.
-        // We skip over `refs/rad/*`, since those are not meant to be fetched into a working copy.
-        for glob in [
-            git::refspec::pattern!("refs/heads/*"),
-            git::refspec::pattern!("refs/tags/*"),
-        ] {
-            for (name, oid) in stored.references_glob(&glob)? {
-                println!("{oid} {name}");
-            }
-        }
-        // List the patch refs, but don't abort if there's an error, as this would break
-        // all fetch behavior. Instead, just output an error to the user.
-        if let Err(e) = patch_refs(profile, stored) {
-            eprintln!("remote: error listing patch refs: {e}");
-        }
-    }
-    println!();
-
-    Ok(())
-}
-
-/// List refs for pushing (`git push`).
-pub fn for_push<R: ReadRepository>(profile: &Profile, stored: &R) -> Result<(), Error> {
-    // Only our own refs can be pushed to.
-    for (name, oid) in stored.references_of(profile.id())? {
-        // Only branches and tags can be pushed to.
-        if name.starts_with(git::refname!("refs/heads").as_str())
-            || name.starts_with(git::refname!("refs/tags").as_str())
-        {
-            println!("{oid} {name}");
-        }
-    }
-    println!();
-
-    Ok(())
-}
-
-/// List canonical patch references. These are magic refs that can be used to pull patch updates.
-fn patch_refs<R: ReadRepository + cob::Store + 'static>(
-    profile: &Profile,
-    stored: &R,
-) -> Result<(), Error> {
-    let patches = profile.patches(stored)?;
-    for patch in patches.list()? {
-        let Ok((id, patch)) = patch else {
-            // Ignore patches that fail to decode.
-            continue;
-        };
-        let head = patch.head();
-
-        if patch.is_open() && stored.commit(*head).is_ok() {
-            println!("{} {}", patch.head(), git::refs::patch(&id));
-        }
-    }
-    Ok(())
-}
diff --git a/radicle-remote-helper/src/push.rs b/radicle-remote-helper/src/push.rs
deleted file mode 100644
index 6bc65723b..000000000
--- a/radicle-remote-helper/src/push.rs
+++ /dev/null
@@ -1,836 +0,0 @@
-#![allow(clippy::too_many_arguments)]
-use std::collections::HashMap;
-use std::io::IsTerminal;
-use std::path::Path;
-use std::str::FromStr;
-use std::{assert_eq, io};
-
-use thiserror::Error;
-
-use radicle::cob;
-use radicle::cob::object::ParseObjectId;
-use radicle::cob::patch;
-use radicle::cob::patch::cache::Patches as _;
-use radicle::crypto::Signer;
-use radicle::explorer::ExplorerResource;
-use radicle::git::canonical;
-use radicle::git::canonical::Canonical;
-use radicle::identity::Did;
-use radicle::node;
-use radicle::node::{Handle, NodeId};
-use radicle::storage;
-use radicle::storage::git::transport::local::Url;
-use radicle::storage::{ReadRepository, SignRepository as _, WriteRepository};
-use radicle::Profile;
-use radicle::{git, rad};
-use radicle_cli as cli;
-use radicle_cli::terminal as term;
-
-use crate::{hint, read_line, warn, Options};
-
-#[derive(Debug, Error)]
-pub enum Error {
-    /// Public key doesn't match the remote namespace we're pushing to.
-    #[error("cannot push to remote namespace owned by {0}")]
-    KeyMismatch(Did),
-    /// No public key is given
-    #[error("no public key given as a remote namespace, perhaps you are attempting to push to restricted refs")]
-    NoKey,
-    /// Head being pushed diverges from canonical head.
-    #[error("refusing to update branch to commit that is not a descendant of canonical head")]
-    HeadsDiverge(git::Oid, git::Oid),
-    /// User tried to delete the canonical branch.
-    #[error("refusing to delete default branch ref '{0}'")]
-    DeleteForbidden(git::RefString),
-    /// Identity document error.
-    #[error("doc: {0}")]
-    Doc(#[from] radicle::identity::doc::DocError),
-    /// Identity payload error.
-    #[error("payload: {0}")]
-    Payload(#[from] radicle::identity::doc::PayloadError),
-    /// Invalid command received.
-    #[error("invalid command `{0}`")]
-    InvalidCommand(String),
-    /// I/O error.
-    #[error("i/o error: {0}")]
-    Io(#[from] io::Error),
-    /// A command exited with an error code.
-    #[error("command '{0}' failed with status {1}")]
-    CommandFailed(String, i32),
-    /// Invalid reference name.
-    #[error("invalid ref: {0}")]
-    InvalidRef(#[from] radicle::git::fmt::Error),
-    /// Invalid reference name.
-    #[error("invalid qualified ref: {0}")]
-    InvalidQualifiedRef(git::RefString),
-    /// Git error.
-    #[error("git: {0}")]
-    Git(#[from] git::raw::Error),
-    /// Git extension error.
-    #[error("git: {0}")]
-    GitExt(#[from] git::ext::Error),
-    /// Storage error.
-    #[error(transparent)]
-    Storage(#[from] radicle::storage::Error),
-    /// Profile error.
-    #[error(transparent)]
-    Profile(#[from] radicle::profile::Error),
-    /// Parse error for object IDs.
-    #[error(transparent)]
-    ParseObjectId(#[from] ParseObjectId),
-    /// Patch COB error.
-    #[error(transparent)]
-    Patch(#[from] radicle::cob::patch::Error),
-    /// Error from COB patch cache.
-    #[error(transparent)]
-    PatchCache(#[from] patch::cache::Error),
-    /// Patch edit message error.
-    #[error(transparent)]
-    PatchEdit(#[from] term::patch::Error),
-    /// Policy config error.
-    #[error("node policy: {0}")]
-    Policy(#[from] node::policy::config::Error),
-    /// Patch not found in store.
-    #[error("patch `{0}` not found")]
-    NotFound(patch::PatchId),
-    /// Patch is empty.
-    #[error("patch commits are already included in the base branch")]
-    EmptyPatch,
-    /// Missing canonical head.
-    #[error("the canonical head is missing from your working copy; please pull before pushing")]
-    MissingCanonicalHead(git::Oid),
-    /// COB store error.
-    #[error(transparent)]
-    Cob(#[from] radicle::cob::store::Error),
-    /// General repository error.
-    #[error(transparent)]
-    Repository(#[from] radicle::storage::RepositoryError),
-    /// Quorum error.
-    #[error(transparent)]
-    Quorum(#[from] radicle::git::canonical::QuorumError),
-}
-
-/// Push command.
-enum Command {
-    /// Update ref.
-    Push(git::Refspec<git::RefString, git::RefString>),
-    /// Delete ref.
-    Delete(git::RefString),
-}
-
-impl Command {
-    /// Return the destination refname.
-    fn dst(&self) -> &git::RefStr {
-        match self {
-            Self::Push(rs) => rs.dst.as_refstr(),
-            Self::Delete(rs) => rs,
-        }
-    }
-}
-
-impl FromStr for Command {
-    type Err = git::ext::ref_format::Error;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let Some((src, dst)) = s.split_once(':') else {
-            return Err(git::ext::ref_format::Error::Empty);
-        };
-        let dst = git::RefString::try_from(dst)?;
-
-        if src.is_empty() {
-            Ok(Self::Delete(dst))
-        } else {
-            let (src, force) = if let Some(stripped) = src.strip_prefix('+') {
-                (stripped, true)
-            } else {
-                (src, false)
-            };
-            let src = git::RefString::try_from(src)?;
-
-            Ok(Self::Push(git::Refspec { src, dst, force }))
-        }
-    }
-}
-
-/// Run a git push command.
-pub fn run(
-    mut specs: Vec<String>,
-    working: &Path,
-    remote: git::RefString,
-    url: Url,
-    stored: &storage::git::Repository,
-    profile: &Profile,
-    stdin: &io::Stdin,
-    opts: Options,
-) -> Result<(), Error> {
-    // Don't allow push if either of these conditions is true:
-    //
-    // 1. Our key is not in ssh-agent, which means we won't be able to sign the refs.
-    // 2. Our key is not the one loaded in the profile, which means that the signed refs
-    //    won't match the remote we're pushing to.
-    // 3. The URL namespace is not set.
-    let nid = url.namespace.ok_or(Error::NoKey).and_then(|ns| {
-        (profile.public_key == ns)
-            .then_some(ns)
-            .ok_or(Error::KeyMismatch(ns.into()))
-    })?;
-    let signer = profile.signer()?;
-    let mut line = String::new();
-    let mut ok = HashMap::new();
-    let hints = opts.hints || profile.hints();
-
-    assert_eq!(signer.public_key(), &nid);
-
-    // Read all the `push` lines.
-    loop {
-        let tokens = read_line(stdin, &mut line)?;
-        match tokens.as_slice() {
-            ["push", spec] => {
-                specs.push(spec.to_string());
-            }
-            // An empty line means end of input.
-            [] => break,
-            // Once the first `push` command is received, we don't expect anything else.
-            _ => return Err(Error::InvalidCommand(line.trim().to_owned())),
-        }
-    }
-    let delegates = stored.delegates()?;
-
-    // For each refspec, push a ref or delete a ref.
-    for spec in specs {
-        let Ok(cmd) = Command::from_str(&spec) else {
-            return Err(Error::InvalidCommand(format!("push {spec}")));
-        };
-        let result = match &cmd {
-            Command::Delete(dst) => {
-                // Delete refs.
-                let refname = nid.to_namespace().join(dst);
-                let (canonical_ref, _) = &stored.head()?;
-
-                if *dst == canonical_ref.to_ref_string() && delegates.contains(&Did::from(nid)) {
-                    return Err(Error::DeleteForbidden(dst.clone()));
-                }
-                stored
-                    .raw()
-                    .find_reference(&refname)
-                    .and_then(|mut r| r.delete())
-                    .map(|_| None)
-                    .map_err(Error::from)
-            }
-            Command::Push(git::Refspec { src, dst, force }) => {
-                let working = git::raw::Repository::open(working)?;
-
-                if dst == &*rad::PATCHES_REFNAME {
-                    patch_open(
-                        src,
-                        &remote,
-                        &nid,
-                        &working,
-                        stored,
-                        profile.patches_mut(stored)?,
-                        &signer,
-                        profile,
-                        opts.clone(),
-                    )
-                } else {
-                    let dst = git::Qualified::from_refstr(dst)
-                        .ok_or_else(|| Error::InvalidQualifiedRef(dst.clone()))?;
-
-                    if let Some(oid) = dst.strip_prefix(git::refname!("refs/heads/patches")) {
-                        let oid = git::Oid::from_str(oid)?;
-
-                        patch_update(
-                            src,
-                            &dst,
-                            *force,
-                            &oid,
-                            &nid,
-                            &working,
-                            stored,
-                            profile.patches_mut(stored)?,
-                            &signer,
-                            opts.clone(),
-                        )
-                    } else {
-                        let identity = stored.identity()?;
-                        let project = identity.project()?;
-                        let canonical_ref = git::refs::branch(project.default_branch());
-                        let me = Did::from(nid);
-
-                        // If we're trying to update the canonical head, make sure
-                        // we don't diverge from the current head. This only applies
-                        // to repos with more than one delegate.
-                        //
-                        // Note that we *do* allow rolling back to a previous commit on the
-                        // canonical branch.
-                        if dst == canonical_ref && delegates.contains(&me) && delegates.len() > 1 {
-                            let head = working.find_reference(src.as_str())?;
-                            let head = head.peel_to_commit()?.id();
-                            let mut canonical =
-                                Canonical::default_branch(stored, &project, &identity.delegates)?;
-                            let converges = canonical::converges(
-                                canonical
-                                    .tips()
-                                    .filter_map(|(did, tip)| (*did != me).then_some(tip)),
-                                head.into(),
-                                &working,
-                            )?;
-                            if converges {
-                                canonical.modify_vote(me, head.into());
-                            }
-
-                            match canonical.quorum(identity.threshold, &working) {
-                                Ok(canonical_oid) => {
-                                    // Canonical head is an ancestor of head.
-                                    let is_ff = head == *canonical_oid
-                                        || working.graph_descendant_of(head, *canonical_oid)?;
-
-                                    if !is_ff && !converges {
-                                        if hints {
-                                            hint(
-                                                "you are attempting to push a commit that would cause \
-                                                 your upstream to diverge from the canonical head",
-                                            );
-                                            hint(
-                                                "to integrate the remote changes, run `git pull --rebase` \
-                                                 and try again",
-                                            );
-                                        }
-                                        return Err(Error::HeadsDiverge(
-                                            head.into(),
-                                            canonical_oid,
-                                        ));
-                                    }
-                                }
-                                Err(canonical::QuorumError::NoQuorum) => {
-                                    warn(format!("no quorum was found for `{canonical_ref}`"));
-                                    warn("it is recommended to find a commit to agree upon");
-                                }
-                                Err(e) => return Err(e.into()),
-                            };
-                        }
-                        push(
-                            src,
-                            &dst,
-                            *force,
-                            &nid,
-                            &working,
-                            stored,
-                            profile.patches_mut(stored)?,
-                            &signer,
-                        )
-                    }
-                }
-            }
-        };
-
-        match result {
-            // Let Git tooling know that this ref has been pushed.
-            Ok(resource) => {
-                println!("ok {}", cmd.dst());
-                ok.insert(spec, resource);
-            }
-            // Let Git tooling know that there was an error pushing the ref.
-            Err(e) => println!("error {} {e}", cmd.dst()),
-        }
-    }
-
-    // Sign refs and sync if at least one ref pushed successfully.
-    if !ok.is_empty() {
-        let _ = stored.sign_refs(&signer)?;
-
-        // N.b. if an error occurs then there may be no quorum
-        if let Ok(head) = stored.set_head() {
-            if head.is_updated() {
-                eprintln!(
-                    "{} Canonical head updated to {}",
-                    term::format::positive("✓"),
-                    term::format::secondary(head.new),
-                );
-            }
-        };
-
-        if !opts.no_sync {
-            if profile.policies()?.is_seeding(&stored.id)? {
-                // Connect to local node and announce refs to the network.
-                // If our node is not running, we simply skip this step, as the
-                // refs will be announced eventually, when the node restarts.
-                let node = radicle::Node::new(profile.socket());
-                if node.is_running() {
-                    // Nb. allow this to fail. The push to local storage was still successful.
-                    sync(stored, ok.into_values().flatten(), opts, node, profile).ok();
-                } else if hints {
-                    hint("offline push, your node is not running");
-                    hint("to sync with the network, run `rad node start`");
-                }
-            } else if hints {
-                hint("you are not seeding this repository; skipping sync");
-            }
-        }
-    }
-
-    // Done.
-    println!();
-
-    Ok(())
-}
-
-/// Open a new patch.
-fn patch_open<G: Signer>(
-    src: &git::RefStr,
-    upstream: &git::RefString,
-    nid: &NodeId,
-    working: &git::raw::Repository,
-    stored: &storage::git::Repository,
-    mut patches: patch::Cache<
-        patch::Patches<'_, storage::git::Repository>,
-        cob::cache::StoreWriter,
-    >,
-    signer: &G,
-    profile: &Profile,
-    opts: Options,
-) -> Result<Option<ExplorerResource>, Error> {
-    let reference = working.find_reference(src.as_str())?;
-    let commit = reference.peel_to_commit()?;
-    let dst = git::refs::storage::staging::patch(nid, commit.id());
-
-    // Before creating the patch, we must push the associated git objects to storage.
-    // Unfortunately, we don't have an easy way to transfer the missing objects without
-    // creating a temporary reference on the remote. The temporary reference is deleted
-    // once the patch is open, or in case of error.
-    //
-    // In case the reference is not properly deleted, the next attempt to open a patch should
-    // not fail, since the reference will already exist with the correct OID.
-    push_ref(src, &dst, false, working, stored.raw())?;
-
-    let (_, target) = stored.canonical_head()?;
-    let head = commit.id().into();
-    let base = if let Some(base) = opts.base {
-        base.resolve(working)?
-    } else {
-        stored.merge_base(&target, &head)?
-    };
-    if base == head {
-        return Err(Error::EmptyPatch);
-    }
-    let (title, description) =
-        term::patch::get_create_message(opts.message, &stored.backend, &base, &head)?;
-
-    let patch = if opts.draft {
-        patches.draft(
-            &title,
-            &description,
-            patch::MergeTarget::default(),
-            base,
-            commit.id(),
-            &[],
-            signer,
-        )
-    } else {
-        patches.create(
-            &title,
-            &description,
-            patch::MergeTarget::default(),
-            base,
-            commit.id(),
-            &[],
-            signer,
-        )
-    };
-    let result = match patch {
-        Ok(patch) => {
-            let action = if patch.is_draft() {
-                "drafted"
-            } else {
-                "opened"
-            };
-            let patch = patch.id;
-
-            eprintln!(
-                "{} Patch {} {action}",
-                term::format::positive("✓"),
-                term::format::tertiary(patch),
-            );
-
-            // Create long-lived patch head reference, now that we know the Patch ID.
-            //
-            //  refs/namespaces/<nid>/refs/heads/patches/<patch-id>
-            //
-            let refname = git::refs::patch(&patch).with_namespace(nid.into());
-            let _ = stored.raw().reference(
-                refname.as_str(),
-                commit.id(),
-                true,
-                "Create reference for patch head",
-            )?;
-
-            // Setup current branch so that pushing updates the patch.
-            if let Some(branch) =
-                rad::setup_patch_upstream(&patch, commit.id().into(), working, upstream, false)?
-            {
-                if let Some(name) = branch.name()? {
-                    if profile.hints() {
-                        // Remove the remote portion of the name, i.e.
-                        // rad/patches/deadbeef -> patches/deadbeef
-                        let name = name.split('/').skip(1).collect::<Vec<_>>().join("/");
-                        hint(format!(
-                            "to update, run `git push` or `git push rad -f HEAD:{name}`"
-                        ));
-                    }
-                }
-            }
-            Ok(Some(ExplorerResource::Patch { id: patch }))
-        }
-        Err(e) => Err(e),
-    };
-
-    // Delete short-lived patch head reference.
-    stored
-        .raw()
-        .find_reference(&dst)
-        .map(|mut r| r.delete())
-        .ok();
-
-    result.map_err(Error::from)
-}
-
-/// Update an existing patch.
-#[allow(clippy::too_many_arguments)]
-fn patch_update<G: Signer>(
-    src: &git::RefStr,
-    dst: &git::Qualified,
-    force: bool,
-    oid: &git::Oid,
-    nid: &NodeId,
-    working: &git::raw::Repository,
-    stored: &storage::git::Repository,
-    mut patches: patch::Cache<
-        patch::Patches<'_, storage::git::Repository>,
-        cob::cache::StoreWriter,
-    >,
-    signer: &G,
-    opts: Options,
-) -> Result<Option<ExplorerResource>, Error> {
-    let reference = working.find_reference(src.as_str())?;
-    let commit = reference.peel_to_commit()?;
-    let patch_id = radicle::cob::ObjectId::from(oid);
-    let dst = dst.with_namespace(nid.into());
-
-    push_ref(src, &dst, force, working, stored.raw())?;
-
-    let Ok(mut patch) = patches.get_mut(&patch_id) else {
-        return Err(Error::NotFound(patch_id));
-    };
-
-    // Don't update patch if it already has a revision matching this commit.
-    if patch.revisions().any(|(_, r)| *r.head() == commit.id()) {
-        return Ok(None);
-    }
-    let message = term::patch::get_update_message(
-        opts.message,
-        &stored.backend,
-        patch.latest().1,
-        &commit.id().into(),
-    )?;
-
-    let (_, target) = stored.canonical_head()?;
-    let head: git::Oid = commit.id().into();
-    let base = if let Some(base) = opts.base {
-        base.resolve(working)?
-    } else {
-        stored.merge_base(&target, &head)?
-    };
-    let revision = patch.update(message, base, head, signer)?;
-
-    eprintln!(
-        "{} Patch {} updated to revision {}",
-        term::format::positive("✓"),
-        term::format::tertiary(term::format::cob(&patch_id)),
-        term::format::dim(revision)
-    );
-
-    // In this case, the patch was already merged via git, and pushed to storage.
-    // To handle this situation, we simply update the patch state to "merged".
-    //
-    // This can happen if for eg. a patch commit is amended, the patch branch is merged
-    // and pushed, but the patch hasn't yet been updated. On push to the patch branch,
-    // it'll seem like the patch is "empty", because the changes are already in the base branch.
-    if base == head && patch.is_open() {
-        patch_merge(patch, revision, head, working, signer)?;
-    }
-
-    Ok(Some(ExplorerResource::Patch { id: patch_id }))
-}
-
-fn push<G: Signer>(
-    src: &git::RefStr,
-    dst: &git::Qualified,
-    force: bool,
-    nid: &NodeId,
-    working: &git::raw::Repository,
-    stored: &storage::git::Repository,
-    mut patches: patch::Cache<
-        patch::Patches<'_, storage::git::Repository>,
-        cob::cache::StoreWriter,
-    >,
-    signer: &G,
-) -> Result<Option<ExplorerResource>, Error> {
-    let head = match working.find_reference(src.as_str()) {
-        Ok(obj) => obj.peel_to_commit()?,
-        Err(e) => {
-            if let Ok(oid) = git::Oid::from_str(src.as_str()) {
-                working.find_commit(oid.into())?
-            } else {
-                return Err(e.into());
-            }
-        }
-    }
-    .id();
-
-    let dst = dst.with_namespace(nid.into());
-    // It's ok for the destination reference to be unknown, eg. when pushing a new branch.
-    let old = stored.backend.find_reference(dst.as_str()).ok();
-
-    push_ref(src, &dst, force, working, stored.raw())?;
-
-    if let Some(old) = old {
-        let proj = stored.project()?;
-        let master = &*git::Qualified::from(git::lit::refs_heads(proj.default_branch()));
-
-        // If we're pushing to the project's default branch, we want to see if any patches got
-        // merged or reverted, and if so, update the patch COB.
-        if &*dst.strip_namespace() == master {
-            let old = old.peel_to_commit()?.id();
-            // Only delegates affect the merge state of the COB.
-            if stored.delegates()?.contains(&nid.into()) {
-                patch_revert_all(
-                    old.into(),
-                    head.into(),
-                    &stored.backend,
-                    &mut patches,
-                    signer,
-                )?;
-                patch_merge_all(old.into(), head.into(), working, &mut patches, signer)?;
-            }
-        }
-    }
-    Ok(Some(ExplorerResource::Tree { oid: head.into() }))
-}
-
-/// Revert all patches that are no longer included in the base branch.
-fn patch_revert_all<G: Signer>(
-    old: git::Oid,
-    new: git::Oid,
-    stored: &git::raw::Repository,
-    patches: &mut patch::Cache<
-        patch::Patches<'_, storage::git::Repository>,
-        cob::cache::StoreWriter,
-    >,
-    _signer: &G,
-) -> Result<(), Error> {
-    // Find all commits reachable from the old OID but not from the new OID.
-    let mut revwalk = stored.revwalk()?;
-    revwalk.push(*old)?;
-    revwalk.hide(*new)?;
-
-    // List of commits that have been dropped.
-    let dropped = revwalk
-        .map(|r| r.map(git::Oid::from))
-        .collect::<Result<Vec<git::Oid>, _>>()?;
-    if dropped.is_empty() {
-        return Ok(());
-    }
-
-    // Get the list of merged patches.
-    let merged = patches
-        .merged()?
-        // Skip patches that failed to load.
-        .filter_map(|patch| patch.ok())
-        .collect::<Vec<_>>();
-
-    for (id, patch) in merged {
-        let revisions = patch
-            .revisions()
-            .map(|(id, r)| (id, r.head()))
-            .collect::<Vec<_>>();
-
-        for commit in &dropped {
-            if let Some((revision_id, _)) = revisions.iter().find(|(_, head)| commit == head) {
-                // Simply refreshing the cache entry will pick up on the fact that this patch
-                // is no longer merged in the canonical branch.
-                match patches.write(&id) {
-                    Ok(()) => {
-                        eprintln!(
-                            "{} Patch {} reverted at revision {}",
-                            term::format::yellow("!"),
-                            term::format::tertiary(&id),
-                            term::format::dim(term::format::oid(*revision_id)),
-                        );
-                    }
-                    Err(e) => {
-                        eprintln!("{} Error reverting patch {id}: {e}", term::ERROR_PREFIX);
-                    }
-                }
-                break;
-            }
-        }
-    }
-
-    Ok(())
-}
-
-/// Merge all patches that have been included in the base branch.
-fn patch_merge_all<G: Signer>(
-    old: git::Oid,
-    new: git::Oid,
-    working: &git::raw::Repository,
-    patches: &mut patch::Cache<
-        patch::Patches<'_, storage::git::Repository>,
-        cob::cache::StoreWriter,
-    >,
-    signer: &G,
-) -> Result<(), Error> {
-    let mut revwalk = working.revwalk()?;
-    revwalk.push_range(&format!("{old}..{new}"))?;
-
-    // These commits are ordered by children first and then parents.
-    let commits = revwalk
-        .map(|r| r.map(git::Oid::from))
-        .collect::<Result<Vec<git::Oid>, _>>()?;
-    if commits.is_empty() {
-        return Ok(());
-    }
-
-    let open = patches
-        .opened()?
-        .chain(patches.drafted()?)
-        // Skip patches that failed to load.
-        .filter_map(|patch| patch.ok())
-        .collect::<Vec<_>>();
-    for (id, patch) in open {
-        // Later revisions are more likely to be merged, so we build the list backwards.
-        let revisions = patch
-            .revisions()
-            .rev()
-            .map(|(id, r)| (id, r.head()))
-            .collect::<Vec<_>>();
-
-        // Try to find a revision to merge. Favor revisions that match the more recent commits.
-        // It's possible for more than one revision to be merged by this push, so we pick the
-        // revision that is closest to the tip of the commit chain we're pushing.
-        for commit in &commits {
-            if let Some((revision_id, _)) = revisions.iter().find(|(_, head)| commit == head) {
-                let patch = patch::PatchMut::new(id, patch, patches);
-                patch_merge(patch, *revision_id, new, working, signer)?;
-
-                break;
-            }
-        }
-    }
-    Ok(())
-}
-
-fn patch_merge<C: cob::cache::Update<patch::Patch>, G: Signer>(
-    mut patch: patch::PatchMut<storage::git::Repository, C>,
-    revision: patch::RevisionId,
-    commit: git::Oid,
-    working: &git::raw::Repository,
-    signer: &G,
-) -> Result<(), Error> {
-    let (latest, _) = patch.latest();
-    let merged = patch.merge(revision, commit, signer)?;
-
-    if revision == latest {
-        eprintln!(
-            "{} Patch {} merged",
-            term::format::positive("✓"),
-            term::format::tertiary(merged.patch)
-        );
-    } else {
-        eprintln!(
-            "{} Patch {} merged at revision {}",
-            term::format::positive("✓"),
-            term::format::tertiary(merged.patch),
-            term::format::dim(term::format::oid(revision)),
-        );
-    }
-
-    // Delete patch references that were created when the patch was opened.
-    // Note that we don't return an error if we can't delete the refs, since it's
-    // not critical.
-    merged.cleanup(working, signer).ok();
-
-    Ok(())
-}
-
-/// Push a single reference to storage.
-fn push_ref(
-    src: &git::RefStr,
-    dst: &git::Namespaced,
-    force: bool,
-    working: &git::raw::Repository,
-    stored: &git::raw::Repository,
-) -> Result<(), Error> {
-    let mut remote = working.remote_anonymous(&git::url::File::new(stored.path()).to_string())?;
-    let refspec = git::Refspec { src, dst, force };
-
-    // Nb. The *force* indicator (`+`) is processed by Git tooling before we even reach this code.
-    // This happens during the `list for-push` phase.
-    remote.push(&[refspec.to_string().as_str()], None)?;
-
-    Ok(())
-}
-
-/// Sync with the network.
-fn sync(
-    repo: &storage::git::Repository,
-    updated: impl Iterator<Item = ExplorerResource>,
-    opts: Options,
-    mut node: radicle::Node,
-    profile: &Profile,
-) -> Result<(), cli::node::SyncError> {
-    let progress = if io::stderr().is_terminal() {
-        cli::node::SyncWriter::Stderr(io::stderr())
-    } else {
-        cli::node::SyncWriter::Sink
-    };
-    let result = cli::node::announce(
-        repo,
-        cli::node::SyncSettings::default().with_profile(profile),
-        cli::node::SyncReporting {
-            progress,
-            completion: cli::node::SyncWriter::Stderr(io::stderr()),
-            debug: opts.sync_debug,
-        },
-        &mut node,
-        profile,
-    )?;
-
-    let mut urls = Vec::new();
-
-    for seed in profile.config.preferred_seeds.iter() {
-        if result.synced(&seed.id).is_some() {
-            for resource in updated {
-                let url = profile
-                    .config
-                    .public_explorer
-                    .url(seed.addr.host.clone(), repo.id)
-                    .resource(resource);
-
-                urls.push(url);
-            }
-            break;
-        }
-    }
-
-    // Print URLs to the updated resources.
-    if !urls.is_empty() {
-        eprintln!();
-        for url in urls {
-            eprintln!("  {}", term::format::dim(url));
-        }
-        eprintln!();
-    }
-
-    Ok(())
-}
diff --git a/radicle-signals/Cargo.toml b/radicle-signals/Cargo.toml
deleted file mode 100644
index 968ac0e35..000000000
--- a/radicle-signals/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-name = "radicle-signals"
-description = "Radicle signal handling"
-homepage = "https://radicle.xyz"
-repository = "https://app.radicle.xyz/seeds/seed.radicle.xyz/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5"
-license = "MIT OR Apache-2.0"
-edition = "2021"
-version = "0.11.0"
-
-[dependencies]
-crossbeam-channel = { version = "0.5.6" }
-libc = { version = "0.2" }
-signals_receipts = { version = "0.2.0", features = ["channel_notify_facility"] }
diff --git a/radicle-signals/src/lib.rs b/radicle-signals/src/lib.rs
deleted file mode 100644
index f0e474c07..000000000
--- a/radicle-signals/src/lib.rs
+++ /dev/null
@@ -1,131 +0,0 @@
-use std::io;
-
-use crossbeam_channel as chan;
-use signals_receipts::channel_notify_facility::{
-    self, FinishError, InstallError, SendError, SignalsChannel as _, UninstallError,
-};
-use signals_receipts::SignalNumber;
-
-use crate::channel_notify_facility_premade::SignalsChannel;
-
-/// Operating system signal.
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub enum Signal {
-    /// `SIGINT`.
-    Interrupt,
-    /// `SIGTERM`.
-    Terminate,
-    /// `SIGHUP`.
-    Hangup,
-    /// `SIGWINCH`.
-    WindowChanged,
-}
-
-impl TryFrom<SignalNumber> for Signal {
-    type Error = SignalNumber;
-
-    fn try_from(value: SignalNumber) -> Result<Self, Self::Error> {
-        match value {
-            libc::SIGTERM => Ok(Self::Terminate),
-            libc::SIGINT => Ok(Self::Interrupt),
-            libc::SIGWINCH => Ok(Self::WindowChanged),
-            libc::SIGHUP => Ok(Self::Hangup),
-            _ => Err(value),
-        }
-    }
-}
-
-// The signals of interest to handle.
-signals_receipts::channel_notify_facility! {
-    SIGINT
-    SIGTERM
-    SIGHUP
-    SIGWINCH
-}
-
-/// Install global signal handlers, with notifications sent to the given
-/// `notify` channel.
-pub fn install(notify: chan::Sender<Signal>) -> io::Result<()> {
-    /// The sender type must implement the facility's trait.
-    #[derive(Debug)]
-    struct ChanSender(chan::Sender<Signal>);
-
-    /// This also does our desired conversion from signal numbers to our
-    /// `Signal` representation.
-    impl channel_notify_facility::Sender for ChanSender {
-        fn send(&self, sig_num: SignalNumber) -> Result<(), SendError> {
-            if let Ok(sig) = sig_num.try_into() {
-                self.0.send(sig).or(Err(SendError::Disconnected))
-            } else {
-                debug_assert!(false, "only called for recognized signal numbers");
-                // Unrecognized signal numbers would be ignored, but
-                // this never occurs.
-                Err(SendError::Ignored)
-            }
-        }
-    }
-
-    SignalsChannel::install_with_outside_channel(ChanSender(notify)).map_err(|e| match e {
-        InstallError::AlreadyInstalled { unused_notify: _ } => io::Error::new(
-            io::ErrorKind::AlreadyExists,
-            "signal handling is already installed",
-        ),
-        _ => io::Error::other(e), // The error type is non-exhaustive.
-    })
-}
-
-/// Uninstall global signal handlers.
-///
-/// The caller must ensure that all `Receiver`s for the other end of the
-/// channel are dropped to disconnect the channel, to ensure that the
-/// internal "signals-receipt" thread wakes to clean-up (in case it's
-/// blocked on sending on the channel).  Such dropping usually occurs
-/// naturally when uninstalling, since the other end is no longer needed
-/// then, and may be done after calling this.  Not doing so might
-/// deadlock the "signals-receipt" thread.
-pub fn uninstall() -> io::Result<()> {
-    SignalsChannel::uninstall_with_outside_channel().map_err(|e| match e {
-        UninstallError::AlreadyUninstalled => io::Error::new(
-            io::ErrorKind::NotFound,
-            "signal handling is already uninstalled",
-        ),
-        #[allow(clippy::unreachable)]
-        UninstallError::WrongMethod => {
-            // SAFETY: Impossible, because `SignalsChannel` is private
-            // and so `SignalsChannel::install()` is never done.
-            unreachable!()
-        }
-        _ => io::Error::other(e), // The error type is non-exhaustive.
-    })
-}
-
-/// Do [`uninstall()`], terminate the internal "signals-receipt"
-/// thread, and wait for that thread to finish.
-///
-/// This is provided in case it's ever needed to completely clean-up the
-/// facility to be like it hadn't been installed before.  It's
-/// unnecessary to use this, just to uninstall the handling.  Usually,
-/// only using `uninstall` is desirable so that the "signals-receipt"
-/// thread is kept alive for faster reuse when re-installing the
-/// handling.
-///
-/// The caller must ensure that all `Receiver`s for the other end of the
-/// channel have **already** been dropped to disconnect the channel,
-/// before calling this, to ensure that the "signals-receipt" thread
-/// wakes (in case it's blocked on sending on the channel) to see that
-/// it must finish.  If this is not done, this might deadlock.
-pub fn finish() -> io::Result<()> {
-    SignalsChannel::finish_with_outside_channel().map_err(|e| match e {
-        FinishError::AlreadyFinished => io::Error::new(
-            io::ErrorKind::NotFound,
-            "signal-handling facility is already finished",
-        ),
-        #[allow(clippy::unreachable)]
-        FinishError::WrongMethod => {
-            // SAFETY: Impossible, because `SignalsChannel` is private
-            // and so `SignalsChannel::install()` is never done.
-            unreachable!()
-        }
-        _ => io::Error::other(e), // The error type is non-exhaustive.
-    })
-}
diff --git a/radicle-ssh/Cargo.toml b/radicle-ssh/Cargo.toml
deleted file mode 100644
index 50add46b7..000000000
--- a/radicle-ssh/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "radicle-ssh"
-description = "Radicle SSH library"
-homepage = "https://radicle.xyz"
-repository = "https://app.radicle.xyz/seeds/seed.radicle.xyz/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5"
-license = "Apache-2.0"
-version = "0.9.0"
-authors = [
-  "Fintan Halpenny <fintan.halpenny@gmail.com>",
-  "Pierre-Étienne Meunier <pe@pijul.org>",
-  "cloudhead <cloudhead@radicle.xyz>"
-]
-edition = "2021"
-
-[dependencies]
-byteorder = "1.4"
-log = "0.4"
-thiserror = "1.0"
-zeroize = "1.5.7"
diff --git a/radicle-ssh/LICENSE b/radicle-ssh/LICENSE
deleted file mode 100644
index f433b1a53..000000000
--- a/radicle-ssh/LICENSE
+++ /dev/null
@@ -1,177 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
diff --git a/radicle-ssh/src/agent.rs b/radicle-ssh/src/agent.rs
deleted file mode 100644
index fd54bf856..000000000
--- a/radicle-ssh/src/agent.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-/// Write clients for SSH agents.
-pub mod client;
-
-mod msg;
-
-/// Constraints on how keys can be used.
-#[derive(Debug, PartialEq, Eq)]
-pub enum Constraint {
-    /// The key shall disappear from the agent's memory after that many seconds.
-    KeyLifetime { seconds: u32 },
-    /// Signatures need to be confirmed by the agent (for instance using a dialog).
-    Confirm,
-    /// Custom constraints
-    Extensions { name: Vec<u8>, details: Vec<u8> },
-}
diff --git a/radicle-ssh/src/agent/client.rs b/radicle-ssh/src/agent/client.rs
deleted file mode 100644
index 881c16fc6..000000000
--- a/radicle-ssh/src/agent/client.rs
+++ /dev/null
@@ -1,423 +0,0 @@
-use std::fmt;
-use std::io::{Read, Write};
-use std::ops::DerefMut;
-use std::os::unix::net::UnixStream;
-use std::path::Path;
-use std::str::FromStr;
-
-use byteorder::{BigEndian, ByteOrder, WriteBytesExt};
-use log::*;
-use thiserror::Error;
-use zeroize::Zeroize as _;
-
-use crate::agent::msg;
-use crate::agent::Constraint;
-use crate::encoding::{self, Encodable};
-use crate::encoding::{Buffer, Encoding, Reader};
-
-/// An ed25519 Signature.
-pub type Signature = [u8; 64];
-
-#[derive(Debug, Error)]
-pub enum Error {
-    /// Agent protocol error.
-    #[error("Agent protocol error")]
-    AgentProtocolError,
-    #[error("Agent failure")]
-    AgentFailure,
-    #[error("Unable to connect to ssh-agent. The environment variable `SSH_AUTH_SOCK` was set, but it points to a nonexistent file or directory.")]
-    BadAuthSock,
-    #[error(transparent)]
-    Encoding(#[from] encoding::Error),
-    #[error("Environment variable `{0}` not found")]
-    EnvVar(&'static str),
-    #[error(transparent)]
-    Io(#[from] std::io::Error),
-    #[error(transparent)]
-    Private(Box<dyn std::error::Error + Send + Sync + 'static>),
-    #[error(transparent)]
-    Public(Box<dyn std::error::Error + Send + Sync + 'static>),
-    #[error(transparent)]
-    Signature(Box<dyn std::error::Error + Send + Sync + 'static>),
-}
-
-impl Error {
-    pub fn is_not_running(&self) -> bool {
-        matches!(self, Self::EnvVar("SSH_AUTH_SOCK"))
-    }
-}
-
-/// SSH agent client.
-pub struct AgentClient<S> {
-    stream: S,
-}
-
-impl<S> AgentClient<S> {
-    /// Connect to an SSH agent via the provided stream (on Unix, usually a Unix-domain socket).
-    pub fn connect(stream: S) -> Self {
-        AgentClient { stream }
-    }
-
-    /// Get the agent PID.
-    pub fn pid(&self) -> Option<u32> {
-        std::env::var("SSH_AGENT_PID")
-            .ok()
-            .and_then(|v| u32::from_str(&v).ok())
-    }
-}
-
-pub trait ClientStream: Sized + Send + Sync {
-    /// Send an agent request through the stream and read the response.
-    fn request(&mut self, req: &[u8]) -> Result<Buffer, Error>;
-
-    /// How to connect the streaming socket
-    fn connect<P>(path: P) -> Result<AgentClient<Self>, Error>
-    where
-        P: AsRef<Path> + Send;
-
-    fn connect_env() -> Result<AgentClient<Self>, Error> {
-        let Ok(var) = std::env::var("SSH_AUTH_SOCK") else {
-            return Err(Error::EnvVar("SSH_AUTH_SOCK"));
-        };
-        match Self::connect(var) {
-            Err(Error::Io(io_err)) if io_err.kind() == std::io::ErrorKind::NotFound => {
-                Err(Error::BadAuthSock)
-            }
-            other => other,
-        }
-    }
-}
-
-impl<S: ClientStream> AgentClient<S> {
-    /// Send a key to the agent, with a (possibly empty) slice of constraints
-    /// to apply when using the key to sign.
-    pub fn add_identity<K>(&mut self, key: &K, constraints: &[Constraint]) -> Result<(), Error>
-    where
-        K: Encodable,
-        K::Error: std::error::Error + Send + Sync + 'static,
-    {
-        let mut buf = Buffer::default();
-
-        buf.resize(4, 0);
-
-        if constraints.is_empty() {
-            buf.push(msg::ADD_IDENTITY)
-        } else {
-            buf.push(msg::ADD_ID_CONSTRAINED)
-        }
-        key.write(&mut buf);
-
-        if !constraints.is_empty() {
-            for cons in constraints {
-                match *cons {
-                    Constraint::KeyLifetime { seconds } => {
-                        buf.push(msg::CONSTRAIN_LIFETIME);
-                        buf.deref_mut().write_u32::<BigEndian>(seconds)?
-                    }
-                    Constraint::Confirm => buf.push(msg::CONSTRAIN_CONFIRM),
-                    Constraint::Extensions {
-                        ref name,
-                        ref details,
-                    } => {
-                        buf.push(msg::CONSTRAIN_EXTENSION);
-                        buf.extend_ssh_string(name);
-                        buf.extend_ssh_string(details);
-                    }
-                }
-            }
-        }
-        buf.write_len();
-        self.stream.request(&buf)?;
-
-        Ok(())
-    }
-
-    /// Add a smart card to the agent, with a (possibly empty) set of
-    /// constraints to apply when signing.
-    pub fn add_smartcard_key(
-        &mut self,
-        id: &str,
-        pin: &[u8],
-        constraints: &[Constraint],
-    ) -> Result<(), Error> {
-        let mut buf = Buffer::default();
-
-        buf.resize(4, 0);
-
-        if constraints.is_empty() {
-            buf.push(msg::ADD_SMARTCARD_KEY)
-        } else {
-            buf.push(msg::ADD_SMARTCARD_KEY_CONSTRAINED)
-        }
-        buf.extend_ssh_string(id.as_bytes());
-        buf.extend_ssh_string(pin);
-
-        if !constraints.is_empty() {
-            buf.deref_mut()
-                .write_u32::<BigEndian>(constraints.len() as u32)?;
-            for cons in constraints {
-                match *cons {
-                    Constraint::KeyLifetime { seconds } => {
-                        buf.push(msg::CONSTRAIN_LIFETIME);
-                        buf.deref_mut().write_u32::<BigEndian>(seconds)?;
-                    }
-                    Constraint::Confirm => buf.push(msg::CONSTRAIN_CONFIRM),
-                    Constraint::Extensions {
-                        ref name,
-                        ref details,
-                    } => {
-                        buf.push(msg::CONSTRAIN_EXTENSION);
-                        buf.extend_ssh_string(name);
-                        buf.extend_ssh_string(details);
-                    }
-                }
-            }
-        }
-        buf.write_len();
-        self.stream.request(&buf)?;
-
-        Ok(())
-    }
-
-    /// Lock the agent, making it refuse to sign until unlocked.
-    pub fn lock(&mut self, passphrase: &[u8]) -> Result<(), Error> {
-        let mut buf = Buffer::default();
-
-        buf.resize(4, 0);
-        buf.push(msg::LOCK);
-        buf.extend_ssh_string(passphrase);
-        buf.write_len();
-
-        self.stream.request(&buf)?;
-
-        Ok(())
-    }
-
-    /// Unlock the agent, allowing it to sign again.
-    pub fn unlock(&mut self, passphrase: &[u8]) -> Result<(), Error> {
-        let mut buf = Buffer::default();
-        buf.resize(4, 0);
-        buf.push(msg::UNLOCK);
-        buf.extend_ssh_string(passphrase);
-        buf.write_len();
-
-        self.stream.request(&buf)?;
-
-        Ok(())
-    }
-
-    /// Ask the agent for a list of the currently registered secret
-    /// keys.
-    pub fn request_identities<K>(&mut self) -> Result<Vec<K>, Error>
-    where
-        K: Encodable,
-        K::Error: std::error::Error + Send + Sync + 'static,
-    {
-        let mut buf = Buffer::default();
-        buf.resize(4, 0);
-        buf.push(msg::REQUEST_IDENTITIES);
-        buf.write_len();
-
-        let mut keys = Vec::new();
-        let resp = self.stream.request(&buf)?;
-
-        if resp[0] == msg::IDENTITIES_ANSWER {
-            let mut r = resp.reader(1);
-            let n = r.read_u32()?;
-
-            for _ in 0..n {
-                let key = r.read_string()?;
-                let _ = r.read_string()?;
-                let mut r = key.reader(0);
-
-                if let Ok(pk) = K::read(&mut r) {
-                    keys.push(pk);
-                }
-            }
-        }
-
-        Ok(keys)
-    }
-
-    /// Ask the agent to sign the supplied piece of data.
-    pub fn sign<K>(&mut self, public: &K, data: &[u8]) -> Result<Signature, Error>
-    where
-        K: Encodable + fmt::Debug,
-    {
-        let req = self.prepare_sign_request(public, data);
-        let resp = self.stream.request(&req)?;
-
-        if !resp.is_empty() && resp[0] == msg::SIGN_RESPONSE {
-            self.read_signature(&resp)
-        } else if !resp.is_empty() && resp[0] == msg::FAILURE {
-            Err(Error::AgentFailure)
-        } else {
-            Err(Error::AgentProtocolError)
-        }
-    }
-
-    fn prepare_sign_request<K>(&self, public: &K, data: &[u8]) -> Buffer
-    where
-        K: Encodable + fmt::Debug,
-    {
-        // byte                    SSH_AGENTC_SIGN_REQUEST
-        // string                  key blob
-        // string                  data
-        // uint32                  flags
-
-        let mut pk = Buffer::default();
-        public.write(&mut pk);
-
-        let total = 1 + pk.len() + 4 + data.len() + 4;
-
-        let mut buf = Buffer::default();
-        buf.write_u32::<BigEndian>(total as u32)
-            .expect("Writing to a vector never fails");
-        buf.push(msg::SIGN_REQUEST);
-        buf.extend_from_slice(&pk);
-        buf.extend_ssh_string(data);
-
-        // Signature flags should be zero for ed25519.
-        buf.write_u32::<BigEndian>(0).unwrap();
-        buf
-    }
-
-    fn read_signature(&self, sig: &[u8]) -> Result<Signature, Error> {
-        let mut r = sig.reader(1);
-        let mut resp = r.read_string()?.reader(0);
-        let _t = resp.read_string()?;
-        let sig = resp.read_string()?;
-
-        let mut out = [0; 64];
-        out.copy_from_slice(sig);
-
-        Ok(out)
-    }
-
-    /// Ask the agent to remove a key from its memory.
-    pub fn remove_identity<K>(&mut self, public: &K) -> Result<(), Error>
-    where
-        K: Encodable,
-    {
-        let mut pk: Buffer = Vec::new().into();
-        public.write(&mut pk);
-
-        let total = 1 + pk.len();
-
-        let mut buf = Buffer::default();
-        buf.write_u32::<BigEndian>(total as u32)?;
-        buf.push(msg::REMOVE_IDENTITY);
-        buf.extend_from_slice(&pk);
-
-        self.stream.request(&buf)?;
-
-        Ok(())
-    }
-
-    /// Ask the agent to remove a smartcard from its memory.
-    pub fn remove_smartcard_key(&mut self, id: &str, pin: &[u8]) -> Result<(), Error> {
-        let mut buf = Buffer::default();
-        buf.resize(4, 0);
-        buf.push(msg::REMOVE_SMARTCARD_KEY);
-        buf.extend_ssh_string(id.as_bytes());
-        buf.extend_ssh_string(pin);
-        buf.write_len();
-
-        self.stream.request(&buf)?;
-
-        Ok(())
-    }
-
-    /// Ask the agent to forget all known keys.
-    pub fn remove_all_identities(&mut self) -> Result<(), Error> {
-        let mut buf = Buffer::default();
-        buf.resize(4, 0);
-        buf.push(msg::REMOVE_ALL_IDENTITIES);
-        buf.write_len();
-
-        self.stream.request(&buf)?;
-
-        Ok(())
-    }
-
-    /// Send a custom message to the agent.
-    pub fn extension(&mut self, typ: &[u8], ext: &[u8]) -> Result<(), Error> {
-        let mut buf = Buffer::default();
-
-        buf.resize(4, 0);
-        buf.push(msg::EXTENSION);
-        buf.extend_ssh_string(typ);
-        buf.extend_ssh_string(ext);
-        buf.write_len();
-
-        self.stream.request(&buf)?;
-
-        Ok(())
-    }
-
-    /// Ask the agent about supported extensions.
-    pub fn query_extension(&mut self, typ: &[u8], mut ext: Buffer) -> Result<bool, Error> {
-        let mut req = Buffer::default();
-
-        req.resize(4, 0);
-        req.push(msg::EXTENSION);
-        req.extend_ssh_string(typ);
-        req.write_len();
-
-        let resp = self.stream.request(&req)?;
-        let mut r = resp.reader(1);
-        ext.extend(r.read_string()?);
-
-        Ok(!resp.is_empty() && resp[0] == msg::SUCCESS)
-    }
-}
-
-#[cfg(not(unix))]
-impl ClientStream for TcpStream {
-    fn connect_uds<P>(_: P) -> Result<AgentClient<Self>, Error>
-    where
-        P: AsRef<Path> + Send,
-    {
-        Err(Error::AgentFailure)
-    }
-
-    fn read_response(&mut self, _: &mut Buffer) -> Result<(), Error> {
-        Err(Error::AgentFailure)
-    }
-
-    fn connect_env() -> Result<AgentClient<Self>, Error> {
-        Err(Error::AgentFailure)
-    }
-}
-
-#[cfg(unix)]
-impl ClientStream for UnixStream {
-    fn connect<P>(path: P) -> Result<AgentClient<Self>, Error>
-    where
-        P: AsRef<Path> + Send,
-    {
-        let stream = UnixStream::connect(path)?;
-
-        Ok(AgentClient { stream })
-    }
-
-    fn request(&mut self, msg: &[u8]) -> Result<Buffer, Error> {
-        let mut resp = Buffer::default();
-
-        // Write the message
-        self.write_all(msg)?;
-        self.flush()?;
-
-        // Read the length
-        resp.resize(4, 0);
-        self.read_exact(&mut resp)?;
-
-        // Read the rest of the buffer
-        let len = BigEndian::read_u32(&resp) as usize;
-        resp.zeroize();
-        resp.resize(len, 0);
-        self.read_exact(&mut resp)?;
-
-        Ok(resp)
-    }
-}
diff --git a/radicle-ssh/src/agent/msg.rs b/radicle-ssh/src/agent/msg.rs
deleted file mode 100644
index d0786fd4f..000000000
--- a/radicle-ssh/src/agent/msg.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-pub const FAILURE: u8 = 5;
-pub const SUCCESS: u8 = 6;
-pub const IDENTITIES_ANSWER: u8 = 12;
-pub const SIGN_RESPONSE: u8 = 14;
-#[allow(dead_code)]
-pub const EXTENSION_FAILURE: u8 = 28;
-
-pub const REQUEST_IDENTITIES: u8 = 11;
-pub const SIGN_REQUEST: u8 = 13;
-pub const ADD_IDENTITY: u8 = 17;
-pub const REMOVE_IDENTITY: u8 = 18;
-pub const REMOVE_ALL_IDENTITIES: u8 = 19;
-pub const ADD_ID_CONSTRAINED: u8 = 25;
-pub const ADD_SMARTCARD_KEY: u8 = 20;
-pub const REMOVE_SMARTCARD_KEY: u8 = 21;
-pub const LOCK: u8 = 22;
-pub const UNLOCK: u8 = 23;
-pub const ADD_SMARTCARD_KEY_CONSTRAINED: u8 = 26;
-pub const EXTENSION: u8 = 27;
-
-pub const CONSTRAIN_LIFETIME: u8 = 1;
-pub const CONSTRAIN_CONFIRM: u8 = 2;
-pub const CONSTRAIN_EXTENSION: u8 = 3;
diff --git a/radicle-ssh/src/encoding.rs b/radicle-ssh/src/encoding.rs
deleted file mode 100644
index 8342eefaa..000000000
--- a/radicle-ssh/src/encoding.rs
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright 2016 Pierre-Étienne Meunier
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-use std::ops::DerefMut;
-
-use byteorder::{BigEndian, ByteOrder, WriteBytesExt};
-use thiserror::Error;
-use zeroize::Zeroizing;
-
-/// General purpose writable byte buffer we use everywhere.
-pub type Buffer = Zeroizing<Vec<u8>>;
-
-#[derive(Debug, Error)]
-pub enum Error {
-    /// Index out of bounds
-    #[error("Index out of bounds")]
-    IndexOutOfBounds,
-}
-
-pub trait Encodable: Sized {
-    type Error: std::error::Error + Send + Sync + 'static;
-
-    /// Read from the SSH format.
-    fn read(reader: &mut Cursor) -> Result<Self, Self::Error>;
-    /// Write to the SSH format.
-    fn write<E: Encoding>(&self, buf: &mut E);
-}
-
-/// Encode in the SSH format.
-pub trait Encoding {
-    /// Push an SSH-encoded string to `self`.
-    fn extend_ssh_string(&mut self, s: &[u8]);
-    /// Push an SSH-encoded blank string of length `s` to `self`.
-    fn extend_ssh_string_blank(&mut self, s: usize) -> &mut [u8];
-    /// Push an SSH-encoded multiple-precision integer.
-    fn extend_ssh_mpint(&mut self, s: &[u8]);
-    /// Push an SSH-encoded list.
-    fn extend_list<'a, I: Iterator<Item = &'a [u8]>>(&mut self, list: I);
-    /// Push an SSH-encoded unsigned 32-bit integer.
-    fn extend_u32(&mut self, u: u32);
-    /// Push an SSH-encoded empty list.
-    fn write_empty_list(&mut self);
-    /// Write the buffer length at the beginning of the buffer.
-    fn write_len(&mut self);
-}
-
-/// Encoding length of the given mpint.
-pub fn mpint_len(s: &[u8]) -> usize {
-    let mut i = 0;
-    while i < s.len() && s[i] == 0 {
-        i += 1
-    }
-    (if s[i] & 0x80 != 0 { 5 } else { 4 }) + s.len() - i
-}
-
-impl Encoding for Vec<u8> {
-    fn extend_ssh_string(&mut self, s: &[u8]) {
-        self.write_u32::<BigEndian>(s.len() as u32).unwrap();
-        self.extend(s);
-    }
-
-    fn extend_ssh_string_blank(&mut self, len: usize) -> &mut [u8] {
-        self.write_u32::<BigEndian>(len as u32).unwrap();
-        let current = self.len();
-        self.resize(current + len, 0u8);
-
-        &mut self[current..]
-    }
-
-    fn extend_ssh_mpint(&mut self, s: &[u8]) {
-        // Skip initial 0s.
-        let mut i = 0;
-        while i < s.len() && s[i] == 0 {
-            i += 1
-        }
-        // If the first non-zero is >= 128, write its length (u32, BE), followed by 0.
-        if s[i] & 0x80 != 0 {
-            self.write_u32::<BigEndian>((s.len() - i + 1) as u32)
-                .unwrap();
-            self.push(0)
-        } else {
-            self.write_u32::<BigEndian>((s.len() - i) as u32).unwrap();
-        }
-        self.extend(&s[i..]);
-    }
-
-    fn extend_u32(&mut self, s: u32) {
-        let mut buf = [0x0; 4];
-        BigEndian::write_u32(&mut buf, s);
-        self.extend(buf);
-    }
-
-    fn extend_list<'a, I: Iterator<Item = &'a [u8]>>(&mut self, list: I) {
-        let len0 = self.len();
-        self.extend([0, 0, 0, 0]);
-
-        let mut first = true;
-        for i in list {
-            if !first {
-                self.push(b',')
-            } else {
-                first = false;
-            }
-            self.extend(i)
-        }
-        let len = (self.len() - len0 - 4) as u32;
-
-        BigEndian::write_u32(&mut self[len0..], len);
-    }
-
-    fn write_empty_list(&mut self) {
-        self.extend([0, 0, 0, 0]);
-    }
-
-    fn write_len(&mut self) {
-        let len = self.len() - 4;
-        BigEndian::write_u32(&mut self[..], len as u32);
-    }
-}
-
-impl Encoding for Buffer {
-    fn extend_ssh_string(&mut self, s: &[u8]) {
-        self.deref_mut().extend_ssh_string(s)
-    }
-
-    fn extend_ssh_string_blank(&mut self, len: usize) -> &mut [u8] {
-        self.deref_mut().extend_ssh_string_blank(len)
-    }
-
-    fn extend_ssh_mpint(&mut self, s: &[u8]) {
-        self.deref_mut().extend_ssh_mpint(s)
-    }
-
-    fn extend_list<'a, I: Iterator<Item = &'a [u8]>>(&mut self, list: I) {
-        self.deref_mut().extend_list(list)
-    }
-
-    fn write_empty_list(&mut self) {
-        self.deref_mut().write_empty_list()
-    }
-
-    fn extend_u32(&mut self, s: u32) {
-        self.deref_mut().extend_u32(s);
-    }
-
-    fn write_len(&mut self) {
-        self.deref_mut().write_len()
-    }
-}
-
-/// A cursor-like trait to read SSH-encoded things.
-pub trait Reader {
-    /// Create an SSH reader for `self`.
-    fn reader(&self, starting_at: usize) -> Cursor;
-}
-
-impl Reader for Buffer {
-    fn reader(&self, starting_at: usize) -> Cursor {
-        Cursor {
-            s: self,
-            position: starting_at,
-        }
-    }
-}
-
-impl Reader for [u8] {
-    fn reader(&self, starting_at: usize) -> Cursor {
-        Cursor {
-            s: self,
-            position: starting_at,
-        }
-    }
-}
-
-/// A cursor-like type to read SSH-encoded values.
-#[derive(Debug)]
-pub struct Cursor<'a> {
-    s: &'a [u8],
-    #[doc(hidden)]
-    pub position: usize,
-}
-
-impl<'a> Cursor<'a> {
-    /// Read one string from this reader.
-    pub fn read_string(&mut self) -> Result<&'a [u8], Error> {
-        let len = self.read_u32()? as usize;
-        if self.position + len <= self.s.len() {
-            let result = &self.s[self.position..(self.position + len)];
-            self.position += len;
-            Ok(result)
-        } else {
-            Err(Error::IndexOutOfBounds)
-        }
-    }
-
-    /// Read a `u32` from this reader.
-    pub fn read_u32(&mut self) -> Result<u32, Error> {
-        if self.position + 4 <= self.s.len() {
-            let u = BigEndian::read_u32(&self.s[self.position..]);
-            self.position += 4;
-            Ok(u)
-        } else {
-            Err(Error::IndexOutOfBounds)
-        }
-    }
-
-    /// Read one byte from this reader.
-    pub fn read_byte(&mut self) -> Result<u8, Error> {
-        if self.position < self.s.len() {
-            let u = self.s[self.position];
-            self.position += 1;
-            Ok(u)
-        } else {
-            Err(Error::IndexOutOfBounds)
-        }
-    }
-
-    pub fn read_bytes<const S: usize>(&mut self) -> Result<[u8; S], Error> {
-        let mut buf = [0; S];
-        for b in buf.iter_mut() {
-            *b = self.read_byte()?;
-        }
-        Ok(buf)
-    }
-
-    /// Read one byte from this reader.
-    pub fn read_mpint(&mut self) -> Result<&'a [u8], Error> {
-        let len = self.read_u32()? as usize;
-        if self.position + len <= self.s.len() {
-            let result = &self.s[self.position..(self.position + len)];
-            self.position += len;
-            Ok(result)
-        } else {
-            Err(Error::IndexOutOfBounds)
-        }
-    }
-}
diff --git a/radicle-ssh/src/lib.rs b/radicle-ssh/src/lib.rs
deleted file mode 100644
index bd07d9008..000000000
--- a/radicle-ssh/src/lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod agent;
-pub mod encoding;
-
-pub use agent::client::Error;
diff --git a/radicle-systemd/Cargo.toml b/radicle-systemd/Cargo.toml
deleted file mode 100644
index acc7dd8a2..000000000
--- a/radicle-systemd/Cargo.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[package]
-name = "radicle-systemd"
-description = "Radicle integration with Systemd"
-homepage = "https://radicle.xyz"
-repository = "https://app.radicle.xyz/seeds/seed.radicle.xyz/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5"
-license = "MIT OR Apache-2.0"
-edition = "2021"
-version = "0.9.0"
diff --git a/radicle-systemd/src/lib.rs b/radicle-systemd/src/lib.rs
deleted file mode 100644
index 00ef63404..000000000
--- a/radicle-systemd/src/lib.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-//! Library for interaction with systemd, specialized for Radicle.
-
-use std::env::{remove_var, var, VarError};
-use std::os::fd::RawFd;
-use std::process::id;
-
-const LISTEN_PID: &str = "LISTEN_PID";
-const LISTEN_FDS: &str = "LISTEN_FDS";
-const LISTEN_FDNAMES: &str = "LISTEN_FDNAMES";
-
-/// Minimum file descriptor used by systemd.
-/// See <https://github.com/systemd/systemd/blob/v254/src/systemd/sd-daemon.h#L56>.
-const SD_LISTEN_FDS_START: RawFd = 3;
-
-/// Checks whether *at most one* file descriptor with given name was passed, returning it.
-/// systemd sending none, more than one, or a file descriptor with a different name, all
-/// results in [`Option::None`], but errors decoding environment variables or missing
-/// environment variables will error.
-/// This is a specialization of [`sd_listen_fds_with_names(3)`](man:sd_listen_fds_with_names(3)).
-/// See:
-///  - <https://www.freedesktop.org/software/systemd/man/254/sd_listen_fds_with_names.html>
-///  - <https://github.com/systemd/systemd/blob/v254/src/libsystemd/sd-daemon/sd-daemon.c>
-///  - <https://0pointer.de/blog/projects/socket-activation.html>
-///  - <https://0pointer.de/blog/projects/socket-activation2.html>
-pub fn listen_fd(name: &str) -> Result<Option<RawFd>, VarError> {
-    let fd = match var(LISTEN_PID) {
-        Err(VarError::NotPresent) => Ok(None),
-        Err(err) => Err(err),
-        Ok(pid) if pid != id().to_string() => Ok(None),
-        _ if var(LISTEN_FDS)? != "1" || var(LISTEN_FDNAMES).ok() != Some(name.to_string()) => {
-            Ok(None)
-        }
-        _ => Ok(Some(SD_LISTEN_FDS_START)),
-    };
-
-    remove_var(LISTEN_PID);
-    remove_var(LISTEN_FDS);
-    remove_var(LISTEN_FDNAMES);
-
-    fd
-}
diff --git a/radicle-term/Cargo.toml b/radicle-term/Cargo.toml
deleted file mode 100644
index 204790350..000000000
--- a/radicle-term/Cargo.toml
+++ /dev/null
@@ -1,40 +0,0 @@
-[package]
-name = "radicle-term"
-description = "Terminal library used by the Radicle CLI"
-homepage = "https://radicle.xyz"
-repository = "https://app.radicle.xyz/seeds/seed.radicle.xyz/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5"
-license = "MIT OR Apache-2.0"
-version = "0.11.0"
-authors = ["cloudhead <cloudhead@radicle.xyz>"]
-edition = "2021"
-
-[features]
-default = ["git2"]
-
-[dependencies]
-anyhow = { version = "1" }
-anstyle-query = { version = "1.0.0" }
-crossbeam-channel = { version = "0.5.6" }
-inquire = { version = "0.7.4", default-features = false, features = ["termion", "editor"] }
-libc = { version = "0.2" }
-once_cell = { version = "1.13" }
-shlex = { version = "1.1" }
-termion = { version = "3" }
-thiserror = { version = "1" }
-unicode-display-width = { version = "0.3.0" }
-unicode-segmentation = { version = "1.7.1" }
-zeroize = { version = "1.1" }
-
-[dependencies.git2]
-version = "0.19.0"
-default-features = false
-features = ["vendored-libgit2"]
-optional = true
-
-[dependencies.radicle-signals]
-path = "../radicle-signals"
-version = "0"
-
-[dev-dependencies]
-pretty_assertions = { version = "1.3.0" }
-tempfile = { version = "3.3.0" }
diff --git a/radicle-term/src/ansi.rs b/radicle-term/src/ansi.rs
deleted file mode 100644
index 1b6f594e5..000000000
--- a/radicle-term/src/ansi.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-//! A dead simple ANSI terminal color painting library.
-//!
-//! This library is a port of the `yansi` crate.
-//! Copyright (c) 2017 Sergio Benitez
-//!
-mod color;
-mod paint;
-mod style;
-#[cfg(test)]
-mod tests;
-mod windows;
-
-pub use color::Color;
-pub use paint::paint;
-pub use paint::Filled;
-pub use paint::Paint;
-pub use style::Style;
diff --git a/radicle-term/src/ansi/color.rs b/radicle-term/src/ansi/color.rs
deleted file mode 100644
index 34aca0b3a..000000000
--- a/radicle-term/src/ansi/color.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-use std::fmt;
-
-use super::{Paint, Style};
-
-/// An enum representing an ANSI color code.
-#[derive(Debug, Default, Eq, PartialEq, Ord, PartialOrd, Hash, Copy, Clone)]
-pub enum Color {
-    /// No color has been set. Nothing is changed when applied.
-    #[default]
-    Unset,
-    /// Black #0 (foreground code `30`, background code `40`).
-    Black,
-    /// Red: #1 (foreground code `31`, background code `41`).
-    Red,
-    /// Green: #2 (foreground code `32`, background code `42`).
-    Green,
-    /// Yellow: #3 (foreground code `33`, background code `43`).
-    Yellow,
-    /// Blue: #4 (foreground code `34`, background code `44`).
-    Blue,
-    /// Magenta: #5 (foreground code `35`, background code `45`).
-    Magenta,
-    /// Cyan: #6 (foreground code `36`, background code `46`).
-    Cyan,
-    /// White: #7 (foreground code `37`, background code `47`).
-    White,
-    /// A color number from 0 to 255, for use in 256-color terminals.
-    Fixed(u8),
-    /// A 24-bit RGB color, as specified by ISO-8613-3.
-    RGB(u8, u8, u8),
-}
-
-impl Color {
-    /// Constructs a new `Paint` structure that encapsulates `item` with the
-    /// foreground color set to the color `self`.
-    #[inline]
-    pub fn paint<T>(self, item: T) -> Paint<T> {
-        Paint::new(item).fg(self)
-    }
-
-    /// Constructs a new `Style` structure with the foreground color set to the
-    /// color `self`.
-    #[inline]
-    pub const fn style(self) -> Style {
-        Style::new(self)
-    }
-
-    pub(crate) fn ansi_fmt(&self, f: &mut dyn fmt::Write) -> fmt::Result {
-        match *self {
-            Color::Unset => Ok(()),
-            Color::Black => write!(f, "0"),
-            Color::Red => write!(f, "1"),
-            Color::Green => write!(f, "2"),
-            Color::Yellow => write!(f, "3"),
-            Color::Blue => write!(f, "4"),
-            Color::Magenta => write!(f, "5"),
-            Color::Cyan => write!(f, "6"),
-            Color::White => write!(f, "7"),
-            Color::Fixed(num) => write!(f, "8;5;{num}"),
-            Color::RGB(r, g, b) => write!(f, "8;2;{r};{g};{b}"),
-        }
-    }
-}
diff --git a/radicle-term/src/ansi/paint.rs b/radicle-term/src/ansi/paint.rs
deleted file mode 100644
index f7e3184d5..000000000
--- a/radicle-term/src/ansi/paint.rs
+++ /dev/null
@@ -1,323 +0,0 @@
-use std::io::IsTerminal as _;
-use std::os::fd::{AsRawFd, BorrowedFd};
-use std::sync::atomic::{AtomicBool, AtomicI32};
-use std::{fmt, sync};
-
-use once_cell::sync::Lazy;
-
-use super::color::Color;
-use super::style::{Property, Style};
-
-/// What file is used for text output.
-static TERMINAL: AtomicI32 = AtomicI32::new(libc::STDOUT_FILENO);
-/// Whether paint styling is enabled or not.
-static ENABLED: AtomicBool = AtomicBool::new(true);
-/// Whether paint styling should be forced.
-static FORCED: AtomicBool = AtomicBool::new(false);
-
-/// A structure encapsulating an item and styling.
-#[derive(Debug, Default, Eq, PartialEq, Ord, PartialOrd, Hash, Copy, Clone)]
-pub struct Paint<T> {
-    pub item: T,
-    pub style: Style,
-}
-
-impl Paint<&str> {
-    /// Return plain content.
-    pub fn content(&self) -> &str {
-        self.item
-    }
-}
-
-impl Paint<String> {
-    /// Return plain content.
-    pub fn content(&self) -> &str {
-        self.item.as_str()
-    }
-}
-
-impl<T> From<T> for Paint<T> {
-    fn from(value: T) -> Self {
-        Self::new(value)
-    }
-}
-
-impl From<&str> for Paint<String> {
-    fn from(item: &str) -> Self {
-        Self::new(item.to_string())
-    }
-}
-
-impl From<Paint<&str>> for Paint<String> {
-    fn from(paint: Paint<&str>) -> Self {
-        Self {
-            item: paint.item.to_owned(),
-            style: paint.style,
-        }
-    }
-}
-
-impl From<Paint<String>> for String {
-    fn from(value: Paint<String>) -> Self {
-        value.item
-    }
-}
-
-impl<T> Paint<T> {
-    /// Constructs a new `Paint` structure encapsulating `item` with no set
-    /// styling.
-    #[inline]
-    pub const fn new(item: T) -> Paint<T> {
-        Paint {
-            item,
-            style: Style {
-                foreground: Color::Unset,
-                background: Color::Unset,
-                properties: Property::new(),
-                wrap: false,
-            },
-        }
-    }
-
-    /// Constructs a new _wrapping_ `Paint` structure encapsulating `item` with
-    /// default styling.
-    ///
-    /// A wrapping `Paint` converts all color resets written out by the internal
-    /// value to the styling of itself. This allows for seamless color wrapping
-    /// of other colored text.
-    ///
-    /// # Performance
-    ///
-    /// In order to wrap an internal value, the internal value must first be
-    /// written out to a local buffer and examined. As a result, displaying a
-    /// wrapped value is likely to result in a heap allocation and copy.
-    #[inline]
-    pub const fn wrapping(item: T) -> Paint<T> {
-        Paint::new(item).wrap()
-    }
-
-    /// Constructs a new `Paint` structure encapsulating `item` with the
-    /// foreground color set to the RGB color `r`, `g`, `b`.
-    #[inline]
-    pub const fn rgb(r: u8, g: u8, b: u8, item: T) -> Paint<T> {
-        Paint::new(item).fg(Color::RGB(r, g, b))
-    }
-
-    /// Constructs a new `Paint` structure encapsulating `item` with the
-    /// foreground color set to the fixed 8-bit color `color`.
-    #[inline]
-    pub const fn fixed(color: u8, item: T) -> Paint<T> {
-        Paint::new(item).fg(Color::Fixed(color))
-    }
-
-    pub const fn red(item: T) -> Paint<T> {
-        Paint::new(item).fg(Color::Red)
-    }
-
-    pub const fn black(item: T) -> Paint<T> {
-        Paint::new(item).fg(Color::Black)
-    }
-
-    pub const fn yellow(item: T) -> Paint<T> {
-        Paint::new(item).fg(Color::Yellow)
-    }
-
-    pub const fn green(item: T) -> Paint<T> {
-        Paint::new(item).fg(Color::Green)
-    }
-
-    pub const fn cyan(item: T) -> Paint<T> {
-        Paint::new(item).fg(Color::Cyan)
-    }
-
-    pub const fn blue(item: T) -> Paint<T> {
-        Paint::new(item).fg(Color::Blue)
-    }
-
-    pub const fn magenta(item: T) -> Paint<T> {
-        Paint::new(item).fg(Color::Magenta)
-    }
-
-    pub const fn white(item: T) -> Paint<T> {
-        Paint::new(item).fg(Color::White)
-    }
-
-    /// Retrieves the style currently set on `self`.
-    #[inline]
-    pub const fn style(&self) -> Style {
-        self.style
-    }
-
-    /// Retrieves a borrow to the inner item.
-    #[inline]
-    pub const fn inner(&self) -> &T {
-        &self.item
-    }
-
-    /// Sets the style of `self` to `style`.
-    #[inline]
-    pub fn with_style(mut self, style: Style) -> Paint<T> {
-        self.style = style;
-        self
-    }
-
-    /// Makes `self` a _wrapping_ `Paint`.
-    ///
-    /// A wrapping `Paint` converts all color resets written out by the internal
-    /// value to the styling of itself. This allows for seamless color wrapping
-    /// of other colored text.
-    ///
-    /// # Performance
-    ///
-    /// In order to wrap an internal value, the internal value must first be
-    /// written out to a local buffer and examined. As a result, displaying a
-    /// wrapped value is likely to result in a heap allocation and copy.
-    #[inline]
-    pub const fn wrap(mut self) -> Paint<T> {
-        self.style.wrap = true;
-        self
-    }
-
-    /// Sets the foreground to `color`.
-    #[inline]
-    pub const fn fg(mut self, color: Color) -> Paint<T> {
-        self.style.foreground = color;
-        self
-    }
-
-    /// Sets the background to `color`.
-    #[inline]
-    pub const fn bg(mut self, color: Color) -> Paint<T> {
-        self.style.background = color;
-        self
-    }
-
-    pub fn bold(mut self) -> Self {
-        self.style.properties.set(Property::BOLD);
-        self
-    }
-
-    pub fn dim(mut self) -> Self {
-        self.style.properties.set(Property::DIM);
-        self
-    }
-
-    pub fn italic(mut self) -> Self {
-        self.style.properties.set(Property::ITALIC);
-        self
-    }
-
-    pub fn underline(mut self) -> Self {
-        self.style.properties.set(Property::UNDERLINE);
-        self
-    }
-
-    pub fn invert(mut self) -> Self {
-        self.style.properties.set(Property::INVERT);
-        self
-    }
-
-    pub fn strikethrough(mut self) -> Self {
-        self.style.properties.set(Property::STRIKETHROUGH);
-        self
-    }
-
-    pub fn blink(mut self) -> Self {
-        self.style.properties.set(Property::BLINK);
-        self
-    }
-
-    pub fn hidden(mut self) -> Self {
-        self.style.properties.set(Property::HIDDEN);
-        self
-    }
-}
-
-impl<T: fmt::Display> fmt::Display for Paint<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        if Paint::is_enabled() && self.style.wrap {
-            let mut prefix = String::new();
-            prefix.push_str("\x1B[0m");
-            self.style.fmt_prefix(&mut prefix)?;
-            self.style.fmt_prefix(f)?;
-
-            let item = format!("{}", self.item).replace("\x1B[0m", &prefix);
-            fmt::Display::fmt(&item, f)?;
-            self.style.fmt_suffix(f)
-        } else if Paint::is_enabled() {
-            self.style.fmt_prefix(f)?;
-            fmt::Display::fmt(&self.item, f)?;
-            self.style.fmt_suffix(f)
-        } else {
-            fmt::Display::fmt(&self.item, f)
-        }
-    }
-}
-
-impl Paint<()> {
-    /// Returns `true` if coloring is enabled and `false` otherwise.
-    pub fn is_enabled() -> bool {
-        if FORCED.load(sync::atomic::Ordering::SeqCst) {
-            return true;
-        }
-        let clicolor = anstyle_query::clicolor();
-        let clicolor_enabled = clicolor.unwrap_or(false);
-        let clicolor_disabled = !clicolor.unwrap_or(true);
-        let terminal = TERMINAL.load(sync::atomic::Ordering::SeqCst);
-        let is_terminal = unsafe { BorrowedFd::borrow_raw(terminal).is_terminal() };
-        let is_enabled = ENABLED.load(sync::atomic::Ordering::SeqCst);
-
-        is_terminal
-            && is_enabled
-            && !anstyle_query::no_color()
-            && !clicolor_disabled
-            && (anstyle_query::term_supports_color() || clicolor_enabled || anstyle_query::is_ci())
-            || anstyle_query::clicolor_force()
-    }
-
-    /// Check 24-bit RGB color support.
-    pub fn truecolor() -> bool {
-        static TRUECOLOR: Lazy<bool> = Lazy::new(anstyle_query::term_supports_color);
-        *TRUECOLOR
-    }
-
-    /// Enable paint styling.
-    pub fn enable() {
-        ENABLED.store(true, sync::atomic::Ordering::SeqCst);
-    }
-
-    /// Set the terminal we are writing to. This influences the logic that checks whether or not to
-    /// include colors.
-    pub fn set_terminal(fd: impl AsRawFd) {
-        TERMINAL.store(fd.as_raw_fd(), sync::atomic::Ordering::SeqCst);
-    }
-
-    /// Force paint styling.
-    /// Useful when you want to output colors to a non-TTY.
-    pub fn force(force: bool) {
-        FORCED.store(force, sync::atomic::Ordering::SeqCst);
-    }
-
-    /// Disable paint styling.
-    pub fn disable() {
-        ENABLED.store(false, sync::atomic::Ordering::SeqCst);
-    }
-}
-
-/// An object filled with a background color.
-#[derive(Debug, Clone)]
-pub struct Filled<T> {
-    pub item: T,
-    pub color: Color,
-}
-
-impl<T: fmt::Display> fmt::Display for Filled<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", Paint::wrapping(&self.item).bg(self.color))
-    }
-}
-
-/// Shorthand for [`Paint::new`].
-pub fn paint<T>(item: T) -> Paint<T> {
-    Paint::new(item)
-}
diff --git a/radicle-term/src/ansi/style.rs b/radicle-term/src/ansi/style.rs
deleted file mode 100644
index 5d4d1ee51..000000000
--- a/radicle-term/src/ansi/style.rs
+++ /dev/null
@@ -1,280 +0,0 @@
-use std::fmt::{self, Display};
-use std::hash::{Hash, Hasher};
-use std::ops::BitOr;
-
-use super::{Color, Paint};
-
-#[derive(Default, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Copy, Clone)]
-pub struct Property(u8);
-
-impl Property {
-    pub const BOLD: Self = Property(1 << 0);
-    pub const DIM: Self = Property(1 << 1);
-    pub const ITALIC: Self = Property(1 << 2);
-    pub const UNDERLINE: Self = Property(1 << 3);
-    pub const BLINK: Self = Property(1 << 4);
-    pub const INVERT: Self = Property(1 << 5);
-    pub const HIDDEN: Self = Property(1 << 6);
-    pub const STRIKETHROUGH: Self = Property(1 << 7);
-
-    pub const fn new() -> Self {
-        Property(0)
-    }
-
-    #[inline(always)]
-    pub const fn contains(self, other: Property) -> bool {
-        (other.0 & self.0) == other.0
-    }
-
-    #[inline(always)]
-    pub fn set(&mut self, other: Property) {
-        self.0 |= other.0;
-    }
-
-    #[inline(always)]
-    pub fn iter(self) -> Iter {
-        Iter {
-            index: 0,
-            properties: self,
-        }
-    }
-}
-
-impl BitOr for Property {
-    type Output = Self;
-
-    #[inline(always)]
-    fn bitor(self, rhs: Self) -> Self {
-        Property(self.0 | rhs.0)
-    }
-}
-
-pub struct Iter {
-    index: u8,
-    properties: Property,
-}
-
-impl Iterator for Iter {
-    type Item = usize;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        while self.index < 8 {
-            let index = self.index;
-            self.index += 1;
-
-            if self.properties.contains(Property(1 << index)) {
-                return Some(index as usize);
-            }
-        }
-
-        None
-    }
-}
-
-/// Represents a set of styling options.
-#[repr(packed)]
-#[derive(Default, Debug, Eq, Ord, PartialOrd, Copy, Clone)]
-pub struct Style {
-    pub(crate) foreground: Color,
-    pub(crate) background: Color,
-    pub(crate) properties: Property,
-    pub(crate) wrap: bool,
-}
-
-impl PartialEq for Style {
-    fn eq(&self, other: &Style) -> bool {
-        self.foreground == other.foreground
-            && self.background == other.background
-            && self.properties == other.properties
-    }
-}
-
-impl Hash for Style {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.foreground.hash(state);
-        self.background.hash(state);
-        self.properties.hash(state);
-    }
-}
-
-#[inline]
-fn write_spliced<T: Display>(c: &mut bool, f: &mut dyn fmt::Write, t: T) -> fmt::Result {
-    if *c {
-        write!(f, ";{t}")
-    } else {
-        *c = true;
-        write!(f, "{t}")
-    }
-}
-
-impl Style {
-    /// Default style with the foreground set to `color` and no other set
-    /// properties.
-    #[inline]
-    pub const fn new(color: Color) -> Style {
-        // Avoiding `Default::default` since unavailable as `const`
-        Self {
-            foreground: color,
-            background: Color::Unset,
-            properties: Property::new(),
-            wrap: false,
-        }
-    }
-
-    /// Sets the foreground to `color`.
-    #[inline]
-    pub const fn fg(mut self, color: Color) -> Style {
-        self.foreground = color;
-        self
-    }
-
-    /// Sets the background to `color`.
-    #[inline]
-    pub const fn bg(mut self, color: Color) -> Style {
-        self.background = color;
-        self
-    }
-
-    /// Merge styles with other. This is an additive process, so colors will only
-    /// be changed if they aren't set on the receiver object.
-    pub fn merge(mut self, other: Style) -> Style {
-        if self.foreground == Color::Unset {
-            self.foreground = other.foreground;
-        }
-        if self.background == Color::Unset {
-            self.background = other.background;
-        }
-        self.properties.set(other.properties);
-        self
-    }
-
-    /// Sets `self` to be wrapping.
-    ///
-    /// A wrapping `Style` converts all color resets written out by the internal
-    /// value to the styling of itself. This allows for seamless color wrapping
-    /// of other colored text.
-    ///
-    /// # Performance
-    ///
-    /// In order to wrap an internal value, the internal value must first be
-    /// written out to a local buffer and examined. As a result, displaying a
-    /// wrapped value is likely to result in a heap allocation and copy.
-    #[inline]
-    pub const fn wrap(mut self) -> Style {
-        self.wrap = true;
-        self
-    }
-
-    pub fn bold(mut self) -> Self {
-        self.properties.set(Property::BOLD);
-        self
-    }
-
-    pub fn dim(mut self) -> Self {
-        self.properties.set(Property::DIM);
-        self
-    }
-
-    pub fn italic(mut self) -> Self {
-        self.properties.set(Property::ITALIC);
-        self
-    }
-
-    pub fn underline(mut self) -> Self {
-        self.properties.set(Property::UNDERLINE);
-        self
-    }
-
-    pub fn invert(mut self) -> Self {
-        self.properties.set(Property::INVERT);
-        self
-    }
-
-    pub fn strikethrough(mut self) -> Self {
-        self.properties.set(Property::STRIKETHROUGH);
-        self
-    }
-
-    /// Constructs a new `Paint` structure that encapsulates `item` with the
-    /// style set to `self`.
-    #[inline]
-    pub fn paint<T>(self, item: T) -> Paint<T> {
-        Paint::new(item).with_style(self)
-    }
-
-    /// Returns the foreground color of `self`.
-    #[inline]
-    pub const fn fg_color(&self) -> Color {
-        self.foreground
-    }
-
-    /// Returns the foreground color of `self`.
-    #[inline]
-    pub const fn bg_color(&self) -> Color {
-        self.background
-    }
-
-    /// Returns `true` if `self` is wrapping.
-    #[inline]
-    pub const fn is_wrapping(&self) -> bool {
-        self.wrap
-    }
-
-    #[inline(always)]
-    fn is_plain(&self) -> bool {
-        self == &Style::default()
-    }
-
-    /// Writes the ANSI code prefix for the currently set styles.
-    ///
-    /// This method is intended to be used inside of [`fmt::Display`] and
-    /// [`fmt::Debug`] implementations for custom or specialized use-cases. Most
-    /// users should use [`Paint`] for all painting needs.
-    ///
-    /// This method writes the ANSI code prefix irrespective of whether painting
-    /// is currently enabled or disabled. To write the prefix only if painting
-    /// is enabled, condition a call to this method on [`Paint::is_enabled()`].
-    pub fn fmt_prefix(&self, f: &mut dyn fmt::Write) -> fmt::Result {
-        // A user may just want a code-free string when no styles are applied.
-        if self.is_plain() {
-            return Ok(());
-        }
-
-        let mut splice = false;
-        write!(f, "\x1B[")?;
-
-        for i in self.properties.iter() {
-            let k = if i >= 5 { i + 2 } else { i + 1 };
-            write_spliced(&mut splice, f, k)?;
-        }
-
-        if self.background != Color::Unset {
-            write_spliced(&mut splice, f, "4")?;
-            self.background.ansi_fmt(f)?;
-        }
-
-        if self.foreground != Color::Unset {
-            write_spliced(&mut splice, f, "3")?;
-            self.foreground.ansi_fmt(f)?;
-        }
-
-        // All the codes end with an `m`.
-        write!(f, "m")
-    }
-
-    /// Writes the ANSI code suffix for the currently set styles.
-    ///
-    /// This method is intended to be used inside of [`fmt::Display`] and
-    /// [`fmt::Debug`] implementations for custom or specialized use-cases. Most
-    /// users should use [`Paint`] for all painting needs.
-    ///
-    /// This method writes the ANSI code suffix irrespective of whether painting
-    /// is currently enabled or disabled. To write the suffix only if painting
-    /// is enabled, condition a call to this method on [`Paint::is_enabled()`].
-    pub fn fmt_suffix(&self, f: &mut dyn fmt::Write) -> fmt::Result {
-        if self.is_plain() {
-            return Ok(());
-        }
-        write!(f, "\x1B[0m")
-    }
-}
diff --git a/radicle-term/src/ansi/tests.rs b/radicle-term/src/ansi/tests.rs
deleted file mode 100644
index fff06161b..000000000
--- a/radicle-term/src/ansi/tests.rs
+++ /dev/null
@@ -1,280 +0,0 @@
-use std::sync::Mutex;
-
-use super::Color::*;
-use super::Paint;
-
-/// Ensures tests are running serially.
-static SERIAL: Mutex<()> = Mutex::new(());
-
-#[test]
-fn colors_enabled() {
-    let _guard = SERIAL.lock();
-
-    Paint::force(true);
-
-    assert_eq!(
-        Paint::new("text/plain").to_string(),
-        "text/plain".to_string()
-    );
-    assert_eq!(
-        Paint::red("hi").to_string(),
-        "\x1B[31mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::black("hi").to_string(),
-        "\x1B[30mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::yellow("hi").bold().to_string(),
-        "\x1B[1;33mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::new("hi").fg(Yellow).bold().to_string(),
-        "\x1B[1;33mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::blue("hi").underline().to_string(),
-        "\x1B[4;34mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::green("hi").bold().underline().to_string(),
-        "\x1B[1;4;32mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::green("hi").underline().bold().to_string(),
-        "\x1B[1;4;32mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::magenta("hi").bg(White).to_string(),
-        "\x1B[47;35mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::red("hi").bg(Blue).fg(Yellow).to_string(),
-        "\x1B[44;33mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::cyan("hi").bg(Blue).fg(Yellow).to_string(),
-        "\x1B[44;33mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::cyan("hi").bold().bg(White).to_string(),
-        "\x1B[1;47;36mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::cyan("hi").underline().bg(White).to_string(),
-        "\x1B[4;47;36mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::cyan("hi").bold().underline().bg(White).to_string(),
-        "\x1B[1;4;47;36mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::cyan("hi").underline().bold().bg(White).to_string(),
-        "\x1B[1;4;47;36mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::fixed(100, "hi").to_string(),
-        "\x1B[38;5;100mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::fixed(100, "hi").bg(Magenta).to_string(),
-        "\x1B[45;38;5;100mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::fixed(100, "hi").bg(Fixed(200)).to_string(),
-        "\x1B[48;5;200;38;5;100mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::rgb(70, 130, 180, "hi").to_string(),
-        "\x1B[38;2;70;130;180mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::rgb(70, 130, 180, "hi").bg(Blue).to_string(),
-        "\x1B[44;38;2;70;130;180mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::blue("hi").bg(RGB(70, 130, 180)).to_string(),
-        "\x1B[48;2;70;130;180;34mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::rgb(70, 130, 180, "hi")
-            .bg(RGB(5, 10, 15))
-            .to_string(),
-        "\x1B[48;2;5;10;15;38;2;70;130;180mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::new("hi").bold().to_string(),
-        "\x1B[1mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::new("hi").underline().to_string(),
-        "\x1B[4mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::new("hi").bold().underline().to_string(),
-        "\x1B[1;4mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::new("hi").dim().to_string(),
-        "\x1B[2mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::new("hi").italic().to_string(),
-        "\x1B[3mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::new("hi").blink().to_string(),
-        "\x1B[5mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::new("hi").invert().to_string(),
-        "\x1B[7mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::new("hi").hidden().to_string(),
-        "\x1B[8mhi\x1B[0m".to_string()
-    );
-    assert_eq!(
-        Paint::new("hi").strikethrough().to_string(),
-        "\x1B[9mhi\x1B[0m".to_string()
-    );
-}
-
-#[test]
-fn colors_disabled() {
-    let _guard = SERIAL.lock();
-
-    Paint::force(false);
-    Paint::disable();
-
-    assert_eq!(
-        Paint::new("text/plain").to_string(),
-        "text/plain".to_string()
-    );
-    assert_eq!(Paint::red("hi").to_string(), "hi".to_string());
-    assert_eq!(Paint::black("hi").to_string(), "hi".to_string());
-    assert_eq!(Paint::yellow("hi").bold().to_string(), "hi".to_string());
-    assert_eq!(
-        Paint::new("hi").fg(Yellow).bold().to_string(),
-        "hi".to_string()
-    );
-    assert_eq!(Paint::blue("hi").underline().to_string(), "hi".to_string());
-    assert_eq!(
-        Paint::green("hi").bold().underline().to_string(),
-        "hi".to_string()
-    );
-    assert_eq!(
-        Paint::green("hi").underline().bold().to_string(),
-        "hi".to_string()
-    );
-    assert_eq!(Paint::magenta("hi").bg(White).to_string(), "hi".to_string());
-    assert_eq!(
-        Paint::red("hi").bg(Blue).fg(Yellow).to_string(),
-        "hi".to_string()
-    );
-    assert_eq!(
-        Paint::cyan("hi").bg(Blue).fg(Yellow).to_string(),
-        "hi".to_string()
-    );
-    assert_eq!(
-        Paint::cyan("hi").bold().bg(White).to_string(),
-        "hi".to_string()
-    );
-    assert_eq!(
-        Paint::cyan("hi").underline().bg(White).to_string(),
-        "hi".to_string()
-    );
-    assert_eq!(
-        Paint::cyan("hi").bold().underline().bg(White).to_string(),
-        "hi".to_string()
-    );
-    assert_eq!(
-        Paint::cyan("hi").underline().bold().bg(White).to_string(),
-        "hi".to_string()
-    );
-    assert_eq!(Paint::fixed(100, "hi").to_string(), "hi".to_string());
-    assert_eq!(
-        Paint::fixed(100, "hi").bg(Magenta).to_string(),
-        "hi".to_string()
-    );
-    assert_eq!(
-        Paint::fixed(100, "hi").bg(Fixed(200)).to_string(),
-        "hi".to_string()
-    );
-    assert_eq!(Paint::rgb(70, 130, 180, "hi").to_string(), "hi".to_string());
-    assert_eq!(
-        Paint::rgb(70, 130, 180, "hi").bg(Blue).to_string(),
-        "hi".to_string()
-    );
-    assert_eq!(
-        Paint::blue("hi").bg(RGB(70, 130, 180)).to_string(),
-        "hi".to_string()
-    );
-    assert_eq!(
-        Paint::blue("hi").bg(RGB(70, 130, 180)).wrap().to_string(),
-        "hi".to_string()
-    );
-    assert_eq!(
-        Paint::rgb(70, 130, 180, "hi")
-            .bg(RGB(5, 10, 15))
-            .to_string(),
-        "hi".to_string()
-    );
-    assert_eq!(Paint::new("hi").bold().to_string(), "hi".to_string());
-    assert_eq!(Paint::new("hi").underline().to_string(), "hi".to_string());
-    assert_eq!(
-        Paint::new("hi").bold().underline().to_string(),
-        "hi".to_string()
-    );
-    assert_eq!(Paint::new("hi").dim().to_string(), "hi".to_string());
-    assert_eq!(Paint::new("hi").italic().to_string(), "hi".to_string());
-    assert_eq!(Paint::new("hi").blink().to_string(), "hi".to_string());
-    assert_eq!(Paint::new("hi").invert().to_string(), "hi".to_string());
-    assert_eq!(Paint::new("hi").hidden().to_string(), "hi".to_string());
-    assert_eq!(
-        Paint::new("hi").strikethrough().to_string(),
-        "hi".to_string()
-    );
-    assert_eq!(
-        Paint::new("hi").strikethrough().wrap().to_string(),
-        "hi".to_string()
-    );
-}
-
-#[test]
-fn wrapping() {
-    let _guard = SERIAL.lock();
-    let inner = || format!("{} b {}", Paint::red("a"), Paint::green("c"));
-    let inner2 = || format!("0 {} 1", Paint::magenta(&inner()).wrap());
-
-    Paint::force(true);
-
-    assert_eq!(
-        Paint::new("text/plain").wrap().to_string(),
-        "text/plain".to_string()
-    );
-    assert_eq!(Paint::new(&inner()).wrap().to_string(), inner());
-    assert_eq!(
-        Paint::new(&inner()).wrap().to_string(),
-        "\u{1b}[31ma\u{1b}[0m b \u{1b}[32mc\u{1b}[0m".to_string()
-    );
-    assert_eq!(
-        Paint::new(&inner()).fg(Blue).wrap().to_string(),
-        "\u{1b}[34m\u{1b}[31ma\u{1b}[0m\u{1b}[34m b \
-            \u{1b}[32mc\u{1b}[0m\u{1b}[34m\u{1b}[0m"
-            .to_string()
-    );
-    assert_eq!(Paint::new(&inner2()).wrap().to_string(), inner2());
-    assert_eq!(
-        Paint::new(&inner2()).wrap().to_string(),
-        "0 \u{1b}[35m\u{1b}[31ma\u{1b}[0m\u{1b}[35m b \
-            \u{1b}[32mc\u{1b}[0m\u{1b}[35m\u{1b}[0m 1"
-            .to_string()
-    );
-    assert_eq!(
-        Paint::new(&inner2()).fg(Blue).wrap().to_string(),
-        "\u{1b}[34m0 \u{1b}[35m\u{1b}[31ma\u{1b}[0m\u{1b}[34m\u{1b}[35m b \
-            \u{1b}[32mc\u{1b}[0m\u{1b}[34m\u{1b}[35m\u{1b}[0m\u{1b}[34m 1\u{1b}[0m"
-            .to_string()
-    );
-}
diff --git a/radicle-term/src/ansi/windows.rs b/radicle-term/src/ansi/windows.rs
deleted file mode 100644
index 711e6d5f2..000000000
--- a/radicle-term/src/ansi/windows.rs
+++ /dev/null
@@ -1,64 +0,0 @@
-#[cfg(windows)]
-mod windows_console {
-    use std::os::raw::c_void;
-
-    #[allow(non_camel_case_types)]
-    type c_ulong = u32;
-    #[allow(non_camel_case_types)]
-    type c_int = i32;
-    type DWORD = c_ulong;
-    type LPDWORD = *mut DWORD;
-    type HANDLE = *mut c_void;
-    type BOOL = c_int;
-
-    const ENABLE_VIRTUAL_TERMINAL_PROCESSING: DWORD = 0x0004;
-    const STD_OUTPUT_HANDLE: DWORD = 0xFFFFFFF5;
-    const STD_ERROR_HANDLE: DWORD = 0xFFFFFFF4;
-    const INVALID_HANDLE_VALUE: HANDLE = -1isize as HANDLE;
-    const FALSE: BOOL = 0;
-    const TRUE: BOOL = 1;
-
-    // This is the win32 console API, taken from the 'winapi' crate.
-    extern "system" {
-        fn GetStdHandle(nStdHandle: DWORD) -> HANDLE;
-        fn GetConsoleMode(hConsoleHandle: HANDLE, lpMode: LPDWORD) -> BOOL;
-        fn SetConsoleMode(hConsoleHandle: HANDLE, dwMode: DWORD) -> BOOL;
-    }
-
-    unsafe fn get_handle(handle_num: DWORD) -> Result<HANDLE, ()> {
-        match GetStdHandle(handle_num) {
-            handle if handle == INVALID_HANDLE_VALUE => Err(()),
-            handle => Ok(handle),
-        }
-    }
-
-    unsafe fn enable_vt(handle: HANDLE) -> Result<(), ()> {
-        let mut dw_mode: DWORD = 0;
-        if GetConsoleMode(handle, &mut dw_mode) == FALSE {
-            return Err(());
-        }
-
-        dw_mode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
-        match SetConsoleMode(handle, dw_mode) {
-            result if result == TRUE => Ok(()),
-            _ => Err(()),
-        }
-    }
-
-    unsafe fn enable_ansi_colors_raw() -> Result<bool, ()> {
-        let stdout_handle = get_handle(STD_OUTPUT_HANDLE)?;
-        let stderr_handle = get_handle(STD_ERROR_HANDLE)?;
-
-        enable_vt(stdout_handle)?;
-        if stdout_handle != stderr_handle {
-            enable_vt(stderr_handle)?;
-        }
-
-        Ok(true)
-    }
-
-    #[inline]
-    pub fn enable_ansi_colors() -> bool {
-        unsafe { enable_ansi_colors_raw().unwrap_or(false) }
-    }
-}
diff --git a/radicle-term/src/args.rs b/radicle-term/src/args.rs
deleted file mode 100644
index eeddd0544..000000000
--- a/radicle-term/src/args.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-use std::ffi::OsString;
-use std::str::FromStr;
-
-use anyhow::anyhow;
-use radicle::crypto;
-use radicle::prelude::{Did, Id, NodeId};
-
-#[derive(thiserror::Error, Debug)]
-pub enum Error {
-    /// If this error is returned from argument parsing, help is displayed.
-    #[error("help invoked")]
-    Help,
-    /// If this error is returned from argument parsing, usage is displayed.
-    #[error("usage invoked")]
-    Usage,
-    /// An error with a hint.
-    #[error("{err}")]
-    WithHint {
-        err: anyhow::Error,
-        hint: &'static str,
-    },
-}
-
-pub struct Help {
-    pub name: &'static str,
-    pub description: &'static str,
-    pub version: &'static str,
-    pub usage: &'static str,
-}
-
-pub trait Args: Sized {
-    fn from_env() -> anyhow::Result<Self> {
-        let args: Vec<_> = std::env::args_os().into_iter().skip(1).collect();
-
-        match Self::from_args(args) {
-            Ok((opts, unparsed)) => {
-                self::finish(unparsed)?;
-
-                Ok(opts)
-            }
-            Err(err) => Err(err),
-        }
-    }
-
-    fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)>;
-}
-
-pub fn parse_value<T: FromStr>(flag: &str, value: OsString) -> anyhow::Result<T>
-where
-    <T as FromStr>::Err: std::error::Error,
-{
-    value
-        .into_string()
-        .map_err(|_| anyhow!("the value specified for '--{}' is not valid unicode", flag))?
-        .parse()
-        .map_err(|e| anyhow!("invalid value specified for '--{}' ({})", flag, e))
-}
-
-pub fn format(arg: lexopt::Arg) -> OsString {
-    match arg {
-        lexopt::Arg::Long(flag) => format!("--{flag}").into(),
-        lexopt::Arg::Short(flag) => format!("-{flag}").into(),
-        lexopt::Arg::Value(val) => val,
-    }
-}
-
-pub fn finish(unparsed: Vec<OsString>) -> anyhow::Result<()> {
-    if let Some(arg) = unparsed.first() {
-        return Err(anyhow::anyhow!(
-            "unexpected argument `{}`",
-            arg.to_string_lossy()
-        ));
-    }
-    Ok(())
-}
-
-pub fn did(val: &OsString) -> anyhow::Result<Did> {
-    let val = val.to_string_lossy();
-    let Ok(peer) = Did::from_str(&val) else {
-        if crypto::PublicKey::from_str(&val).is_ok() {
-            return Err(anyhow!("expected DID, did you mean 'did:key:{val}'?"));
-        } else {
-            return Err(anyhow!("invalid DID '{}', expected 'did:key'", val));
-        }
-    };
-    Ok(peer)
-}
-
-pub fn nid(val: &OsString) -> anyhow::Result<NodeId> {
-    let val = val.to_string_lossy();
-    NodeId::from_str(&val).map_err(|_| anyhow!("invalid Node ID '{}'", val))
-}
-
-pub fn rid(val: &OsString) -> anyhow::Result<Id> {
-    let val = val.to_string_lossy();
-    Id::from_str(&val).map_err(|_| anyhow!("invalid Repository ID '{}'", val))
-}
diff --git a/radicle-term/src/cell.rs b/radicle-term/src/cell.rs
deleted file mode 100644
index 48c3785aa..000000000
--- a/radicle-term/src/cell.rs
+++ /dev/null
@@ -1,217 +0,0 @@
-use std::fmt;
-
-use super::{Color, Filled, Line, Paint};
-
-use unicode_display_width as unicode;
-use unicode_segmentation::UnicodeSegmentation as _;
-
-/// Text that can be displayed on the terminal, measured, truncated and padded.
-pub trait Cell: fmt::Display {
-    /// Type after truncation.
-    type Truncated: Cell;
-    /// Type after padding.
-    type Padded: Cell;
-
-    /// Cell display width in number of terminal columns.
-    fn width(&self) -> usize;
-    /// Background color of cell.
-    fn background(&self) -> Color {
-        Color::Unset
-    }
-    /// Truncate cell if longer than given width. Shows the delimiter if truncated.
-    #[must_use]
-    fn truncate(&self, width: usize, delim: &str) -> Self::Truncated;
-    /// Pad the cell so that it is the given width, while keeping the content left-aligned.
-    #[must_use]
-    fn pad(&self, width: usize) -> Self::Padded;
-}
-
-impl Cell for Paint<String> {
-    type Truncated = Self;
-    type Padded = Self;
-
-    fn width(&self) -> usize {
-        Cell::width(self.content())
-    }
-
-    fn background(&self) -> Color {
-        self.style.background
-    }
-
-    fn truncate(&self, width: usize, delim: &str) -> Self {
-        Self {
-            item: self.item.truncate(width, delim),
-            style: self.style,
-        }
-    }
-
-    fn pad(&self, width: usize) -> Self {
-        Self {
-            item: self.item.pad(width),
-            style: self.style,
-        }
-    }
-}
-
-impl Cell for Line {
-    type Truncated = Line;
-    type Padded = Line;
-
-    fn width(&self) -> usize {
-        Line::width(self)
-    }
-
-    fn pad(&self, width: usize) -> Self::Padded {
-        let mut line = self.clone();
-        Line::pad(&mut line, width);
-        line
-    }
-
-    fn truncate(&self, width: usize, delim: &str) -> Self::Truncated {
-        let mut line = self.clone();
-        Line::truncate(&mut line, width, delim);
-        line
-    }
-}
-
-impl Cell for Paint<&str> {
-    type Truncated = Paint<String>;
-    type Padded = Paint<String>;
-
-    fn width(&self) -> usize {
-        Cell::width(self.item)
-    }
-
-    fn background(&self) -> Color {
-        self.style.background
-    }
-
-    fn truncate(&self, width: usize, delim: &str) -> Paint<String> {
-        Paint {
-            item: self.item.truncate(width, delim),
-            style: self.style,
-        }
-    }
-
-    fn pad(&self, width: usize) -> Paint<String> {
-        Paint {
-            item: self.item.pad(width),
-            style: self.style,
-        }
-    }
-}
-
-impl Cell for String {
-    type Truncated = Self;
-    type Padded = Self;
-
-    fn width(&self) -> usize {
-        Cell::width(self.as_str())
-    }
-
-    fn truncate(&self, width: usize, delim: &str) -> Self {
-        self.as_str().truncate(width, delim)
-    }
-
-    fn pad(&self, width: usize) -> Self {
-        self.as_str().pad(width)
-    }
-}
-
-impl Cell for str {
-    type Truncated = String;
-    type Padded = String;
-
-    fn width(&self) -> usize {
-        self.graphemes(true)
-            .map(|g| unicode::width(g) as usize)
-            .sum()
-    }
-
-    fn truncate(&self, width: usize, delim: &str) -> String {
-        if width < Cell::width(self) {
-            let d = Cell::width(delim);
-            if width < d {
-                // If we can't even fit the delimiter, just return an empty string.
-                return String::new();
-            }
-            // Find the unicode byte boundary where the display width is the largest,
-            // while being smaller than the given max width.
-            let mut cols = 0; // Number of visual columns we need.
-            let mut boundary = 0; // Boundary in bytes.
-            for g in self.graphemes(true) {
-                let c = Cell::width(g);
-                if cols + c + d > width {
-                    break;
-                }
-                boundary += g.len();
-                cols += c;
-            }
-            // Don't add the delimiter if we just trimmed whitespace.
-            if self[boundary..].trim().is_empty() {
-                self[..boundary + 1].to_owned()
-            } else {
-                format!("{}{delim}", &self[..boundary])
-            }
-        } else {
-            self.to_owned()
-        }
-    }
-
-    fn pad(&self, max: usize) -> String {
-        let width = Cell::width(self);
-
-        if width < max {
-            format!("{self}{}", " ".repeat(max - width))
-        } else {
-            self.to_owned()
-        }
-    }
-}
-
-impl<T: Cell + ?Sized> Cell for &T {
-    type Truncated = T::Truncated;
-    type Padded = T::Padded;
-
-    fn width(&self) -> usize {
-        T::width(self)
-    }
-
-    fn truncate(&self, width: usize, delim: &str) -> Self::Truncated {
-        T::truncate(self, width, delim)
-    }
-
-    fn pad(&self, width: usize) -> Self::Padded {
-        T::pad(self, width)
-    }
-}
-
-impl<T: Cell + fmt::Display> Cell for Filled<T> {
-    type Truncated = T::Truncated;
-    type Padded = T::Padded;
-
-    fn width(&self) -> usize {
-        T::width(&self.item)
-    }
-
-    fn background(&self) -> Color {
-        self.color
-    }
-
-    fn truncate(&self, width: usize, delim: &str) -> Self::Truncated {
-        T::truncate(&self.item, width, delim)
-    }
-
-    fn pad(&self, width: usize) -> Self::Padded {
-        T::pad(&self.item, width)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    #[test]
-    fn test_width() {
-        assert_eq!(unicode_display_width::width("❤️"), 2);
-        assert_eq!(unicode_display_width::width("🪵"), 2);
-    }
-}
diff --git a/radicle-term/src/colors.rs b/radicle-term/src/colors.rs
deleted file mode 100644
index ffdd7853b..000000000
--- a/radicle-term/src/colors.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use crate::ansi::Color;
-
-/// The faintest color; useful for borders and such.
-pub const FAINT: Color = fixed::FAINT;
-
-// RGB (24-bit) colors supported by modern terminals.
-pub mod rgb {
-    use super::*;
-
-    pub const NEGATIVE: Color = Color::RGB(60, 10, 20);
-    pub const POSITIVE: Color = Color::RGB(10, 60, 20);
-    pub const NEGATIVE_DARK: Color = Color::RGB(30, 10, 20);
-    pub const POSITIVE_DARK: Color = Color::RGB(10, 30, 20);
-    pub const NEGATIVE_LIGHT: Color = Color::RGB(170, 80, 120);
-    pub const POSITIVE_LIGHT: Color = Color::RGB(80, 170, 120);
-    pub const DIM: Color = Color::RGB(100, 100, 100);
-    pub const FAINT: Color = Color::RGB(20, 20, 20);
-
-    // Default syntax theme.
-    pub const PURPLE: Color = Color::RGB(0xd2, 0xa8, 0xff);
-    pub const RED: Color = Color::RGB(0xff, 0x7b, 0x72);
-    pub const GREEN: Color = Color::RGB(0x7e, 0xd7, 0x87);
-    pub const TEAL: Color = Color::RGB(0xa5, 0xd6, 0xff);
-    pub const ORANGE: Color = Color::RGB(0xff, 0xa6, 0x57);
-    pub const BLUE: Color = Color::RGB(0x79, 0xc0, 0xff);
-    pub const GREY: Color = Color::RGB(0x8b, 0x94, 0x9e);
-    pub const GREY_LIGHT: Color = Color::RGB(0xc9, 0xd1, 0xd9);
-
-    /// Get a color using the color name.
-    pub fn theme(name: &'static str) -> Option<Color> {
-        match name {
-            "negative" => Some(NEGATIVE),
-            "negative.dark" => Some(NEGATIVE_DARK),
-            "negative.light" => Some(NEGATIVE_LIGHT),
-            "positive" => Some(POSITIVE),
-            "positive.dark" => Some(POSITIVE_DARK),
-            "positive.light" => Some(POSITIVE_LIGHT),
-            "dim" => Some(DIM),
-            "faint" => Some(FAINT),
-            "purple" => Some(PURPLE),
-            "red" => Some(RED),
-            "green" => Some(GREEN),
-            "teal" => Some(TEAL),
-            "orange" => Some(ORANGE),
-            "blue" => Some(BLUE),
-            "grey" => Some(GREY),
-            "grey.light" => Some(GREY_LIGHT),
-
-            _ => None,
-        }
-    }
-}
-
-/// "Fixed" ANSI colors, supported by most terminals.
-pub mod fixed {
-    use super::*;
-
-    /// The faintest color; useful for borders and such.
-    pub const FAINT: Color = Color::Fixed(236);
-    /// Slightly brighter than faint.
-    pub const DIM: Color = Color::Fixed(239);
-
-    /// Get a color using the color name.
-    pub fn theme(name: &'static str) -> Option<Color> {
-        match name {
-            "negative" => Some(Color::Red),
-            "negative.dark" => None,
-            "positive" => Some(Color::Green),
-            "positive.dark" => None,
-            "dim" => None,
-            "faint" => None,
-            "blue" => Some(Color::Blue),
-            "green" => Some(Color::Green),
-            "red" => Some(Color::Red),
-            "teal" => Some(Color::Cyan),
-            "purple" => Some(Color::Magenta),
-
-            _ => None,
-        }
-    }
-}
diff --git a/radicle-term/src/command.rs b/radicle-term/src/command.rs
deleted file mode 100644
index 83844ea81..000000000
--- a/radicle-term/src/command.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use std::io::Write;
-use std::process::{Command, Stdio};
-
-pub fn bat<S: AsRef<std::ffi::OsStr>>(
-    args: impl IntoIterator<Item = S>,
-    stdin: &str,
-) -> anyhow::Result<()> {
-    let mut child = Command::new("bat")
-        .stdin(Stdio::piped())
-        .args(args)
-        .spawn()?;
-
-    let writer = child.stdin.as_mut().unwrap();
-    writer.write_all(stdin.as_bytes())?;
-
-    child.wait()?;
-
-    Ok(())
-}
diff --git a/radicle-term/src/editor.rs b/radicle-term/src/editor.rs
deleted file mode 100644
index c4e7bab0b..000000000
--- a/radicle-term/src/editor.rs
+++ /dev/null
@@ -1,168 +0,0 @@
-use std::ffi::OsString;
-use std::io::IsTerminal;
-use std::io::Write;
-use std::os::fd::{AsRawFd, FromRawFd};
-use std::path::{Path, PathBuf};
-use std::process;
-use std::{env, fs, io};
-
-pub const COMMENT_FILE: &str = "RAD_COMMENT";
-/// Some common paths where system-installed binaries are found.
-pub const PATHS: &[&str] = &["/usr/local/bin", "/usr/bin", "/bin"];
-
-/// Allows for text input in the configured editor.
-pub struct Editor {
-    path: PathBuf,
-}
-
-impl Drop for Editor {
-    fn drop(&mut self) {
-        fs::remove_file(&self.path).ok();
-    }
-}
-
-impl Default for Editor {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl Editor {
-    /// Create a new editor.
-    pub fn new() -> Self {
-        let path = env::temp_dir().join(COMMENT_FILE);
-
-        Self { path }
-    }
-
-    /// Set the file extension.
-    pub fn extension(mut self, ext: &str) -> Self {
-        let ext = ext.trim_start_matches('.');
-
-        self.path.set_extension(ext);
-        self
-    }
-
-    /// Open the editor and return the edited text.
-    ///
-    /// If the text hasn't changed from the initial contents of the editor,
-    /// return `None`.
-    pub fn edit(&mut self, initial: impl AsRef<[u8]>) -> io::Result<Option<String>> {
-        let initial = initial.as_ref();
-        let mut file = fs::OpenOptions::new()
-            .write(true)
-            .create(true)
-            .truncate(true)
-            .open(&self.path)?;
-
-        if file.metadata()?.len() == 0 {
-            file.write_all(initial)?;
-            if !initial.ends_with(&[b'\n']) {
-                file.write_all(b"\n")?;
-            }
-            file.flush()?;
-        }
-
-        let Some(cmd) = self::default_editor() else {
-            return Err(io::Error::new(
-                io::ErrorKind::NotFound,
-                "editor not configured: the `EDITOR` environment variable is not set",
-            ));
-        };
-        let Some(parts) = shlex::split(cmd.to_string_lossy().as_ref()) else {
-            return Err(io::Error::new(
-                io::ErrorKind::InvalidInput,
-                format!("invalid editor command {cmd:?}"),
-            ));
-        };
-        let Some((program, args)) = parts.split_first() else {
-            return Err(io::Error::new(
-                io::ErrorKind::InvalidInput,
-                format!("invalid editor command {cmd:?}"),
-            ));
-        };
-
-        // We duplicate the stderr file descriptor to pass it to the child process, otherwise, if
-        // we simply pass the `RawFd` of our stderr, `Command` will close our stderr when the
-        // child exits.
-        let stderr = io::stderr().as_raw_fd();
-        let stderr = unsafe { libc::dup(stderr) };
-        let stdin = if io::stdin().is_terminal() {
-            process::Stdio::inherit()
-        } else {
-            let tty = termion::get_tty()?;
-            // If standard input is not a terminal device, the editor won't work correctly.
-            // In that case, we use the terminal device, eg. `/dev/tty` as standard input.
-            process::Stdio::from(tty)
-        };
-
-        process::Command::new(program)
-            .stdout(unsafe { process::Stdio::from_raw_fd(stderr) })
-            .stderr(process::Stdio::inherit())
-            .stdin(stdin)
-            .args(args)
-            .arg(&self.path)
-            .spawn()
-            .map_err(|e| {
-                io::Error::new(
-                    e.kind(),
-                    format!("failed to spawn editor command {cmd:?}: {e}"),
-                )
-            })?
-            .wait()
-            .map_err(|e| {
-                io::Error::new(
-                    e.kind(),
-                    format!("editor command {cmd:?} didn't spawn: {e}"),
-                )
-            })?;
-
-        let text = fs::read_to_string(&self.path)?;
-        if text.trim().is_empty() {
-            return Ok(None);
-        }
-        Ok(Some(text))
-    }
-}
-
-/// Get the default editor command.
-pub fn default_editor() -> Option<OsString> {
-    // First check the standard environment variables.
-    if let Ok(visual) = env::var("VISUAL") {
-        if !visual.is_empty() {
-            return Some(visual.into());
-        }
-    }
-    if let Ok(editor) = env::var("EDITOR") {
-        if !editor.is_empty() {
-            return Some(editor.into());
-        }
-    }
-    // Check Git. The user might have configured their editor there.
-    #[cfg(feature = "git2")]
-    if let Ok(path) = git2::Config::open_default().and_then(|cfg| cfg.get_path("core.editor")) {
-        return Some(path.into_os_string());
-    }
-    // On macOS, `nano` is installed by default and it's what most users are used to
-    // in the terminal.
-    if cfg!(target_os = "macos") && exists("nano") {
-        return Some("nano".into());
-    }
-    // If all else fails, we try `vi`. It's usually installed on most unix-based systems.
-    if exists("vi") {
-        return Some("vi".into());
-    }
-    None
-}
-
-/// Check whether a binary can be found in the most common paths.
-/// We don't bother checking the $PATH variable, as we're only looking for very standard tools
-/// and prefer not to make this too complex.
-fn exists(cmd: &str) -> bool {
-    for dir in PATHS {
-        if Path::new(dir).join(cmd).exists() {
-            return true;
-        }
-    }
-    false
-}
diff --git a/radicle-term/src/element.rs b/radicle-term/src/element.rs
deleted file mode 100644
index 7d87d2d39..000000000
--- a/radicle-term/src/element.rs
+++ /dev/null
@@ -1,397 +0,0 @@
-use std::fmt;
-use std::io::IsTerminal;
-use std::ops::Deref;
-use std::{io, vec};
-
-use crate::cell::Cell;
-use crate::{viewport, Color, Filled, Label, Style};
-
-/// Rendering constraint.
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub struct Constraint {
-    /// Minimum space the element can take.
-    pub min: Size,
-    /// Maximum space the element can take.
-    pub max: Size,
-}
-
-impl Default for Constraint {
-    fn default() -> Self {
-        Self::UNBOUNDED
-    }
-}
-
-impl Constraint {
-    /// Can satisfy any size of object.
-    pub const UNBOUNDED: Self = Self {
-        min: Size::MIN,
-        max: Size::MAX,
-    };
-
-    /// Create a new constraint.
-    pub fn new(min: Size, max: Size) -> Self {
-        assert!(min.cols <= max.cols && min.rows <= max.rows);
-
-        Self { min, max }
-    }
-
-    /// A constraint with only a maximum size.
-    pub fn max(max: Size) -> Self {
-        Self {
-            min: Size::MIN,
-            max,
-        }
-    }
-
-    /// A constraint that can only be satisfied by a single column size.
-    /// The rows are unconstrained.
-    pub fn tight(cols: usize) -> Self {
-        Self {
-            min: Size::new(cols, 1),
-            max: Size::new(cols, usize::MAX),
-        }
-    }
-
-    /// Create a constraint from the terminal environment.
-    /// Returns [`None`] if the output device is not a terminal.
-    pub fn from_env() -> Option<Self> {
-        if io::stdout().is_terminal() {
-            Some(Self::max(viewport().unwrap_or(Size::MAX)))
-        } else {
-            None
-        }
-    }
-}
-
-/// A text element that has a size and can be rendered to the terminal.
-pub trait Element: fmt::Debug + Send + Sync {
-    /// Get the size of the element, in rows and columns.
-    fn size(&self, parent: Constraint) -> Size;
-
-    #[must_use]
-    /// Render the element as lines of text that can be printed.
-    fn render(&self, parent: Constraint) -> Vec<Line>;
-
-    /// Get the number of columns occupied by this element.
-    fn columns(&self, parent: Constraint) -> usize {
-        self.size(parent).cols
-    }
-
-    /// Get the number of rows occupied by this element.
-    fn rows(&self, parent: Constraint) -> usize {
-        self.size(parent).rows
-    }
-
-    /// Print this element to stdout.
-    fn print(&self) {
-        for line in self.render(Constraint::from_env().unwrap_or_default()) {
-            println!("{}", line.to_string().trim_end());
-        }
-    }
-
-    /// Write using the given constraints to `stdout`.
-    fn write(&self, constraints: Constraint) -> io::Result<()>
-    where
-        Self: Sized,
-    {
-        self::write_to(self, &mut io::stdout(), constraints)
-    }
-
-    #[must_use]
-    /// Return a string representation of this element.
-    fn display(&self, constraints: Constraint) -> String {
-        let mut out = String::new();
-        for line in self.render(constraints) {
-            out.extend(line.into_iter().map(|l| l.to_string()));
-            out.push('\n');
-        }
-        out
-    }
-}
-
-impl<'a> Element for Box<dyn Element + 'a> {
-    fn size(&self, parent: Constraint) -> Size {
-        self.deref().size(parent)
-    }
-
-    fn render(&self, parent: Constraint) -> Vec<Line> {
-        self.deref().render(parent)
-    }
-
-    fn print(&self) {
-        self.deref().print()
-    }
-}
-
-impl<T: Element> Element for &T {
-    fn size(&self, parent: Constraint) -> Size {
-        (*self).size(parent)
-    }
-
-    fn render(&self, parent: Constraint) -> Vec<Line> {
-        (*self).render(parent)
-    }
-
-    fn print(&self) {
-        (*self).print()
-    }
-}
-
-/// Write using the given constraints, to a writer.
-pub fn write_to(
-    elem: &impl Element,
-    writer: &mut impl io::Write,
-    constraints: Constraint,
-) -> io::Result<()> {
-    for line in elem.render(constraints) {
-        writeln!(writer, "{}", line.to_string().trim_end())?;
-    }
-    Ok(())
-}
-
-/// A line of text that has styling and can be displayed.
-#[derive(Clone, Default, Debug)]
-pub struct Line {
-    items: Vec<Label>,
-}
-
-impl Line {
-    /// Create a new line.
-    pub fn new(item: impl Into<Label>) -> Self {
-        Self {
-            items: vec![item.into()],
-        }
-    }
-
-    /// Create a blank line.
-    pub fn blank() -> Self {
-        Self { items: vec![] }
-    }
-
-    /// Return a styled line by styling all its labels.
-    pub fn style(self, style: Style) -> Line {
-        Self {
-            items: self
-                .items
-                .into_iter()
-                .map(|l| {
-                    let style = l.paint().style().merge(style);
-                    l.style(style)
-                })
-                .collect(),
-        }
-    }
-
-    /// Return a line with a single space between the given labels.
-    pub fn spaced(items: impl IntoIterator<Item = Label>) -> Self {
-        let mut line = Self::default();
-        for item in items.into_iter() {
-            // Don't create spaces around empty labels.
-            if item.is_blank() {
-                continue;
-            }
-            line.push(item);
-            line.push(Label::space());
-        }
-        line.items.pop();
-        line
-    }
-
-    /// Add an item to this line.
-    pub fn item(mut self, item: impl Into<Label>) -> Self {
-        self.push(item);
-        self
-    }
-
-    /// Add multiple items to this line.
-    pub fn extend(mut self, items: impl IntoIterator<Item = Label>) -> Self {
-        self.items.extend(items);
-        self
-    }
-
-    /// Add an item to this line.
-    pub fn push(&mut self, item: impl Into<Label>) {
-        self.items.push(item.into());
-    }
-
-    /// Pad this line to occupy the given width.
-    pub fn pad(&mut self, width: usize) {
-        let w = self.width();
-
-        if width > w {
-            let pad = width - w;
-            let bg = if let Some(last) = self.items.last() {
-                last.background()
-            } else {
-                Color::Unset
-            };
-            self.items.push(Label::new(" ".repeat(pad).as_str()).bg(bg));
-        }
-    }
-
-    /// Truncate this line to the given width.
-    pub fn truncate(&mut self, width: usize, delim: &str) {
-        while self.width() > width {
-            let total = self.width();
-
-            if total - self.items.last().map_or(0, Cell::width) > width {
-                self.items.pop();
-            } else if let Some(item) = self.items.last_mut() {
-                *item = item.truncate(width - (total - Cell::width(item)), delim);
-            }
-        }
-    }
-
-    /// Get the actual column width of this line.
-    pub fn width(&self) -> usize {
-        self.items.iter().map(Cell::width).sum()
-    }
-
-    /// Create a line that contains a single space.
-    pub fn space(mut self) -> Self {
-        self.items.push(Label::space());
-        self
-    }
-
-    /// Box this line as an [`Element`].
-    pub fn boxed(self) -> Box<dyn Element> {
-        Box::new(self)
-    }
-
-    /// Return a filled line.
-    pub fn filled(self, color: Color) -> Filled<Self> {
-        Filled { item: self, color }
-    }
-}
-
-impl IntoIterator for Line {
-    type Item = Label;
-    type IntoIter = Box<dyn Iterator<Item = Label>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        Box::new(self.items.into_iter())
-    }
-}
-
-impl<T: Into<Label>> From<T> for Line {
-    fn from(value: T) -> Self {
-        Self::new(value)
-    }
-}
-
-impl From<Vec<Label>> for Line {
-    fn from(items: Vec<Label>) -> Self {
-        Self { items }
-    }
-}
-
-impl Element for Line {
-    fn size(&self, _parent: Constraint) -> Size {
-        Size::new(self.items.iter().map(Cell::width).sum(), 1)
-    }
-
-    fn render(&self, _parent: Constraint) -> Vec<Line> {
-        vec![self.clone()]
-    }
-}
-
-impl Element for Vec<Line> {
-    fn size(&self, parent: Constraint) -> Size {
-        let width = self
-            .iter()
-            .map(|e| e.columns(parent))
-            .max()
-            .unwrap_or_default();
-        let height = self.len();
-
-        Size::new(width, height)
-    }
-
-    fn render(&self, parent: Constraint) -> Vec<Line> {
-        self.iter()
-            .cloned()
-            .flat_map(|l| l.render(parent))
-            .collect()
-    }
-}
-
-impl fmt::Display for Line {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        for item in &self.items {
-            write!(f, "{item}")?;
-        }
-        Ok(())
-    }
-}
-
-/// Size of a text element, in columns and rows.
-#[derive(Clone, Debug, Default, Copy, PartialEq, Eq)]
-pub struct Size {
-    /// Columns occupied.
-    pub cols: usize,
-    /// Rows occupied.
-    pub rows: usize,
-}
-
-impl Size {
-    /// Minimum size.
-    pub const MIN: Self = Self {
-        cols: usize::MIN,
-        rows: usize::MIN,
-    };
-    /// Maximum size.
-    pub const MAX: Self = Self {
-        cols: usize::MAX,
-        rows: usize::MAX,
-    };
-
-    /// Create a new [`Size`].
-    pub fn new(cols: usize, rows: usize) -> Self {
-        Self { cols, rows }
-    }
-
-    /// Constrain size.
-    pub fn constrain(self, c: Constraint) -> Self {
-        Self {
-            cols: self.cols.clamp(c.min.cols, c.max.cols),
-            rows: self.rows.clamp(c.min.rows, c.max.rows),
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_truncate() {
-        let line = Line::default().item("banana").item("peach").item("apple");
-
-        let mut actual = line.clone();
-        actual = actual.truncate(9, "…");
-        assert_eq!(actual.to_string(), "bananape…");
-
-        let mut actual = line.clone();
-        actual = actual.truncate(7, "…");
-        assert_eq!(actual.to_string(), "banana…");
-
-        let mut actual = line.clone();
-        actual = actual.truncate(1, "…");
-        assert_eq!(actual.to_string(), "…");
-
-        let mut actual = line;
-        actual = actual.truncate(0, "…");
-        assert_eq!(actual.to_string(), "");
-    }
-
-    #[test]
-    fn test_width() {
-        // Nb. This might not display correctly in some editors or terminals.
-        let line = Line::new("Radicle Heartwood Protocol & Stack ❤️🪵");
-        assert_eq!(line.width(), 39, "{line}");
-        let line = Line::new("❤\u{fe0f}");
-        assert_eq!(line.width(), 2, "{line}");
-        let line = Line::new("❤️");
-        assert_eq!(line.width(), 2, "{line}");
-    }
-}
diff --git a/radicle-term/src/format.rs b/radicle-term/src/format.rs
deleted file mode 100644
index 50f336653..000000000
--- a/radicle-term/src/format.rs
+++ /dev/null
@@ -1,97 +0,0 @@
-use crate::Paint;
-
-pub fn default<D: std::fmt::Display>(msg: D) -> Paint<D> {
-    Paint::new(msg)
-}
-
-pub fn wrap<D: std::fmt::Display>(msg: D) -> Paint<D> {
-    Paint::wrapping(msg)
-}
-
-pub fn negative<D: std::fmt::Display>(msg: D) -> Paint<D> {
-    Paint::red(msg)
-}
-
-pub fn positive<D: std::fmt::Display>(msg: D) -> Paint<D> {
-    Paint::green(msg)
-}
-
-pub fn primary<D: std::fmt::Display>(msg: D) -> Paint<D> {
-    Paint::magenta(msg)
-}
-
-pub fn secondary<D: std::fmt::Display>(msg: D) -> Paint<D> {
-    Paint::blue(msg)
-}
-
-pub fn tertiary<D: std::fmt::Display>(msg: D) -> Paint<D> {
-    Paint::cyan(msg)
-}
-
-pub fn yellow<D: std::fmt::Display>(msg: D) -> Paint<D> {
-    Paint::yellow(msg)
-}
-
-pub fn hint<D: std::fmt::Display>(msg: D) -> Paint<D> {
-    Paint::yellow(msg)
-}
-
-pub fn faint<D: std::fmt::Display>(msg: D) -> Paint<D> {
-    Paint::fixed(236, msg)
-}
-
-pub fn highlight<D: std::fmt::Debug + std::fmt::Display>(input: D) -> Paint<D> {
-    Paint::green(input).bold()
-}
-
-pub fn badge_primary<D: std::fmt::Display>(input: D) -> Paint<String> {
-    if Paint::is_enabled() {
-        Paint::magenta(format!(" {input} ")).invert()
-    } else {
-        Paint::new(format!("❲{input}❳"))
-    }
-}
-
-pub fn badge_yellow<D: std::fmt::Display>(input: D) -> Paint<String> {
-    if Paint::is_enabled() {
-        Paint::yellow(format!(" {input} ")).invert()
-    } else {
-        Paint::new(format!("❲{input}❳"))
-    }
-}
-
-pub fn badge_positive<D: std::fmt::Display>(input: D) -> Paint<String> {
-    if Paint::is_enabled() {
-        Paint::green(format!(" {input} ")).invert()
-    } else {
-        Paint::new(format!("❲{input}❳"))
-    }
-}
-
-pub fn badge_negative<D: std::fmt::Display>(input: D) -> Paint<String> {
-    if Paint::is_enabled() {
-        Paint::red(format!(" {input} ")).invert()
-    } else {
-        Paint::new(format!("❲{input}❳"))
-    }
-}
-
-pub fn badge_secondary<D: std::fmt::Display>(input: D) -> Paint<String> {
-    if Paint::is_enabled() {
-        Paint::blue(format!(" {input} ")).invert()
-    } else {
-        Paint::new(format!("❲{input}❳"))
-    }
-}
-
-pub fn bold<D: std::fmt::Display>(input: D) -> Paint<D> {
-    Paint::new(input).bold()
-}
-
-pub fn dim<D: std::fmt::Display>(input: D) -> Paint<D> {
-    Paint::new(input).dim()
-}
-
-pub fn italic<D: std::fmt::Display>(input: D) -> Paint<D> {
-    Paint::new(input).italic().dim()
-}
diff --git a/radicle-term/src/hstack.rs b/radicle-term/src/hstack.rs
deleted file mode 100644
index 7af1a38e8..000000000
--- a/radicle-term/src/hstack.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use crate::{Constraint, Element, Line, Size};
-
-/// Horizontal stack of [`Element`] objects that implements [`Element`].
-#[derive(Default, Debug)]
-pub struct HStack<'a> {
-    elems: Vec<Box<dyn Element + 'a>>,
-}
-
-impl<'a> HStack<'a> {
-    /// Add an element to the stack.
-    pub fn child(mut self, child: impl Element + 'a) -> Self {
-        self.push(child);
-        self
-    }
-
-    pub fn push(&mut self, child: impl Element + 'a) {
-        self.elems.push(Box::new(child));
-    }
-}
-
-impl<'a> Element for HStack<'a> {
-    fn size(&self, parent: Constraint) -> Size {
-        let width = self.elems.iter().map(|c| c.columns(parent)).sum();
-        let height = self.elems.iter().map(|c| c.rows(parent)).max().unwrap_or(0);
-
-        Size::new(width, height)
-    }
-
-    fn render(&self, parent: Constraint) -> Vec<Line> {
-        fn rearrange(input: Vec<Vec<Line>>) -> Vec<Line> {
-            let max_len = input.iter().map(|v| v.len()).max().unwrap_or(0);
-
-            (0..max_len)
-                .map(|i| {
-                    Line::default().extend(
-                        input
-                            .iter()
-                            .filter_map(move |v| v.get(i))
-                            .flat_map(|l| l.clone()),
-                    )
-                })
-                .collect()
-        }
-        rearrange(self.elems.iter().map(|e| e.render(parent)).collect())
-    }
-}
diff --git a/radicle-term/src/io.rs b/radicle-term/src/io.rs
deleted file mode 100644
index 13d77f4a5..000000000
--- a/radicle-term/src/io.rs
+++ /dev/null
@@ -1,288 +0,0 @@
-use std::ffi::OsStr;
-use std::fmt::Write;
-use std::process::Stdio;
-use std::{env, fmt, io, process};
-
-use inquire::ui::{ErrorMessageRenderConfig, StyleSheet, Styled};
-use inquire::validator;
-use inquire::InquireError;
-use inquire::{ui::Color, ui::RenderConfig, Confirm, CustomType, Password};
-use once_cell::sync::Lazy;
-use zeroize::Zeroizing;
-
-use crate::command;
-use crate::format;
-use crate::{style, Paint, Size};
-
-pub use inquire;
-pub use inquire::Select;
-
-pub const ERROR_PREFIX: Paint<&str> = Paint::red("✗");
-pub const ERROR_HINT_PREFIX: Paint<&str> = Paint::yellow("✗ Hint:");
-pub const WARNING_PREFIX: Paint<&str> = Paint::yellow("!");
-pub const TAB: &str = "    ";
-
-/// Passphrase input.
-pub type Passphrase = Zeroizing<String>;
-
-/// Render configuration.
-pub static CONFIG: Lazy<RenderConfig> = Lazy::new(|| RenderConfig {
-    prompt: StyleSheet::new().with_fg(Color::LightCyan),
-    prompt_prefix: Styled::new("?").with_fg(Color::LightBlue),
-    answered_prompt_prefix: Styled::new("✓").with_fg(Color::LightGreen),
-    answer: StyleSheet::new(),
-    highlighted_option_prefix: Styled::new("✓").with_fg(Color::LightYellow),
-    selected_option: Some(StyleSheet::new().with_fg(Color::LightYellow)),
-    option: StyleSheet::new(),
-    help_message: StyleSheet::new().with_fg(Color::DarkGrey),
-    default_value: StyleSheet::new().with_fg(Color::LightBlue),
-    error_message: ErrorMessageRenderConfig::default_colored()
-        .with_prefix(Styled::new("✗").with_fg(Color::LightRed)),
-    ..RenderConfig::default_colored()
-});
-
-#[macro_export]
-macro_rules! info {
-    ($writer:expr; $($arg:tt)*) => ({
-        writeln!($writer, $($arg)*).ok();
-    });
-    ($($arg:tt)*) => ({
-        println!("{}", format_args!($($arg)*));
-    })
-}
-
-#[macro_export]
-macro_rules! success {
-    // Pattern when a writer is provided.
-    ($writer:expr; $($arg:tt)*) => ({
-        $crate::io::success_args($writer, format_args!($($arg)*));
-    });
-    // Pattern without writer.
-    ($($arg:tt)*) => ({
-        $crate::io::success_args(&mut std::io::stdout(), format_args!($($arg)*));
-    });
-}
-
-#[macro_export]
-macro_rules! tip {
-    ($($arg:tt)*) => ({
-        $crate::io::tip_args(format_args!($($arg)*));
-    })
-}
-
-#[macro_export]
-macro_rules! notice {
-    // Pattern when a writer is provided.
-    ($writer:expr; $($arg:tt)*) => ({
-        $crate::io::notice_args($writer, format_args!($($arg)*));
-    });
-    ($($arg:tt)*) => ({
-        $crate::io::notice_args(&mut std::io::stdout(), format_args!($($arg)*));
-    })
-}
-
-pub use info;
-pub use notice;
-pub use success;
-pub use tip;
-
-pub fn success_args<W: io::Write>(w: &mut W, args: fmt::Arguments) {
-    writeln!(w, "{} {args}", Paint::green("✓")).ok();
-}
-
-pub fn tip_args(args: fmt::Arguments) {
-    println!(
-        "{} {}",
-        format::yellow("*"),
-        style(format!("{args}")).italic()
-    );
-}
-
-pub fn notice_args<W: io::Write>(w: &mut W, args: fmt::Arguments) {
-    writeln!(w, "{} {args}", Paint::new("!").dim()).ok();
-}
-
-pub fn columns() -> Option<usize> {
-    termion::terminal_size().map(|(cols, _)| cols as usize).ok()
-}
-
-pub fn rows() -> Option<usize> {
-    termion::terminal_size().map(|(_, rows)| rows as usize).ok()
-}
-
-pub fn viewport() -> Option<Size> {
-    termion::terminal_size()
-        .map(|(cols, rows)| Size::new(cols as usize, rows as usize))
-        .ok()
-}
-
-pub fn headline(headline: impl fmt::Display) {
-    println!();
-    println!("{}", style(headline).bold());
-    println!();
-}
-
-pub fn header(header: &str) {
-    println!();
-    println!("{}", style(format::yellow(header)).bold().underline());
-    println!();
-}
-
-pub fn blob(text: impl fmt::Display) {
-    println!("{}", style(text.to_string().trim()).dim());
-}
-
-pub fn blank() {
-    println!()
-}
-
-pub fn print(msg: impl fmt::Display) {
-    println!("{msg}");
-}
-
-pub fn prefixed(prefix: &str, text: &str) -> String {
-    text.split('\n').fold(String::new(), |mut s, line| {
-        writeln!(&mut s, "{prefix}{line}").ok();
-        s
-    })
-}
-
-pub fn help(name: &str, version: &str, description: &str, usage: &str) {
-    println!("rad-{name} {version}\n{description}\n{usage}");
-}
-
-pub fn manual(name: &str) -> io::Result<process::ExitStatus> {
-    let mut child = process::Command::new("man")
-        .arg(name)
-        .stderr(Stdio::null())
-        .spawn()?;
-
-    child.wait()
-}
-
-pub fn usage(name: &str, usage: &str) {
-    println!(
-        "{} {}\n{}",
-        ERROR_PREFIX,
-        Paint::red(format!("Error: rad-{name}: invalid usage")),
-        Paint::red(prefixed(TAB, usage)).dim()
-    );
-}
-
-pub fn println(prefix: impl fmt::Display, msg: impl fmt::Display) {
-    println!("{prefix} {msg}");
-}
-
-pub fn indented(msg: impl fmt::Display) {
-    println!("{TAB}{msg}");
-}
-
-pub fn subcommand(msg: impl fmt::Display) {
-    println!("{}", style(format!("Running `{msg}`...")).dim());
-}
-
-pub fn warning(warning: impl fmt::Display) {
-    println!(
-        "{} {} {warning}",
-        WARNING_PREFIX,
-        Paint::yellow("Warning:").bold(),
-    );
-}
-
-pub fn error(error: impl fmt::Display) {
-    println!("{ERROR_PREFIX} {} {error}", Paint::red("Error:"));
-}
-
-pub fn hint(hint: impl fmt::Display) {
-    println!("{ERROR_HINT_PREFIX} {}", format::hint(hint));
-}
-
-pub fn ask<D: fmt::Display>(prompt: D, default: bool) -> bool {
-    let prompt = prompt.to_string();
-
-    Confirm::new(&prompt)
-        .with_default(default)
-        .with_render_config(*CONFIG)
-        .prompt()
-        .unwrap_or_default()
-}
-
-pub fn confirm<D: fmt::Display>(prompt: D) -> bool {
-    ask(prompt, true)
-}
-
-pub fn abort<D: fmt::Display>(prompt: D) -> bool {
-    ask(prompt, false)
-}
-
-pub fn input<S, E>(message: &str, default: Option<S>, help: Option<&str>) -> anyhow::Result<S>
-where
-    S: fmt::Display + std::str::FromStr<Err = E> + Clone,
-    E: fmt::Debug + fmt::Display,
-{
-    let mut input = CustomType::<S>::new(message).with_render_config(*CONFIG);
-
-    input.default = default;
-    input.help_message = help;
-
-    let value = input.prompt()?;
-
-    Ok(value)
-}
-
-pub fn passphrase<V: validator::StringValidator + 'static>(
-    validate: V,
-) -> Result<Passphrase, inquire::InquireError> {
-    Ok(Passphrase::from(
-        Password::new("Passphrase:")
-            .with_render_config(*CONFIG)
-            .with_display_mode(inquire::PasswordDisplayMode::Masked)
-            .without_confirmation()
-            .with_validator(validate)
-            .prompt()?,
-    ))
-}
-
-pub fn passphrase_confirm<K: AsRef<OsStr>>(
-    prompt: &str,
-    var: K,
-) -> Result<Passphrase, anyhow::Error> {
-    if let Ok(p) = env::var(var) {
-        Ok(Passphrase::from(p))
-    } else {
-        Ok(Passphrase::from(
-            Password::new(prompt)
-                .with_render_config(*CONFIG)
-                .with_display_mode(inquire::PasswordDisplayMode::Masked)
-                .with_custom_confirmation_message("Repeat passphrase:")
-                .with_custom_confirmation_error_message("The passphrases don't match.")
-                .with_help_message("Leave this blank to keep your radicle key unencrypted")
-                .prompt()?,
-        ))
-    }
-}
-
-pub fn passphrase_stdin() -> Result<Passphrase, anyhow::Error> {
-    let mut input = String::new();
-    std::io::stdin().read_line(&mut input)?;
-
-    Ok(Passphrase::from(input.trim_end().to_owned()))
-}
-
-pub fn select<'a, T>(prompt: &str, options: &'a [T], help: &str) -> Result<&'a T, InquireError>
-where
-    T: fmt::Display + Eq + PartialEq,
-{
-    let selection = Select::new(prompt, options.iter().collect::<Vec<_>>())
-        .with_vim_mode(true)
-        .with_help_message(help)
-        .with_render_config(*CONFIG);
-
-    selection.with_starting_cursor(0).prompt()
-}
-
-pub fn markdown(content: &str) {
-    if !content.is_empty() && command::bat(["-p", "-l", "md"], content).is_err() {
-        blob(content);
-    }
-}
diff --git a/radicle-term/src/label.rs b/radicle-term/src/label.rs
deleted file mode 100644
index 10e440589..000000000
--- a/radicle-term/src/label.rs
+++ /dev/null
@@ -1,137 +0,0 @@
-use std::fmt;
-
-use crate::{cell::Cell, Color, Constraint, Element, Filled, Line, Paint, Size, Style};
-
-/// A styled string that does not contain any `'\n'` and implements [`Element`] and [`Cell`].
-#[derive(Clone, Default, Debug)]
-pub struct Label(Paint<String>);
-
-impl Label {
-    /// Create a new label.
-    pub fn new(s: &str) -> Self {
-        Self(Paint::new(cleanup(s)))
-    }
-
-    /// Create a blank label.
-    pub fn blank() -> Self {
-        Self(Paint::default())
-    }
-
-    /// Is this label empty.
-    pub fn is_blank(&self) -> bool {
-        self.content().is_empty()
-    }
-
-    /// Get unstyled content.
-    pub fn content(&self) -> &str {
-        self.0.content()
-    }
-
-    /// Create a single space label
-    pub fn space() -> Self {
-        Self(Paint::new(" ".to_owned()))
-    }
-
-    /// Box the label.
-    pub fn boxed(self) -> Box<dyn Element> {
-        Box::new(self)
-    }
-
-    /// Color the label's foreground.
-    pub fn fg(self, color: Color) -> Self {
-        Self(self.0.fg(color))
-    }
-
-    /// Color the label's background.
-    pub fn bg(self, color: Color) -> Self {
-        Self(self.0.bg(color))
-    }
-
-    /// Style a label.
-    pub fn style(self, style: Style) -> Self {
-        Self(self.0.with_style(style))
-    }
-
-    /// Get inner paint object.
-    pub fn paint(&self) -> &Paint<String> {
-        &self.0
-    }
-
-    /// Return a filled cell from this label.
-    pub fn filled(self, color: Color) -> Filled<Self> {
-        Filled { item: self, color }
-    }
-
-    /// Wrap into a line.
-    pub fn to_line(self) -> Line {
-        Line::from(self)
-    }
-}
-
-impl Element for Label {
-    fn size(&self, _parent: Constraint) -> Size {
-        Size::new(self.0.width(), 1)
-    }
-
-    fn render(&self, _parent: Constraint) -> Vec<Line> {
-        vec![Line::new(self.clone())]
-    }
-}
-
-impl fmt::Display for Label {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl Cell for Label {
-    type Padded = Self;
-    type Truncated = Self;
-
-    fn background(&self) -> Color {
-        self.paint().style.background
-    }
-
-    fn pad(&self, width: usize) -> Self::Padded {
-        Self(self.0.pad(width))
-    }
-
-    fn truncate(&self, width: usize, delim: &str) -> Self::Truncated {
-        Self(self.0.truncate(width, delim))
-    }
-
-    fn width(&self) -> usize {
-        Cell::width(&self.0)
-    }
-}
-
-impl<D: fmt::Display> From<Paint<D>> for Label {
-    fn from(paint: Paint<D>) -> Self {
-        Self(Paint {
-            item: cleanup(paint.item.to_string().as_str()),
-            style: paint.style,
-        })
-    }
-}
-
-impl From<String> for Label {
-    fn from(value: String) -> Self {
-        Self::new(value.as_str())
-    }
-}
-
-impl From<&str> for Label {
-    fn from(value: &str) -> Self {
-        Self::new(value)
-    }
-}
-
-/// Create a new label from a [`Paint`] object.
-pub fn label(s: impl Into<Paint<String>>) -> Label {
-    Label::from(s.into())
-}
-
-/// Cleanup the input string for display as a label.
-fn cleanup(input: &str) -> String {
-    input.chars().filter(|c| *c != '\n' && *c != '\r').collect()
-}
diff --git a/radicle-term/src/lib.rs b/radicle-term/src/lib.rs
deleted file mode 100644
index b7fd4f051..000000000
--- a/radicle-term/src/lib.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-pub mod ansi;
-pub mod cell;
-pub mod colors;
-pub mod command;
-pub mod editor;
-pub mod element;
-pub mod format;
-pub mod hstack;
-pub mod io;
-pub mod label;
-pub mod pager;
-pub mod spinner;
-pub mod table;
-pub mod textarea;
-pub mod vstack;
-
-use std::fmt;
-use std::io::IsTerminal;
-
-pub use ansi::Color;
-pub use ansi::{paint, Filled, Paint, Style};
-pub use editor::Editor;
-pub use element::{Constraint, Element, Line, Size};
-pub use hstack::HStack;
-pub use inquire::ui::Styled;
-pub use io::*;
-pub use label::{label, Label};
-pub use spinner::{spinner, spinner_to, Spinner};
-pub use table::{Table, TableOptions};
-pub use textarea::{textarea, TextArea};
-pub use vstack::{VStack, VStackOptions};
-
-#[derive(Debug, PartialEq, Eq, Copy, Clone, Default)]
-pub enum Interactive {
-    Yes,
-    #[default]
-    No,
-}
-
-impl Interactive {
-    pub fn new(term: impl IsTerminal) -> Self {
-        Self::from(term.is_terminal())
-    }
-
-    pub fn yes(&self) -> bool {
-        (*self).into()
-    }
-
-    pub fn no(&self) -> bool {
-        !self.yes()
-    }
-
-    pub fn confirm(&self, prompt: impl fmt::Display) -> bool {
-        if self.yes() {
-            confirm(prompt)
-        } else {
-            true
-        }
-    }
-}
-
-impl From<Interactive> for bool {
-    fn from(c: Interactive) -> Self {
-        match c {
-            Interactive::Yes => true,
-            Interactive::No => false,
-        }
-    }
-}
-
-impl From<bool> for Interactive {
-    fn from(b: bool) -> Self {
-        if b {
-            Interactive::Yes
-        } else {
-            Interactive::No
-        }
-    }
-}
-
-pub fn style<T>(item: T) -> Paint<T> {
-    paint(item)
-}
diff --git a/radicle-term/src/pager.rs b/radicle-term/src/pager.rs
deleted file mode 100644
index a783e5012..000000000
--- a/radicle-term/src/pager.rs
+++ /dev/null
@@ -1,186 +0,0 @@
-use std::io::{IsTerminal, Write};
-use std::{io, thread};
-
-use crate::element::Size;
-use crate::{Constraint, Element, Line, Paint};
-
-use crossbeam_channel as chan;
-use radicle_signals as signals;
-use termion::event::{Event, Key, MouseButton, MouseEvent};
-use termion::{input::TermRead, raw::IntoRawMode, screen::IntoAlternateScreen};
-
-/// How many lines to scroll when the mouse wheel is used.
-const MOUSE_SCROLL_LINES: usize = 3;
-
-/// Pager error.
-#[derive(Debug, thiserror::Error)]
-pub enum Error {
-    #[error(transparent)]
-    Io(#[from] io::Error),
-    #[error(transparent)]
-    Channel(#[from] chan::RecvError),
-}
-
-/// A pager for the given element. Re-renders the element when the terminal is resized so that
-/// it doesn't wrap. If the output device is not a TTY, just prints the element via
-/// [`Element::print`].
-///
-/// # Signal Handling
-///
-/// This will install handlers for the pager until finished by the user, with there
-/// being only one element handling signals at a time. If the pager cannot install
-/// handlers, then it will return with an error.
-pub fn page<E: Element + Send + 'static>(element: E) -> Result<(), Error> {
-    let (events_tx, events_rx) = chan::unbounded();
-    let (signals_tx, signals_rx) = chan::unbounded();
-
-    signals::install(signals_tx)?;
-
-    thread::spawn(move || {
-        for e in io::stdin().events() {
-            events_tx.send(e).ok();
-        }
-    });
-    let result = thread::spawn(move || main(element, signals_rx, events_rx))
-        .join()
-        .unwrap();
-
-    signals::uninstall()?;
-
-    result
-}
-
-fn main<E: Element>(
-    element: E,
-    signals_rx: chan::Receiver<signals::Signal>,
-    events_rx: chan::Receiver<Result<Event, io::Error>>,
-) -> Result<(), Error> {
-    let stdout = io::stdout();
-    if !stdout.is_terminal() {
-        element.print();
-        return Ok(());
-    }
-    let raw = stdout.into_raw_mode()?;
-    let mut stdout = termion::input::MouseTerminal::from(raw).into_alternate_screen()?;
-    let (mut width, mut height) = termion::terminal_size()?;
-    let mut lines = element.render(Constraint::max(Size::new(width as usize, height as usize)));
-    let mut line = 0;
-
-    render(&mut stdout, lines.as_slice(), line, (width, height))?;
-
-    loop {
-        chan::select! {
-            recv(signals_rx) -> signal => {
-                match signal? {
-                    signals::Signal::WindowChanged => {
-                        let (w, h) = termion::terminal_size()?;
-
-                        lines = element.render(Constraint::max(Size::new(w as usize, h as usize)));
-                        width = w;
-                        height = h;
-                    }
-                    signals::Signal::Interrupt | signals::Signal::Terminate => {
-                        break;
-                    }
-                    _ => continue,
-                }
-            }
-            recv(events_rx) -> event => {
-                let event = event??;
-                let page = height as usize - 1; // Don't count the status bar.
-                let end = if page > lines.len() { 0 } else { lines.len() - page };
-                let prev = line;
-
-                match event {
-                    Event::Key(key) => match key {
-                        Key::Up | Key::Char('k') => {
-                            line = line.saturating_sub(1);
-                        }
-                        Key::Home => {
-                            line = 0;
-                        }
-                        Key::End | Key::Char('G') => {
-                            line = end;
-                        }
-                        Key::PageUp | Key::Char('b') => {
-                            line = line.saturating_sub(page);
-                        }
-                        Key::PageDown | Key::Char(' ') => {
-                            line = (line + page).min(end);
-                        }
-                        Key::Down | Key::Char('j') => {
-                            if line < end {
-                                line += 1;
-                            }
-                        }
-                        Key::Char('q') => break,
-
-                        _ => continue,
-                    }
-                    Event::Mouse(MouseEvent::Press(MouseButton::WheelDown, _, _)) => {
-                        if line < end {
-                            line += MOUSE_SCROLL_LINES;
-                        }
-                    }
-                    Event::Mouse(MouseEvent::Press(MouseButton::WheelUp, _, _)) => {
-                        line = line.saturating_sub(MOUSE_SCROLL_LINES);
-                    }
-                    _ => continue,
-                }
-                // Don't re-render if there's no change in line.
-                if line == prev {
-                    continue;
-                }
-            }
-        }
-        render(&mut stdout, &lines, line, (width, height))?;
-    }
-    Ok(())
-}
-
-fn render<W: Write>(
-    out: &mut W,
-    lines: &[Line],
-    start_line: usize,
-    (width, height): (u16, u16),
-) -> io::Result<()> {
-    write!(
-        out,
-        "{}{}",
-        termion::clear::All,
-        termion::cursor::Goto(1, 1)
-    )?;
-
-    let content_length = lines.len();
-    let window_size = height as usize - 1;
-    let end_line = if start_line + window_size > content_length {
-        content_length
-    } else {
-        start_line + window_size
-    };
-    // Render content.
-    for (ix, line) in lines[start_line..end_line].iter().enumerate() {
-        write!(out, "{}{}", termion::cursor::Goto(1, ix as u16 + 1), line)?;
-    }
-    // Render progress meter.
-    write!(
-        out,
-        "{}{}",
-        termion::cursor::Goto(width - 3, height),
-        Paint::new(format!(
-            "{:.0}%",
-            end_line as f64 / lines.len() as f64 * 100.
-        ))
-        .dim()
-    )?;
-    // Render cursor input area.
-    write!(
-        out,
-        "{}{}",
-        termion::cursor::Goto(1, height),
-        Paint::new(":").dim()
-    )?;
-    out.flush()?;
-
-    Ok(())
-}
diff --git a/radicle-term/src/spinner.rs b/radicle-term/src/spinner.rs
deleted file mode 100644
index 78fe712d8..000000000
--- a/radicle-term/src/spinner.rs
+++ /dev/null
@@ -1,239 +0,0 @@
-use std::io::{IsTerminal, Write};
-use std::mem::ManuallyDrop;
-use std::sync::{Arc, Mutex};
-use std::{fmt, io, thread, time};
-
-use crossbeam_channel as chan;
-
-use radicle_signals as signals;
-use signals::Signal;
-
-use crate::io::{ERROR_PREFIX, WARNING_PREFIX};
-use crate::Paint;
-
-/// How much time to wait between spinner animation updates.
-pub const DEFAULT_TICK: time::Duration = time::Duration::from_millis(99);
-/// The spinner animation strings.
-pub const DEFAULT_STYLE: [Paint<&'static str>; 4] = [
-    Paint::magenta("◢"),
-    Paint::cyan("◣"),
-    Paint::magenta("◤"),
-    Paint::blue("◥"),
-];
-
-struct Progress {
-    state: State,
-    message: Paint<String>,
-}
-
-impl Progress {
-    fn new(message: Paint<String>) -> Self {
-        Self {
-            state: State::Running { cursor: 0 },
-            message,
-        }
-    }
-}
-
-enum State {
-    Running { cursor: usize },
-    Canceled,
-    Done,
-    Warn,
-    Error,
-}
-
-/// A progress spinner.
-pub struct Spinner {
-    progress: Arc<Mutex<Progress>>,
-    handle: ManuallyDrop<thread::JoinHandle<()>>,
-}
-
-impl Drop for Spinner {
-    fn drop(&mut self) {
-        if let Ok(mut progress) = self.progress.lock() {
-            if let State::Running { .. } = progress.state {
-                progress.state = State::Canceled;
-            }
-        }
-        unsafe { ManuallyDrop::take(&mut self.handle) }
-            .join()
-            .unwrap();
-    }
-}
-
-impl Spinner {
-    /// Mark the spinner as successfully completed.
-    pub fn finish(self) {
-        if let Ok(mut progress) = self.progress.lock() {
-            progress.state = State::Done;
-        }
-    }
-
-    /// Mark the spinner as failed. This cancels the spinner.
-    pub fn failed(self) {
-        if let Ok(mut progress) = self.progress.lock() {
-            progress.state = State::Error;
-        }
-    }
-
-    /// Cancel the spinner with an error.
-    pub fn error(self, msg: impl fmt::Display) {
-        if let Ok(mut progress) = self.progress.lock() {
-            progress.state = State::Error;
-            progress.message = Paint::new(format!(
-                "{} {} {}",
-                progress.message,
-                Paint::red("error:"),
-                msg
-            ));
-        }
-    }
-
-    /// Cancel the spinner with a warning sign.
-    pub fn warn(self) {
-        if let Ok(mut progress) = self.progress.lock() {
-            progress.state = State::Warn;
-        }
-    }
-
-    /// Set the spinner's message.
-    pub fn message(&mut self, msg: impl fmt::Display) {
-        let msg = msg.to_string();
-
-        if let Ok(mut progress) = self.progress.lock() {
-            progress.message = Paint::new(msg);
-        }
-    }
-}
-
-/// Create a new spinner with the given message. Sends animation output to `stderr` and success or
-/// failure messages to `stdout`. This function handles signals, with there being only one
-/// element handling signals at a time, and is a wrapper to [`spinner_to()`].
-pub fn spinner(message: impl ToString) -> Spinner {
-    let (stdout, stderr) = (io::stdout(), io::stderr());
-    if stderr.is_terminal() {
-        spinner_to(message, stdout, stderr)
-    } else {
-        spinner_to(message, stdout, io::sink())
-    }
-}
-
-/// Create a new spinner with the given message, and send output to the given writers.
-///
-/// # Signal Handling
-///
-/// This will install handlers for the spinner until cancelled or dropped, with there
-/// being only one element handling signals at a time. If the spinner cannot install
-/// handlers, then it will not attempt to install handlers again, and continue running.
-pub fn spinner_to(
-    message: impl ToString,
-    mut completion: impl io::Write + Send + 'static,
-    animation: impl io::Write + Send + 'static,
-) -> Spinner {
-    let message = message.to_string();
-    let progress = Arc::new(Mutex::new(Progress::new(Paint::new(message))));
-    let (sig_tx, sig_rx) = chan::unbounded();
-    let sig_result = signals::install(sig_tx);
-    let handle = thread::Builder::new()
-        .name(String::from("spinner"))
-        .spawn({
-            let progress = progress.clone();
-
-            move || {
-                let mut animation = termion::cursor::HideCursor::from(animation);
-
-                loop {
-                    let Ok(mut progress) = progress.lock() else {
-                        break;
-                    };
-                    // If were unable to install handles, skip signal processing entirely.
-                    if sig_result.is_ok() {
-                        match sig_rx.try_recv() {
-                            Ok(sig) if sig == Signal::Interrupt || sig == Signal::Terminate => {
-                                write!(animation, "\r{}", termion::clear::UntilNewline).ok();
-                                writeln!(
-                                    completion,
-                                    "{ERROR_PREFIX} {} {}",
-                                    &progress.message,
-                                    Paint::red("<canceled>")
-                                )
-                                .ok();
-                                drop(animation);
-                                std::process::exit(-1);
-                            }
-                            Ok(_) => {}
-                            Err(_) => {}
-                        }
-                    }
-                    match &mut *progress {
-                        Progress {
-                            state: State::Running { cursor },
-                            message,
-                        } => {
-                            let spinner = DEFAULT_STYLE[*cursor];
-
-                            write!(
-                                animation,
-                                "\r{}{spinner} {message}",
-                                termion::clear::UntilNewline,
-                            )
-                            .ok();
-
-                            *cursor += 1;
-                            *cursor %= DEFAULT_STYLE.len();
-                        }
-                        Progress {
-                            state: State::Done,
-                            message,
-                        } => {
-                            write!(animation, "\r{}", termion::clear::UntilNewline).ok();
-                            writeln!(completion, "{} {message}", Paint::green("✓")).ok();
-                            break;
-                        }
-                        Progress {
-                            state: State::Canceled,
-                            message,
-                        } => {
-                            write!(animation, "\r{}", termion::clear::UntilNewline).ok();
-                            writeln!(
-                                completion,
-                                "{ERROR_PREFIX} {message} {}",
-                                Paint::red("<canceled>")
-                            )
-                            .ok();
-                            break;
-                        }
-                        Progress {
-                            state: State::Warn,
-                            message,
-                        } => {
-                            write!(animation, "\r{}", termion::clear::UntilNewline).ok();
-                            writeln!(completion, "{WARNING_PREFIX} {message}").ok();
-                            break;
-                        }
-                        Progress {
-                            state: State::Error,
-                            message,
-                        } => {
-                            write!(animation, "\r{}", termion::clear::UntilNewline).ok();
-                            writeln!(completion, "{ERROR_PREFIX} {message}").ok();
-                            break;
-                        }
-                    }
-                    drop(progress);
-                    thread::sleep(DEFAULT_TICK);
-                }
-                if sig_result.is_ok() {
-                    let _ = signals::uninstall();
-                }
-            }
-        })
-        // SAFETY: Only panics if the thread name contains `null` bytes, which isn't the case here.
-        .unwrap();
-
-    Spinner {
-        progress,
-        handle: ManuallyDrop::new(handle),
-    }
-}
diff --git a/radicle-term/src/table.rs b/radicle-term/src/table.rs
deleted file mode 100644
index 8cc8ff34a..000000000
--- a/radicle-term/src/table.rs
+++ /dev/null
@@ -1,449 +0,0 @@
-//! Print column-aligned text to the console.
-//!
-//! Example:
-//! ```
-//! use radicle_term::table::*;
-//!
-//! let mut t = Table::new(TableOptions::default());
-//! t.push(["pest", "biological control"]);
-//! t.push(["aphid", "lacewing"]);
-//! t.push(["spider mite", "ladybug"]);
-//! t.print();
-//! ```
-//! Output:
-//! ``` plain
-//! pest        biological control
-//! aphid       ladybug
-//! spider mite persimilis
-//! ```
-use std::fmt;
-
-use crate::cell::Cell;
-use crate::{self as term, Style};
-use crate::{Color, Constraint, Line, Paint, Size};
-
-pub use crate::Element;
-
-#[derive(Debug)]
-pub struct TableOptions {
-    /// Whether the table should be allowed to overflow.
-    pub overflow: bool,
-    /// Horizontal spacing between table cells.
-    pub spacing: usize,
-    /// Table border.
-    pub border: Option<Color>,
-}
-
-impl Default for TableOptions {
-    fn default() -> Self {
-        Self {
-            overflow: false,
-            spacing: 1,
-            border: None,
-        }
-    }
-}
-
-impl TableOptions {
-    pub fn bordered() -> Self {
-        Self {
-            border: Some(term::colors::FAINT),
-            spacing: 3,
-            ..Self::default()
-        }
-    }
-}
-
-#[derive(Debug)]
-enum Row<const W: usize, T> {
-    Header([T; W]),
-    Data([T; W]),
-    Divider,
-}
-
-#[derive(Debug)]
-pub struct Table<const W: usize, T> {
-    rows: Vec<Row<W, T>>,
-    widths: [usize; W],
-    opts: TableOptions,
-}
-
-impl<const W: usize, T> Default for Table<W, T> {
-    fn default() -> Self {
-        Self {
-            rows: Vec::new(),
-            widths: [0; W],
-            opts: TableOptions::default(),
-        }
-    }
-}
-
-impl<const W: usize, T: Cell + fmt::Debug + Send + Sync> Element for Table<W, T>
-where
-    T::Padded: Into<Line>,
-{
-    fn size(&self, parent: Constraint) -> Size {
-        Table::size(self, parent)
-    }
-
-    fn render(&self, parent: Constraint) -> Vec<Line> {
-        let mut lines = Vec::new();
-        let border = self.opts.border;
-        let inner = self.inner(parent);
-        let cols = inner.cols;
-
-        // Don't print empty tables.
-        if self.is_empty() {
-            return lines;
-        }
-
-        if let Some(color) = border {
-            lines.push(
-                Line::default()
-                    .item(Paint::new("╭").fg(color))
-                    .item(Paint::new("─".repeat(cols)).fg(color))
-                    .item(Paint::new("╮").fg(color)),
-            );
-        }
-
-        for row in &self.rows {
-            let mut line = Line::default();
-
-            match row {
-                Row::Header(cells) | Row::Data(cells) => {
-                    if let Some(color) = border {
-                        line.push(Paint::new("│ ").fg(color));
-                    }
-                    for (i, cell) in cells.iter().enumerate() {
-                        let pad = if i == cells.len() - 1 {
-                            0
-                        } else {
-                            self.widths[i] + self.opts.spacing
-                        };
-                        line = line.extend(
-                            cell.pad(pad)
-                                .into()
-                                .style(Style::default().bg(cell.background())),
-                        );
-                    }
-                    Line::pad(&mut line, cols);
-                    Line::truncate(&mut line, cols, "…");
-
-                    if let Some(color) = border {
-                        line.push(Paint::new(" │").fg(color));
-                    }
-                    lines.push(line);
-                }
-                Row::Divider => {
-                    if let Some(color) = border {
-                        lines.push(
-                            Line::default()
-                                .item(Paint::new("├").fg(color))
-                                .item(Paint::new("─".repeat(cols)).fg(color))
-                                .item(Paint::new("┤").fg(color)),
-                        );
-                    } else {
-                        lines.push(Line::default());
-                    }
-                }
-            }
-        }
-        if let Some(color) = border {
-            lines.push(
-                Line::default()
-                    .item(Paint::new("╰").fg(color))
-                    .item(Paint::new("─".repeat(cols)).fg(color))
-                    .item(Paint::new("╯").fg(color)),
-            );
-        }
-        lines
-    }
-}
-
-impl<const W: usize, T: Cell> Table<W, T> {
-    pub fn new(opts: TableOptions) -> Self {
-        Self {
-            rows: Vec::new(),
-            widths: [0; W],
-            opts,
-        }
-    }
-
-    pub fn size(&self, parent: Constraint) -> Size {
-        self.outer(parent)
-    }
-
-    pub fn divider(&mut self) {
-        self.rows.push(Row::Divider);
-    }
-
-    pub fn push(&mut self, row: [T; W]) {
-        for (i, cell) in row.iter().enumerate() {
-            self.widths[i] = self.widths[i].max(cell.width());
-        }
-        self.rows.push(Row::Data(row));
-    }
-
-    pub fn header(&mut self, row: [T; W]) {
-        for (i, cell) in row.iter().enumerate() {
-            self.widths[i] = self.widths[i].max(cell.width());
-        }
-        self.rows.push(Row::Header(row));
-    }
-
-    pub fn extend(&mut self, rows: impl IntoIterator<Item = [T; W]>) {
-        for row in rows.into_iter() {
-            self.push(row);
-        }
-    }
-
-    pub fn is_empty(&self) -> bool {
-        !self.rows.iter().any(|r| matches!(r, Row::Data { .. }))
-    }
-
-    fn inner(&self, c: Constraint) -> Size {
-        let mut outer = self.outer(c);
-
-        if self.opts.border.is_some() {
-            outer.cols -= 2;
-            outer.rows -= 2;
-        }
-        outer
-    }
-
-    fn outer(&self, c: Constraint) -> Size {
-        let mut cols = self.widths.iter().sum::<usize>() + (W - 1) * self.opts.spacing;
-        let mut rows = self.rows.len();
-        let padding = 2;
-
-        // Account for outer borders.
-        if self.opts.border.is_some() {
-            cols += 2 + padding;
-            rows += 2;
-        }
-        Size::new(cols, rows).constrain(c)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::Element;
-
-    use super::*;
-    use pretty_assertions::assert_eq;
-
-    #[test]
-    fn test_truncate() {
-        assert_eq!("🍍".truncate(1, "…"), String::from("…"));
-        assert_eq!("🍍".truncate(1, ""), String::from(""));
-        assert_eq!("🍍🍍".truncate(2, "…"), String::from("…"));
-        assert_eq!("🍍🍍".truncate(3, "…"), String::from("🍍…"));
-        assert_eq!("🍍".truncate(1, "🍎"), String::from(""));
-        assert_eq!("🍍".truncate(2, "🍎"), String::from("🍍"));
-        assert_eq!("🍍🍍".truncate(3, "🍎"), String::from("🍎"));
-        assert_eq!("🍍🍍🍍".truncate(4, "🍎"), String::from("🍍🍎"));
-        assert_eq!("hello".truncate(3, "…"), String::from("he…"));
-    }
-
-    #[test]
-    fn test_table() {
-        let mut t = Table::new(TableOptions::default());
-
-        t.push(["pineapple", "rosemary"]);
-        t.push(["apples", "pears"]);
-
-        #[rustfmt::skip]
-        assert_eq!(
-            t.display(Constraint::UNBOUNDED),
-            [
-                "pineapple rosemary\n",
-                "apples    pears   \n"
-            ].join("")
-        );
-    }
-
-    #[test]
-    fn test_table_border() {
-        let mut t = Table::new(TableOptions {
-            border: Some(Color::Unset),
-            spacing: 3,
-            ..TableOptions::default()
-        });
-
-        t.push(["Country", "Population", "Code"]);
-        t.divider();
-        t.push(["France", "60M", "FR"]);
-        t.push(["Switzerland", "7M", "CH"]);
-        t.push(["Germany", "80M", "DE"]);
-
-        let inner = t.inner(Constraint::UNBOUNDED);
-        assert_eq!(inner.cols, 33);
-        assert_eq!(inner.rows, 5);
-
-        let outer = t.outer(Constraint::UNBOUNDED);
-        assert_eq!(outer.cols, 35);
-        assert_eq!(outer.rows, 7);
-
-        assert_eq!(
-            t.display(Constraint::UNBOUNDED),
-            r#"
-╭─────────────────────────────────╮
-│ Country       Population   Code │
-├─────────────────────────────────┤
-│ France        60M          FR   │
-│ Switzerland   7M           CH   │
-│ Germany       80M          DE   │
-╰─────────────────────────────────╯
-"#
-            .trim_start()
-        );
-    }
-
-    #[test]
-    fn test_table_border_truncated() {
-        let mut t = Table::new(TableOptions {
-            border: Some(Color::Unset),
-            spacing: 3,
-            ..TableOptions::default()
-        });
-
-        t.push(["Code", "Name"]);
-        t.divider();
-        t.push(["FR", "France"]);
-        t.push(["CH", "Switzerland"]);
-        t.push(["DE", "Germany"]);
-
-        let constrain = Constraint::max(Size {
-            cols: 19,
-            rows: usize::MAX,
-        });
-        let outer = t.outer(constrain);
-        assert_eq!(outer.cols, 19);
-        assert_eq!(outer.rows, 7);
-
-        let inner = t.inner(constrain);
-        assert_eq!(inner.cols, 17);
-        assert_eq!(inner.rows, 5);
-
-        assert_eq!(
-            t.display(constrain),
-            r#"
-╭─────────────────╮
-│ Code   Name     │
-├─────────────────┤
-│ FR     France   │
-│ CH     Switzer… │
-│ DE     Germany  │
-╰─────────────────╯
-"#
-            .trim_start()
-        );
-    }
-
-    #[test]
-    fn test_table_border_maximized() {
-        let mut t = Table::new(TableOptions {
-            border: Some(Color::Unset),
-            spacing: 3,
-            ..TableOptions::default()
-        });
-
-        t.push(["Code", "Name"]);
-        t.divider();
-        t.push(["FR", "France"]);
-        t.push(["CH", "Switzerland"]);
-        t.push(["DE", "Germany"]);
-
-        let constrain = Constraint::new(
-            Size { cols: 26, rows: 0 },
-            Size {
-                cols: 26,
-                rows: usize::MAX,
-            },
-        );
-        let outer = t.outer(constrain);
-        assert_eq!(outer.cols, 26);
-        assert_eq!(outer.rows, 7);
-
-        let inner = t.inner(constrain);
-        assert_eq!(inner.cols, 24);
-        assert_eq!(inner.rows, 5);
-
-        assert_eq!(
-            t.display(constrain),
-            r#"
-╭────────────────────────╮
-│ Code   Name            │
-├────────────────────────┤
-│ FR     France          │
-│ CH     Switzerland     │
-│ DE     Germany         │
-╰────────────────────────╯
-"#
-            .trim_start()
-        );
-    }
-
-    #[test]
-    fn test_table_truncate() {
-        let mut t = Table::default();
-        let constrain = Constraint::new(
-            Size::MIN,
-            Size {
-                cols: 16,
-                rows: usize::MAX,
-            },
-        );
-
-        t.push(["pineapple", "rosemary"]);
-        t.push(["apples", "pears"]);
-
-        #[rustfmt::skip]
-        assert_eq!(
-            t.display(constrain),
-            [
-                "pineapple rosem…\n",
-                "apples    pears \n"
-            ].join("")
-        );
-    }
-
-    #[test]
-    fn test_table_unicode() {
-        let mut t = Table::new(TableOptions::default());
-
-        t.push(["🍍pineapple", "__rosemary", "__sage"]);
-        t.push(["__pears", "🍎apples", "🍌bananas"]);
-
-        #[rustfmt::skip]
-        assert_eq!(
-            t.display(Constraint::UNBOUNDED),
-            [
-                "🍍pineapple __rosemary __sage   \n",
-                "__pears     🍎apples   🍌bananas\n"
-            ].join("")
-        );
-    }
-
-    #[test]
-    fn test_table_unicode_truncate() {
-        let mut t = Table::new(TableOptions {
-            ..TableOptions::default()
-        });
-        let constrain = Constraint::max(Size {
-            cols: 16,
-            rows: usize::MAX,
-        });
-        t.push(["🍍pineapple", "__rosemary"]);
-        t.push(["__pears", "🍎apples"]);
-
-        #[rustfmt::skip]
-        assert_eq!(
-            t.display(constrain),
-            [
-                "🍍pineapple __r…\n",
-                "__pears     🍎a…\n"
-            ].join("")
-        );
-    }
-}
diff --git a/radicle-term/src/textarea.rs b/radicle-term/src/textarea.rs
deleted file mode 100644
index da719a0d7..000000000
--- a/radicle-term/src/textarea.rs
+++ /dev/null
@@ -1,209 +0,0 @@
-use crate::{cell::Cell, Constraint, Element, Line, Paint, Size};
-
-/// Default text wrap width.
-pub const DEFAULT_WRAP: usize = 80;
-/// Soft tab replacement for '\t'.
-pub const SOFT_TAB: &str = "  ";
-
-/// Text area.
-///
-/// A block of text that can contain multiple lines.
-#[derive(Debug)]
-pub struct TextArea {
-    body: Paint<String>,
-    wrap: usize,
-}
-
-impl TextArea {
-    /// Create a new text area.
-    pub fn new(body: impl Into<Paint<String>>) -> Self {
-        Self {
-            body: body.into(),
-            wrap: DEFAULT_WRAP,
-        }
-    }
-
-    /// Set wrap width.
-    pub fn wrap(mut self, cols: usize) -> Self {
-        self.wrap = cols;
-        self
-    }
-
-    /// Get the lines of text in this text area.
-    pub fn lines(&self) -> impl Iterator<Item = String> {
-        let mut lines: Vec<String> = Vec::new();
-        let mut fenced = false;
-
-        for line in self
-            .body
-            .content()
-            .lines()
-            // Replace tabs as their visual width cannot be calculated.
-            .map(|l| l.replace('\t', SOFT_TAB))
-        {
-            // Fenced code block support.
-            if line.starts_with("```") {
-                fenced = !fenced;
-            }
-            // Code blocks are not wrapped, they are truncated.
-            if fenced || line.starts_with('\t') || line.starts_with(' ') {
-                lines.push(line.truncate(self.wrap, "…"));
-                continue;
-            }
-            let mut current = String::new();
-
-            for word in line.split_whitespace() {
-                if current.width() + word.width() > self.wrap {
-                    lines.push(current.trim_end().to_owned());
-                    current = word.to_owned();
-                } else {
-                    current.push_str(word);
-                }
-                current.push(' ');
-            }
-            lines.push(current.trim_end().to_owned());
-        }
-        lines.into_iter()
-    }
-
-    /// Box the text area.
-    pub fn boxed(self) -> Box<dyn Element> {
-        Box::new(self)
-    }
-}
-
-impl Element for TextArea {
-    fn size(&self, _parent: Constraint) -> Size {
-        let cols = self.lines().map(|l| l.width()).max().unwrap_or(0);
-        let rows = self.lines().count();
-
-        Size::new(cols, rows)
-    }
-
-    fn render(&self, _parent: Constraint) -> Vec<Line> {
-        self.lines()
-            .map(|l| Line::new(Paint::new(l).with_style(self.body.style)))
-            .collect()
-    }
-}
-
-/// Create a new text area.
-pub fn textarea(content: impl Into<Paint<String>>) -> TextArea {
-    TextArea::new(content)
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use pretty_assertions::assert_eq;
-
-    #[test]
-    fn test_wrapping() {
-        let t = TextArea::new(
-            "Radicle enables users to run their own nodes, \
-            ensuring censorship-resistant code collaboration \
-            and fostering a resilient network without reliance \
-            on third-parties.",
-        )
-        .wrap(50);
-        let wrapped = t.lines().collect::<Vec<_>>();
-
-        assert_eq!(
-            wrapped,
-            vec![
-                "Radicle enables users to run their own nodes,".to_owned(),
-                "ensuring censorship-resistant code collaboration".to_owned(),
-                "and fostering a resilient network without reliance".to_owned(),
-                "on third-parties.".to_owned(),
-            ]
-        );
-    }
-
-    #[test]
-    fn test_wrapping_paragraphs() {
-        let t = TextArea::new(
-            "Radicle enables users to run their own nodes, \
-            ensuring censorship-resistant code collaboration \
-            and fostering a resilient network without reliance \
-            on third-parties.\n\n\
-            All social artifacts are stored in git, and signed \
-            using public-key cryptography. Radicle verifies \
-            the authenticity and authorship of all data \
-            automatically.",
-        )
-        .wrap(50);
-        let wrapped = t.lines().collect::<Vec<_>>();
-
-        assert_eq!(
-            wrapped,
-            vec![
-                "Radicle enables users to run their own nodes,".to_owned(),
-                "ensuring censorship-resistant code collaboration".to_owned(),
-                "and fostering a resilient network without reliance".to_owned(),
-                "on third-parties.".to_owned(),
-                "".to_owned(),
-                "All social artifacts are stored in git, and signed".to_owned(),
-                "using public-key cryptography. Radicle verifies".to_owned(),
-                "the authenticity and authorship of all data".to_owned(),
-                "automatically.".to_owned(),
-            ]
-        );
-    }
-
-    #[test]
-    fn test_wrapping_code_block() {
-        let t = TextArea::new(
-            "\
-Here's an example:
-
-  $ git push rad://z3gqcJUoA1n9HaHKufZs5FCSGazv5/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT
-  $ rad sync
-
-Run the above and wait for your project to sync.\
-        ",
-        )
-        .wrap(50);
-        let wrapped = t.lines().collect::<Vec<_>>();
-
-        assert_eq!(
-            wrapped,
-            vec![
-                "Here's an example:".to_owned(),
-                "".to_owned(),
-                "  $ git push rad://z3gqcJUoA1n9HaHKufZs5FCSGazv5/…".to_owned(),
-                "  $ rad sync".to_owned(),
-                "".to_owned(),
-                "Run the above and wait for your project to sync.".to_owned()
-            ]
-        );
-    }
-
-    #[test]
-    fn test_wrapping_fenced_block() {
-        let t = TextArea::new(
-            "\
-Here's an example:
-```
-$ git push rad://z3gqcJUoA1n9HaHKufZs5FCSGazv5/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT
-$ rad sync
-```
-Run the above and wait for your project to sync.\
-        ",
-        )
-        .wrap(40);
-        let wrapped = t.lines().collect::<Vec<_>>();
-
-        assert_eq!(
-            wrapped,
-            vec![
-                "Here's an example:".to_owned(),
-                "```".to_owned(),
-                "$ git push rad://z3gqcJUoA1n9HaHKufZs5F…".to_owned(),
-                "$ rad sync".to_owned(),
-                "```".to_owned(),
-                "Run the above and wait for your project".to_owned(),
-                "to sync.".to_owned()
-            ]
-        );
-    }
-}
diff --git a/radicle-term/src/vstack.rs b/radicle-term/src/vstack.rs
deleted file mode 100644
index 844ca4028..000000000
--- a/radicle-term/src/vstack.rs
+++ /dev/null
@@ -1,282 +0,0 @@
-use crate::colors;
-use crate::{Color, Constraint, Element, Label, Line, Paint, Size};
-
-/// Options for [`VStack`].
-#[derive(Debug)]
-pub struct VStackOptions {
-    border: Option<Color>,
-    padding: usize,
-}
-
-impl Default for VStackOptions {
-    fn default() -> Self {
-        Self {
-            border: None,
-            padding: 1,
-        }
-    }
-}
-
-/// A vertical stack row.
-#[derive(Default, Debug)]
-enum Row<'a> {
-    Element(Box<dyn Element + 'a>),
-    #[default]
-    Dividier,
-}
-
-impl<'a> Row<'a> {
-    fn width(&self, c: Constraint) -> usize {
-        match self {
-            Self::Element(e) => e.columns(c),
-            Self::Dividier => c.min.cols,
-        }
-    }
-
-    fn height(&self, c: Constraint) -> usize {
-        match self {
-            Self::Element(e) => e.rows(c),
-            Self::Dividier => 1,
-        }
-    }
-}
-
-/// Vertical stack of [`Element`] objects that implements [`Element`].
-#[derive(Default, Debug)]
-pub struct VStack<'a> {
-    rows: Vec<Row<'a>>,
-    opts: VStackOptions,
-}
-
-impl<'a> VStack<'a> {
-    /// Add an element to the stack and return the stack.
-    pub fn child(mut self, child: impl Element + 'a) -> Self {
-        self.push(child);
-        self
-    }
-
-    /// Add a blank line to the stack.
-    pub fn blank(self) -> Self {
-        self.child(Label::blank())
-    }
-
-    /// Add a horizontal divider.
-    pub fn divider(mut self) -> Self {
-        self.rows.push(Row::Dividier);
-        self
-    }
-
-    /// Check if this stack is empty.
-    pub fn is_empty(&self) -> bool {
-        self.rows.is_empty()
-    }
-
-    /// Add multiple elements to the stack.
-    pub fn children<I>(self, children: I) -> Self
-    where
-        I: IntoIterator<Item = Box<dyn Element>>,
-    {
-        let mut vstack = self;
-
-        for child in children.into_iter() {
-            vstack = vstack.child(child);
-        }
-        vstack
-    }
-
-    /// Merge with another `VStack`.
-    pub fn merge(mut self, other: Self) -> Self {
-        for row in other.rows {
-            self.rows.push(row);
-        }
-        self
-    }
-
-    /// Set or unset the outer border.
-    pub fn border(mut self, color: Option<Color>) -> Self {
-        self.opts.border = color;
-        self
-    }
-
-    /// Set horizontal padding.
-    pub fn padding(mut self, cols: usize) -> Self {
-        self.opts.padding = cols;
-        self
-    }
-
-    /// Add an element to the stack.
-    pub fn push(&mut self, child: impl Element + 'a) {
-        self.rows.push(Row::Element(Box::new(child)));
-    }
-
-    /// Box this element.
-    pub fn boxed(self) -> Box<dyn Element + 'a> {
-        Box::new(self)
-    }
-
-    /// Inner size.
-    fn inner(&self, c: Constraint) -> Size {
-        let mut outer = self.outer(c);
-
-        if self.opts.border.is_some() {
-            outer.cols -= 2;
-            outer.rows -= 2;
-        }
-        outer
-    }
-
-    /// Outer size (includes borders).
-    fn outer(&self, c: Constraint) -> Size {
-        let padding = self.opts.padding * 2;
-        let mut cols = self.rows.iter().map(|r| r.width(c)).max().unwrap_or(0) + padding;
-        let mut rows = self.rows.iter().map(|r| r.height(c)).sum();
-
-        // Account for outer borders.
-        if self.opts.border.is_some() {
-            cols += 2;
-            rows += 2;
-        }
-        Size::new(cols, rows).constrain(c)
-    }
-}
-
-impl<'a> Element for VStack<'a> {
-    fn size(&self, parent: Constraint) -> Size {
-        self.outer(parent)
-    }
-
-    fn render(&self, parent: Constraint) -> Vec<Line> {
-        let mut lines = Vec::new();
-        let padding = self.opts.padding;
-        let inner = self.inner(parent);
-        let child = Constraint::tight(inner.cols - padding * 2);
-
-        if let Some(color) = self.opts.border {
-            lines.push(
-                Line::default()
-                    .item(Paint::new("╭").fg(color))
-                    .item(Paint::new("─".repeat(inner.cols)).fg(color))
-                    .item(Paint::new("╮").fg(color)),
-            );
-        }
-
-        for row in &self.rows {
-            match row {
-                Row::Element(elem) => {
-                    for mut line in elem.render(child) {
-                        line.pad(child.max.cols);
-
-                        if let Some(color) = self.opts.border {
-                            lines.push(
-                                Line::default()
-                                    .item(Paint::new(format!("│{}", " ".repeat(padding))).fg(color))
-                                    .extend(line)
-                                    .item(
-                                        Paint::new(format!("{}│", " ".repeat(padding))).fg(color),
-                                    ),
-                            );
-                        } else {
-                            lines.push(line);
-                        }
-                    }
-                }
-                Row::Dividier => {
-                    if let Some(color) = self.opts.border {
-                        lines.push(
-                            Line::default()
-                                .item(Paint::new("├").fg(color))
-                                .item(Paint::new("─".repeat(inner.cols)).fg(color))
-                                .item(Paint::new("┤").fg(color)),
-                        );
-                    } else {
-                        lines.push(Line::default());
-                    }
-                }
-            }
-        }
-
-        if let Some(color) = self.opts.border {
-            lines.push(
-                Line::default()
-                    .item(Paint::new("╰").fg(color))
-                    .item(Paint::new("─".repeat(inner.cols)).fg(color))
-                    .item(Paint::new("╯").fg(color)),
-            );
-        }
-        lines.into_iter().flat_map(|h| h.render(child)).collect()
-    }
-}
-
-/// Simple bordered vstack.
-pub fn bordered<'a>(child: impl Element + 'a) -> VStack<'a> {
-    VStack::default().border(Some(colors::FAINT)).child(child)
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use pretty_assertions::assert_eq;
-
-    #[test]
-    fn test_vstack() {
-        let mut v = VStack::default().border(Some(Color::Unset)).padding(1);
-
-        v.push(Line::new("banana"));
-        v.push(Line::new("apple"));
-        v.push(Line::new("abricot"));
-
-        let constraint = Constraint::default();
-        let outer = v.outer(constraint);
-        assert_eq!(outer.cols, 11);
-        assert_eq!(outer.rows, 5);
-
-        let inner = v.inner(constraint);
-        assert_eq!(inner.cols, 9);
-        assert_eq!(inner.rows, 3);
-
-        assert_eq!(
-            v.display(constraint),
-            r#"
-╭─────────╮
-│ banana  │
-│ apple   │
-│ abricot │
-╰─────────╯
-"#
-            .trim_start()
-        );
-    }
-
-    #[test]
-    fn test_vstack_maximize() {
-        let mut v = VStack::default().border(Some(Color::Unset)).padding(1);
-
-        v.push(Line::new("banana"));
-        v.push(Line::new("apple"));
-        v.push(Line::new("abricot"));
-
-        let constraint = Constraint {
-            min: Size::new(14, 0),
-            max: Size::new(14, usize::MAX),
-        };
-        let outer = v.outer(constraint);
-        assert_eq!(outer.cols, 14);
-        assert_eq!(outer.rows, 5);
-
-        let inner = v.inner(constraint);
-        assert_eq!(inner.cols, 12);
-        assert_eq!(inner.rows, 3);
-
-        assert_eq!(
-            v.display(constraint),
-            r#"
-╭────────────╮
-│ banana     │
-│ apple      │
-│ abricot    │
-╰────────────╯
-"#
-            .trim_start()
-        );
-    }
-}
diff --git a/radicle-tools/Cargo.toml b/radicle-tools/Cargo.toml
deleted file mode 100644
index 85b53bff4..000000000
--- a/radicle-tools/Cargo.toml
+++ /dev/null
@@ -1,52 +0,0 @@
-[package]
-name = "radicle-tools"
-license = "MIT OR Apache-2.0"
-version = "0.9.0"
-authors = ["Alexis Sellier <alexis@radicle.xyz>"]
-edition = "2021"
-
-[dependencies]
-anyhow = { version = "1" }
-# N.b. this is required to use macros, even though it's re-exported
-# through radicle
-radicle-git-ext = { version = "0.8.0", features = ["serde"] }
-
-[dependencies.radicle]
-version = "0"
-path = "../radicle"
-
-[dependencies.radicle-cli]
-version = "0"
-path = "../radicle-cli"
-
-[dependencies.radicle-term]
-version = "0"
-path = "../radicle-term"
-
-[[bin]]
-name = "rad-init"
-path = "src/rad-init.rs"
-
-[[bin]]
-name = "rad-self"
-path = "src/rad-self.rs"
-
-[[bin]]
-name = "rad-merge"
-path = "src/rad-merge.rs"
-
-[[bin]]
-name = "rad-set-canonical-refs"
-path = "src/rad-set-canonical-refs.rs"
-
-[[bin]]
-name = "rad-push"
-path = "src/rad-push.rs"
-
-[[bin]]
-name = "rad-agent"
-path = "src/rad-agent.rs"
-
-[[bin]]
-name = "rad-cli-demo"
-path = "src/rad-cli-demo.rs"
diff --git a/radicle-tools/src/rad-agent.rs b/radicle-tools/src/rad-agent.rs
deleted file mode 100644
index 82d7005fa..000000000
--- a/radicle-tools/src/rad-agent.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use anyhow::{anyhow, Context as _};
-use radicle::{crypto, crypto::ssh};
-use std::io::prelude::*;
-use std::{env, io};
-
-fn main() -> anyhow::Result<()> {
-    let profile = radicle::Profile::load()?;
-    let mut agent = ssh::agent::Agent::connect()?;
-
-    println!("key: {}", ssh::fmt::key(profile.id()));
-    println!("hash: {}", ssh::fmt::fingerprint(profile.id()));
-
-    match env::args().nth(1).as_deref() {
-        Some("add") => {
-            print!("passphrase: ");
-            io::stdout().flush()?;
-
-            let mut passphrase = String::new();
-            io::stdin().lock().read_line(&mut passphrase)?;
-
-            let passphrase = passphrase.trim().to_owned().into();
-            let secret = profile
-                .keystore
-                .secret_key(Some(passphrase))?
-                .ok_or_else(|| anyhow!("Key not found in {:?}", profile.keystore.path()))?;
-
-            agent.register(&secret)?;
-            println!("ok");
-        }
-        Some("remove") => {
-            agent.remove_identity(profile.id())?;
-            println!("ok");
-        }
-        Some("remove-all") => {
-            agent.remove_all_identities()?;
-            println!("ok");
-        }
-        Some("sign") => {
-            let mut stdin = Vec::new();
-            io::stdin().read_to_end(&mut stdin)?;
-
-            let sig = agent.sign(profile.id(), &stdin).context("Signing failed")?;
-            let sig = crypto::Signature::from(sig);
-
-            println!("{}", &sig);
-        }
-        Some(other) => {
-            anyhow::bail!("Unknown command `{}`", other);
-        }
-        None => {
-            if agent.signer(profile.public_key).is_ready()? {
-                println!("ready: yes");
-            } else {
-                println!("ready: no");
-            }
-        }
-    }
-
-    Ok(())
-}
diff --git a/radicle-tools/src/rad-cli-demo.rs b/radicle-tools/src/rad-cli-demo.rs
deleted file mode 100644
index 36caf3187..000000000
--- a/radicle-tools/src/rad-cli-demo.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-use std::{thread, time};
-
-use radicle_cli::terminal;
-
-fn main() -> anyhow::Result<()> {
-    let demo = terminal::io::select(
-        "Choose something to try out:",
-        &[
-            "confirm",
-            "pager",
-            "spinner",
-            "spinner-drop",
-            "spinner-error",
-            "editor",
-            "prompt",
-        ],
-        "Choose wisely!",
-    )?;
-
-    match *demo {
-        "confirm" => {
-            if terminal::confirm("Would you like to proceed?") {
-                terminal::success!("You said 'yes'");
-            }
-        }
-        "pager" => {
-            let mut table = radicle_term::Table::<1, radicle_term::Label>::new(
-                radicle_term::TableOptions::bordered(),
-            );
-            let rows = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/src/rad-cli-demo.rs"));
-
-            for row in rows.lines() {
-                table.push([row.into()]);
-            }
-            radicle_term::pager::page(table)?;
-        }
-        "editor" => {
-            let output = terminal::editor::Editor::new()
-                .extension("rs")
-                .edit("// Enter code here.");
-
-            match output {
-                Ok(Some(s)) => {
-                    terminal::info!("You entered:");
-                    terminal::blob(s);
-                }
-                Ok(None) => {
-                    terminal::info!("You didn't enter anything.");
-                }
-                Err(e) => {
-                    return Err(e.into());
-                }
-            }
-        }
-        "spinner" => {
-            let mut spinner = terminal::spinner("Spinning turbines..");
-            thread::sleep(time::Duration::from_secs(1));
-            spinner.message("Still spinning..");
-            thread::sleep(time::Duration::from_secs(1));
-            spinner.message("Almost done..");
-            thread::sleep(time::Duration::from_secs(1));
-            spinner.message("Done.");
-
-            spinner.finish();
-        }
-        "spinner-drop" => {
-            let _spinner = terminal::spinner("Spinning turbines..");
-            thread::sleep(time::Duration::from_secs(3));
-        }
-        "spinner-error" => {
-            let spinner = terminal::spinner("Spinning turbines..");
-            thread::sleep(time::Duration::from_secs(3));
-            spinner.error("broken turbine");
-        }
-        "prompt" => {
-            let fruit = terminal::io::select(
-                "Enter your favorite fruit:",
-                &["apple", "pear", "banana", "strawberry"],
-                "Choose wisely!",
-            )?;
-            terminal::success!("You have chosen '{fruit}'");
-        }
-        _ => {}
-    }
-
-    Ok(())
-}
diff --git a/radicle-tools/src/rad-init.rs b/radicle-tools/src/rad-init.rs
deleted file mode 100644
index 3a846e557..000000000
--- a/radicle-tools/src/rad-init.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-use std::path::Path;
-
-use radicle::{git, identity::Visibility, Profile};
-
-fn main() -> anyhow::Result<()> {
-    let cwd = Path::new(".").canonicalize()?;
-    let name = cwd.file_name().unwrap().to_string_lossy().to_string();
-    let repo = radicle::git::raw::Repository::open(cwd)?;
-    let profile = Profile::load()?;
-    let signer = profile.signer()?;
-    let (id, _, _) = radicle::rad::init(
-        &repo,
-        name.try_into()?,
-        "",
-        git::refname!("master"),
-        Visibility::default(),
-        &signer,
-        &profile.storage,
-    )?;
-
-    println!("ok: {id}");
-
-    Ok(())
-}
diff --git a/radicle-tools/src/rad-merge.rs b/radicle-tools/src/rad-merge.rs
deleted file mode 100644
index c909adeec..000000000
--- a/radicle-tools/src/rad-merge.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-use std::collections::HashSet;
-use std::env;
-
-use anyhow::{anyhow, bail};
-use radicle::cob::patch::{PatchId, RevisionId};
-use radicle::git::Oid;
-use radicle::storage::ReadStorage;
-use radicle_cli::terminal as term;
-
-fn main() -> anyhow::Result<()> {
-    let args = env::args().skip(1).collect::<Vec<_>>();
-    let (pid, rev) = match args.as_slice() {
-        [pid, rev] => {
-            let pid: PatchId = pid.parse()?;
-            let rev: Oid = rev.parse()?;
-
-            (pid, Some(RevisionId::from(rev)))
-        }
-        [pid] => {
-            let pid: PatchId = pid.parse()?;
-
-            (pid, None)
-        }
-        _ => bail!("usage: rad-merge <patch-id> [<revision-id>]"),
-    };
-    let profile = radicle::Profile::load()?;
-    let (working, rid) = radicle::rad::cwd()?;
-    let stored = profile.storage.repository(rid)?;
-    let mut patches = profile.patches_mut(&stored)?;
-    let mut patch = patches.get_mut(&pid)?;
-
-    if patch.is_merged() {
-        anyhow::bail!("fatal: patch {pid} is already merged");
-    }
-    let (revision, r) = if let Some(id) = rev {
-        let r = patch
-            .revision(&id)
-            .ok_or_else(|| anyhow!("revision {id} not found"))?;
-        (id, r)
-    } else {
-        patch.latest()
-    };
-    let head = r.head();
-
-    let mut revwalk = stored.backend.revwalk()?;
-    revwalk.push_head()?;
-
-    let commits = revwalk
-        .map(|r| r.map(Oid::from))
-        .collect::<Result<HashSet<Oid>, _>>()?;
-
-    if !commits.contains(&head) {
-        anyhow::bail!("fatal: patch head {head} is not in default branch");
-    }
-    let signer = term::signer(&profile)?;
-
-    patch
-        .merge(revision, head, &signer)?
-        .cleanup(&working, &signer)?;
-
-    println!("✓ Patch {pid} merged at commit {head}");
-    println!("You may now run `rad sync --announce`.");
-
-    Ok(())
-}
diff --git a/radicle-tools/src/rad-push.rs b/radicle-tools/src/rad-push.rs
deleted file mode 100644
index 8d686ae83..000000000
--- a/radicle-tools/src/rad-push.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use std::path::Path;
-
-use radicle::{
-    node::Handle,
-    storage::{ReadStorage, SignRepository, WriteRepository},
-};
-
-fn main() -> anyhow::Result<()> {
-    let cwd = Path::new(".").canonicalize()?;
-    let repo = radicle::git::raw::Repository::open(&cwd)?;
-    let profile = radicle::Profile::load()?;
-    let (_, id) = radicle::rad::remote(&repo)?;
-
-    let output = radicle::git::run::<_, _, &str, &str>(&cwd, ["push", "rad"], None)?;
-    println!("{output}");
-
-    let signer = profile.signer()?;
-    let project = profile.storage.repository(id)?;
-    let sigrefs = project.sign_refs(&signer)?;
-    let head = project.set_head()?;
-
-    radicle::Node::new(profile.socket()).announce_refs(id)?;
-
-    println!("head: {}", head.new);
-    println!("ok: {}", sigrefs.signature);
-
-    Ok(())
-}
diff --git a/radicle-tools/src/rad-self.rs b/radicle-tools/src/rad-self.rs
deleted file mode 100644
index 9b7aae41c..000000000
--- a/radicle-tools/src/rad-self.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-fn main() -> anyhow::Result<()> {
-    let profile = radicle::Profile::load()?;
-
-    println!("id: {}", profile.id());
-    println!("key: {}", radicle::crypto::ssh::fmt::key(profile.id()));
-    println!(
-        "fingerprint: {}",
-        radicle::crypto::ssh::fmt::fingerprint(profile.id())
-    );
-    println!("home: {}", profile.home().path().display());
-
-    Ok(())
-}
diff --git a/radicle-tools/src/rad-set-canonical-refs.rs b/radicle-tools/src/rad-set-canonical-refs.rs
deleted file mode 100644
index f1de5cfff..000000000
--- a/radicle-tools/src/rad-set-canonical-refs.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use radicle::{
-    storage::{WriteRepository, WriteStorage},
-    Profile,
-};
-
-fn main() -> anyhow::Result<()> {
-    let profile = Profile::load()?;
-
-    let (_, rid) = radicle::rad::cwd()?;
-    let repo = profile.storage.repository_mut(rid)?;
-
-    let id_oid = repo.set_identity_head()?;
-    let branch = repo.set_head()?;
-
-    println!("ok: identity: {id_oid}");
-    println!("ok: branch: {}", branch.new);
-
-    Ok(())
-}
diff --git a/radicle/Cargo.toml b/radicle/Cargo.toml
deleted file mode 100644
index e0c0b89c6..000000000
--- a/radicle/Cargo.toml
+++ /dev/null
@@ -1,84 +0,0 @@
-[package]
-name = "radicle"
-description = "Radicle standard library"
-homepage = "https://radicle.xyz"
-repository = "https://app.radicle.xyz/seeds/seed.radicle.xyz/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5"
-license = "MIT OR Apache-2.0"
-version = "0.13.0"
-authors = ["cloudhead <cloudhead@radicle.xyz>"]
-edition = "2021"
-
-[features]
-default = []
-test = ["qcheck", "radicle-crypto/test"]
-logger = ["colored", "chrono"]
-
-[dependencies]
-amplify = { version = "4.0.0", default-features = false, features = ["std"] }
-base64 = { version = "0.21.3" }
-crossbeam-channel = { version = "0.5.6" }
-cyphernet = { version = "0.5.0", features = ["tor", "dns", "p2p-ed25519"] }
-fastrand = { version = "2.0.0" }
-multibase = { version = "0.9.1" }
-localtime = { version = "1.2.0", features = ["serde"] }
-libc = { version = "0.2" }
-log = { version = "0.4.17", features = ["std"] }
-nonempty = { version = "0.9.0", features = ["serialize"] }
-once_cell = { version = "1.13" }
-serde = { version = "1", features = ["derive"] }
-serde_json = { version = "1", features = ["preserve_order"] }
-siphasher = { version = "1.0.0" }
-radicle-git-ext = { version = "0.8.0", features = ["serde"] }
-sqlite = { version = "0.32.0", features = ["bundled"] }
-tempfile = { version = "3.3.0" }
-thiserror = { version = "1" }
-unicode-normalization = { version = "0.1" }
-
-[dependencies.chrono]
-version = "0.4.0"
-default-features = false
-features = ["clock"]
-optional = true
-
-[dependencies.colored]
-version = "2.1.0"
-optional = true
-
-[dependencies.git2]
-version = "0.19.0"
-default-features = false
-features = ["vendored-libgit2"]
-
-[dependencies.radicle-cob]
-path = "../radicle-cob"
-version = "0"
-
-[dependencies.radicle-crypto]
-path = "../radicle-crypto"
-version = "0"
-features = ["radicle-git-ext", "ssh", "sqlite", "cyphernet"]
-
-[dependencies.radicle-ssh]
-path = "../radicle-ssh"
-version = "0"
-default-features = false
-
-[dependencies.qcheck]
-version = "1"
-default-features = false
-optional = true
-
-[dev-dependencies]
-pretty_assertions = { version = "1.3.0" }
-qcheck-macros = { version = "1", default-features = false }
-qcheck = { version = "1", default-features = false }
-
-[dev-dependencies.radicle-crypto]
-path = "../radicle-crypto"
-version = "0"
-features = ["test"]
-
-[dev-dependencies.radicle-cob]
-path = "../radicle-cob"
-version = "0"
-features = ["stable-commit-ids"]
diff --git a/radicle/src/canonical.rs b/radicle/src/canonical.rs
deleted file mode 100644
index 80f3b3b31..000000000
--- a/radicle/src/canonical.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-//! A [Canonical JSON] formatter that escapes control characters. This
-//! differs to the olpc-cjson standard.
-//!
-//! The [`olpc-cjson`] crate itself states:
-//!
-//! > OLPC’s canonical JSON specification is subtly different from
-//! > other “canonical JSON” specifications, and is also not a strict
-//! > subset of JSON (specifically, ASCII control characters 0x00–0x1f
-//! > are printed literally, which is not valid JSON). Therefore,
-//! > serde_json cannot necessarily deserialize JSON produced by this
-//! > formatter.
-//!
-//! [Canonical JSON]: http://wiki.laptop.org/go/Canonical_JSON
-//! [olpc-json]: https://docs.rs/olpc-cjson/0.1.2/olpc_cjson
-
-pub mod formatter;
diff --git a/radicle/src/canonical/formatter.rs b/radicle/src/canonical/formatter.rs
deleted file mode 100644
index 1c3e014ba..000000000
--- a/radicle/src/canonical/formatter.rs
+++ /dev/null
@@ -1,372 +0,0 @@
-// Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: MIT OR Apache-2.0
-
-use std::{
-    collections::BTreeMap,
-    io::{Error, ErrorKind, Result, Write},
-};
-
-use serde::Serialize;
-use serde_json::ser::{CharEscape, CompactFormatter, Formatter, Serializer};
-use unicode_normalization::UnicodeNormalization;
-
-/// A [`serde_json::ser::Formatter`] which outputs [Canonical JSON].
-///
-/// The Radicle specification disagrees with [Canonical JSON] spec, in that
-/// ASCII plane control characters (`U+0000` - `U+007F`) string values are
-/// escaped according to the normal JSON escaping rules as per [RFC 8259],
-/// Section 7. The reason is that conformant JSON parsers (such as `serde_json`)
-/// will typically refuse to accept strings containing these characters as
-/// unescaped bytes. As we standardise on an exact set, and mandate that hex
-/// escape sequences shall be lower-case, canonicity is preserved (unicode
-/// normalisation still applies).
-///
-/// This implementation is based on the [`olpc-cjson`] crate, and inlined here
-/// for distribution convenience. We expressly license the original code under
-/// the term of the MIT licence.
-///
-/// [Canonical JSON]: http://wiki.laptop.org/go/Canonical_JSON
-/// [RFC 8259]: https://www.rfc-editor.org/rfc/rfc8259.txt
-#[derive(Debug, Default)]
-pub struct CanonicalFormatter {
-    object_stack: Vec<Object>,
-}
-
-/// Internal struct to keep track of an object in progress of being built.
-///
-/// As keys and values are received by `CanonicalFormatter`, they are written to
-/// `next_key` and `next_value` by using the `CanonicalFormatter::writer`
-/// convenience method.
-///
-/// How this struct behaves when `Formatter` methods are called:
-///
-/// ```plain
-/// [other methods]  // values written to the writer received by method
-/// begin_object     // create this object
-/// /-> begin_object_key    // object.key_done = false;
-/// |   [other methods]     // values written to object.next_key, writer received by method ignored
-/// |   end_object_key      // object.key_done = true;
-/// |   begin_object_value  // [nothing]
-/// |   [other methods]     // values written to object.next_value
-/// |   end_object_value    // object.next_key and object.next_value are inserted into object.obj
-/// \---- // jump back if more values are present
-/// end_object       // write the object (sorted by its keys) to the writer received by the method
-/// ```
-#[derive(Debug, Default)]
-struct Object {
-    obj: BTreeMap<Vec<u8>, Vec<u8>>,
-    next_key: Vec<u8>,
-    next_value: Vec<u8>,
-    key_done: bool,
-}
-
-impl CanonicalFormatter {
-    /// Create a new `CanonicalFormatter` object.
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    /// Convenience method to return the appropriate writer given the current
-    /// context.
-    ///
-    /// If we are currently writing an object (that is, if
-    /// `!self.object_stack.is_empty()`), we need to write the value to
-    /// either the next key or next value depending on that state
-    /// machine. See the docstrings for `Object` for more detail.
-    ///
-    /// If we are not currently writing an object, pass through `writer`.
-    fn writer<'a, W: Write + ?Sized>(&'a mut self, writer: &'a mut W) -> Box<dyn Write + 'a> {
-        if let Some(object) = self.object_stack.last_mut() {
-            if object.key_done {
-                Box::new(&mut object.next_value)
-            } else {
-                Box::new(&mut object.next_key)
-            }
-        } else {
-            Box::new(writer)
-        }
-    }
-
-    /// Returns a mutable reference to the top of the object stack.
-    fn obj_mut(&mut self) -> Result<&mut Object> {
-        self.object_stack.last_mut().ok_or_else(|| {
-            Error::new(
-                ErrorKind::Other,
-                "serde_json called an object method without calling begin_object first",
-            )
-        })
-    }
-}
-
-/// Wraps `serde_json::CompactFormatter` to use the appropriate writer (see
-/// `CanonicalFormatter::writer`).
-macro_rules! wrapper {
-    ($f:ident) => {
-        fn $f<W: Write + ?Sized>(&mut self, writer: &mut W) -> Result<()> {
-            CompactFormatter.$f(&mut self.writer(writer))
-        }
-    };
-
-    ($f:ident, $t:ty) => {
-        fn $f<W: Write + ?Sized>(&mut self, writer: &mut W, arg: $t) -> Result<()> {
-            CompactFormatter.$f(&mut self.writer(writer), arg)
-        }
-    };
-}
-
-/// This is used in three places. Write it once.
-macro_rules! float_err {
-    () => {
-        Err(Error::new(
-            ErrorKind::InvalidInput,
-            "floating point numbers are not allowed in canonical JSON",
-        ))
-    };
-}
-
-impl Formatter for CanonicalFormatter {
-    wrapper!(write_null);
-    wrapper!(write_bool, bool);
-    wrapper!(write_i8, i8);
-    wrapper!(write_i16, i16);
-    wrapper!(write_i32, i32);
-    wrapper!(write_i64, i64);
-    wrapper!(write_u8, u8);
-    wrapper!(write_u16, u16);
-    wrapper!(write_u32, u32);
-    wrapper!(write_u64, u64);
-
-    fn write_f32<W: Write + ?Sized>(&mut self, _writer: &mut W, _value: f32) -> Result<()> {
-        float_err!()
-    }
-
-    fn write_f64<W: Write + ?Sized>(&mut self, _writer: &mut W, _value: f64) -> Result<()> {
-        float_err!()
-    }
-
-    // By default this is only used for u128/i128. If serde_json's
-    // `arbitrary_precision` feature is enabled, all numbers are internally
-    // stored as strings, and this method is always used (even for floating
-    // point values).
-    fn write_number_str<W: Write + ?Sized>(&mut self, writer: &mut W, value: &str) -> Result<()> {
-        if value.chars().any(|c| c == '.' || c == 'e' || c == 'E') {
-            float_err!()
-        } else {
-            CompactFormatter.write_number_str(&mut self.writer(writer), value)
-        }
-    }
-
-    wrapper!(begin_string);
-    wrapper!(end_string);
-
-    // Strings are normalized as Normalization Form C (NFC). `str::nfc` is provided
-    // by the `UnicodeNormalization` trait and returns an iterator of `char`s.
-    fn write_string_fragment<W: Write + ?Sized>(
-        &mut self,
-        writer: &mut W,
-        fragment: &str,
-    ) -> Result<()> {
-        fragment.nfc().try_for_each(|ch| {
-            self.writer(writer)
-                .write_all(ch.encode_utf8(&mut [0; 4]).as_bytes())
-        })
-    }
-
-    // Unlike Canonical JSON proper, we **do** escape control characters
-    wrapper!(write_char_escape, CharEscape);
-
-    wrapper!(begin_array);
-    wrapper!(end_array);
-    wrapper!(begin_array_value, bool); // hack: this passes through the `first` argument
-    wrapper!(end_array_value);
-
-    // Here are the object methods. Because keys must be sorted, we serialize the
-    // object's keys and values in memory as a `BTreeMap`, then write it all out
-    // when `end_object_value` is called.
-
-    fn begin_object<W: Write + ?Sized>(&mut self, writer: &mut W) -> Result<()> {
-        CompactFormatter.begin_object(&mut self.writer(writer))?;
-        self.object_stack.push(Object::default());
-        Ok(())
-    }
-
-    fn end_object<W: Write + ?Sized>(&mut self, writer: &mut W) -> Result<()> {
-        let object = self.object_stack.pop().ok_or_else(|| {
-            Error::new(
-                ErrorKind::Other,
-                "serde_json called Formatter::end_object object method
-                 without calling begin_object first",
-            )
-        })?;
-        let mut writer = self.writer(writer);
-        let mut first = true;
-
-        for (key, value) in object.obj {
-            CompactFormatter.begin_object_key(&mut writer, first)?;
-            writer.write_all(&key)?;
-            CompactFormatter.end_object_key(&mut writer)?;
-
-            CompactFormatter.begin_object_value(&mut writer)?;
-            writer.write_all(&value)?;
-            CompactFormatter.end_object_value(&mut writer)?;
-
-            first = false;
-        }
-
-        CompactFormatter.end_object(&mut writer)
-    }
-
-    fn begin_object_key<W: Write + ?Sized>(&mut self, _writer: &mut W, _first: bool) -> Result<()> {
-        let object = self.obj_mut()?;
-        object.key_done = false;
-        Ok(())
-    }
-
-    fn end_object_key<W: Write + ?Sized>(&mut self, _writer: &mut W) -> Result<()> {
-        let object = self.obj_mut()?;
-        object.key_done = true;
-        Ok(())
-    }
-
-    fn begin_object_value<W: Write + ?Sized>(&mut self, _writer: &mut W) -> Result<()> {
-        Ok(())
-    }
-
-    fn end_object_value<W: Write + ?Sized>(&mut self, _writer: &mut W) -> Result<()> {
-        let object = self.obj_mut()?;
-        let key = std::mem::take(&mut object.next_key);
-        let value = std::mem::take(&mut object.next_value);
-        object.obj.insert(key, value);
-        Ok(())
-    }
-
-    // This is for serde_json's `raw_value` feature, which provides a RawValue type
-    // that is passed through as-is. That's not good enough for canonical JSON,
-    // so we parse it and immediately write it back out... as canonical JSON.
-    fn write_raw_fragment<W: Write + ?Sized>(
-        &mut self,
-        writer: &mut W,
-        fragment: &str,
-    ) -> Result<()> {
-        let mut ser = Serializer::with_formatter(self.writer(writer), Self::new());
-        serde_json::from_str::<serde_json::Value>(fragment)?.serialize(&mut ser)?;
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use std::io::Result;
-
-    use super::CanonicalFormatter;
-    use serde::Serialize;
-    use serde_json::Serializer;
-
-    macro_rules! encode {
-        ($($tt:tt)+) => {
-            (|v: serde_json::Value| -> Result<Vec<u8>> {
-                let mut buf = Vec::new();
-                let mut ser = Serializer::with_formatter(&mut buf, CanonicalFormatter::new());
-                v.serialize(&mut ser)?;
-                Ok(buf)
-            })(serde_json::json!($($tt)+))
-        };
-    }
-
-    macro_rules! encode_string {
-        ($($tt:tt)+) => {
-            (|v: serde_json::Value| -> Result<String> {
-                let bytes = encode!(v)?;
-                let string = unsafe { String::from_utf8_unchecked(bytes) };
-                Ok(string)
-            })(serde_json::json!($($tt)+))
-        };
-    }
-
-    #[test]
-    fn securesystemslib_asserts() -> Result<()> {
-        assert_eq!(encode!([1, 2, 3])?, b"[1,2,3]");
-        assert_eq!(encode!([1, 2, 3])?, b"[1,2,3]");
-        assert_eq!(encode!([])?, b"[]");
-        assert_eq!(encode!({})?, b"{}");
-        assert_eq!(encode!({"A": [99]})?, br#"{"A":[99]}"#);
-        assert_eq!(encode!({"A": true})?, br#"{"A":true}"#);
-        assert_eq!(encode!({"B": false})?, br#"{"B":false}"#);
-        assert_eq!(encode!({"x": 3, "y": 2})?, br#"{"x":3,"y":2}"#);
-        assert_eq!(encode!({"x": 3, "y": null})?, br#"{"x":3,"y":null}"#);
-
-        // Test conditions for invalid arguments.
-        assert!(encode!(8.0).is_err());
-        assert!(encode!({"x": 8.0}).is_err());
-
-        Ok(())
-    }
-
-    #[test]
-    fn ascii_control_characters() -> Result<()> {
-        assert_eq!(encode_string!("\x00")?, r#""\u0000""#);
-        assert_eq!(encode_string!("\x01")?, r#""\u0001""#);
-        assert_eq!(encode_string!("\x02")?, r#""\u0002""#);
-        assert_eq!(encode_string!("\x03")?, r#""\u0003""#);
-        assert_eq!(encode_string!("\x04")?, r#""\u0004""#);
-        assert_eq!(encode_string!("\x05")?, r#""\u0005""#);
-        assert_eq!(encode_string!("\x06")?, r#""\u0006""#);
-        assert_eq!(encode_string!("\x07")?, r#""\u0007""#);
-        assert_eq!(encode_string!("\x08")?, r#""\b""#);
-        assert_eq!(encode_string!("\x09")?, r#""\t""#);
-        assert_eq!(encode_string!("\x0a")?, r#""\n""#);
-        assert_eq!(encode_string!("\x0b")?, r#""\u000b""#);
-        assert_eq!(encode_string!("\x0c")?, r#""\f""#);
-        assert_eq!(encode_string!("\x0d")?, r#""\r""#);
-        assert_eq!(encode_string!("\x0e")?, r#""\u000e""#);
-        assert_eq!(encode_string!("\x0f")?, r#""\u000f""#);
-        assert_eq!(encode_string!("\x10")?, r#""\u0010""#);
-        assert_eq!(encode_string!("\x11")?, r#""\u0011""#);
-        assert_eq!(encode_string!("\x12")?, r#""\u0012""#);
-        assert_eq!(encode_string!("\x13")?, r#""\u0013""#);
-        assert_eq!(encode_string!("\x14")?, r#""\u0014""#);
-        assert_eq!(encode_string!("\x15")?, r#""\u0015""#);
-        assert_eq!(encode_string!("\x16")?, r#""\u0016""#);
-        assert_eq!(encode_string!("\x17")?, r#""\u0017""#);
-        assert_eq!(encode_string!("\x18")?, r#""\u0018""#);
-        assert_eq!(encode_string!("\x19")?, r#""\u0019""#);
-        assert_eq!(encode_string!("\x1a")?, r#""\u001a""#);
-        assert_eq!(encode_string!("\x1b")?, r#""\u001b""#);
-        assert_eq!(encode_string!("\x1c")?, r#""\u001c""#);
-        assert_eq!(encode_string!("\x1d")?, r#""\u001d""#);
-        assert_eq!(encode_string!("\x1e")?, r#""\u001e""#);
-        assert_eq!(encode_string!("\x1f")?, r#""\u001f""#);
-
-        pretty_assertions::assert_eq!(encode_string!({"\t": "\n"})?, r#"{"\t":"\n"}"#);
-        assert_eq!(encode_string!("\\")?, r#""\\""#);
-        assert_eq!(encode_string!("\"")?, r#""\"""#);
-
-        Ok(())
-    }
-
-    #[test]
-    fn ordered_nested_object() -> Result<()> {
-        assert_eq!(
-            encode!({
-                "nested": {
-                    "good": false,
-                    "bad": true
-                },
-                "b": 2,
-                "a": 1,
-                "c": {
-                    "h": {
-                        "h": -5,
-                        "i": 3
-                    },
-                    "a": null,
-                    "x": {}
-                },
-                "zzz": "I have a newline\n"
-            })?,
-            br#"{"a":1,"b":2,"c":{"a":null,"h":{"h":-5,"i":3},"x":{}},"nested":{"bad":true,"good":false},"zzz":"I have a newline\n"}"#.to_vec(),
-        );
-
-        Ok(())
-    }
-}
diff --git a/radicle/src/cli.rs b/radicle/src/cli.rs
deleted file mode 100644
index a1dc54c48..000000000
--- a/radicle/src/cli.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-/// CLI configuration.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Config {
-    /// Whether to show hints or not in the CLI.
-    #[serde(default)]
-    pub hints: bool,
-}
-
-impl Default for Config {
-    fn default() -> Self {
-        Self { hints: true }
-    }
-}
diff --git a/radicle/src/cob.rs b/radicle/src/cob.rs
deleted file mode 100644
index dd0b47971..000000000
--- a/radicle/src/cob.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-#![warn(clippy::unwrap_used)]
-pub mod cache;
-pub mod common;
-pub mod identity;
-pub mod issue;
-pub mod op;
-pub mod patch;
-pub mod store;
-pub mod thread;
-
-#[cfg(test)]
-pub mod test;
-
-pub use common::*;
-pub use op::{ActorId, Op};
-pub use radicle_cob::{
-    change, history::EntryId, object, object::collaboration::error, type_name::TypeNameParse,
-    CollaborativeObject, Contents, Create, Embed, Entry, Evaluate, History, Manifest, ObjectId,
-    Store, TypeName, Update, Updated, Version,
-};
-pub use radicle_cob::{create, get, git, list, remove, update};
-
-/// The exact identifier for a particular COB.
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, serde::Serialize)]
-pub struct TypedId {
-    /// The identifier of the COB in the store.
-    pub id: ObjectId,
-    /// The type identifier of the COB in the store.
-    pub type_name: TypeName,
-}
-
-impl std::fmt::Display for TypedId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}/{}", self.type_name, self.id)
-    }
-}
-
-/// Errors that occur when parsing a Git refname into a [`TypedId`].
-#[derive(Debug, thiserror::Error)]
-pub enum ParseIdentifierError {
-    #[error(transparent)]
-    TypeName(#[from] TypeNameParse),
-    #[error(transparent)]
-    ObjectId(#[from] object::ParseObjectId),
-}
-
-impl TypedId {
-    /// Returns `true` is the [`TypedId::type_name`] is for an
-    /// [`issue::Issue`].
-    pub fn is_issue(&self) -> bool {
-        self.type_name == *issue::TYPENAME
-    }
-
-    /// Returns `true` is the [`TypedId::type_name`] is for an
-    /// [`patch::Patch`].
-    pub fn is_patch(&self) -> bool {
-        self.type_name == *patch::TYPENAME
-    }
-
-    /// Returns `true` is the [`TypedId::type_name`] is for an
-    /// [`identity::Identity`].
-    pub fn is_identity(&self) -> bool {
-        self.type_name == *identity::TYPENAME
-    }
-
-    /// Parse a [`crate::git::Namespaced`] refname into a [`TypedId`].
-    ///
-    /// All namespaces are stripped before parsing the suffix for the
-    /// [`TypedId`] (see [`TypedId::from_qualified`]).
-    pub fn from_namespaced(
-        n: &crate::git::Namespaced,
-    ) -> Result<Option<Self>, ParseIdentifierError> {
-        Self::from_qualified(&n.strip_namespace_recursive())
-    }
-
-    /// Parse a [`crate::git::Qualified`] refname into a [`TypedId`].
-    ///
-    /// The refname is expected to be of the form:
-    ///     `refs/cobs/<type name>/<object id>`
-    ///
-    /// If the refname is not of that form then `None` will be returned.
-    ///
-    /// # Errors
-    ///
-    /// This will fail if the refname is of the correct form, but the
-    /// type name or object id fail to parse.
-    pub fn from_qualified(q: &crate::git::Qualified) -> Result<Option<Self>, ParseIdentifierError> {
-        match q.non_empty_iter() {
-            ("refs", "cobs", type_name, mut id) => {
-                let Some(id) = id.next() else {
-                    return Ok(None);
-                };
-                Ok(Some(Self {
-                    id: id.parse()?,
-                    type_name: type_name.parse()?,
-                }))
-            }
-            _ => Ok(None),
-        }
-    }
-}
diff --git a/radicle/src/cob/cache.rs b/radicle/src/cob/cache.rs
deleted file mode 100644
index ae4fdc2e6..000000000
--- a/radicle/src/cob/cache.rs
+++ /dev/null
@@ -1,320 +0,0 @@
-use std::collections::HashMap;
-use std::convert::Infallible;
-use std::fmt;
-use std::marker::PhantomData;
-use std::path::Path;
-use std::sync::Arc;
-use std::time;
-
-use radicle_cob::ObjectId;
-use sqlite as sql;
-use thiserror::Error;
-
-use crate::prelude::RepoId;
-use crate::sql::transaction;
-
-/// File suffix for storing the COBs database file.
-pub const COBS_DB_FILE: &str = "cache.db";
-
-/// How long to wait for the database lock to be released before failing a read.
-const DB_READ_TIMEOUT: time::Duration = time::Duration::from_secs(3);
-/// How long to wait for the database lock to be released before failing a write.
-const DB_WRITE_TIMEOUT: time::Duration = time::Duration::from_secs(6);
-
-/// Database migrations.
-/// The first migration is the creation of the initial tables.
-const MIGRATIONS: &[&str] = &[include_str!("cache/migrations/1.sql")];
-
-#[derive(Error, Debug)]
-pub enum Error {
-    /// An Internal error.
-    #[error("internal error: {0}")]
-    Internal(#[from] sql::Error),
-    /// No rows returned in query result.
-    #[error("no rows returned")]
-    NoRows,
-}
-
-/// Read and write to the store.
-pub type StoreWriter = Store<Write>;
-/// Write to the store.
-pub type StoreReader = Store<Read>;
-
-/// Read-only type witness.
-#[derive(Clone)]
-pub struct Read;
-/// Read-write type witness.
-#[derive(Clone)]
-pub struct Write;
-
-/// A file-backed database storing materialized COBs.
-#[derive(Clone)]
-pub struct Store<T> {
-    pub(super) db: Arc<sql::ConnectionThreadSafe>,
-    marker: PhantomData<T>,
-}
-
-impl<T> fmt::Debug for Store<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Database").finish()
-    }
-}
-
-impl Store<Read> {
-    /// Same as [`Self::open`], but in read-only mode. This is useful to have multiple
-    /// open databases, as no locking is required.
-    pub fn reader<P: AsRef<Path>>(path: P) -> Result<Self, Error> {
-        let mut db = sql::Connection::open_thread_safe_with_flags(
-            path,
-            sqlite::OpenFlags::new().with_read_only(),
-        )?;
-        db.set_busy_timeout(DB_READ_TIMEOUT.as_millis() as usize)?;
-
-        Ok(Self {
-            db: Arc::new(db),
-            marker: PhantomData,
-        })
-    }
-
-    /// Create a new in-memory database.
-    pub fn memory() -> Result<Self, Error> {
-        let mut db = sql::Connection::open_thread_safe_with_flags(
-            ":memory:",
-            sqlite::OpenFlags::new().with_read_only(),
-        )?;
-        db.set_busy_timeout(DB_READ_TIMEOUT.as_millis() as usize)?;
-
-        Ok(Self {
-            db: Arc::new(db),
-            marker: PhantomData,
-        })
-    }
-}
-
-impl Store<Write> {
-    /// Open a database at the given path. Creates a new database if it
-    /// doesn't exist.
-    pub fn open<P: AsRef<Path>>(path: P) -> Result<Self, Error> {
-        let mut db = sql::Connection::open_thread_safe(path)?;
-        db.set_busy_timeout(DB_WRITE_TIMEOUT.as_millis() as usize)?;
-        migrate(&db)?;
-
-        Ok(Self {
-            db: Arc::new(db),
-            marker: PhantomData,
-        })
-    }
-
-    /// Create a new in-memory database.
-    pub fn memory() -> Result<Self, Error> {
-        let db = Arc::new(sql::Connection::open_thread_safe(":memory:")?);
-        migrate(&db)?;
-
-        Ok(Self {
-            db,
-            marker: PhantomData,
-        })
-    }
-
-    /// Turn this handle into a read-only handle.
-    pub fn read_only(self) -> Store<Read> {
-        Store {
-            db: self.db,
-            marker: PhantomData,
-        }
-    }
-
-    /// Perform a raw query on the database handle.
-    pub fn raw_query<T, E, F>(&self, query: F) -> Result<T, E>
-    where
-        F: FnOnce(&sql::Connection) -> Result<T, E>,
-        E: From<sql::Error>,
-    {
-        transaction(&self.db, query)
-    }
-}
-
-impl<T> Store<T> {
-    /// Get the database version. This is updated on schema changes.
-    pub fn version(&self) -> Result<usize, Error> {
-        version(&self.db)
-    }
-}
-
-/// Get the `user_version` value from the database header.
-pub fn version(db: &sql::Connection) -> Result<usize, Error> {
-    let version = db
-        .prepare("PRAGMA user_version")?
-        .into_iter()
-        .next()
-        .ok_or(Error::NoRows)??
-        .read::<i64, _>(0);
-
-    Ok(version as usize)
-}
-
-/// Bump the `user_version` value.
-fn bump(db: &sql::Connection) -> Result<usize, Error> {
-    let old = version(db)?;
-    let new = old + 1;
-
-    db.execute(format!("PRAGMA user_version = {new}"))?;
-
-    Ok(new as usize)
-}
-
-/// Migrate the database to the latest schema.
-fn migrate(db: &sql::Connection) -> Result<usize, Error> {
-    let mut version = version(db)?;
-    for (i, migration) in MIGRATIONS.iter().enumerate() {
-        if i >= version {
-            transaction(db, |db| {
-                db.execute(migration)?;
-                version = bump(db)?;
-
-                Ok::<_, Error>(())
-            })?;
-        }
-    }
-    Ok(version)
-}
-
-/// Update a COB object in the cache.
-pub trait Update<T> {
-    /// The output type, if any, for a successful update.
-    type Out;
-    type UpdateError: std::error::Error + Send + Sync + 'static;
-
-    fn update(
-        &mut self,
-        rid: &RepoId,
-        id: &ObjectId,
-        object: &T,
-    ) -> Result<Self::Out, Self::UpdateError>;
-}
-
-/// Remove a COB object in the cache.
-pub trait Remove<T> {
-    /// The output type, if any, for a successful removal.
-    type Out;
-    type RemoveError: std::error::Error + Send + Sync + 'static;
-
-    /// Delete an object in the COB cache.
-    ///
-    /// This assumes that the `id` is unique across repositories.
-    fn remove(&mut self, id: &ObjectId) -> Result<Self::Out, Self::RemoveError>;
-    /// Delete all entries from a repo.
-    fn remove_all(&mut self, rid: &RepoId) -> Result<Self::Out, Self::RemoveError>;
-}
-
-/// An in-memory cache for storing COB objects.
-///
-/// The intention is for this to be used in tests that expect cache
-/// reads.
-#[derive(Clone, Debug)]
-pub struct InMemory<T> {
-    inner: HashMap<RepoId, HashMap<ObjectId, T>>,
-}
-
-impl<T> Default for InMemory<T> {
-    fn default() -> Self {
-        Self {
-            inner: HashMap::new(),
-        }
-    }
-}
-
-impl<T> Update<T> for InMemory<T>
-where
-    T: Clone,
-{
-    type Out = Option<T>;
-    type UpdateError = Infallible;
-
-    fn update(
-        &mut self,
-        rid: &RepoId,
-        id: &ObjectId,
-        object: &T,
-    ) -> Result<Self::Out, Self::UpdateError> {
-        let objects = self.inner.entry(*rid).or_default();
-        Ok(objects.insert(*id, object.clone()))
-    }
-}
-
-/// The `/dev/null` of caches.
-///
-/// It will ignore any updates, and successfully return on each call
-/// of [`Update::update`].
-///
-/// The intention is for this to be used in tests that do not expect
-/// any cache reads.
-pub struct NoCache;
-
-impl<T> Update<T> for NoCache {
-    type Out = ();
-    type UpdateError = Infallible;
-
-    fn update(
-        &mut self,
-        _rid: &RepoId,
-        _id: &ObjectId,
-        _object: &T,
-    ) -> Result<Self::Out, Self::UpdateError> {
-        Ok(())
-    }
-}
-
-impl<T> Remove<T> for NoCache {
-    type Out = ();
-    type RemoveError = Infallible;
-
-    fn remove(&mut self, _id: &ObjectId) -> Result<Self::Out, Self::RemoveError> {
-        Ok(())
-    }
-
-    fn remove_all(&mut self, _rid: &RepoId) -> Result<Self::Out, Self::RemoveError> {
-        Ok(())
-    }
-}
-
-/// Track the progress of cache writes when transferring the
-/// repository COBs to their respective caches.
-///
-/// See [`crate::cob::issue::Cache::write_all`] and
-/// [`crate::cob::patch::Cache::write_all`].
-pub struct WriteAllProgress {
-    total: usize,
-    seen: usize,
-}
-
-impl WriteAllProgress {
-    /// Create a new progress tracker with the given `total` amount.
-    pub fn new(total: usize) -> Self {
-        Self { total, seen: 0 }
-    }
-
-    /// Increment the [`WriteAllProgress::seen`] progress.
-    pub fn inc(&mut self) {
-        self.seen += 1;
-    }
-
-    /// Return the `total` amount.
-    pub fn total(&self) -> usize {
-        self.total
-    }
-
-    /// Return the `seen` amount.
-    pub fn seen(&self) -> usize {
-        self.seen
-    }
-
-    /// Return the percentage of the progress made.
-    ///
-    /// # Panics
-    ///
-    /// If the `total` provided is `0`.
-    pub fn percentage(&self) -> f32 {
-        (self.seen as f32 / self.total as f32) * 100.0
-    }
-}
diff --git a/radicle/src/cob/cache/migrations/1.sql b/radicle/src/cob/cache/migrations/1.sql
deleted file mode 100644
index 5f18981c2..000000000
--- a/radicle/src/cob/cache/migrations/1.sql
+++ /dev/null
@@ -1,19 +0,0 @@
--- Issues
-create table if not exists "issues" (
-  -- Issue ID
-  "id"            text      primary key not null,
-  -- Repository ID
-  "repo"          text      not null,
-  -- Issue in JSON format
-  "issue"         text      not null
-) strict;
-
--- Patches
-create table if not exists "patches" (
-  -- Patch ID
-  "id"            text      primary key not null,
-  -- Repository ID
-  "repo"          text      not null,
-  -- Patch in JSON format
-  "patch"         text      not null
-) strict;
diff --git a/radicle/src/cob/common.rs b/radicle/src/cob/common.rs
deleted file mode 100644
index 0d69de155..000000000
--- a/radicle/src/cob/common.rs
+++ /dev/null
@@ -1,468 +0,0 @@
-use std::fmt;
-use std::fmt::Display;
-use std::ops::{Deref, Range};
-use std::path::PathBuf;
-use std::str::FromStr;
-
-use base64::prelude::{Engine, BASE64_STANDARD};
-use localtime::LocalTime;
-use serde::{Deserialize, Serialize};
-
-use crate::cob::Embed;
-use crate::git::Oid;
-use crate::prelude::{Did, PublicKey};
-use crate::storage::ReadRepository;
-
-/// Timestamp used for COB operations.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
-#[serde(transparent)]
-pub struct Timestamp(LocalTime);
-
-impl Timestamp {
-    pub fn from_secs(secs: u64) -> Self {
-        Self(LocalTime::from_secs(secs))
-    }
-}
-
-impl From<LocalTime> for Timestamp {
-    fn from(time: LocalTime) -> Self {
-        Self(time)
-    }
-}
-
-impl From<Timestamp> for LocalTime {
-    fn from(time: Timestamp) -> Self {
-        time.0
-    }
-}
-
-impl Deref for Timestamp {
-    type Target = LocalTime;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-/// Author.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
-pub struct Author {
-    pub id: Did,
-}
-
-impl Author {
-    pub fn new(id: impl Into<Did>) -> Self {
-        Self { id: id.into() }
-    }
-
-    pub fn id(&self) -> &Did {
-        &self.id
-    }
-
-    pub fn public_key(&self) -> &PublicKey {
-        self.id.as_key()
-    }
-}
-
-impl Display for Author {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.id)
-    }
-}
-
-impl From<PublicKey> for Author {
-    fn from(value: PublicKey) -> Self {
-        Self::new(value)
-    }
-}
-
-#[derive(thiserror::Error, Debug)]
-pub enum ReactionError {
-    #[error("invalid reaction")]
-    InvalidReaction,
-}
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Copy, Clone, Serialize)]
-#[serde(transparent)]
-pub struct Reaction {
-    emoji: char,
-}
-
-impl Reaction {
-    /// Create a new reaction from an emoji.
-    pub fn new(emoji: char) -> Result<Self, ReactionError> {
-        let val = emoji as u32;
-        let emoticons = 0x1F600..=0x1F64F;
-        let misc = 0x1F300..=0x1F5FF; // Miscellaneous Symbols and Pictographs
-        let dingbats = 0x2700..=0x27BF;
-        let supp = 0x1F900..=0x1F9FF; // Supplemental Symbols and Pictographs
-        let transport = 0x1F680..=0x1F6FF;
-
-        if emoticons.contains(&val)
-            || misc.contains(&val)
-            || dingbats.contains(&val)
-            || supp.contains(&val)
-            || transport.contains(&val)
-        {
-            Ok(Self { emoji })
-        } else {
-            Err(ReactionError::InvalidReaction)
-        }
-    }
-
-    /// Get the reaction emoji.
-    pub fn emoji(&self) -> char {
-        self.emoji
-    }
-}
-
-impl<'de> Deserialize<'de> for Reaction {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        struct ReactionVisitor;
-
-        impl<'de> serde::de::Visitor<'de> for ReactionVisitor {
-            type Value = Reaction;
-
-            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-                formatter.write_str("a reaction emoji")
-            }
-
-            fn visit_char<E>(self, v: char) -> Result<Self::Value, E>
-            where
-                E: serde::de::Error,
-            {
-                Reaction::new(v).map_err(|e| E::custom(e.to_string()))
-            }
-
-            fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
-            where
-                E: serde::de::Error,
-            {
-                Reaction::from_str(v).map_err(|e| E::custom(e.to_string()))
-            }
-
-            fn visit_string<E>(self, v: String) -> Result<Self::Value, E>
-            where
-                E: serde::de::Error,
-            {
-                Reaction::from_str(&v).map_err(|e| E::custom(e.to_string()))
-            }
-        }
-
-        deserializer.deserialize_char(ReactionVisitor)
-    }
-}
-
-impl FromStr for Reaction {
-    type Err = ReactionError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let mut chars = s.chars();
-        let first = chars.next().ok_or(ReactionError::InvalidReaction)?;
-
-        // Reactions should not consist of more than a single emoji.
-        if chars.next().is_some() {
-            return Err(ReactionError::InvalidReaction);
-        }
-        Reaction::new(first)
-    }
-}
-
-#[derive(thiserror::Error, Debug)]
-pub enum LabelError {
-    #[error("invalid tag name: `{0}`")]
-    InvalidName(String),
-}
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Serialize, Deserialize)]
-#[serde(transparent)]
-pub struct Label(String);
-
-impl Label {
-    pub fn new(name: impl ToString) -> Result<Self, LabelError> {
-        let name = name.to_string();
-
-        if name.chars().any(|c| c.is_whitespace()) || name.is_empty() {
-            return Err(LabelError::InvalidName(name));
-        }
-        Ok(Self(name))
-    }
-
-    pub fn name(&self) -> &str {
-        self.0.as_str()
-    }
-}
-
-impl FromStr for Label {
-    type Err = LabelError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Self::new(s)
-    }
-}
-
-impl Display for Label {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl From<Label> for String {
-    fn from(Label(name): Label) -> Self {
-        name
-    }
-}
-
-/// RGB color.
-#[derive(Debug, PartialEq, Eq, Hash, Clone)]
-pub struct Color(u32);
-
-#[derive(thiserror::Error, Debug)]
-pub enum ColorConversionError {
-    #[error("invalid format: expect '#rrggbb'")]
-    InvalidFormat,
-    #[error(transparent)]
-    ParseInt(#[from] std::num::ParseIntError),
-}
-
-impl fmt::Display for Color {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "#{:06x}", self.0)
-    }
-}
-
-impl FromStr for Color {
-    type Err = ColorConversionError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let hex = s.replace('#', "").to_lowercase();
-
-        if hex.chars().count() != 6 {
-            return Err(ColorConversionError::InvalidFormat);
-        }
-
-        match u32::from_str_radix(&hex, 16) {
-            Ok(n) => Ok(Color(n)),
-            Err(e) => Err(e.into()),
-        }
-    }
-}
-
-impl Serialize for Color {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::ser::Serializer,
-    {
-        let s = self.to_string();
-        serializer.serialize_str(&s)
-    }
-}
-
-impl<'a> Deserialize<'a> for Color {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::de::Deserializer<'a>,
-    {
-        let color = String::deserialize(deserializer)?;
-        Self::from_str(&color).map_err(serde::de::Error::custom)
-    }
-}
-
-/// A URI.
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Serialize, Deserialize)]
-#[serde(transparent)]
-pub struct Uri(String);
-
-impl Uri {
-    /// Get a string reference to the URI.
-    pub fn as_str(&self) -> &str {
-        self.0.as_str()
-    }
-}
-
-impl From<Oid> for Uri {
-    fn from(oid: Oid) -> Self {
-        Uri(format!("git:{oid}"))
-    }
-}
-
-impl TryFrom<&Uri> for Oid {
-    type Error = Uri;
-
-    fn try_from(value: &Uri) -> Result<Self, Self::Error> {
-        if let Some(oid) = value.as_str().strip_prefix("git:") {
-            let oid = oid.parse().map_err(|_| value.clone())?;
-
-            return Ok(oid);
-        }
-        Err(value.clone())
-    }
-}
-
-impl std::fmt::Display for Uri {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl std::str::FromStr for Uri {
-    type Err = String;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        if !s.chars().all(|c| c.is_ascii()) {
-            return Err(s.to_owned());
-        }
-        if !s.contains(':') {
-            return Err(s.to_owned());
-        }
-        Ok(Self(s.to_owned()))
-    }
-}
-
-/// A `data:` URI.
-#[derive(Debug, Clone)]
-pub struct DataUri(Vec<u8>);
-
-impl From<DataUri> for Vec<u8> {
-    fn from(value: DataUri) -> Self {
-        value.0
-    }
-}
-
-impl TryFrom<&Uri> for DataUri {
-    type Error = Uri;
-
-    fn try_from(value: &Uri) -> Result<Self, Self::Error> {
-        if let Some(data_uri) = value.as_str().strip_prefix("data:") {
-            let (_, uri_data) = data_uri.split_once(',').ok_or(value.clone())?;
-            let uri_data = BASE64_STANDARD
-                .decode(uri_data)
-                .map_err(|_| value.clone())?;
-
-            return Ok(DataUri(uri_data));
-        }
-        Err(value.clone())
-    }
-}
-
-/// Resolve an embed with a URI to one with actual data.
-pub fn resolve_embed(repo: &impl ReadRepository, embed: Embed<Uri>) -> Option<Embed<Vec<u8>>> {
-    DataUri::try_from(&embed.content)
-        .ok()
-        .map(|content| Embed {
-            name: embed.name.clone(),
-            content: content.into(),
-        })
-        .or_else(|| {
-            Oid::try_from(&embed.content).ok().and_then(|oid| {
-                repo.blob(oid).ok().map(|blob| Embed {
-                    name: embed.name,
-                    content: blob.content().to_vec(),
-                })
-            })
-        })
-}
-
-/// The result of an authorization check on an COB action.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum Authorization {
-    /// Action is allowed.
-    Allow,
-    /// Action is denied.
-    Deny,
-    /// Authorization cannot be determined due to missing object, eg. due to redaction.
-    Unknown,
-}
-
-impl From<bool> for Authorization {
-    fn from(value: bool) -> Self {
-        if value {
-            Self::Allow
-        } else {
-            Self::Deny
-        }
-    }
-}
-
-#[cfg(test)]
-#[allow(clippy::unwrap_used)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_color() {
-        let c = Color::from_str("#ffccaa").unwrap();
-        assert_eq!(c.to_string(), "#ffccaa".to_owned());
-        assert_eq!(serde_json::to_string(&c).unwrap(), "\"#ffccaa\"".to_owned());
-        assert_eq!(serde_json::from_str::<'_, Color>("\"#ffccaa\"").unwrap(), c);
-
-        let c = Color::from_str("#0000aa").unwrap();
-        assert_eq!(c.to_string(), "#0000aa".to_owned());
-
-        let c = Color::from_str("#aa0000").unwrap();
-        assert_eq!(c.to_string(), "#aa0000".to_owned());
-
-        let c = Color::from_str("#00aa00").unwrap();
-        assert_eq!(c.to_string(), "#00aa00".to_owned());
-
-        Color::from_str("#aa00").unwrap_err();
-        Color::from_str("#abc").unwrap_err();
-    }
-}
-
-/// Describes a code location that can be used for comments on
-/// patches, issues, and diffs.
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct CodeLocation {
-    /// [`Oid`] of the Git commit.
-    pub commit: Oid,
-    /// Path of file.
-    pub path: PathBuf,
-    /// Line range on old file. `None` for added files.
-    pub old: Option<CodeRange>,
-    /// Line range on new file. `None` for deleted files.
-    pub new: Option<CodeRange>,
-}
-
-/// Code range.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", tag = "type")]
-pub enum CodeRange {
-    /// One or more lines.
-    Lines { range: Range<usize> },
-    /// Character range within a line.
-    Chars { line: usize, range: Range<usize> },
-}
-
-impl std::cmp::PartialOrd for CodeRange {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl std::cmp::Ord for CodeRange {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        match (self, other) {
-            (CodeRange::Lines { .. }, CodeRange::Chars { .. }) => std::cmp::Ordering::Less,
-            (CodeRange::Chars { .. }, CodeRange::Lines { .. }) => std::cmp::Ordering::Greater,
-
-            (CodeRange::Lines { range: a }, CodeRange::Lines { range: b }) => {
-                a.clone().cmp(b.clone())
-            }
-            (
-                CodeRange::Chars {
-                    line: l1,
-                    range: r1,
-                },
-                CodeRange::Chars {
-                    line: l2,
-                    range: r2,
-                },
-            ) => l1.cmp(l2).then(r1.clone().cmp(r2.clone())),
-        }
-    }
-}
diff --git a/radicle/src/cob/identity.rs b/radicle/src/cob/identity.rs
deleted file mode 100644
index bf21aad74..000000000
--- a/radicle/src/cob/identity.rs
+++ /dev/null
@@ -1,1490 +0,0 @@
-use std::collections::BTreeMap;
-use std::{fmt, ops::Deref, str::FromStr};
-
-use crypto::{PublicKey, Signature};
-use once_cell::sync::Lazy;
-use radicle_cob::{ObjectId, TypeName};
-use radicle_crypto::{Signer, Verified};
-use radicle_git_ext as git_ext;
-use radicle_git_ext::Oid;
-use serde::{Deserialize, Serialize};
-use thiserror::Error;
-
-use crate::{
-    cob,
-    cob::{
-        op, store,
-        store::{Cob, CobAction, Transaction},
-        ActorId, Timestamp,
-    },
-    identity::{
-        doc::{Doc, DocError, RepoId},
-        Did,
-    },
-    storage::{ReadRepository, RepositoryError, WriteRepository},
-};
-
-use super::{Author, EntryId};
-
-/// Type name of an identity proposal.
-pub static TYPENAME: Lazy<TypeName> =
-    Lazy::new(|| FromStr::from_str("xyz.radicle.id").expect("type name is valid"));
-
-/// Identity operation.
-pub type Op = cob::Op<Action>;
-
-/// Identifier for an identity revision.
-pub type RevisionId = EntryId;
-
-/// Proposal operation.
-#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
-#[serde(tag = "type")]
-pub enum Action {
-    #[serde(rename = "revision")]
-    Revision {
-        /// Short summary of changes.
-        title: String,
-        /// Longer comment on proposed changes.
-        #[serde(default, skip_serializing_if = "String::is_empty")]
-        description: String,
-        /// Blob identifier of the document included in this action as an embed.
-        /// Hence, we do not include it as a parent of this action in [`CobAction`].
-        blob: Oid,
-        /// Parent revision that this revision replaces.
-        parent: Option<RevisionId>,
-        /// Signature over the revision blob.
-        signature: Signature,
-    },
-    RevisionEdit {
-        /// The revision to edit.
-        revision: RevisionId,
-        /// Short summary of changes.
-        title: String,
-        /// Longer comment on proposed changes.
-        #[serde(default, skip_serializing_if = "String::is_empty")]
-        description: String,
-    },
-    #[serde(rename = "revision.accept")]
-    RevisionAccept {
-        revision: RevisionId,
-        /// Signature over the blob.
-        signature: Signature,
-    },
-    #[serde(rename = "revision.reject")]
-    RevisionReject { revision: RevisionId },
-    #[serde(rename = "revision.redact")]
-    RevisionRedact { revision: RevisionId },
-}
-
-impl CobAction for Action {}
-
-/// Error applying an operation onto a state.
-#[derive(Error, Debug)]
-pub enum ApplyError {
-    /// Causal dependency missing.
-    ///
-    /// This error indicates that the operations are not being applied
-    /// in causal order, which is a requirement for this CRDT.
-    ///
-    /// For example, this can occur if an operation references anothern operation
-    /// that hasn't happened yet.
-    #[error("causal dependency {0:?} missing")]
-    Missing(EntryId),
-    /// General error initializing an identity.
-    #[error("initialization failed: {0}")]
-    Init(&'static str),
-    /// Invalid signature over document blob.
-    #[error("invalid signature from {0} for blob {1}")]
-    InvalidSignature(PublicKey, Oid),
-    /// Unauthorized action.
-    #[error("not authorized to perform this action")]
-    NotAuthorized,
-    #[error("parent id is missing from revision")]
-    MissingParent,
-    #[error("verdict for this revision has already been applied")]
-    DuplicateVerdict,
-    #[error("revision is in an unexpected state")]
-    UnexpectedState,
-    #[error("revision has been redacted")]
-    Redacted,
-    #[error("document does not contain any changes to current identity")]
-    DocUnchanged,
-    #[error("git: {0}")]
-    Git(#[from] git2::Error),
-    #[error("git: {0}")]
-    GitExt(#[from] git_ext::Error),
-    #[error("identity document error: {0}")]
-    Doc(#[from] DocError),
-}
-
-/// Error updating or creating proposals.
-#[derive(Error, Debug)]
-pub enum Error {
-    #[error("apply failed: {0}")]
-    Apply(#[from] ApplyError),
-    #[error("store: {0}")]
-    Store(#[from] store::Error),
-    #[error("op decoding failed: {0}")]
-    Op(#[from] op::OpEncodingError),
-    #[error(transparent)]
-    Doc(#[from] DocError),
-    #[error("revision {0} was not found")]
-    NotFound(RevisionId),
-}
-
-/// An evolving identity document.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Identity {
-    /// The canonical identifier for this identity.
-    /// This is the object id of the initial document blob.
-    pub id: RepoId,
-    /// The current revision of the document.
-    /// Equal to the head of the identity branch.
-    pub current: RevisionId,
-    /// The initial revision of the document.
-    pub root: RevisionId,
-    /// The latest revision that each delegate has accepted.
-    /// Delegates can only accept one revision at a time.
-    pub heads: BTreeMap<Did, RevisionId>,
-
-    /// Revisions.
-    revisions: BTreeMap<RevisionId, Option<Revision>>,
-    /// Timeline of events.
-    timeline: Vec<EntryId>,
-}
-
-impl std::ops::Deref for Identity {
-    type Target = Revision;
-
-    fn deref(&self) -> &Self::Target {
-        self.current()
-    }
-}
-
-impl Identity {
-    pub fn new(revision: Revision) -> Self {
-        let root = revision.id;
-
-        Self {
-            id: revision.blob.into(),
-            root,
-            current: root,
-            heads: revision
-                .delegates
-                .iter()
-                .copied()
-                .map(|did| (did, root))
-                .collect(),
-            revisions: BTreeMap::from_iter([(root, Some(revision))]),
-            timeline: vec![root],
-        }
-    }
-
-    pub fn initialize<'a, R: WriteRepository + cob::Store, G: Signer>(
-        doc: &Doc<Verified>,
-        store: &'a R,
-        signer: &G,
-    ) -> Result<IdentityMut<'a, R>, cob::store::Error> {
-        let mut store = cob::store::Store::open(store)?;
-        let (id, identity) =
-            Transaction::<Identity, _>::initial("Initialize identity", &mut store, signer, |tx| {
-                tx.revision("Initial revision", "", doc, None, signer)
-            })?;
-
-        Ok(IdentityMut {
-            id,
-            identity,
-            store,
-        })
-    }
-
-    pub fn get<R: ReadRepository + cob::Store>(
-        object: &ObjectId,
-        repo: &R,
-    ) -> Result<Identity, store::Error> {
-        cob::get::<Self, _>(repo, Self::type_name(), object)
-            .map(|r| r.map(|cob| cob.object))?
-            .ok_or_else(move || store::Error::NotFound(TYPENAME.clone(), *object))
-    }
-
-    /// Get a proposal mutably.
-    pub fn get_mut<'a, R: WriteRepository + cob::Store>(
-        id: &ObjectId,
-        repo: &'a R,
-    ) -> Result<IdentityMut<'a, R>, store::Error> {
-        let obj = Self::get(id, repo)?;
-        let store = cob::store::Store::open(repo)?;
-
-        Ok(IdentityMut {
-            id: *id,
-            identity: obj,
-            store,
-        })
-    }
-
-    pub fn load<R: ReadRepository + cob::Store>(repo: &R) -> Result<Identity, RepositoryError> {
-        let oid = repo.identity_root()?;
-        let oid = ObjectId::from(oid);
-
-        Self::get(&oid, repo).map_err(RepositoryError::from)
-    }
-
-    pub fn load_mut<R: WriteRepository + cob::Store>(
-        repo: &R,
-    ) -> Result<IdentityMut<R>, RepositoryError> {
-        let oid = repo.identity_root()?;
-        let oid = ObjectId::from(oid);
-
-        Self::get_mut(&oid, repo).map_err(RepositoryError::from)
-    }
-}
-
-impl Identity {
-    /// The repository identifier.
-    pub fn id(&self) -> RepoId {
-        self.id
-    }
-
-    /// The current document.
-    pub fn doc(&self) -> &Doc<Verified> {
-        &self.current().doc
-    }
-
-    /// The current revision.
-    pub fn current(&self) -> &Revision {
-        self.revision(&self.current)
-            .expect("Identity::current: the current revision must always exist")
-    }
-
-    /// The initial revision of this identity.
-    pub fn root(&self) -> &Revision {
-        self.revision(&self.root)
-            .expect("Identity::root: the root revision must always exist")
-    }
-
-    /// The head of the identity branch. This points to a commit that
-    /// contains the current document blob.
-    pub fn head(&self) -> Oid {
-        self.current
-    }
-
-    /// A specific [`Revision`], that may be redacted.
-    pub fn revision(&self, revision: &RevisionId) -> Option<&Revision> {
-        self.revisions.get(revision).and_then(|r| r.as_ref())
-    }
-
-    /// All the [`Revision`]s that have not been redacted.
-    pub fn revisions(&self) -> impl DoubleEndedIterator<Item = &Revision> {
-        self.timeline
-            .iter()
-            .filter_map(|id| self.revisions.get(id).and_then(|o| o.as_ref()))
-    }
-
-    pub fn latest_by(&self, who: &Did) -> Option<&Revision> {
-        self.revisions().rev().find(|r| r.author.id() == who)
-    }
-}
-
-impl store::Cob for Identity {
-    type Action = Action;
-    type Error = ApplyError;
-
-    fn type_name() -> &'static TypeName {
-        &TYPENAME
-    }
-
-    fn from_root<R: ReadRepository>(op: Op, repo: &R) -> Result<Self, Self::Error> {
-        let mut actions = op.actions.into_iter();
-        let Some(Action::Revision {
-            title,
-            description,
-            blob,
-            signature,
-            parent,
-        }) = actions.next()
-        else {
-            return Err(ApplyError::Init(
-                "the first action must be of type `revision`",
-            ));
-        };
-        if parent.is_some() {
-            return Err(ApplyError::Init(
-                "the initial revision must not have a parent",
-            ));
-        }
-        if actions.next().is_some() {
-            return Err(ApplyError::Init(
-                "the first operation must contain only one action",
-            ));
-        }
-        let root = Doc::<Verified>::load_at(op.id, repo)?;
-        if root.blob != blob {
-            return Err(ApplyError::Init("invalid object id specified in revision"));
-        }
-        if root.blob != *repo.id() {
-            return Err(ApplyError::Init(
-                "repository root does not match identifier",
-            ));
-        }
-        assert_eq!(root.commit, op.id);
-
-        let founder = root.delegates.first();
-        if founder.as_key() != &op.author {
-            return Err(ApplyError::Init("delegate does not match committer"));
-        }
-        // Verify signature against root document. Since there is no previous document,
-        // we verify it against itself.
-        if root
-            .verify_signature(founder, &signature, root.blob)
-            .is_err()
-        {
-            return Err(ApplyError::InvalidSignature(**founder, root.blob));
-        }
-        let revision = Revision::new(
-            root.commit,
-            title,
-            description,
-            op.author.into(),
-            root.blob,
-            root.doc,
-            State::Accepted,
-            signature,
-            parent,
-            op.timestamp,
-        );
-        Ok(Identity::new(revision))
-    }
-
-    fn op<'a, R: ReadRepository, I: IntoIterator<Item = &'a cob::Entry>>(
-        &mut self,
-        op: Op,
-        concurrent: I,
-        repo: &R,
-    ) -> Result<(), ApplyError> {
-        let id = op.id;
-        let concurrent = concurrent.into_iter().collect::<Vec<_>>();
-
-        for action in op.actions {
-            match self.action(action, id, op.author, op.timestamp, &concurrent, repo) {
-                Ok(()) => {}
-                // This particular error is returned when there is a mismatch between the expected
-                // and the actual state of a revision, which can happen concurrently. Therefore
-                // if there are other concurrent ops, it is not fatal and we simply ignore it.
-                Err(ApplyError::UnexpectedState) => {
-                    if concurrent.is_empty() {
-                        return Err(ApplyError::UnexpectedState);
-                    }
-                }
-                // It's not a user error if the revision happens to be redacted by
-                // the time this action is processed.
-                Err(ApplyError::Redacted) => {}
-                Err(other) => return Err(other),
-            }
-            debug_assert!(!self.timeline.contains(&id));
-            self.timeline.push(id);
-        }
-        Ok(())
-    }
-}
-
-impl Identity {
-    /// Apply a single action to the identity document.
-    ///
-    /// This function ensures a few things:
-    /// * Only delegates can interact with the state.
-    /// * There is only ever one accepted revision; this is the "current" revision.
-    /// * There can be zero or more active revisions, up to the number of delegates.
-    /// * An active revision is one that can be "voted" on.
-    /// * An active revision always has the current revision as parent.
-    /// * Only the active revision can be accepted, rejected or edited.
-    fn action<R: ReadRepository>(
-        &mut self,
-        action: Action,
-        entry: EntryId,
-        author: ActorId,
-        timestamp: Timestamp,
-        _concurrent: &[&cob::Entry],
-        repo: &R,
-    ) -> Result<(), ApplyError> {
-        let current = self.current().clone();
-
-        if !current.is_delegate(&author) {
-            return Err(ApplyError::UnexpectedState);
-        }
-        match action {
-            Action::RevisionAccept {
-                revision,
-                signature,
-            } => {
-                let id = revision;
-                let Some(revision) = lookup::revision_mut(&mut self.revisions, &id)? else {
-                    return Err(ApplyError::Redacted);
-                };
-                if !revision.is_active() {
-                    // You can't vote on an inactive revision.
-                    return Err(ApplyError::UnexpectedState);
-                }
-                assert_eq!(revision.parent, Some(current.id));
-
-                self.heads.insert(author.into(), id);
-                revision.accept(author, signature, &current)?;
-
-                self.adopt(id);
-            }
-            Action::RevisionReject { revision } => {
-                let Some(revision) = lookup::revision_mut(&mut self.revisions, &revision)? else {
-                    return Err(ApplyError::Redacted);
-                };
-                if !revision.is_active() {
-                    // You can't vote on an inactive revision.
-                    return Err(ApplyError::UnexpectedState);
-                }
-                assert_eq!(revision.parent, Some(current.id));
-
-                revision.reject(author)?;
-            }
-            Action::RevisionEdit {
-                title,
-                description,
-                revision,
-            } => {
-                if revision == self.current {
-                    return Err(ApplyError::NotAuthorized);
-                }
-                let Some(revision) = lookup::revision_mut(&mut self.revisions, &revision)? else {
-                    return Err(ApplyError::Redacted);
-                };
-                if !revision.is_active() {
-                    // You can't edit an inactive revision.
-                    return Err(ApplyError::UnexpectedState);
-                }
-                if revision.author.public_key() != &author {
-                    // Can't edit someone else's revision.
-                    // Since the author never changes, we can safely mark this as invalid.
-                    return Err(ApplyError::NotAuthorized);
-                }
-                assert_eq!(revision.parent, Some(current.id));
-
-                revision.title = title;
-                revision.description = description;
-            }
-            Action::RevisionRedact { revision } => {
-                if revision == self.current {
-                    // Can't redact the current revision.
-                    return Err(ApplyError::UnexpectedState);
-                }
-                if let Some(revision) = self.revisions.get_mut(&revision) {
-                    if let Some(r) = revision {
-                        if r.is_accepted() {
-                            // You can't redact an accepted revision.
-                            return Err(ApplyError::UnexpectedState);
-                        }
-                        if r.author.public_key() != &author {
-                            // Can't redact someone else's revision.
-                            // Since the author never changes, we can safely mark this as invalid.
-                            return Err(ApplyError::NotAuthorized);
-                        }
-                        *revision = None;
-                    }
-                } else {
-                    return Err(ApplyError::Missing(revision));
-                }
-            }
-            Action::Revision {
-                title,
-                description,
-                blob,
-                signature,
-                parent,
-            } => {
-                debug_assert!(!self.revisions.contains_key(&entry));
-
-                let doc = repo.blob(blob)?;
-                let doc = Doc::from_blob(&doc)?;
-                // All revisions but the first one must have a parent.
-                let Some(parent) = parent else {
-                    return Err(ApplyError::MissingParent);
-                };
-                let Some(parent) = lookup::revision(&self.revisions, &parent)? else {
-                    return Err(ApplyError::Redacted);
-                };
-                // If the parent of this revision is no longer the current document, this
-                // revision can be marked as outdated.
-                let state = if parent.id == current.id {
-                    // If the revision is not outdated, we expect it to make a change to the
-                    // current version.
-                    if doc == parent.doc {
-                        return Err(ApplyError::DocUnchanged);
-                    }
-                    State::Active
-                } else {
-                    State::Stale
-                };
-
-                // Verify signature over new blob, using trusted delegates.
-                if parent.verify_signature(&author, &signature, blob).is_err() {
-                    return Err(ApplyError::InvalidSignature(author, blob));
-                }
-                let revision = Revision::new(
-                    entry,
-                    title,
-                    description,
-                    author.into(),
-                    blob,
-                    doc,
-                    state,
-                    signature,
-                    Some(parent.id),
-                    timestamp,
-                );
-                let id = revision.id;
-
-                self.heads.insert(author.into(), id);
-                self.revisions.insert(id, Some(revision));
-
-                if state == State::Active {
-                    self.adopt(id);
-                }
-            }
-        }
-        Ok(())
-    }
-
-    /// Try to adopt a revision as the current one.
-    fn adopt(&mut self, id: RevisionId) {
-        if self.current == id {
-            return;
-        }
-        let votes = self
-            .heads
-            .values()
-            .filter(|revision| **revision == id)
-            .count();
-        if self.is_majority(votes) {
-            self.current = id;
-            self.current_mut().state = State::Accepted;
-
-            // Void all other active revisions.
-            for r in self
-                .revisions
-                .iter_mut()
-                .filter_map(|(_, r)| r.as_mut())
-                .filter(|r| r.state == State::Active)
-            {
-                r.state = State::Stale;
-            }
-        }
-    }
-
-    /// A specific [`Revision`], mutably.
-    fn revision_mut(&mut self, revision: &RevisionId) -> Option<&mut Revision> {
-        self.revisions.get_mut(revision).and_then(|r| r.as_mut())
-    }
-
-    /// The current revision, mutably.
-    fn current_mut(&mut self) -> &mut Revision {
-        let current = self.current;
-        self.revision_mut(&current)
-            .expect("Identity::current_mut: the current revision must always exist")
-    }
-}
-
-impl<R: ReadRepository> cob::Evaluate<R> for Identity {
-    type Error = Error;
-
-    fn init(entry: &cob::Entry, repo: &R) -> Result<Self, Self::Error> {
-        let op = Op::try_from(entry)?;
-        let object = Identity::from_root(op, repo)?;
-
-        Ok(object)
-    }
-
-    fn apply<'a, I: Iterator<Item = (&'a EntryId, &'a cob::Entry)>>(
-        &mut self,
-        entry: &cob::Entry,
-        concurrent: I,
-        repo: &R,
-    ) -> Result<(), Self::Error> {
-        let op = Op::try_from(entry)?;
-
-        self.op(op, concurrent.map(|(_, e)| e), repo)
-            .map_err(Error::Apply)
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize)]
-pub enum Verdict {
-    /// An accepting verdict must supply the [`Signature`] over the
-    /// new proposed [`Doc`].
-    Accept(Signature),
-    /// Rejecting the proposed [`Doc`].
-    Reject,
-}
-
-/// State of a revision.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum State {
-    /// The revision is actively being voted on. From here, it can go into any of the
-    /// other states.
-    Active,
-    /// The revision has been accepted by a majority of delegates. Once accepted,
-    /// a revision doesn't change state.
-    Accepted,
-    /// The revision was rejected by a majority of delegates. Once rejected,
-    /// a revision doesn't change state.
-    Rejected,
-    /// The revision was active, but has been replaced by another revision,
-    /// and is now outdated. Once stale, a revision doesn't change state.
-    Stale,
-}
-
-impl std::fmt::Display for State {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Active => write!(f, "active"),
-            Self::Accepted => write!(f, "accepted"),
-            Self::Rejected => write!(f, "rejected"),
-            Self::Stale => write!(f, "stale"),
-        }
-    }
-}
-
-/// A new [`Doc`] for an [`Identity`]. The revision can be
-/// reviewed by gathering [`Signature`]s for accepting the changes, or
-/// rejecting them.
-///
-/// Once a revision has reached the quorum threshold of the previous
-/// [`Identity`] it is then adopted as the current identity.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize)]
-pub struct Revision {
-    /// The id of this revision. Points to a commit.
-    pub id: RevisionId,
-    /// Identity document blob at this revision.
-    pub blob: Oid,
-    /// Title of the proposal.
-    pub title: String,
-    /// State of the revision.
-    pub state: State,
-    /// Description of the proposal.
-    pub description: String,
-    /// Author of this proposed revision.
-    pub author: Author,
-    /// New [`Doc`] that will replace `previous`' document.
-    pub doc: Doc<Verified>,
-    /// Physical timestamp of this proposal revision.
-    pub timestamp: Timestamp,
-    /// Parent revision.
-    pub parent: Option<RevisionId>,
-
-    /// Signatures and rejections given by the delegates.
-    verdicts: BTreeMap<PublicKey, Verdict>,
-}
-
-impl std::ops::Deref for Revision {
-    type Target = Doc<Verified>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.doc
-    }
-}
-
-impl Revision {
-    pub fn signatures(&self) -> impl Iterator<Item = (&PublicKey, Signature)> {
-        self.verdicts().filter_map(|(key, verdict)| match verdict {
-            Verdict::Accept(sig) => Some((key, *sig)),
-            Verdict::Reject => None,
-        })
-    }
-
-    pub fn is_accepted(&self) -> bool {
-        matches!(self.state, State::Accepted)
-    }
-
-    pub fn is_active(&self) -> bool {
-        matches!(self.state, State::Active)
-    }
-
-    pub fn verdicts(&self) -> impl Iterator<Item = (&PublicKey, &Verdict)> {
-        self.verdicts.iter()
-    }
-
-    pub fn accepted(&self) -> impl Iterator<Item = Did> + '_ {
-        self.signatures().map(|(key, _)| key.into())
-    }
-
-    pub fn rejected(&self) -> impl Iterator<Item = Did> + '_ {
-        self.verdicts().filter_map(|(key, v)| match v {
-            Verdict::Accept(_) => None,
-            Verdict::Reject => Some(key.into()),
-        })
-    }
-
-    pub fn sign<G: Signer>(&self, signer: &G) -> Result<Signature, DocError> {
-        self.doc.signature_of(signer)
-    }
-}
-
-// Private functions that may not do all the verification. Use with caution.
-impl Revision {
-    fn new(
-        id: RevisionId,
-        title: String,
-        description: String,
-        author: Author,
-        blob: Oid,
-        doc: Doc<Verified>,
-        state: State,
-        signature: Signature,
-        parent: Option<RevisionId>,
-        timestamp: Timestamp,
-    ) -> Self {
-        let verdicts = BTreeMap::from_iter([(*author.public_key(), Verdict::Accept(signature))]);
-
-        Self {
-            id,
-            title,
-            description,
-            author,
-            blob,
-            doc,
-            state,
-            verdicts,
-            parent,
-            timestamp,
-        }
-    }
-
-    fn accept(
-        &mut self,
-        author: PublicKey,
-        signature: Signature,
-        current: &Revision,
-    ) -> Result<(), ApplyError> {
-        // Check that this is a valid signature over the new document blob id.
-        if current
-            .verify_signature(&author, &signature, self.blob)
-            .is_err()
-        {
-            return Err(ApplyError::InvalidSignature(author, self.blob));
-        }
-        if self
-            .verdicts
-            .insert(author, Verdict::Accept(signature))
-            .is_some()
-        {
-            return Err(ApplyError::DuplicateVerdict);
-        }
-        Ok(())
-    }
-
-    fn reject(&mut self, key: PublicKey) -> Result<(), ApplyError> {
-        if self.verdicts.insert(key, Verdict::Reject).is_some() {
-            return Err(ApplyError::DuplicateVerdict);
-        }
-        // Mark as rejected if it's impossible for this revision to be accepted
-        // with the current delegate set. Note that if the delegate set changes,
-        // this proposal will be marked as `stale` anyway.
-        if self.is_active() && self.rejected().count() > self.delegates.len() - self.majority() {
-            self.state = State::Rejected;
-        }
-        Ok(())
-    }
-}
-
-impl<R: ReadRepository> store::Transaction<Identity, R> {
-    pub fn accept(
-        &mut self,
-        revision: RevisionId,
-        signature: Signature,
-    ) -> Result<(), store::Error> {
-        self.push(Action::RevisionAccept {
-            revision,
-            signature,
-        })
-    }
-
-    pub fn reject(&mut self, revision: RevisionId) -> Result<(), store::Error> {
-        self.push(Action::RevisionReject { revision })
-    }
-
-    pub fn edit(
-        &mut self,
-        revision: RevisionId,
-        title: impl ToString,
-        description: impl ToString,
-    ) -> Result<(), store::Error> {
-        self.push(Action::RevisionEdit {
-            revision,
-            title: title.to_string(),
-            description: description.to_string(),
-        })
-    }
-
-    pub fn redact(&mut self, revision: RevisionId) -> Result<(), store::Error> {
-        self.push(Action::RevisionRedact { revision })
-    }
-
-    pub fn revision<G: Signer>(
-        &mut self,
-        title: impl ToString,
-        description: impl ToString,
-        doc: &Doc<Verified>,
-        parent: Option<RevisionId>,
-        signer: &G,
-    ) -> Result<(), store::Error> {
-        let (blob, content, signature) = doc.sign(signer).map_err(store::Error::Identity)?;
-
-        // Identity document.
-        self.embed([cob::Embed {
-            name: String::from("radicle.json"),
-            content,
-        }])?;
-
-        // Revision metadata.
-        self.push(Action::Revision {
-            title: title.to_string(),
-            description: description.to_string(),
-            blob,
-            parent,
-            signature,
-        })
-    }
-}
-
-pub struct IdentityMut<'a, R> {
-    pub id: ObjectId,
-
-    identity: Identity,
-    store: store::Store<'a, Identity, R>,
-}
-
-impl<'a, R> fmt::Debug for IdentityMut<'a, R> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("IdentityMut")
-            .field("id", &self.id)
-            .field("identity", &self.identity)
-            .finish()
-    }
-}
-
-impl<'a, R> IdentityMut<'a, R>
-where
-    R: WriteRepository + cob::Store,
-{
-    /// Reload the identity data from storage.
-    pub fn reload(&mut self) -> Result<(), store::Error> {
-        self.identity = self
-            .store
-            .get(&self.id)?
-            .ok_or_else(|| store::Error::NotFound(TYPENAME.clone(), self.id))?;
-
-        Ok(())
-    }
-
-    pub fn transaction<G, F>(
-        &mut self,
-        message: &str,
-        signer: &G,
-        operations: F,
-    ) -> Result<EntryId, Error>
-    where
-        G: Signer,
-        F: FnOnce(&mut Transaction<Identity, R>) -> Result<(), store::Error>,
-    {
-        let mut tx = Transaction::default();
-        operations(&mut tx)?;
-
-        let (doc, commit) = tx.commit(message, self.id, &mut self.store, signer)?;
-        self.identity = doc;
-
-        Ok(commit)
-    }
-
-    /// Update the identity by proposing a new revision.
-    /// If the signer is the only delegate, the revision is accepted automatically.
-    pub fn update<G: Signer>(
-        &mut self,
-        title: impl ToString,
-        description: impl ToString,
-        doc: &Doc<Verified>,
-        signer: &G,
-    ) -> Result<RevisionId, Error> {
-        let parent = self.current;
-        let id = self.transaction("Propose revision", signer, |tx| {
-            tx.revision(title, description, doc, Some(parent), signer)
-        })?;
-
-        Ok(id)
-    }
-
-    /// Accept an active revision.
-    pub fn accept<G: Signer>(
-        &mut self,
-        revision: &RevisionId,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        let id = *revision;
-        let revision = self.revision(revision).ok_or(Error::NotFound(id))?;
-        let signature = revision.sign(signer)?;
-
-        self.transaction("Accept revision", signer, |tx| tx.accept(id, signature))
-    }
-
-    /// Reject an active revision.
-    pub fn reject<G: Signer>(
-        &mut self,
-        revision: RevisionId,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Reject revision", signer, |tx| tx.reject(revision))
-    }
-
-    /// Redact a revision.
-    pub fn redact<G: Signer>(
-        &mut self,
-        revision: RevisionId,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Redact revision", signer, |tx| tx.redact(revision))
-    }
-
-    /// Edit an active revision's title or description.
-    pub fn edit<G: Signer>(
-        &mut self,
-        revision: RevisionId,
-        title: String,
-        description: String,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Edit revision", signer, |tx| {
-            tx.edit(revision, title, description)
-        })
-    }
-}
-
-impl<'a, R> Deref for IdentityMut<'a, R> {
-    type Target = Identity;
-
-    fn deref(&self) -> &Self::Target {
-        &self.identity
-    }
-}
-
-mod lookup {
-    use super::*;
-
-    pub fn revision_mut<'a>(
-        revisions: &'a mut BTreeMap<RevisionId, Option<Revision>>,
-        revision: &RevisionId,
-    ) -> Result<Option<&'a mut Revision>, ApplyError> {
-        match revisions.get_mut(revision) {
-            Some(Some(revision)) => Ok(Some(revision)),
-            // Redacted.
-            Some(None) => Ok(None),
-            // Missing. Causal error.
-            None => Err(ApplyError::Missing(*revision)),
-        }
-    }
-
-    pub fn revision<'a>(
-        revisions: &'a BTreeMap<RevisionId, Option<Revision>>,
-        revision: &RevisionId,
-    ) -> Result<Option<&'a Revision>, ApplyError> {
-        match revisions.get(revision) {
-            Some(Some(revision)) => Ok(Some(revision)),
-            // Redacted.
-            Some(None) => Ok(None),
-            // Missing. Causal error.
-            None => Err(ApplyError::Missing(*revision)),
-        }
-    }
-}
-
-#[cfg(test)]
-#[allow(clippy::unwrap_used)]
-mod test {
-    use qcheck_macros::quickcheck;
-    use radicle_crypto::test::signer::MockSigner;
-    use radicle_crypto::Signer as _;
-
-    use crate::crypto::PublicKey;
-    use crate::identity::Visibility;
-    use crate::rad;
-    use crate::storage::git::Storage;
-    use crate::storage::ReadStorage;
-    use crate::test::fixtures;
-    use crate::test::setup::{Network, NodeWithRepo};
-
-    use super::*;
-    use crate::identity::did::Did;
-    use crate::identity::doc::PayloadId;
-
-    #[quickcheck]
-    fn prop_json_eq_str(pk: PublicKey, proj: RepoId, did: Did) {
-        let json = serde_json::to_string(&pk).unwrap();
-        assert_eq!(format!("\"{pk}\""), json);
-
-        let json = serde_json::to_string(&proj).unwrap();
-        assert_eq!(format!("\"{}\"", proj.urn()), json);
-
-        let json = serde_json::to_string(&did).unwrap();
-        assert_eq!(format!("\"{did}\""), json);
-    }
-
-    #[test]
-    fn test_identity_updates() {
-        let NodeWithRepo { node, repo } = NodeWithRepo::default();
-        let bob = MockSigner::default();
-        let signer = &node.signer;
-        let mut identity = Identity::load_mut(&*repo).unwrap();
-        let mut doc = identity.doc().clone();
-        let title = "Identity update";
-        let description = "";
-        let r0 = identity.current;
-
-        // The initial state is accepted.
-        assert!(identity.current().is_accepted());
-        // Using an identical document to the current one fails.
-        identity
-            .update(title, description, &doc, signer)
-            .unwrap_err();
-        assert_eq!(identity.current, r0);
-
-        // Change threshold to `2`, even though there's only one delegate. This should
-        // fail as it makes the master branch immutable.
-        doc.threshold = 2;
-        identity
-            .update(title, description, &doc, signer)
-            .unwrap_err();
-        assert_eq!(identity.current, r0);
-        // Let's add another delegate.
-        doc.delegate(bob.public_key());
-        // The update should go through now.
-        let r1 = identity.update(title, description, &doc, signer).unwrap();
-        assert!(identity.revision(&r1).unwrap().is_accepted());
-        assert_eq!(identity.current, r1);
-        // With two delegates now, we need two signatures for any update to go through.
-        // So this next update shouldn't be accepted as canonical until the second delegate
-        // signs it.
-        doc.visibility = Visibility::private([]);
-        let r2 = identity.update(title, description, &doc, signer).unwrap();
-        // R1 is still the head.
-        assert_eq!(identity.current, r1);
-        assert_eq!(identity.revision(&r2).unwrap().state, State::Active);
-        assert_eq!(repo.canonical_identity_head().unwrap(), r1);
-        assert_eq!(repo.identity_doc().unwrap().visibility, Visibility::Public);
-        // Now let's add a signature on R2 from Bob.
-        identity.accept(&r2, &bob).unwrap();
-
-        // R2 is now the head.
-        assert_eq!(identity.current, r2);
-        assert_eq!(identity.revision(&r2).unwrap().state, State::Accepted);
-        assert_eq!(repo.canonical_identity_head().unwrap(), r2);
-        assert_eq!(
-            repo.canonical_identity_doc().unwrap().visibility,
-            Visibility::private([])
-        );
-    }
-
-    #[test]
-    fn test_identity_update_rejected() {
-        let NodeWithRepo { node, repo } = NodeWithRepo::default();
-        let bob = MockSigner::default();
-        let eve = MockSigner::default();
-        let signer = &node.signer;
-        let mut identity = Identity::load_mut(&*repo).unwrap();
-        let mut doc = identity.doc().clone();
-        let title = "Identity update";
-        let description = "";
-
-        // Let's add another delegate.
-        doc.delegate(bob.public_key());
-        let r1 = identity.update(title, description, &doc, signer).unwrap();
-        assert_eq!(identity.current, r1);
-
-        doc.visibility = Visibility::private([]);
-        let r2 = identity
-            .update("Make private", description, &doc, &node.signer)
-            .unwrap();
-
-        // 1/2 rejected means that we can never reach the required 2/2 votes.
-        identity.reject(r2, &bob).unwrap();
-        let r2 = identity.revision(&r2).unwrap();
-        assert_eq!(r2.state, State::Rejected);
-
-        // Now let's add another delegate.
-        doc.delegate(eve.public_key());
-        let r3 = identity
-            .update("Add Eve", description, &doc, &node.signer)
-            .unwrap();
-        let _ = identity.accept(&r3, &bob).unwrap();
-        assert_eq!(identity.current, r3);
-
-        doc.visibility = Visibility::Public;
-        let r3 = identity
-            .update("Make public", description, &doc, &node.signer)
-            .unwrap();
-
-        // 1/3 rejected means that we can still reach the 2/3 required votes.
-        identity.reject(r3, &bob).unwrap();
-        let r3 = identity.revision(&r3).unwrap().clone();
-        assert_eq!(r3.state, State::Active); // Still active.
-
-        // 2/3 rejected means that we can no longer reach the 2/3 required votes.
-        identity.reject(r3.id, &eve).unwrap();
-        let r3 = identity.revision(&r3.id).unwrap();
-        assert_eq!(r3.state, State::Rejected);
-    }
-
-    #[test]
-    fn test_identity_updates_concurrent() {
-        let network = Network::default();
-        let alice = &network.alice;
-        let bob = &network.bob;
-
-        let mut alice_identity = Identity::load_mut(&*alice.repo).unwrap();
-        let mut alice_doc = alice_identity.doc().clone();
-
-        alice_doc.delegate(bob.signer.public_key());
-        let a1 = alice_identity
-            .update("Add Bob", "", &alice_doc, &alice.signer)
-            .unwrap();
-
-        bob.repo.fetch(alice);
-
-        let mut bob_identity = Identity::load_mut(&*bob.repo).unwrap();
-        let bob_doc = bob_identity.doc().clone();
-        assert!(bob_doc.is_delegate(bob.signer.public_key()));
-
-        // Alice changes the document without making Bob aware.
-        alice_doc.visibility = Visibility::private([]);
-        let a2 = alice_identity
-            .update("Change visibility", "", &alice_doc, &alice.signer)
-            .unwrap();
-        // Bob makes the same change without knowing Alice already did.
-        let b1 = bob_identity
-            .update("Make private", "", &alice_doc, &bob.signer)
-            .unwrap();
-
-        // Bob gets Alice's data.
-        bob.repo.fetch(alice);
-        bob_identity.reload().unwrap();
-        assert_eq!(bob_identity.current, a1);
-
-        // Alice gets Bob's data.
-        // There's not enough votes for either of these proposals to pass.
-        alice.repo.fetch(bob);
-        alice_identity.reload().unwrap();
-        assert_eq!(alice_identity.current, a1);
-        assert_eq!(bob_identity.revision(&a2).unwrap().state, State::Active);
-        assert_eq!(bob_identity.revision(&b1).unwrap().state, State::Active);
-
-        // Now Bob accepts Alice's proposal. This voids his own.
-        bob_identity.accept(&a2, &bob.signer).unwrap();
-        assert_eq!(bob_identity.current, a2);
-        assert_eq!(bob_identity.revision(&a1).unwrap().state, State::Accepted);
-        assert_eq!(bob_identity.revision(&a2).unwrap().state, State::Accepted);
-        assert_eq!(bob_identity.revision(&b1).unwrap().state, State::Stale);
-    }
-
-    #[test]
-    fn test_identity_redact_revision() {
-        let network = Network::default();
-        let alice = &network.alice;
-        let bob = &network.bob;
-        let eve = &network.eve;
-
-        let mut alice_identity = Identity::load_mut(&*alice.repo).unwrap();
-        let mut alice_doc = alice_identity.doc().clone();
-
-        alice_doc.delegate(bob.signer.public_key());
-        let a0 = alice_identity.root;
-        let a1 = alice_identity
-            .update("Add Bob", "Eh.", &alice_doc, &alice.signer)
-            .unwrap();
-
-        alice_doc.visibility = Visibility::private([eve.signer.public_key().into()]);
-        let a2 = alice_identity
-            .update("Change visibility", "Eh.", &alice_doc, &alice.signer)
-            .unwrap();
-
-        bob.repo.fetch(alice);
-        let a3 = alice_identity.redact(a2, &alice.signer).unwrap();
-        assert!(alice_identity.revision(&a1).is_some());
-        assert_eq!(alice_identity.timeline, vec![a0, a1, a2, a3]);
-
-        let mut bob_identity = Identity::load_mut(&*bob.repo).unwrap();
-        let b1 = bob_identity.accept(&a2, &bob.signer).unwrap();
-
-        assert_eq!(bob_identity.timeline, vec![a0, a1, a2, b1]);
-        assert_eq!(bob_identity.revision(&a2).unwrap().state, State::Accepted);
-        bob.repo.fetch(alice);
-        bob_identity.reload().unwrap();
-
-        assert_eq!(bob_identity.timeline, vec![a0, a1, a2, a3, b1]);
-        assert_eq!(bob_identity.revision(&a2), None);
-        assert_eq!(bob_identity.current, a1);
-    }
-
-    #[test]
-    fn test_identity_remove_delegate_concurrent() {
-        let network = Network::default();
-        let alice = &network.alice;
-        let bob = &network.bob;
-        let eve = &network.eve;
-
-        let mut alice_identity = Identity::load_mut(&*alice.repo).unwrap();
-        let mut alice_doc = alice_identity.doc().clone();
-
-        alice_doc.delegate(bob.signer.public_key());
-        alice_doc.delegate(eve.signer.public_key());
-        let a0 = alice_identity.root;
-        let a1 = alice_identity // Change description to change traversal order.
-            .update("Add Bob and Eve", "Eh#!", &alice_doc, &alice.signer)
-            .unwrap();
-
-        alice_doc.rescind(eve.signer.public_key()).unwrap();
-        let a2 = alice_identity
-            .update("Remove Eve", "", &alice_doc, &alice.signer)
-            .unwrap();
-
-        bob.repo.fetch(eve);
-        bob.repo.fetch(alice);
-        eve.repo.fetch(bob);
-
-        let mut bob_identity = Identity::load_mut(&*bob.repo).unwrap();
-        let b1 = bob_identity.accept(&a2, &bob.signer).unwrap();
-        assert_eq!(bob_identity.current, a2);
-
-        let mut eve_identity = Identity::load_mut(&*eve.repo).unwrap();
-        let mut eve_doc = eve_identity.doc().clone();
-        eve_doc.visibility = Visibility::private([eve.signer.public_key().into()]);
-        let e1 = eve_identity
-            .update("Change visibility", "", &eve_doc, &eve.signer)
-            .unwrap();
-        // Eve's revision is active.
-        assert!(eve_identity.revision(&e1).unwrap().is_active());
-
-        //  b1      (Accept "Remove Eve") 2/2
-        //  |  e1   (Change visibility)
-        //  | /
-        //  a2      (Propose "Remove Eve") 1/2
-        //  |
-        //  a1      (Add Bob and Eve)
-        //  |
-        //  a0
-
-        eve.repo.fetch(bob);
-        eve_identity.reload().unwrap();
-        // Now that Eve reloaded, since Bob's vote to remove Eve went through first (b1 < e1),
-        // her revision is no longer valid.
-        assert_eq!(eve_identity.timeline, vec![a0, a1, a2, b1, e1]);
-        assert_eq!(eve_identity.revision(&e1), None);
-        assert!(!eve_identity.is_delegate(eve.signer.public_key()));
-    }
-
-    #[test]
-    fn test_identity_reject_concurrent() {
-        let network = Network::default();
-        let alice = &network.alice;
-        let bob = &network.bob;
-        let eve = &network.eve;
-
-        let mut alice_identity = Identity::load_mut(&*alice.repo).unwrap();
-        let mut alice_doc = alice_identity.doc().clone();
-
-        alice_doc.delegate(bob.signer.public_key());
-        alice_doc.delegate(eve.signer.public_key());
-        let a0 = alice_identity.root;
-        let a1 = alice_identity
-            .update("Add Bob and Eve", "Eh!#", &alice_doc, &alice.signer)
-            .unwrap();
-
-        alice_doc.visibility = Visibility::private([]);
-        let a2 = alice_identity
-            .update("Change visibility", "", &alice_doc, &alice.signer)
-            .unwrap();
-
-        bob.repo.fetch(eve);
-        bob.repo.fetch(alice);
-        eve.repo.fetch(bob);
-
-        // Bob accepts alice's revision.
-        let mut bob_identity = Identity::load_mut(&*bob.repo).unwrap();
-        let b1 = bob_identity.accept(&a2, &bob.signer).unwrap();
-
-        // Eve rejects the revision, not knowing.
-        let mut eve_identity = Identity::load_mut(&*eve.repo).unwrap();
-        let e1 = eve_identity.reject(a2, &eve.signer).unwrap();
-        assert!(eve_identity.revision(&a2).unwrap().is_active());
-
-        // Then she submits a new revision.
-        let mut eve_doc = eve_identity.doc().clone();
-        eve_doc.visibility = Visibility::private([eve.signer.public_key().into()]);
-        let e2 = eve_identity
-            .update("Change visibility", "", &eve_doc, &eve.signer)
-            .unwrap();
-        assert!(eve_identity.revision(&e2).unwrap().is_active());
-
-        //     e2   (Propose "Change visibility") 1/2
-        //     |
-        //     e1   (Reject "Change visibility")  1/2
-        //  b1 |    (Accept "Change visibility")  2/2
-        //  | /
-        //  a2      (Propose "Change visibility") 1/2
-        //  |
-        //  a1      (Add Bob and Eve)
-        //  |
-        //  a0
-
-        // Though the rules are that you cannot reject an already accepted revision,
-        // since this update was done concurrently there was no way of knowing. Therefore,
-        // an error shouldn't be returned. We simply ignore the rejection.
-
-        eve.repo.fetch(bob);
-        eve_identity.reload().unwrap();
-        assert_eq!(eve_identity.timeline, vec![a0, a1, a2, b1, e1, e2]);
-
-        // Her revision is there, although stale, since another revision was accepted since.
-        // However, it wasn't pruned, even though rejecting an accepted revision is an error.
-        let e2 = eve_identity.revision(&e2).unwrap();
-        assert_eq!(e2.state, State::Stale);
-        assert!(eve_identity.revision(&a2).unwrap().is_accepted());
-    }
-
-    #[test]
-    fn test_identity_updates_concurrent_outdated() {
-        let network = Network::default();
-        let alice = &network.alice;
-        let bob = &network.bob;
-        let eve = &network.eve;
-
-        let mut alice_identity = Identity::load_mut(&*alice.repo).unwrap();
-        let mut alice_doc = alice_identity.doc().clone();
-
-        alice.repo.fetch(bob);
-        alice.repo.fetch(eve);
-        alice_doc.delegate(bob.signer.public_key());
-        alice_doc.delegate(eve.signer.public_key());
-        let a0 = alice_identity.root;
-        let a1 = alice_identity
-            .update("Add Bob and Eve", "", &alice_doc, &alice.signer)
-            .unwrap();
-
-        bob.repo.fetch(alice);
-        eve.repo.fetch(alice);
-
-        let mut bob_identity = Identity::load_mut(&*bob.repo).unwrap();
-        let mut bob_doc = bob_identity.doc().clone();
-        assert!(bob_doc.is_delegate(bob.signer.public_key()));
-
-        //  a2 e1
-        //  | /
-        //  b1
-        //  |
-        //  a1
-        //  |
-        //  a0
-
-        // Bob and Alice change the document visibility. Eve is not aware.
-        bob_doc.visibility = Visibility::private([]);
-        let b1 = bob_identity
-            .update("Change visibility #1", "", &bob_doc, &bob.signer)
-            .unwrap();
-        alice.repo.fetch(bob);
-        eve.repo.fetch(bob);
-
-        // In the meantime, Eve does the same thing on her side.
-        let mut eve_identity = Identity::load_mut(&*eve.repo).unwrap();
-        let mut eve_doc = eve_identity.doc().clone();
-        eve_doc.visibility = Visibility::private([]);
-        let e1 = eve_identity
-            .update("Change visibility #2", "Woops", &eve_doc, &eve.signer)
-            .unwrap();
-        assert_eq!(eve_identity.revisions().count(), 4);
-        assert_eq!(eve_identity.revision(&e1).unwrap().state, State::Active);
-
-        alice_identity.reload().unwrap();
-        let a2 = alice_identity.accept(&b1, &alice.signer).unwrap();
-
-        eve.repo.fetch(alice);
-        eve_identity.reload().unwrap();
-
-        assert_eq!(eve_identity.timeline, vec![a0, a1, b1, e1, a2]);
-        assert_eq!(eve_identity.revision(&e1).unwrap().state, State::Stale);
-    }
-
-    #[test]
-    fn test_valid_identity() {
-        let tempdir = tempfile::tempdir().unwrap();
-        let mut rng = fastrand::Rng::new();
-
-        let alice = MockSigner::new(&mut rng);
-        let bob = MockSigner::new(&mut rng);
-        let eve = MockSigner::new(&mut rng);
-
-        let storage = Storage::open(tempdir.path().join("storage"), fixtures::user()).unwrap();
-        let (id, _, _, _) =
-            fixtures::project(tempdir.path().join("copy"), &storage, &alice).unwrap();
-
-        // Bob and Eve fork the project from Alice.
-        rad::fork_remote(id, alice.public_key(), &bob, &storage).unwrap();
-        rad::fork_remote(id, alice.public_key(), &eve, &storage).unwrap();
-
-        let repo = storage.repository(id).unwrap();
-        let mut identity = Identity::load_mut(&repo).unwrap();
-        let mut doc = identity.doc().clone();
-        let prj = doc.project().unwrap();
-
-        // Make a change to the description and sign it.
-        let desc = prj.description().to_owned() + "!";
-        let prj = prj.update(None, desc, None).unwrap();
-        doc.payload.insert(PayloadId::project(), prj.clone().into());
-        identity
-            .update("Update description", "", &doc, &alice)
-            .unwrap();
-
-        // Add Bob as a delegate, and sign it.
-        doc.delegate(bob.public_key());
-        doc.threshold = 2;
-        identity.update("Add bob", "", &doc, &alice).unwrap();
-
-        // Add Eve as a delegate.
-        doc.delegate(eve.public_key());
-
-        // Update with both Bob and Alice's signature.
-        let revision = identity.update("Add eve", "", &doc, &alice).unwrap();
-        identity.accept(&revision, &bob).unwrap();
-
-        // Update description again with signatures by Eve and Bob.
-        let desc = prj.description().to_owned() + "?";
-        let prj = prj.update(None, desc, None).unwrap();
-        doc.payload.insert(PayloadId::project(), prj.into());
-
-        let revision = identity
-            .update("Update description again", "Bob's repository", &doc, &bob)
-            .unwrap();
-        identity.accept(&revision, &eve).unwrap();
-
-        let identity: Identity = Identity::load(&repo).unwrap();
-        let root = repo.identity_root().unwrap();
-        let doc = repo.identity_doc_at(revision).unwrap();
-
-        assert_eq!(identity.signatures().count(), 2);
-        assert_eq!(identity.revisions().count(), 5);
-        assert_eq!(identity.id(), id);
-        assert_eq!(identity.root().id, root);
-        assert_eq!(identity.current().blob, doc.blob);
-        assert_eq!(identity.current().description.as_str(), "Bob's repository");
-        assert_eq!(identity.head(), revision);
-        assert_eq!(identity.doc(), &*doc);
-        assert_eq!(
-            identity.doc().project().unwrap().description(),
-            "Acme's repository!?"
-        );
-
-        assert_eq!(doc.project().unwrap().description(), "Acme's repository!?");
-    }
-}
diff --git a/radicle/src/cob/issue.rs b/radicle/src/cob/issue.rs
deleted file mode 100644
index dbdf453a4..000000000
--- a/radicle/src/cob/issue.rs
+++ /dev/null
@@ -1,1782 +0,0 @@
-pub mod cache;
-
-use std::collections::BTreeSet;
-use std::ops::Deref;
-use std::str::FromStr;
-
-use once_cell::sync::Lazy;
-use serde::{Deserialize, Serialize};
-use thiserror::Error;
-
-use crate::cob;
-use crate::cob::common::{Author, Authorization, Label, Reaction, Timestamp, Uri};
-use crate::cob::store::Transaction;
-use crate::cob::store::{Cob, CobAction};
-use crate::cob::thread;
-use crate::cob::thread::{Comment, CommentId, Thread};
-use crate::cob::{op, store, ActorId, Embed, EntryId, ObjectId, TypeName};
-use crate::crypto::Signer;
-use crate::identity::doc::{Doc, DocError};
-use crate::prelude::{Did, ReadRepository, RepoId, Verified};
-use crate::storage::{HasRepoId, RepositoryError, WriteRepository};
-
-pub use cache::Cache;
-
-/// Issue operation.
-pub type Op = cob::Op<Action>;
-
-/// Type name of an issue.
-pub static TYPENAME: Lazy<TypeName> =
-    Lazy::new(|| FromStr::from_str("xyz.radicle.issue").expect("type name is valid"));
-
-/// Identifier for an issue.
-pub type IssueId = ObjectId;
-
-/// Error updating or creating issues.
-#[derive(Error, Debug)]
-pub enum Error {
-    /// Error loading the identity document.
-    #[error("identity doc failed to load: {0}")]
-    Doc(#[from] DocError),
-    #[error("thread apply failed: {0}")]
-    Thread(#[from] thread::Error),
-    #[error("store: {0}")]
-    Store(#[from] store::Error),
-    /// Action not authorized.
-    #[error("{0} not authorized to apply {1:?}")]
-    NotAuthorized(ActorId, Action),
-    /// Action not allowed.
-    #[error("action is not allowed: {0}")]
-    NotAllowed(EntryId),
-    /// Title is invalid.
-    #[error("invalid title: {0:?}")]
-    InvalidTitle(String),
-    /// The identity doc is missing.
-    #[error("identity document missing")]
-    MissingIdentity,
-    /// General error initializing an issue.
-    #[error("initialization failed: {0}")]
-    Init(&'static str),
-    /// Error decoding an operation.
-    #[error("op decoding failed: {0}")]
-    Op(#[from] op::OpEncodingError),
-    #[error("failed to update issue {id} in cache: {err}")]
-    CacheUpdate {
-        id: IssueId,
-        #[source]
-        err: Box<dyn std::error::Error + Send + Sync + 'static>,
-    },
-    #[error("failed to remove issue {id} from cache : {err}")]
-    CacheRemove {
-        id: IssueId,
-        #[source]
-        err: Box<dyn std::error::Error + Send + Sync + 'static>,
-    },
-    #[error("failed to remove issues from cache: {err}")]
-    CacheRemoveAll {
-        #[source]
-        err: Box<dyn std::error::Error + Send + Sync + 'static>,
-    },
-}
-
-/// Reason why an issue was closed.
-#[derive(Debug, Clone, Copy, PartialOrd, Ord, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum CloseReason {
-    Other,
-    Solved,
-}
-
-impl std::fmt::Display for CloseReason {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let reason = match self {
-            Self::Other => "unspecified",
-            Self::Solved => "solved",
-        };
-        write!(f, "{reason}")
-    }
-}
-
-/// Issue state.
-#[derive(Debug, Default, Clone, Copy, PartialOrd, Ord, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", tag = "status")]
-pub enum State {
-    /// The issue is closed.
-    Closed { reason: CloseReason },
-    /// The issue is open.
-    #[default]
-    Open,
-}
-
-impl std::fmt::Display for State {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Closed { .. } => write!(f, "closed"),
-            Self::Open => write!(f, "open"),
-        }
-    }
-}
-
-impl State {
-    pub fn lifecycle_message(self) -> String {
-        match self {
-            Self::Open => "Open issue".to_owned(),
-            Self::Closed { .. } => "Close issue".to_owned(),
-        }
-    }
-}
-
-/// Issue state. Accumulates [`Action`].
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Issue {
-    /// Actors assigned to this issue.
-    pub(super) assignees: BTreeSet<Did>,
-    /// Title of the issue.
-    pub(super) title: String,
-    /// Current state of the issue.
-    pub(super) state: State,
-    /// Associated labels.
-    pub(super) labels: BTreeSet<Label>,
-    /// Discussion around this issue.
-    pub(super) thread: Thread,
-}
-
-impl store::Cob for Issue {
-    type Action = Action;
-    type Error = Error;
-
-    fn type_name() -> &'static TypeName {
-        &TYPENAME
-    }
-
-    fn from_root<R: ReadRepository>(op: Op, repo: &R) -> Result<Self, Self::Error> {
-        let doc = op.identity_doc(repo)?.ok_or(Error::MissingIdentity)?;
-        let mut actions = op.actions.into_iter();
-        let Some(Action::Comment {
-            body,
-            reply_to: None,
-            embeds,
-        }) = actions.next()
-        else {
-            return Err(Error::Init("the first action must be of type `comment`"));
-        };
-        let comment = Comment::new(op.author, body, None, None, embeds, op.timestamp);
-        let thread = Thread::new(op.id, comment);
-        let mut issue = Issue::new(thread);
-
-        for action in actions {
-            match issue.authorization(&action, &op.author, &doc)? {
-                Authorization::Allow => {
-                    issue.action(action, op.id, op.author, op.timestamp, &[], &doc, repo)?;
-                }
-                Authorization::Deny => {
-                    return Err(Error::NotAuthorized(op.author, action));
-                }
-                Authorization::Unknown => {
-                    // Note that this shouldn't really happen since there's no concurrency in the
-                    // root operation.
-                    continue;
-                }
-            }
-        }
-        Ok(issue)
-    }
-
-    fn op<'a, R: ReadRepository, I: IntoIterator<Item = &'a cob::Entry>>(
-        &mut self,
-        op: Op,
-        concurrent: I,
-        repo: &R,
-    ) -> Result<(), Error> {
-        let doc = op.identity_doc(repo)?.ok_or(Error::MissingIdentity)?;
-        let concurrent = concurrent.into_iter().collect::<Vec<_>>();
-        for action in op.actions {
-            match self.authorization(&action, &op.author, &doc)? {
-                Authorization::Allow => {
-                    self.action(
-                        action,
-                        op.id,
-                        op.author,
-                        op.timestamp,
-                        &concurrent,
-                        &doc,
-                        repo,
-                    )?;
-                }
-                Authorization::Deny => {
-                    return Err(Error::NotAuthorized(op.author, action));
-                }
-                Authorization::Unknown => {
-                    continue;
-                }
-            }
-        }
-        Ok(())
-    }
-}
-
-impl<R: ReadRepository> cob::Evaluate<R> for Issue {
-    type Error = Error;
-
-    fn init(entry: &cob::Entry, repo: &R) -> Result<Self, Self::Error> {
-        let op = Op::try_from(entry)?;
-        let object = Issue::from_root(op, repo)?;
-
-        Ok(object)
-    }
-
-    fn apply<'a, I: Iterator<Item = (&'a EntryId, &'a cob::Entry)>>(
-        &mut self,
-        entry: &cob::Entry,
-        concurrent: I,
-        repo: &R,
-    ) -> Result<(), Self::Error> {
-        let op = Op::try_from(entry)?;
-
-        self.op(op, concurrent.map(|(_, e)| e), repo)
-    }
-}
-
-impl Issue {
-    /// Construct a new issue.
-    pub fn new(thread: Thread) -> Self {
-        Self {
-            assignees: BTreeSet::default(),
-            title: String::default(),
-            state: State::default(),
-            labels: BTreeSet::default(),
-            thread,
-        }
-    }
-
-    pub fn assignees(&self) -> impl Iterator<Item = &Did> + '_ {
-        self.assignees.iter()
-    }
-
-    pub fn title(&self) -> &str {
-        self.title.as_str()
-    }
-
-    pub fn state(&self) -> &State {
-        &self.state
-    }
-
-    pub fn labels(&self) -> impl Iterator<Item = &Label> {
-        self.labels.iter()
-    }
-
-    pub fn timestamp(&self) -> Timestamp {
-        self.thread
-            .comments()
-            .next()
-            .map(|(_, c)| c)
-            .expect("Issue::timestamp: at least one comment is present")
-            .timestamp()
-    }
-
-    pub fn author(&self) -> Author {
-        self.thread
-            .comments()
-            .next()
-            .map(|(_, c)| Author::new(c.author()))
-            .expect("Issue::author: at least one comment is present")
-    }
-
-    pub fn root(&self) -> (&CommentId, &Comment) {
-        self.thread
-            .comments()
-            .next()
-            .expect("Issue::root: at least one comment is present")
-    }
-
-    pub fn description(&self) -> &str {
-        self.thread
-            .comments()
-            .next()
-            .map(|(_, c)| c.body())
-            .expect("Issue::description: at least one comment is present")
-    }
-
-    pub fn thread(&self) -> &Thread {
-        &self.thread
-    }
-
-    pub fn comments(&self) -> impl Iterator<Item = (&CommentId, &thread::Comment)> {
-        self.thread.comments()
-    }
-
-    /// Get replies to a specific comment.
-    pub fn replies_to<'a>(
-        &'a self,
-        to: &'a CommentId,
-    ) -> impl Iterator<Item = (&CommentId, &thread::Comment)> {
-        self.thread.replies(to)
-    }
-
-    /// Iterate over all top-level replies. Does not include the top-level root comment.
-    /// Use [`Issue::comments`] to get all comments including the "root" comment.
-    pub fn replies(&self) -> impl Iterator<Item = (&CommentId, &thread::Comment)> {
-        self.comments().skip(1)
-    }
-
-    /// Apply authorization rules on issue actions.
-    pub fn authorization(
-        &self,
-        action: &Action,
-        actor: &ActorId,
-        doc: &Doc<Verified>,
-    ) -> Result<Authorization, Error> {
-        if doc.is_delegate(actor) {
-            // A delegate is authorized to do all actions.
-            return Ok(Authorization::Allow);
-        }
-        let author: ActorId = *self.author().id().as_key();
-        let outcome = match action {
-            // Only delegate can assign someone to an issue.
-            Action::Assign { assignees } => {
-                if assignees == &self.assignees {
-                    // No-op is allowed for backwards compatibility.
-                    Authorization::Allow
-                } else {
-                    Authorization::Deny
-                }
-            }
-            // Issue authors can edit their own issues.
-            Action::Edit { .. } => Authorization::from(*actor == author),
-            // Issue authors can close or re-open their own issue.
-            Action::Lifecycle { state } => Authorization::from(match state {
-                State::Closed { .. } => *actor == author,
-                State::Open => *actor == author,
-            }),
-            // Only delegate can label an issue.
-            Action::Label { labels } => {
-                if labels == &self.labels {
-                    // No-op is allowed for backwards compatibility.
-                    Authorization::Allow
-                } else {
-                    Authorization::Deny
-                }
-            }
-            // All roles can comment on an issues
-            Action::Comment { .. } => Authorization::Allow,
-            // All roles can edit or redact their own comments.
-            Action::CommentEdit { id, .. } | Action::CommentRedact { id, .. } => {
-                if let Some(comment) = self.thread.comments.get(id) {
-                    if let Some(comment) = comment {
-                        Authorization::from(*actor == comment.author())
-                    } else {
-                        Authorization::Unknown
-                    }
-                } else {
-                    return Err(Error::Thread(thread::Error::Missing(*id)));
-                }
-            }
-            // All roles can react to a comment on an issue.
-            Action::CommentReact { .. } => Authorization::Allow,
-        };
-        Ok(outcome)
-    }
-}
-
-impl Issue {
-    /// Apply a single action to the issue.
-    fn action<R: ReadRepository>(
-        &mut self,
-        action: Action,
-        entry: EntryId,
-        author: ActorId,
-        timestamp: Timestamp,
-        _concurrent: &[&cob::Entry],
-        _doc: &Doc<Verified>,
-        _repo: &R,
-    ) -> Result<(), Error> {
-        match action {
-            Action::Assign { assignees } => {
-                self.assignees = BTreeSet::from_iter(assignees);
-            }
-            Action::Edit { title } => {
-                if title.contains('\n') || title.contains('\r') {
-                    return Err(Error::InvalidTitle(title));
-                }
-                self.title = title;
-            }
-            Action::Lifecycle { state } => {
-                self.state = state;
-            }
-            Action::Label { labels } => {
-                self.labels = BTreeSet::from_iter(labels);
-            }
-            Action::Comment {
-                body,
-                reply_to,
-                embeds,
-            } => {
-                thread::comment(
-                    &mut self.thread,
-                    entry,
-                    author,
-                    timestamp,
-                    body,
-                    reply_to,
-                    None,
-                    embeds,
-                )?;
-            }
-            Action::CommentEdit { id, body, embeds } => {
-                thread::edit(&mut self.thread, entry, author, id, timestamp, body, embeds)?;
-            }
-            Action::CommentRedact { id } => {
-                let (root, _) = self.root();
-                if id == *root {
-                    return Err(Error::NotAllowed(entry));
-                }
-                thread::redact(&mut self.thread, entry, id)?;
-            }
-            Action::CommentReact {
-                id,
-                reaction,
-                active,
-            } => {
-                thread::react(&mut self.thread, entry, author, id, reaction, active)?;
-            }
-        }
-        Ok(())
-    }
-}
-
-impl<'a, 'g, R, C> From<IssueMut<'a, 'g, R, C>> for (IssueId, Issue) {
-    fn from(value: IssueMut<'a, 'g, R, C>) -> Self {
-        (value.id, value.issue)
-    }
-}
-
-impl Deref for Issue {
-    type Target = Thread;
-
-    fn deref(&self) -> &Self::Target {
-        &self.thread
-    }
-}
-
-impl<R: ReadRepository> store::Transaction<Issue, R> {
-    /// Assign DIDs to the issue.
-    pub fn assign(&mut self, assignees: impl IntoIterator<Item = Did>) -> Result<(), store::Error> {
-        self.push(Action::Assign {
-            assignees: assignees.into_iter().collect(),
-        })
-    }
-
-    /// Edit an issue comment.
-    pub fn edit_comment(
-        &mut self,
-        id: CommentId,
-        body: impl ToString,
-        embeds: Vec<Embed>,
-    ) -> Result<(), store::Error> {
-        let hashed = embeds.iter().map(|e| e.hashed()).collect();
-
-        self.embed(embeds)?;
-        self.push(Action::CommentEdit {
-            id,
-            body: body.to_string(),
-            embeds: hashed,
-        })
-    }
-
-    /// Set the issue title.
-    pub fn edit(&mut self, title: impl ToString) -> Result<(), store::Error> {
-        self.push(Action::Edit {
-            title: title.to_string(),
-        })
-    }
-
-    /// Redact a comment.
-    pub fn redact_comment(&mut self, id: CommentId) -> Result<(), store::Error> {
-        self.push(Action::CommentRedact { id })
-    }
-
-    /// Lifecycle an issue.
-    pub fn lifecycle(&mut self, state: State) -> Result<(), store::Error> {
-        self.push(Action::Lifecycle { state })
-    }
-
-    /// Comment on an issue.
-    pub fn comment<S: ToString>(
-        &mut self,
-        body: S,
-        reply_to: CommentId,
-        embeds: Vec<Embed>,
-    ) -> Result<(), store::Error> {
-        let hashed = embeds.iter().map(|e| e.hashed()).collect();
-
-        self.embed(embeds)?;
-        self.push(Action::Comment {
-            body: body.to_string(),
-            reply_to: Some(reply_to),
-            embeds: hashed,
-        })
-    }
-
-    /// Label an issue.
-    pub fn label(&mut self, labels: impl IntoIterator<Item = Label>) -> Result<(), store::Error> {
-        self.push(Action::Label {
-            labels: labels.into_iter().collect(),
-        })
-    }
-
-    /// React to an issue comment.
-    pub fn react(
-        &mut self,
-        id: CommentId,
-        reaction: Reaction,
-        active: bool,
-    ) -> Result<(), store::Error> {
-        self.push(Action::CommentReact {
-            id,
-            reaction,
-            active,
-        })
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-
-    /// Create the issue thread.
-    fn thread<S: ToString>(
-        &mut self,
-        body: S,
-        embeds: impl IntoIterator<Item = Embed>,
-    ) -> Result<(), store::Error> {
-        let embeds = embeds.into_iter().collect::<Vec<_>>();
-        let hashed = embeds.iter().map(|e| e.hashed()).collect();
-
-        self.embed(embeds)?;
-        self.push(Action::Comment {
-            body: body.to_string(),
-            reply_to: None,
-            embeds: hashed,
-        })
-    }
-}
-
-pub struct IssueMut<'a, 'g, R, C> {
-    id: ObjectId,
-    issue: Issue,
-    store: &'g mut Issues<'a, R>,
-    cache: &'g mut C,
-}
-
-impl<'a, 'g, R, C> std::fmt::Debug for IssueMut<'a, 'g, R, C> {
-    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-        f.debug_struct("IssueMut")
-            .field("id", &self.id)
-            .field("issue", &self.issue)
-            .finish()
-    }
-}
-
-impl<'a, 'g, R, C> IssueMut<'a, 'g, R, C>
-where
-    R: WriteRepository + cob::Store,
-    C: cob::cache::Update<Issue>,
-{
-    /// Reload the issue data from storage.
-    pub fn reload(&mut self) -> Result<(), store::Error> {
-        self.issue = self
-            .store
-            .get(&self.id)?
-            .ok_or_else(|| store::Error::NotFound(TYPENAME.clone(), self.id))?;
-
-        Ok(())
-    }
-
-    /// Get the issue id.
-    pub fn id(&self) -> &ObjectId {
-        &self.id
-    }
-
-    /// Assign one or more actors to an issue.
-    pub fn assign<G: Signer>(
-        &mut self,
-        assignees: impl IntoIterator<Item = Did>,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Assign", signer, |tx| tx.assign(assignees))
-    }
-
-    /// Set the issue title.
-    pub fn edit<G: Signer>(&mut self, title: impl ToString, signer: &G) -> Result<EntryId, Error> {
-        self.transaction("Edit", signer, |tx| tx.edit(title))
-    }
-
-    /// Set the issue description.
-    pub fn edit_description<G: Signer>(
-        &mut self,
-        description: impl ToString,
-        embeds: impl IntoIterator<Item = Embed>,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        let (id, _) = self.root();
-        let id = *id;
-        self.transaction("Edit description", signer, |tx| {
-            tx.edit_comment(id, description, embeds.into_iter().collect())
-        })
-    }
-
-    /// Lifecycle an issue.
-    pub fn lifecycle<G: Signer>(&mut self, state: State, signer: &G) -> Result<EntryId, Error> {
-        self.transaction("Lifecycle", signer, |tx| tx.lifecycle(state))
-    }
-
-    /// Comment on an issue.
-    pub fn comment<G: Signer, S: ToString>(
-        &mut self,
-        body: S,
-        reply_to: CommentId,
-        embeds: impl IntoIterator<Item = Embed>,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Comment", signer, |tx| {
-            tx.comment(body, reply_to, embeds.into_iter().collect())
-        })
-    }
-
-    /// Edit a comment.
-    pub fn edit_comment<G: Signer, S: ToString>(
-        &mut self,
-        id: CommentId,
-        body: S,
-        embeds: impl IntoIterator<Item = Embed>,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Edit comment", signer, |tx| {
-            tx.edit_comment(id, body, embeds.into_iter().collect())
-        })
-    }
-
-    /// Redact a comment.
-    pub fn redact_comment<G: Signer>(
-        &mut self,
-        id: CommentId,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Redact comment", signer, |tx| tx.redact_comment(id))
-    }
-
-    /// Label an issue.
-    pub fn label<G: Signer>(
-        &mut self,
-        labels: impl IntoIterator<Item = Label>,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Label", signer, |tx| tx.label(labels))
-    }
-
-    /// React to an issue comment.
-    pub fn react<G: Signer>(
-        &mut self,
-        to: CommentId,
-        reaction: Reaction,
-        active: bool,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("React", signer, |tx| tx.react(to, reaction, active))
-    }
-
-    pub fn transaction<G, F>(
-        &mut self,
-        message: &str,
-        signer: &G,
-        operations: F,
-    ) -> Result<EntryId, Error>
-    where
-        G: Signer,
-        F: FnOnce(&mut Transaction<Issue, R>) -> Result<(), store::Error>,
-    {
-        let mut tx = Transaction::default();
-        operations(&mut tx)?;
-
-        let (issue, commit) = tx.commit(message, self.id, &mut self.store.raw, signer)?;
-        self.cache
-            .update(&self.store.as_ref().id(), &self.id, &issue)
-            .map_err(|e| Error::CacheUpdate {
-                id: self.id,
-                err: e.into(),
-            })?;
-        self.issue = issue;
-
-        Ok(commit)
-    }
-}
-
-impl<'a, 'g, R, C> Deref for IssueMut<'a, 'g, R, C> {
-    type Target = Issue;
-
-    fn deref(&self) -> &Self::Target {
-        &self.issue
-    }
-}
-
-pub struct Issues<'a, R> {
-    raw: store::Store<'a, Issue, R>,
-}
-
-impl<'a, R> Deref for Issues<'a, R> {
-    type Target = store::Store<'a, Issue, R>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.raw
-    }
-}
-
-impl<'a, R> HasRepoId for Issues<'a, R>
-where
-    R: ReadRepository,
-{
-    fn rid(&self) -> RepoId {
-        self.raw.as_ref().id()
-    }
-}
-
-/// Detailed information on issue states
-#[derive(Clone, Debug, PartialEq, Eq, Default, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct IssueCounts {
-    pub open: usize,
-    pub closed: usize,
-}
-
-impl IssueCounts {
-    /// Total count.
-    pub fn total(&self) -> usize {
-        self.open + self.closed
-    }
-}
-
-impl<'a, R> Issues<'a, R>
-where
-    R: ReadRepository + cob::Store,
-{
-    /// Open an issues store.
-    pub fn open(repository: &'a R) -> Result<Self, RepositoryError> {
-        let identity = repository.identity_head()?;
-        let raw = store::Store::open(repository)?.identity(identity);
-
-        Ok(Self { raw })
-    }
-}
-
-impl<'a, R> Issues<'a, R>
-where
-    R: WriteRepository + cob::Store,
-{
-    /// Create a new issue.
-    pub fn create<'g, G, C>(
-        &'g mut self,
-        title: impl ToString,
-        description: impl ToString,
-        labels: &[Label],
-        assignees: &[Did],
-        embeds: impl IntoIterator<Item = Embed>,
-        cache: &'g mut C,
-        signer: &G,
-    ) -> Result<IssueMut<'a, 'g, R, C>, Error>
-    where
-        G: Signer,
-        C: cob::cache::Update<Issue>,
-    {
-        let (id, issue) = Transaction::initial("Create issue", &mut self.raw, signer, |tx| {
-            tx.thread(description, embeds)?;
-            tx.edit(title)?;
-
-            if !assignees.is_empty() {
-                tx.assign(assignees.to_owned())?;
-            }
-            if !labels.is_empty() {
-                tx.label(labels.to_owned())?;
-            }
-            Ok(())
-        })?;
-        cache
-            .update(&self.raw.as_ref().id(), &id, &issue)
-            .map_err(|e| Error::CacheUpdate { id, err: e.into() })?;
-
-        Ok(IssueMut {
-            id,
-            issue,
-            store: self,
-            cache,
-        })
-    }
-
-    /// Remove an issue.
-    pub fn remove<C, G: Signer>(&self, id: &ObjectId, signer: &G) -> Result<(), store::Error>
-    where
-        C: cob::cache::Remove<Issue>,
-    {
-        self.raw.remove(id, signer)
-    }
-}
-
-impl<'a, R> Issues<'a, R>
-where
-    R: ReadRepository + cob::Store,
-{
-    /// Get an issue.
-    pub fn get(&self, id: &ObjectId) -> Result<Option<Issue>, store::Error> {
-        self.raw.get(id)
-    }
-
-    /// Get an issue mutably.
-    pub fn get_mut<'g, C>(
-        &'g mut self,
-        id: &ObjectId,
-        cache: &'g mut C,
-    ) -> Result<IssueMut<'a, 'g, R, C>, store::Error> {
-        let issue = self
-            .raw
-            .get(id)?
-            .ok_or_else(move || store::Error::NotFound(TYPENAME.clone(), *id))?;
-
-        Ok(IssueMut {
-            id: *id,
-            issue,
-            store: self,
-            cache,
-        })
-    }
-
-    /// Issues count by state.
-    pub fn counts(&self) -> Result<IssueCounts, Error> {
-        let all = self.all()?;
-        let state_groups =
-            all.filter_map(|s| s.ok())
-                .fold(IssueCounts::default(), |mut state, (_, p)| {
-                    match p.state() {
-                        State::Open => state.open += 1,
-                        State::Closed { .. } => state.closed += 1,
-                    }
-                    state
-                });
-
-        Ok(state_groups)
-    }
-}
-
-/// Issue action.
-#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
-#[serde(tag = "type", rename_all = "camelCase")]
-pub enum Action {
-    /// Assign issue to an actor.
-    #[serde(rename = "assign")]
-    Assign { assignees: BTreeSet<Did> },
-
-    /// Edit issue title.
-    #[serde(rename = "edit")]
-    Edit { title: String },
-
-    /// Transition to a different state.
-    #[serde(rename = "lifecycle")]
-    Lifecycle { state: State },
-
-    /// Modify issue labels.
-    #[serde(rename = "label")]
-    Label { labels: BTreeSet<Label> },
-
-    /// Comment on a thread.
-    #[serde(rename_all = "camelCase")]
-    #[serde(rename = "comment")]
-    Comment {
-        /// Comment body.
-        body: String,
-        /// Comment this is a reply to.
-        /// Should be [`None`] if it's the top-level comment.
-        /// Should be the root [`CommentId`] if it's a top-level comment.
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        reply_to: Option<CommentId>,
-        /// Embeded content.
-        #[serde(default, skip_serializing_if = "Vec::is_empty")]
-        embeds: Vec<Embed<Uri>>,
-    },
-
-    /// Edit a comment.
-    #[serde(rename = "comment.edit")]
-    CommentEdit {
-        /// Comment being edited.
-        id: CommentId,
-        /// New value for the comment body.
-        body: String,
-        /// New value for the embeds list.
-        embeds: Vec<Embed<Uri>>,
-    },
-
-    /// Redact a change. Not all changes can be redacted.
-    #[serde(rename = "comment.redact")]
-    CommentRedact { id: CommentId },
-
-    /// React to a comment.
-    #[serde(rename = "comment.react")]
-    CommentReact {
-        id: CommentId,
-        reaction: Reaction,
-        active: bool,
-    },
-}
-
-impl CobAction for Action {}
-
-#[cfg(test)]
-#[allow(clippy::unwrap_used)]
-mod test {
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-    use crate::cob::{ActorId, Reaction};
-    use crate::git::Oid;
-    use crate::issue::cache::Issues as _;
-    use crate::test;
-    use crate::test::arbitrary;
-
-    #[test]
-    fn test_concurrency() {
-        let t = test::setup::Network::default();
-        let mut issues_alice = Cache::no_cache(&*t.alice.repo).unwrap();
-        let mut bob_issues = Cache::no_cache(&*t.bob.repo).unwrap();
-        let mut eve_issues = Cache::no_cache(&*t.eve.repo).unwrap();
-        let mut issue_alice = issues_alice
-            .create(
-                "Alice Issue",
-                "Alice's comment",
-                &[],
-                &[],
-                [],
-                &t.alice.signer,
-            )
-            .unwrap();
-        let id = *issue_alice.id();
-
-        t.bob.repo.fetch(&t.alice);
-        t.eve.repo.fetch(&t.alice);
-
-        let mut issue_eve = eve_issues.get_mut(&id).unwrap();
-        let mut issue_bob = bob_issues.get_mut(&id).unwrap();
-
-        issue_bob
-            .comment("Bob's reply", *id, vec![], &t.bob.signer)
-            .unwrap();
-        issue_alice
-            .comment("Alice's reply", *id, vec![], &t.alice.signer)
-            .unwrap();
-
-        assert_eq!(issue_bob.comments().count(), 2);
-        assert_eq!(issue_alice.comments().count(), 2);
-
-        t.bob.repo.fetch(&t.alice);
-        issue_bob.reload().unwrap();
-        assert_eq!(issue_bob.comments().count(), 3);
-
-        t.alice.repo.fetch(&t.bob);
-        issue_alice.reload().unwrap();
-        assert_eq!(issue_alice.comments().count(), 3);
-
-        let bob_comments = issue_bob
-            .comments()
-            .map(|(_, c)| c.body())
-            .collect::<Vec<_>>();
-        let alice_comments = issue_alice
-            .comments()
-            .map(|(_, c)| c.body())
-            .collect::<Vec<_>>();
-
-        assert_eq!(bob_comments, alice_comments);
-
-        t.eve.repo.fetch(&t.alice);
-
-        let eve_reply = issue_eve
-            .comment("Eve's reply", *id, vec![], &t.eve.signer)
-            .unwrap();
-
-        t.bob.repo.fetch(&t.eve);
-        t.alice.repo.fetch(&t.eve);
-
-        issue_alice.reload().unwrap();
-        issue_bob.reload().unwrap();
-        issue_eve.reload().unwrap();
-
-        assert_eq!(issue_eve.comments().count(), 4);
-        assert_eq!(issue_bob.comments().count(), 4);
-        assert_eq!(issue_alice.comments().count(), 4);
-
-        let (first, _) = issue_bob.comments().next().unwrap();
-        let (last, _) = issue_bob.comments().last().unwrap();
-
-        assert_eq!(*first, *issue_alice.id);
-        assert_eq!(*last, eve_reply);
-    }
-
-    #[test]
-    fn test_ordering() {
-        assert!(CloseReason::Solved > CloseReason::Other);
-        assert!(
-            State::Open
-                > State::Closed {
-                    reason: CloseReason::Solved
-                }
-        );
-    }
-
-    #[test]
-    fn test_issue_create_and_assign() {
-        let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
-        let mut issues = Cache::no_cache(&*repo).unwrap();
-
-        let assignee = Did::from(arbitrary::gen::<ActorId>(1));
-        let assignee_two = Did::from(arbitrary::gen::<ActorId>(1));
-        let issue = issues
-            .create(
-                "My first issue",
-                "Blah blah blah.",
-                &[],
-                &[assignee],
-                [],
-                &node.signer,
-            )
-            .unwrap();
-
-        let id = issue.id;
-        let issue = issues.get(&id).unwrap().unwrap();
-        let assignees: Vec<_> = issue.assignees().cloned().collect::<Vec<_>>();
-
-        assert_eq!(1, assignees.len());
-        assert!(assignees.contains(&assignee));
-
-        let mut issue = issues.get_mut(&id).unwrap();
-        issue
-            .assign([assignee, assignee_two], &node.signer)
-            .unwrap();
-
-        let id = issue.id;
-        let issue = issues.get(&id).unwrap().unwrap();
-        let assignees: Vec<_> = issue.assignees().cloned().collect::<Vec<_>>();
-
-        assert_eq!(2, assignees.len());
-        assert!(assignees.contains(&assignee));
-        assert!(assignees.contains(&assignee_two));
-    }
-
-    #[test]
-    fn test_issue_create_and_reassign() {
-        let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
-        let mut issues = Cache::no_cache(&*repo).unwrap();
-
-        let assignee = Did::from(arbitrary::gen::<ActorId>(1));
-        let assignee_two = Did::from(arbitrary::gen::<ActorId>(1));
-        let mut issue = issues
-            .create(
-                "My first issue",
-                "Blah blah blah.",
-                &[],
-                &[assignee, assignee_two],
-                [],
-                &node.signer,
-            )
-            .unwrap();
-
-        issue.assign([assignee_two], &node.signer).unwrap();
-        issue.assign([assignee_two], &node.signer).unwrap();
-        issue.reload().unwrap();
-
-        let assignees: Vec<_> = issue.assignees().cloned().collect::<Vec<_>>();
-
-        assert_eq!(1, assignees.len());
-        assert!(assignees.contains(&assignee_two));
-
-        issue.assign([], &node.signer).unwrap();
-        issue.reload().unwrap();
-
-        assert_eq!(0, issue.assignees().count());
-    }
-
-    #[test]
-    fn test_issue_create_and_get() {
-        let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
-        let mut issues = Cache::no_cache(&*repo).unwrap();
-        let created = issues
-            .create(
-                "My first issue",
-                "Blah blah blah.",
-                &[],
-                &[],
-                [],
-                &node.signer,
-            )
-            .unwrap();
-
-        let (id, created) = (created.id, created.issue);
-        let issue = issues.get(&id).unwrap().unwrap();
-
-        assert_eq!(created, issue);
-        assert_eq!(issue.title(), "My first issue");
-        assert_eq!(issue.author().id, Did::from(node.signer.public_key()));
-        assert_eq!(issue.description(), "Blah blah blah.");
-        assert_eq!(issue.comments().count(), 1);
-        assert_eq!(issue.state(), &State::Open);
-    }
-
-    #[test]
-    fn test_issue_create_and_change_state() {
-        let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
-        let mut issues = Cache::no_cache(&*repo).unwrap();
-        let mut issue = issues
-            .create(
-                "My first issue",
-                "Blah blah blah.",
-                &[],
-                &[],
-                [],
-                &node.signer,
-            )
-            .unwrap();
-
-        issue
-            .lifecycle(
-                State::Closed {
-                    reason: CloseReason::Other,
-                },
-                &node.signer,
-            )
-            .unwrap();
-
-        let id = issue.id;
-        let mut issue = issues.get_mut(&id).unwrap();
-
-        assert_eq!(
-            *issue.state(),
-            State::Closed {
-                reason: CloseReason::Other
-            }
-        );
-
-        issue.lifecycle(State::Open, &node.signer).unwrap();
-        let issue = issues.get(&id).unwrap().unwrap();
-
-        assert_eq!(*issue.state(), State::Open);
-    }
-
-    #[test]
-    fn test_issue_create_and_unassign() {
-        let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
-        let mut issues = Cache::no_cache(&*repo).unwrap();
-
-        let assignee = Did::from(arbitrary::gen::<ActorId>(1));
-        let assignee_two = Did::from(arbitrary::gen::<ActorId>(1));
-        let mut issue = issues
-            .create(
-                "My first issue",
-                "Blah blah blah.",
-                &[],
-                &[assignee, assignee_two],
-                [],
-                &node.signer,
-            )
-            .unwrap();
-        assert_eq!(2, issue.assignees().count());
-
-        issue.assign([assignee_two], &node.signer).unwrap();
-        issue.reload().unwrap();
-
-        let assignees: Vec<_> = issue.assignees().cloned().collect::<Vec<_>>();
-
-        assert_eq!(1, assignees.len());
-        assert!(assignees.contains(&assignee_two));
-    }
-
-    #[test]
-    fn test_issue_edit() {
-        let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
-        let mut issues = Cache::no_cache(&*repo).unwrap();
-
-        let mut issue = issues
-            .create(
-                "My first issue",
-                "Blah blah blah.",
-                &[],
-                &[],
-                [],
-                &node.signer,
-            )
-            .unwrap();
-
-        issue.edit("Sorry typo", &node.signer).unwrap();
-
-        let id = issue.id;
-        let issue = issues.get(&id).unwrap().unwrap();
-        let r = issue.title();
-
-        assert_eq!(r, "Sorry typo");
-    }
-
-    #[test]
-    fn test_issue_edit_description() {
-        let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
-        let mut issues = Cache::no_cache(&*repo).unwrap();
-        let mut issue = issues
-            .create(
-                "My first issue",
-                "Blah blah blah.",
-                &[],
-                &[],
-                [],
-                &node.signer,
-            )
-            .unwrap();
-
-        issue
-            .edit_description("Bob Loblaw law blog", vec![], &node.signer)
-            .unwrap();
-
-        let id = issue.id;
-        let issue = issues.get(&id).unwrap().unwrap();
-        let desc = issue.description();
-
-        assert_eq!(desc, "Bob Loblaw law blog");
-    }
-
-    #[test]
-    fn test_issue_react() {
-        let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
-        let mut issues = Cache::no_cache(&*repo).unwrap();
-        let mut issue = issues
-            .create(
-                "My first issue",
-                "Blah blah blah.",
-                &[],
-                &[],
-                [],
-                &node.signer,
-            )
-            .unwrap();
-
-        let (comment, _) = issue.root();
-        let comment = *comment;
-        let reaction = Reaction::new('🥳').unwrap();
-        issue.react(comment, reaction, true, &node.signer).unwrap();
-
-        let id = issue.id;
-        let issue = issues.get(&id).unwrap().unwrap();
-        let reactions = issue.comment(&comment).unwrap().reactions();
-        let authors = reactions.get(&reaction).unwrap();
-
-        assert_eq!(authors.first().unwrap(), &node.signer.public_key());
-
-        // TODO: Test multiple reactions from same author and different authors
-    }
-
-    #[test]
-    fn test_issue_reply() {
-        let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
-        let mut issues = Cache::no_cache(&*repo).unwrap();
-        let mut issue = issues
-            .create(
-                "My first issue",
-                "Blah blah blah.",
-                &[],
-                &[],
-                [],
-                &node.signer,
-            )
-            .unwrap();
-        let (root, _) = issue.root();
-        let root = *root;
-
-        let c1 = issue
-            .comment("Hi hi hi.", root, vec![], &node.signer)
-            .unwrap();
-        let c2 = issue
-            .comment("Ha ha ha.", root, vec![], &node.signer)
-            .unwrap();
-
-        let id = issue.id;
-        let mut issue = issues.get_mut(&id).unwrap();
-        let (_, reply1) = &issue.replies_to(&root).nth(0).unwrap();
-        let (_, reply2) = &issue.replies_to(&root).nth(1).unwrap();
-
-        assert_eq!(reply1.body(), "Hi hi hi.");
-        assert_eq!(reply2.body(), "Ha ha ha.");
-
-        issue.comment("Re: Hi.", c1, vec![], &node.signer).unwrap();
-        issue.comment("Re: Ha.", c2, vec![], &node.signer).unwrap();
-        issue
-            .comment("Re: Ha. Ha.", c2, vec![], &node.signer)
-            .unwrap();
-        issue
-            .comment("Re: Ha. Ha. Ha.", c2, vec![], &node.signer)
-            .unwrap();
-
-        let issue = issues.get(&id).unwrap().unwrap();
-
-        assert_eq!(issue.replies_to(&c1).nth(0).unwrap().1.body(), "Re: Hi.");
-        assert_eq!(issue.replies_to(&c2).nth(0).unwrap().1.body(), "Re: Ha.");
-        assert_eq!(
-            issue.replies_to(&c2).nth(1).unwrap().1.body(),
-            "Re: Ha. Ha."
-        );
-        assert_eq!(
-            issue.replies_to(&c2).nth(2).unwrap().1.body(),
-            "Re: Ha. Ha. Ha."
-        );
-    }
-
-    #[test]
-    fn test_issue_label() {
-        let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
-        let mut issues = Cache::no_cache(&*repo).unwrap();
-        let bug_label = Label::new("bug").unwrap();
-        let ux_label = Label::new("ux").unwrap();
-        let wontfix_label = Label::new("wontfix").unwrap();
-        let mut issue = issues
-            .create(
-                "My first issue",
-                "Blah blah blah.",
-                &[ux_label.clone()],
-                &[],
-                [],
-                &node.signer,
-            )
-            .unwrap();
-
-        issue
-            .label([ux_label.clone(), bug_label.clone()], &node.signer)
-            .unwrap();
-        issue
-            .label(
-                [ux_label.clone(), bug_label.clone(), wontfix_label.clone()],
-                &node.signer,
-            )
-            .unwrap();
-
-        let id = issue.id;
-        let issue = issues.get(&id).unwrap().unwrap();
-        let labels = issue.labels().cloned().collect::<Vec<_>>();
-
-        assert!(labels.contains(&ux_label));
-        assert!(labels.contains(&bug_label));
-        assert!(labels.contains(&wontfix_label));
-    }
-
-    #[test]
-    fn test_issue_comment() {
-        let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
-        let author = *node.signer.public_key();
-        let mut issues = Cache::no_cache(&*repo).unwrap();
-        let mut issue = issues
-            .create(
-                "My first issue",
-                "Blah blah blah.",
-                &[],
-                &[],
-                [],
-                &node.signer,
-            )
-            .unwrap();
-
-        // The root thread op id is always the same.
-        let (c0, _) = issue.root();
-        let c0 = *c0;
-
-        issue
-            .comment("Ho ho ho.", c0, vec![], &node.signer)
-            .unwrap();
-        issue
-            .comment("Ha ha ha.", c0, vec![], &node.signer)
-            .unwrap();
-
-        let id = issue.id;
-        let issue = issues.get(&id).unwrap().unwrap();
-        let (_, c0) = &issue.comments().nth(0).unwrap();
-        let (_, c1) = &issue.comments().nth(1).unwrap();
-        let (_, c2) = &issue.comments().nth(2).unwrap();
-
-        assert_eq!(c0.body(), "Blah blah blah.");
-        assert_eq!(c0.author(), author);
-        assert_eq!(c1.body(), "Ho ho ho.");
-        assert_eq!(c1.author(), author);
-        assert_eq!(c2.body(), "Ha ha ha.");
-        assert_eq!(c2.author(), author);
-    }
-
-    #[test]
-    fn test_issue_comment_redact() {
-        let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
-        let mut issues = Cache::no_cache(&*repo).unwrap();
-        let mut issue = issues
-            .create(
-                "My first issue",
-                "Blah blah blah.",
-                &[],
-                &[],
-                [],
-                &node.signer,
-            )
-            .unwrap();
-
-        // The root thread op id is always the same.
-        let (c0, _) = issue.root();
-        let c0 = *c0;
-
-        let comment = issue
-            .comment("Ho ho ho.", c0, vec![], &node.signer)
-            .unwrap();
-        issue.reload().unwrap();
-        assert_eq!(issue.comments().count(), 2);
-
-        issue.redact_comment(comment, &node.signer).unwrap();
-        assert_eq!(issue.comments().count(), 1);
-
-        // Can't redact root comment.
-        issue.redact_comment(*issue.id, &node.signer).unwrap_err();
-    }
-
-    #[test]
-    fn test_issue_state_serde() {
-        assert_eq!(
-            serde_json::to_value(State::Open).unwrap(),
-            serde_json::json!({ "status": "open" })
-        );
-
-        assert_eq!(
-            serde_json::to_value(State::Closed {
-                reason: CloseReason::Solved
-            })
-            .unwrap(),
-            serde_json::json!({ "status": "closed", "reason": "solved" })
-        );
-    }
-
-    #[test]
-    fn test_issue_all() {
-        let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
-        let mut issues = Cache::no_cache(&*repo).unwrap();
-        issues
-            .create("First", "Blah", &[], &[], [], &node.signer)
-            .unwrap();
-        issues
-            .create("Second", "Blah", &[], &[], [], &node.signer)
-            .unwrap();
-        issues
-            .create("Third", "Blah", &[], &[], [], &node.signer)
-            .unwrap();
-
-        let issues = issues
-            .list()
-            .unwrap()
-            .map(|r| r.map(|(_, i)| i))
-            .collect::<Result<Vec<_>, _>>()
-            .unwrap();
-
-        assert_eq!(issues.len(), 3);
-
-        issues.iter().find(|i| i.title() == "First").unwrap();
-        issues.iter().find(|i| i.title() == "Second").unwrap();
-        issues.iter().find(|i| i.title() == "Third").unwrap();
-    }
-
-    #[test]
-    fn test_issue_multilines() {
-        let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
-        let mut issues = Cache::no_cache(&*repo).unwrap();
-        let created = issues
-            .create(
-                "My first issue",
-                "Blah blah blah.\nYah yah yah",
-                &[],
-                &[],
-                [],
-                &node.signer,
-            )
-            .unwrap();
-
-        let (id, created) = (created.id, created.issue);
-        let issue = issues.get(&id).unwrap().unwrap();
-
-        assert_eq!(created, issue);
-        assert_eq!(issue.title(), "My first issue");
-        assert_eq!(issue.author().id, Did::from(node.signer.public_key()));
-        assert_eq!(issue.description(), "Blah blah blah.\nYah yah yah");
-        assert_eq!(issue.comments().count(), 1);
-        assert_eq!(issue.state(), &State::Open);
-    }
-
-    #[test]
-    fn test_embeds() {
-        let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
-        let mut issues = Cache::no_cache(&*repo).unwrap();
-        let embed1 = Embed {
-            name: String::from("example.html"),
-            content: b"<html>Hello World!</html>".to_vec(),
-        };
-        let embed2 = Embed {
-            name: String::from("style.css"),
-            content: b"body { color: red }".to_vec(),
-        };
-        let embed3 = Embed {
-            name: String::from("bin"),
-            content: vec![0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
-        };
-        let mut issue = issues
-            .create(
-                "My first issue",
-                "Blah blah blah.",
-                &[],
-                &[],
-                [embed1.clone(), embed2.clone()],
-                &node.signer,
-            )
-            .unwrap();
-
-        issue
-            .comment(
-                "Here's a binary file",
-                *issue.id,
-                [embed3.clone()],
-                &node.signer,
-            )
-            .unwrap();
-
-        issue.reload().unwrap();
-
-        let (_, c0) = issue.thread().comments().next().unwrap();
-        let (_, c1) = issue.thread().comments().next_back().unwrap();
-
-        let e1 = &c0.embeds()[0];
-        let e2 = &c0.embeds()[1];
-        let e3 = &c1.embeds()[0];
-
-        let b1 = repo.blob(Oid::try_from(&e1.content).unwrap()).unwrap();
-        let b2 = repo.blob(Oid::try_from(&e2.content).unwrap()).unwrap();
-        let b3 = repo.blob(Oid::try_from(&e3.content).unwrap()).unwrap();
-
-        assert_eq!(b1.content(), &embed1.content);
-        assert_eq!(b2.content(), &embed2.content);
-        assert_eq!(b3.content(), &embed3.content);
-
-        assert_eq!(b1.is_binary(), false);
-        assert_eq!(b2.is_binary(), false);
-        assert_eq!(b3.is_binary(), true);
-    }
-
-    #[test]
-    fn test_embeds_edit() {
-        let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
-        let mut issues = Cache::no_cache(&*repo).unwrap();
-        let embed1 = Embed {
-            name: String::from("example.html"),
-            content: b"<html>Hello World!</html>".to_vec(),
-        };
-        let embed1_edited = Embed {
-            name: String::from("example.html"),
-            content: b"<html>Hello Radicle!</html>".to_vec(),
-        };
-        let embed2 = Embed {
-            name: String::from("style.css"),
-            content: b"body { color: red }".to_vec(),
-        };
-        let mut issue = issues
-            .create(
-                "My first issue",
-                "Blah blah blah.",
-                &[],
-                &[],
-                [embed1, embed2],
-                &node.signer,
-            )
-            .unwrap();
-
-        issue.reload().unwrap();
-        issue
-            .edit_description("My first issue", [embed1_edited.clone()], &node.signer)
-            .unwrap();
-        issue.reload().unwrap();
-
-        let (_, c0) = issue.thread().comments().next().unwrap();
-
-        assert_eq!(c0.embeds().len(), 1);
-
-        let e1 = &c0.embeds()[0];
-        let b1 = repo.blob(Oid::try_from(&e1.content).unwrap()).unwrap();
-
-        assert_eq!(e1.content, Uri::from(embed1_edited.oid()));
-        assert_eq!(b1.content(), &embed1_edited.content);
-    }
-
-    #[test]
-    fn test_invalid_actions() {
-        let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
-        let mut issues = Cache::no_cache(&*repo).unwrap();
-        let mut issue = issues
-            .create(
-                "My first issue",
-                "Blah blah blah.",
-                &[],
-                &[],
-                [],
-                &node.signer,
-            )
-            .unwrap();
-        let missing = arbitrary::oid();
-
-        issue
-            .comment("Invalid", missing, [], &node.signer)
-            .unwrap_err();
-        assert_eq!(issue.comments().count(), 1);
-        issue.reload().unwrap();
-        assert_eq!(issue.comments().count(), 1);
-
-        let cob = cob::get::<Issue, _>(&*repo, Issue::type_name(), issue.id())
-            .unwrap()
-            .unwrap();
-
-        assert_eq!(cob.history().len(), 1);
-        assert_eq!(
-            cob.history().tips().into_iter().collect::<Vec<_>>(),
-            vec![*issue.id]
-        );
-    }
-
-    #[test]
-    fn test_invalid_tx() {
-        let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
-        let mut issues = Cache::no_cache(&*repo).unwrap();
-        let mut issue = issues
-            .create(
-                "My first issue",
-                "Blah blah blah.",
-                &[],
-                &[],
-                [],
-                &node.signer,
-            )
-            .unwrap();
-        let missing = arbitrary::oid();
-
-        // An invalid comment which points to a missing parent.
-        // Even creating it via a transaction will trigger an error.
-        let mut tx = Transaction::<Issue, _>::default();
-        tx.comment("Invalid comment", missing, vec![]).unwrap();
-        tx.commit("Add comment", issue.id, &mut issue.store.raw, &node.signer)
-            .unwrap_err();
-
-        issue.reload().unwrap();
-        assert_eq!(issue.comments().count(), 1);
-    }
-
-    #[test]
-    fn test_invalid_cob() {
-        use crate::crypto::test::signer::MockSigner;
-        use cob::change::Storage as _;
-        use cob::object::Storage as _;
-        use nonempty::NonEmpty;
-
-        let test::setup::NodeWithRepo { node, repo, .. } = test::setup::NodeWithRepo::default();
-        let eve = MockSigner::default();
-        let identity = repo.identity().unwrap().head();
-        let missing = arbitrary::oid();
-        let type_name = Issue::type_name().clone();
-        let mut issues = Cache::no_cache(&*repo).unwrap();
-        let mut issue = issues
-            .create(
-                "My first issue",
-                "Blah blah blah.",
-                &[],
-                &[],
-                [],
-                &node.signer,
-            )
-            .unwrap();
-
-        // Initially, there is one node in the DAG.
-        let cob = cob::get::<NonEmpty<cob::Entry>, _>(&*repo, &type_name, issue.id())
-            .unwrap()
-            .unwrap();
-
-        assert_eq!(cob.history.len(), 1);
-        assert_eq!(cob.object.len(), 1);
-
-        // We have a valid issue. Now we're going to add an invalid action to it, by bypassing
-        // the COB API. We do this using a different key, so that valid actions by
-        // our issue author don't overwrite the invalid action, since there is
-        // only one ref per COB per user.
-        let action = Action::CommentRedact { id: missing };
-        let action = cob::store::encoding::encode(action).unwrap();
-        let contents = NonEmpty::new(action);
-        let invalid = repo
-            .store(
-                Some(identity),
-                vec![],
-                &eve,
-                cob::change::Template {
-                    tips: vec![*issue.id],
-                    embeds: vec![],
-                    contents: contents.clone(),
-                    type_name: type_name.clone(),
-                    message: String::from("Add invalid operation"),
-                },
-            )
-            .unwrap();
-
-        repo.update(eve.public_key(), &type_name, &issue.id, &invalid.id)
-            .unwrap();
-
-        // If we fetch the COB with its history, *without* trying to interpret it as an issue,
-        // we'll see that all entries, including the invalid one are there.
-        let cob = cob::get::<NonEmpty<cob::Entry>, _>(&*repo, &type_name, issue.id())
-            .unwrap()
-            .unwrap();
-
-        assert_eq!(cob.history.len(), 2);
-        assert_eq!(cob.object.len(), 2);
-        assert_eq!(cob.object.last().contents(), &contents);
-
-        // However, if we try to fetch it as an *issue*, the invalid comment is pruned.
-        let cob = cob::get::<Issue, _>(&*repo, &type_name, issue.id())
-            .unwrap()
-            .unwrap();
-        assert_eq!(cob.history.len(), 1);
-        assert_eq!(cob.object.comments().count(), 1);
-        assert!(cob.object.comment(&issue.id).is_some());
-
-        // Additionally, when adding a *valid* comment, it does not build upon the bad operation.
-        issue.reload().unwrap();
-        issue
-            .comment("Valid comment", *issue.id, vec![], &node.signer)
-            .unwrap();
-        issue.reload().unwrap();
-        assert_eq!(issue.comments().count(), 2);
-        assert_eq!(issue.thread.timeline().count(), 2);
-        assert_eq!(issue.comments().last().unwrap().1.body(), "Valid comment");
-
-        // The actual DAG contains 3 nodes, but only 2 were loaded as an issue.
-        let cob = cob::get::<NonEmpty<cob::Entry>, _>(&*repo, &type_name, issue.id())
-            .unwrap()
-            .unwrap();
-
-        assert_eq!(cob.history.len(), 3);
-        assert_eq!(cob.object.len(), 3);
-
-        // If Eve now writes a valid comment via the `Issue` type, it will overwrite her invalid
-        // one, since it won't be loaded as a tip.
-        issue
-            .comment("Eve's comment", *issue.id, vec![], &eve)
-            .unwrap();
-
-        let cob = cob::get::<NonEmpty<cob::Entry>, _>(&*repo, &type_name, issue.id())
-            .unwrap()
-            .unwrap();
-
-        // There are three nodes still, but they are all valid comments.
-        // The invalid comment of Eve was replaced with a valid one.
-        assert_eq!(issue.comments().count(), 3);
-        assert_eq!(cob.history.len(), 3);
-        assert_eq!(cob.object.len(), 3);
-    }
-}
diff --git a/radicle/src/cob/issue/cache.rs b/radicle/src/cob/issue/cache.rs
deleted file mode 100644
index 80a3122bb..000000000
--- a/radicle/src/cob/issue/cache.rs
+++ /dev/null
@@ -1,701 +0,0 @@
-use std::ops::ControlFlow;
-use std::str::FromStr;
-
-use sqlite as sql;
-use thiserror::Error;
-
-use crate::cob;
-use crate::cob::cache;
-use crate::cob::cache::{Remove, StoreReader, StoreWriter, Update};
-use crate::cob::store;
-use crate::cob::{Embed, Label, ObjectId, TypeName};
-use crate::crypto::Signer;
-use crate::prelude::{Did, RepoId};
-use crate::storage::{HasRepoId, ReadRepository, RepositoryError, SignRepository, WriteRepository};
-
-use super::{Issue, IssueCounts, IssueId, IssueMut, State};
-
-/// A set of read-only methods for a [`Issue`] store.
-pub trait Issues {
-    type Error: std::error::Error + Send + Sync + 'static;
-
-    /// An iterator for returning a set of issues from the store.
-    type Iter<'a>: Iterator<Item = Result<(IssueId, Issue), Self::Error>> + 'a
-    where
-        Self: 'a;
-
-    /// Get the `Issue`, identified by `id`, returning `None` if it
-    /// was not found.
-    fn get(&self, id: &IssueId) -> Result<Option<Issue>, Self::Error>;
-
-    /// List all issues that are in the store.
-    fn list(&self) -> Result<Self::Iter<'_>, Self::Error>;
-
-    /// Get the [`IssueCounts`] of all the issues in the store.
-    fn counts(&self) -> Result<IssueCounts, Self::Error>;
-
-    /// Returns `true` if there are no issues in the store.
-    fn is_empty(&self) -> Result<bool, Self::Error> {
-        Ok(self.counts()?.total() == 0)
-    }
-}
-
-/// [`Issues`] store that can also [`Update`] and [`Remove`]
-/// [`Issue`] in/from the store.
-pub trait IssuesMut: Issues + Update<Issue> + Remove<Issue> {}
-
-impl<T> IssuesMut for T where T: Issues + Update<Issue> + Remove<Issue> {}
-
-/// An `Issue` store that relies on the `cache` for reads and as a
-/// write-through cache.
-///
-/// The `store` is used for the main storage when performing a
-/// write-through. It is also used for identifying which `RepoId` is
-/// being used for the `cache`.
-pub struct Cache<R, C> {
-    store: R,
-    cache: C,
-}
-
-impl<R, C> Cache<R, C> {
-    pub fn new(store: R, cache: C) -> Self {
-        Self { store, cache }
-    }
-
-    pub fn rid(&self) -> RepoId
-    where
-        R: HasRepoId,
-    {
-        self.store.rid()
-    }
-}
-
-impl<'a, R, C> Cache<super::Issues<'a, R>, C> {
-    /// Create a new [`Issue`] using the [`super::Issues`] as the
-    /// main storage, and writing the update to the `cache`.
-    pub fn create<'g, G>(
-        &'g mut self,
-        title: impl ToString,
-        description: impl ToString,
-        labels: &[Label],
-        assignees: &[Did],
-        embeds: impl IntoIterator<Item = Embed>,
-        signer: &G,
-    ) -> Result<IssueMut<'a, 'g, R, C>, super::Error>
-    where
-        R: ReadRepository + WriteRepository + cob::Store,
-        G: Signer,
-        C: Update<Issue>,
-    {
-        self.store.create(
-            title,
-            description,
-            labels,
-            assignees,
-            embeds,
-            &mut self.cache,
-            signer,
-        )
-    }
-
-    /// Remove the given `id` from the [`super::Issues`] storage, and
-    /// removing the entry from the `cache`.
-    pub fn remove<G>(&mut self, id: &IssueId, signer: &G) -> Result<(), super::Error>
-    where
-        G: Signer,
-        R: ReadRepository + SignRepository + cob::Store,
-        C: Remove<Issue>,
-    {
-        self.store.remove(id, signer)?;
-        self.cache
-            .remove(id)
-            .map_err(|e| super::Error::CacheRemove {
-                id: *id,
-                err: e.into(),
-            })?;
-        Ok(())
-    }
-
-    /// Read the given `id` from the [`super::Issues`] store and
-    /// writing it to the `cache`.
-    pub fn write(&mut self, id: &IssueId) -> Result<(), super::Error>
-    where
-        R: ReadRepository + cob::Store,
-        C: Update<Issue>,
-    {
-        let issue = self
-            .store
-            .get(id)?
-            .ok_or_else(|| store::Error::NotFound((*super::TYPENAME).clone(), *id))?;
-        self.update(&self.rid(), id, &issue)
-            .map_err(|e| super::Error::CacheUpdate {
-                id: *id,
-                err: e.into(),
-            })?;
-        Ok(())
-    }
-
-    /// Read all the issues from the [`super::Issues`] store and
-    /// writing them to `cache`.
-    ///
-    /// The `callback` is used for reporting success, failures, and
-    /// progress to the caller. The caller may also decide to continue
-    /// or break from the process.
-    pub fn write_all(
-        &mut self,
-        on_issue: impl Fn(
-            &Result<(IssueId, Issue), store::Error>,
-            &cache::WriteAllProgress,
-        ) -> ControlFlow<()>,
-    ) -> Result<(), super::Error>
-    where
-        R: ReadRepository + cob::Store,
-        C: Update<Issue> + Remove<Issue>,
-    {
-        // Start by clearing the cache. This will get rid of issues that are cached but
-        // no longer exist in storage.
-        self.remove_all(&self.rid())
-            .map_err(|e| super::Error::CacheRemoveAll { err: e.into() })?;
-
-        let issues = self.store.all()?;
-        let mut progress = cache::WriteAllProgress::new(issues.len());
-        for issue in self.store.all()? {
-            progress.inc();
-            match on_issue(&issue, &progress) {
-                ControlFlow::Continue(()) => match issue {
-                    Ok((id, issue)) => {
-                        self.update(&self.rid(), &id, &issue)
-                            .map_err(|e| super::Error::CacheUpdate { id, err: e.into() })?;
-                    }
-                    Err(_) => continue,
-                },
-                ControlFlow::Break(()) => break,
-            }
-        }
-        Ok(())
-    }
-}
-
-impl<'a, R> Cache<super::Issues<'a, R>, cache::NoCache>
-where
-    R: ReadRepository + cob::Store,
-{
-    /// Get a `Cache` that does no write-through modifications and
-    /// uses the [`super::Issues`] store for all reads and writes.
-    pub fn no_cache(repository: &'a R) -> Result<Self, RepositoryError> {
-        let store = super::Issues::open(repository)?;
-        Ok(Self {
-            store,
-            cache: cache::NoCache,
-        })
-    }
-
-    /// Get the [`IssueMut`], identified by `id`.
-    pub fn get_mut<'g>(
-        &'g mut self,
-        id: &ObjectId,
-    ) -> Result<IssueMut<'a, 'g, R, cache::NoCache>, super::Error> {
-        let issue = self
-            .store
-            .get(id)?
-            .ok_or_else(move || store::Error::NotFound(super::TYPENAME.clone(), *id))?;
-
-        Ok(IssueMut {
-            id: *id,
-            issue,
-            store: &mut self.store,
-            cache: &mut self.cache,
-        })
-    }
-}
-
-impl<R> Cache<R, StoreReader> {
-    pub fn reader(store: R, cache: StoreReader) -> Self {
-        Self { store, cache }
-    }
-}
-
-impl<R> Cache<R, StoreWriter> {
-    pub fn open(store: R, cache: StoreWriter) -> Self {
-        Self { store, cache }
-    }
-}
-
-impl<'a, R> Cache<super::Issues<'a, R>, StoreWriter>
-where
-    R: ReadRepository + cob::Store,
-{
-    /// Get the [`IssueMut`], identified by `id`, using the
-    /// `StoreWriter` for retrieving the `Issue`.
-    pub fn get_mut<'g>(
-        &'g mut self,
-        id: &ObjectId,
-    ) -> Result<IssueMut<'a, 'g, R, StoreWriter>, Error> {
-        let issue = Issues::get(self, id)?
-            .ok_or_else(move || Error::NotFound(super::TYPENAME.clone(), *id))?;
-
-        Ok(IssueMut {
-            id: *id,
-            issue,
-            store: &mut self.store,
-            cache: &mut self.cache,
-        })
-    }
-}
-
-impl<R, C> cache::Update<Issue> for Cache<R, C>
-where
-    C: cache::Update<Issue>,
-{
-    type Out = <C as cache::Update<Issue>>::Out;
-    type UpdateError = <C as cache::Update<Issue>>::UpdateError;
-
-    fn update(
-        &mut self,
-        rid: &RepoId,
-        id: &ObjectId,
-        object: &Issue,
-    ) -> Result<Self::Out, Self::UpdateError> {
-        self.cache.update(rid, id, object)
-    }
-}
-
-impl<R, C> cache::Remove<Issue> for Cache<R, C>
-where
-    C: cache::Remove<Issue>,
-{
-    type Out = <C as cache::Remove<Issue>>::Out;
-    type RemoveError = <C as cache::Remove<Issue>>::RemoveError;
-
-    fn remove(&mut self, id: &ObjectId) -> Result<Self::Out, Self::RemoveError> {
-        self.cache.remove(id)
-    }
-
-    fn remove_all(&mut self, rid: &RepoId) -> Result<Self::Out, Self::RemoveError> {
-        self.cache.remove_all(rid)
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum UpdateError {
-    #[error(transparent)]
-    Json(#[from] serde_json::Error),
-    #[error(transparent)]
-    Sql(#[from] sql::Error),
-}
-
-impl Update<Issue> for StoreWriter {
-    type Out = bool;
-    type UpdateError = UpdateError;
-
-    fn update(
-        &mut self,
-        rid: &RepoId,
-        id: &ObjectId,
-        object: &Issue,
-    ) -> Result<Self::Out, Self::UpdateError> {
-        let mut stmt = self.db.prepare(
-            "INSERT INTO issues (id, repo, issue)
-             VALUES (?1, ?2, ?3)
-             ON CONFLICT DO UPDATE
-             SET issue = (?3)",
-        )?;
-
-        stmt.bind((1, sql::Value::String(id.to_string())))?;
-        stmt.bind((2, rid))?;
-        stmt.bind((3, sql::Value::String(serde_json::to_string(&object)?)))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count() > 0)
-    }
-}
-
-impl Remove<Issue> for StoreWriter {
-    type Out = bool;
-    type RemoveError = sql::Error;
-
-    fn remove(&mut self, id: &ObjectId) -> Result<Self::Out, Self::RemoveError> {
-        let mut stmt = self.db.prepare(
-            "DELETE FROM issues
-             WHERE id = ?1",
-        )?;
-
-        stmt.bind((1, sql::Value::String(id.to_string())))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count() > 0)
-    }
-
-    fn remove_all(&mut self, rid: &RepoId) -> Result<Self::Out, Self::RemoveError> {
-        let mut stmt = self.db.prepare(
-            "DELETE FROM issues
-             WHERE repo = ?1",
-        )?;
-
-        stmt.bind((1, rid))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count() > 0)
-    }
-}
-
-pub struct NoCacheIter<'a> {
-    inner: Box<dyn Iterator<Item = Result<(IssueId, Issue), super::Error>> + 'a>,
-}
-
-impl<'a> Iterator for NoCacheIter<'a> {
-    type Item = Result<(IssueId, Issue), super::Error>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner.next()
-    }
-}
-
-impl<'a, R> Issues for Cache<super::Issues<'a, R>, cache::NoCache>
-where
-    R: ReadRepository + cob::Store,
-{
-    type Error = super::Error;
-    type Iter<'b> = NoCacheIter<'b> where Self: 'b;
-
-    fn get(&self, id: &IssueId) -> Result<Option<Issue>, Self::Error> {
-        self.store.get(id).map_err(super::Error::from)
-    }
-
-    fn list(&self) -> Result<Self::Iter<'_>, Self::Error> {
-        self.store
-            .all()
-            .map(|inner| NoCacheIter {
-                inner: Box::new(inner.into_iter().map(|res| res.map_err(super::Error::from))),
-            })
-            .map_err(super::Error::from)
-    }
-
-    fn counts(&self) -> Result<IssueCounts, Self::Error> {
-        self.store.counts().map_err(super::Error::from)
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum Error {
-    #[error("object `{1}` of type `{0}` was not found")]
-    NotFound(TypeName, ObjectId),
-    #[error(transparent)]
-    Object(#[from] cob::object::ParseObjectId),
-    #[error(transparent)]
-    Json(#[from] serde_json::Error),
-    #[error(transparent)]
-    Sql(#[from] sql::Error),
-}
-
-/// Iterator that returns a set of issues based on an SQL query.
-///
-/// The query is expected to return rows with columns identified by
-/// the `id` and `issue` names.
-pub struct IssuesIter<'a> {
-    inner: sql::CursorWithOwnership<'a>,
-}
-
-impl<'a> IssuesIter<'a> {
-    fn parse_row(row: sql::Row) -> Result<(IssueId, Issue), Error> {
-        let id = IssueId::from_str(row.read::<&str, _>("id"))?;
-        let issue = serde_json::from_str::<Issue>(row.read::<&str, _>("issue"))?;
-        Ok((id, issue))
-    }
-}
-
-impl<'a> Iterator for IssuesIter<'a> {
-    type Item = Result<(IssueId, Issue), Error>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let row = self.inner.next()?;
-        Some(row.map_err(Error::from).and_then(IssuesIter::parse_row))
-    }
-}
-
-impl<R> Issues for Cache<R, StoreWriter>
-where
-    R: HasRepoId,
-{
-    type Error = Error;
-    type Iter<'b> = IssuesIter<'b> where Self: 'b;
-
-    fn get(&self, id: &IssueId) -> Result<Option<Issue>, Self::Error> {
-        query::get(&self.cache.db, &self.rid(), id)
-    }
-
-    fn list(&self) -> Result<Self::Iter<'_>, Self::Error> {
-        query::list(&self.cache.db, &self.rid())
-    }
-
-    fn counts(&self) -> Result<IssueCounts, Self::Error> {
-        query::counts(&self.cache.db, &self.rid())
-    }
-}
-
-impl<R> Issues for Cache<R, StoreReader>
-where
-    R: HasRepoId,
-{
-    type Error = Error;
-    type Iter<'b> = IssuesIter<'b> where Self: 'b;
-
-    fn get(&self, id: &IssueId) -> Result<Option<Issue>, Self::Error> {
-        query::get(&self.cache.db, &self.rid(), id)
-    }
-
-    fn list(&self) -> Result<Self::Iter<'_>, Self::Error> {
-        query::list(&self.cache.db, &self.rid())
-    }
-
-    fn counts(&self) -> Result<IssueCounts, Self::Error> {
-        query::counts(&self.cache.db, &self.rid())
-    }
-}
-
-/// Helper SQL queries for [ `Issues`] trait implementations.
-mod query {
-    use sqlite as sql;
-
-    use super::*;
-
-    pub(super) fn get(
-        db: &sql::ConnectionThreadSafe,
-        rid: &RepoId,
-        id: &IssueId,
-    ) -> Result<Option<Issue>, Error> {
-        let id = sql::Value::String(id.to_string());
-        let mut stmt = db.prepare(
-            "SELECT issue
-             FROM issues
-             WHERE id = ?1 and repo = ?2",
-        )?;
-
-        stmt.bind((1, id))?;
-        stmt.bind((2, rid))?;
-
-        match stmt.into_iter().next().transpose()? {
-            None => Ok(None),
-            Some(row) => {
-                let issue = row.read::<&str, _>("issue");
-                let issue = serde_json::from_str(issue)?;
-                Ok(Some(issue))
-            }
-        }
-    }
-
-    pub(super) fn list<'a>(
-        db: &'a sql::ConnectionThreadSafe,
-        rid: &RepoId,
-    ) -> Result<IssuesIter<'a>, Error> {
-        let mut stmt = db.prepare(
-            "SELECT id, issue
-             FROM issues
-             WHERE repo = ?1
-            ",
-        )?;
-        stmt.bind((1, rid))?;
-        Ok(IssuesIter {
-            inner: stmt.into_iter(),
-        })
-    }
-
-    pub(super) fn counts(
-        db: &sql::ConnectionThreadSafe,
-        rid: &RepoId,
-    ) -> Result<IssueCounts, Error> {
-        let mut stmt = db.prepare(
-            "SELECT
-                 issue->'$.state' AS state,
-                 COUNT(*) AS count
-             FROM issues
-             WHERE repo = ?1
-             GROUP BY issue->'$.state.status'",
-        )?;
-        stmt.bind((1, rid))?;
-
-        stmt.into_iter()
-            .try_fold(IssueCounts::default(), |mut counts, row| {
-                let row = row?;
-                let count = row.read::<i64, _>("count") as usize;
-                let status = serde_json::from_str::<State>(row.read::<&str, _>("state"))?;
-                match status {
-                    State::Closed { .. } => counts.closed += count,
-                    State::Open => counts.open += count,
-                }
-                Ok(counts)
-            })
-    }
-}
-
-#[allow(clippy::unwrap_used)]
-#[cfg(test)]
-mod tests {
-    use std::collections::BTreeSet;
-    use std::str::FromStr;
-
-    use radicle_cob::ObjectId;
-
-    use crate::cob::cache::{Store, Update, Write};
-    use crate::cob::thread::Thread;
-    use crate::issue::{CloseReason, Issue, IssueCounts, IssueId, State};
-    use crate::test::arbitrary;
-    use crate::test::storage::MockRepository;
-
-    use super::{Cache, Issues};
-
-    fn memory(store: MockRepository) -> Cache<MockRepository, Store<Write>> {
-        let cache = Store::<Write>::memory().unwrap();
-        Cache { store, cache }
-    }
-
-    #[test]
-    fn test_is_empty() {
-        let repo = arbitrary::gen::<MockRepository>(1);
-        let mut cache = memory(repo);
-        assert!(cache.is_empty().unwrap());
-
-        let issue = Issue::new(Thread::default());
-        let id = ObjectId::from_str("47799cbab2eca047b6520b9fce805da42b49ecab").unwrap();
-        cache.update(&cache.rid(), &id, &issue).unwrap();
-
-        let issue = Issue {
-            state: State::Closed {
-                reason: CloseReason::Solved,
-            },
-            ..Issue::new(Thread::default())
-        };
-        let id = ObjectId::from_str("ae981ded6ed2ed2cdba34c8603714782667f18a3").unwrap();
-        cache.update(&cache.rid(), &id, &issue).unwrap();
-
-        assert!(!cache.is_empty().unwrap())
-    }
-
-    #[test]
-    fn test_counts() {
-        let repo = arbitrary::gen::<MockRepository>(1);
-        let mut cache = memory(repo);
-        let n_open = arbitrary::gen::<u8>(0);
-        let n_closed = arbitrary::gen::<u8>(1);
-        let open_ids = (0..n_open)
-            .map(|_| IssueId::from(arbitrary::oid()))
-            .collect::<BTreeSet<IssueId>>();
-        let closed_ids = (0..n_closed)
-            .map(|_| IssueId::from(arbitrary::oid()))
-            .collect::<BTreeSet<IssueId>>();
-
-        for id in open_ids.iter() {
-            let issue = Issue::new(Thread::default());
-            cache
-                .update(&cache.rid(), &IssueId::from(*id), &issue)
-                .unwrap();
-        }
-
-        for id in closed_ids.iter() {
-            let issue = Issue {
-                state: State::Closed {
-                    reason: CloseReason::Solved,
-                },
-                ..Issue::new(Thread::default())
-            };
-            cache
-                .update(&cache.rid(), &IssueId::from(*id), &issue)
-                .unwrap();
-        }
-
-        assert_eq!(
-            cache.counts().unwrap(),
-            IssueCounts {
-                open: open_ids.len(),
-                closed: closed_ids.len()
-            }
-        );
-    }
-
-    #[test]
-    fn test_get() {
-        let repo = arbitrary::gen::<MockRepository>(1);
-        let mut cache = memory(repo);
-        let ids = (0..arbitrary::gen::<u8>(1))
-            .map(|_| IssueId::from(arbitrary::oid()))
-            .collect::<BTreeSet<IssueId>>();
-        let missing = (0..arbitrary::gen::<u8>(2))
-            .filter_map(|_| {
-                let id = IssueId::from(arbitrary::oid());
-                (!ids.contains(&id)).then_some(id)
-            })
-            .collect::<BTreeSet<IssueId>>();
-        let mut issues = Vec::with_capacity(ids.len());
-
-        for id in ids.iter() {
-            let issue = Issue {
-                title: id.to_string(),
-                ..Issue::new(Thread::default())
-            };
-            cache
-                .update(&cache.rid(), &IssueId::from(*id), &issue)
-                .unwrap();
-            issues.push((*id, issue));
-        }
-
-        for (id, issue) in issues.into_iter() {
-            assert_eq!(Some(issue), cache.get(&id).unwrap());
-        }
-
-        for id in &missing {
-            assert_eq!(cache.get(id).unwrap(), None);
-        }
-    }
-
-    #[test]
-    fn test_list() {
-        let repo = arbitrary::gen::<MockRepository>(1);
-        let mut cache = memory(repo);
-        let ids = (0..arbitrary::gen::<u8>(1))
-            .map(|_| IssueId::from(arbitrary::oid()))
-            .collect::<BTreeSet<IssueId>>();
-        let mut issues = Vec::with_capacity(ids.len());
-
-        for id in ids.iter() {
-            let issue = Issue {
-                title: id.to_string(),
-                ..Issue::new(Thread::default())
-            };
-            cache
-                .update(&cache.rid(), &IssueId::from(*id), &issue)
-                .unwrap();
-            issues.push((*id, issue));
-        }
-
-        let mut list = cache
-            .list()
-            .unwrap()
-            .collect::<Result<Vec<_>, _>>()
-            .unwrap();
-        list.sort_by_key(|(id, _)| *id);
-        issues.sort_by_key(|(id, _)| *id);
-        assert_eq!(issues, list);
-    }
-
-    #[test]
-    fn test_remove() {
-        let repo = arbitrary::gen::<MockRepository>(1);
-        let mut cache = memory(repo);
-        let ids = (0..arbitrary::gen::<u8>(1))
-            .map(|_| IssueId::from(arbitrary::oid()))
-            .collect::<BTreeSet<IssueId>>();
-
-        for id in ids.iter() {
-            let issue = Issue {
-                title: id.to_string(),
-                ..Issue::new(Thread::default())
-            };
-            cache
-                .update(&cache.rid(), &IssueId::from(*id), &issue)
-                .unwrap();
-            assert_eq!(Some(issue), cache.get(id).unwrap());
-            super::Remove::remove(&mut cache, id).unwrap();
-            assert_eq!(None, cache.get(id).unwrap());
-        }
-    }
-}
diff --git a/radicle/src/cob/op.rs b/radicle/src/cob/op.rs
deleted file mode 100644
index c958065de..000000000
--- a/radicle/src/cob/op.rs
+++ /dev/null
@@ -1,154 +0,0 @@
-use nonempty::NonEmpty;
-use radicle_cob::Manifest;
-use serde::Serialize;
-use thiserror::Error;
-
-use radicle_cob::history::{Entry, EntryId};
-use radicle_crypto::PublicKey;
-
-use crate::cob::Timestamp;
-use crate::identity::DocAt;
-use crate::storage::ReadRepository;
-use crate::{git, identity};
-
-/// The author of an [`Op`].
-pub type ActorId = PublicKey;
-
-/// Error decoding an operation from an entry.
-#[derive(Error, Debug)]
-pub enum OpEncodingError {
-    #[error("encoding failed: {0}")]
-    Encoding(#[from] serde_json::Error),
-    #[error("git: {0}")]
-    Git(#[from] git2::Error),
-}
-
-/// The `Op` is the operation that is applied onto a state to form a CRDT.
-///
-/// Everything that can be done in the system is represented by an `Op`.
-/// Operations are applied to an accumulator to yield a final state.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
-pub struct Op<A> {
-    /// Id of the entry under which this operation lives.
-    pub id: EntryId,
-    /// The action carried out by this operation.
-    pub actions: NonEmpty<A>,
-    /// The author of the operation.
-    pub author: ActorId,
-    /// Timestamp of this operation.
-    pub timestamp: Timestamp,
-    /// Parent operations.
-    pub parents: Vec<EntryId>,
-    /// Related objects.
-    pub related: Vec<git::Oid>,
-    /// Head of identity document committed to by this operation.
-    pub identity: Option<git::Oid>,
-    /// Object manifest.
-    pub manifest: Manifest,
-}
-
-impl<A: Eq> PartialOrd for Op<A> {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl<A: Eq> Ord for Op<A> {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        self.id.cmp(&other.id)
-    }
-}
-
-impl<A> Op<A> {
-    pub fn new(
-        id: EntryId,
-        actions: impl Into<NonEmpty<A>>,
-        author: ActorId,
-        timestamp: impl Into<Timestamp>,
-        identity: Option<git::Oid>,
-        manifest: Manifest,
-    ) -> Self {
-        Self {
-            id,
-            actions: actions.into(),
-            author,
-            timestamp: timestamp.into(),
-            parents: vec![],
-            related: vec![],
-            identity,
-            manifest,
-        }
-    }
-
-    pub fn id(&self) -> EntryId {
-        self.id
-    }
-
-    pub fn identity_doc<R: ReadRepository>(
-        &self,
-        repo: &R,
-    ) -> Result<Option<DocAt>, identity::DocError> {
-        match self.identity {
-            None => Ok(None),
-            Some(head) => repo.identity_doc_at(head).map(Some),
-        }
-    }
-}
-
-impl From<Entry> for Op<Vec<u8>> {
-    fn from(entry: Entry) -> Self {
-        Self {
-            id: *entry.id(),
-            actions: entry.contents().clone(),
-            author: *entry.author(),
-            parents: entry.parents,
-            related: entry.related,
-            timestamp: Timestamp::from_secs(entry.timestamp),
-            identity: entry.resource,
-            manifest: entry.manifest.clone(),
-        }
-    }
-}
-
-impl<'a, A> TryFrom<&'a Entry> for Op<A>
-where
-    for<'de> A: serde::Deserialize<'de>,
-{
-    type Error = OpEncodingError;
-
-    fn try_from(entry: &'a Entry) -> Result<Self, Self::Error> {
-        let id = *entry.id();
-        let identity = entry.resource().copied();
-        let actions: Vec<_> = entry
-            .contents()
-            .iter()
-            .map(|blob| serde_json::from_slice(blob.as_slice()))
-            .collect::<Result<_, _>>()?;
-        let manifest = entry.manifest.clone();
-
-        // SAFETY: Entry is guaranteed to have at least one operation.
-        #[allow(clippy::unwrap_used)]
-        let actions = NonEmpty::from_vec(actions).unwrap();
-        let op = Op {
-            id,
-            actions,
-            author: *entry.author(),
-            timestamp: Timestamp::from_secs(entry.timestamp),
-            parents: entry.parents.to_owned(),
-            related: entry.related.to_owned(),
-            identity,
-            manifest,
-        };
-
-        Ok(op)
-    }
-}
-
-impl<A: 'static> IntoIterator for Op<A> {
-    type Item = A;
-    type IntoIter = <NonEmpty<A> as IntoIterator>::IntoIter;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.actions.into_iter()
-    }
-}
diff --git a/radicle/src/cob/patch.rs b/radicle/src/cob/patch.rs
deleted file mode 100644
index 19a1b5756..000000000
--- a/radicle/src/cob/patch.rs
+++ /dev/null
@@ -1,3329 +0,0 @@
-pub mod cache;
-
-use std::collections::{BTreeMap, BTreeSet, HashMap};
-use std::fmt;
-use std::ops::Deref;
-use std::str::FromStr;
-
-use amplify::Wrapper;
-use nonempty::NonEmpty;
-use once_cell::sync::Lazy;
-use serde::{Deserialize, Serialize};
-use storage::{HasRepoId, RepositoryError};
-use thiserror::Error;
-
-use crate::cob;
-use crate::cob::common::{Author, Authorization, CodeLocation, Label, Reaction, Timestamp};
-use crate::cob::store::Transaction;
-use crate::cob::store::{Cob, CobAction};
-use crate::cob::thread;
-use crate::cob::thread::Thread;
-use crate::cob::thread::{Comment, CommentId, Edit, Reactions};
-use crate::cob::{op, store, ActorId, Embed, EntryId, ObjectId, TypeName, Uri};
-use crate::crypto::{PublicKey, Signer};
-use crate::git;
-use crate::identity::doc::DocError;
-use crate::identity::PayloadError;
-use crate::prelude::*;
-use crate::storage;
-
-pub use cache::Cache;
-
-/// Type name of a patch.
-pub static TYPENAME: Lazy<TypeName> =
-    Lazy::new(|| FromStr::from_str("xyz.radicle.patch").expect("type name is valid"));
-
-/// Patch operation.
-pub type Op = cob::Op<Action>;
-
-/// Identifier for a patch.
-pub type PatchId = ObjectId;
-
-/// Unique identifier for a patch revision.
-#[derive(
-    Wrapper,
-    Debug,
-    Clone,
-    Copy,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    PartialOrd,
-    Ord,
-    Hash,
-    From,
-    Display,
-)]
-#[display(inner)]
-#[wrap(Deref)]
-pub struct RevisionId(EntryId);
-
-/// Unique identifier for a patch review.
-#[derive(
-    Wrapper,
-    Debug,
-    Clone,
-    Copy,
-    Serialize,
-    Deserialize,
-    PartialEq,
-    Eq,
-    PartialOrd,
-    Ord,
-    Hash,
-    From,
-    Display,
-)]
-#[display(inner)]
-#[wrapper(Deref)]
-pub struct ReviewId(EntryId);
-
-/// Index of a revision in the revisions list.
-pub type RevisionIx = usize;
-
-/// Error applying an operation onto a state.
-#[derive(Debug, Error)]
-pub enum Error {
-    /// Causal dependency missing.
-    ///
-    /// This error indicates that the operations are not being applied
-    /// in causal order, which is a requirement for this CRDT.
-    ///
-    /// For example, this can occur if an operation references anothern operation
-    /// that hasn't happened yet.
-    #[error("causal dependency {0:?} missing")]
-    Missing(EntryId),
-    /// Error applying an op to the patch thread.
-    #[error("thread apply failed: {0}")]
-    Thread(#[from] thread::Error),
-    /// Error loading the identity document committed to by an operation.
-    #[error("identity doc failed to load: {0}")]
-    Doc(#[from] DocError),
-    /// Identity document is missing.
-    #[error("missing identity document")]
-    MissingIdentity,
-    /// Review is empty.
-    #[error("empty review; verdict or summary not provided")]
-    EmptyReview,
-    /// Duplicate review.
-    #[error("review {0} of {1} already exists by author {2}")]
-    DuplicateReview(ReviewId, RevisionId, NodeId),
-    /// Error loading the document payload.
-    #[error("payload failed to load: {0}")]
-    Payload(#[from] PayloadError),
-    /// Git error.
-    #[error("git: {0}")]
-    Git(#[from] git::ext::Error),
-    /// Store error.
-    #[error("store: {0}")]
-    Store(#[from] store::Error),
-    #[error("op decoding failed: {0}")]
-    Op(#[from] op::OpEncodingError),
-    /// Action not authorized by the author
-    #[error("{0} not authorized to apply {1:?}")]
-    NotAuthorized(ActorId, Action),
-    /// An illegal action.
-    #[error("action is not allowed: {0}")]
-    NotAllowed(EntryId),
-    /// Revision not found.
-    #[error("revision not found: {0}")]
-    RevisionNotFound(RevisionId),
-    /// Initialization failed.
-    #[error("initialization failed: {0}")]
-    Init(&'static str),
-    #[error("failed to update patch {id} in cache: {err}")]
-    CacheUpdate {
-        id: PatchId,
-        #[source]
-        err: Box<dyn std::error::Error + Send + Sync + 'static>,
-    },
-    #[error("failed to remove patch {id} from cache: {err}")]
-    CacheRemove {
-        id: PatchId,
-        #[source]
-        err: Box<dyn std::error::Error + Send + Sync + 'static>,
-    },
-    #[error("failed to remove patches from cache: {err}")]
-    CacheRemoveAll {
-        #[source]
-        err: Box<dyn std::error::Error + Send + Sync + 'static>,
-    },
-}
-
-/// Patch operation.
-#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
-#[serde(tag = "type", rename_all = "camelCase")]
-pub enum Action {
-    //
-    // Actions on patch.
-    //
-    #[serde(rename = "edit")]
-    Edit { title: String, target: MergeTarget },
-    #[serde(rename = "label")]
-    Label { labels: BTreeSet<Label> },
-    #[serde(rename = "lifecycle")]
-    Lifecycle { state: Lifecycle },
-    #[serde(rename = "assign")]
-    Assign { assignees: BTreeSet<Did> },
-    #[serde(rename = "merge")]
-    Merge {
-        revision: RevisionId,
-        commit: git::Oid,
-    },
-
-    //
-    // Review actions
-    //
-    #[serde(rename = "review")]
-    Review {
-        revision: RevisionId,
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        summary: Option<String>,
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        verdict: Option<Verdict>,
-        #[serde(default, skip_serializing_if = "Vec::is_empty")]
-        labels: Vec<Label>,
-    },
-    #[serde(rename = "review.redact")]
-    ReviewRedact { review: ReviewId },
-    #[serde(rename = "review.comment")]
-    ReviewComment {
-        review: ReviewId,
-        body: String,
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        location: Option<CodeLocation>,
-        /// Comment this is a reply to.
-        /// Should be [`None`] if it's the first comment.
-        /// Should be [`Some`] otherwise.
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        reply_to: Option<CommentId>,
-        /// Embeded content.
-        #[serde(default, skip_serializing_if = "Vec::is_empty")]
-        embeds: Vec<Embed<Uri>>,
-    },
-    #[serde(rename = "review.comment.edit")]
-    ReviewCommentEdit {
-        review: ReviewId,
-        comment: EntryId,
-        body: String,
-        embeds: Vec<Embed<Uri>>,
-    },
-    #[serde(rename = "review.comment.redact")]
-    ReviewCommentRedact { review: ReviewId, comment: EntryId },
-    #[serde(rename = "review.comment.react")]
-    ReviewCommentReact {
-        review: ReviewId,
-        comment: EntryId,
-        reaction: Reaction,
-        active: bool,
-    },
-    #[serde(rename = "review.comment.resolve")]
-    ReviewCommentResolve { review: ReviewId, comment: EntryId },
-    #[serde(rename = "review.comment.unresolve")]
-    ReviewCommentUnresolve { review: ReviewId, comment: EntryId },
-
-    //
-    // Revision actions
-    //
-    #[serde(rename = "revision")]
-    Revision {
-        description: String,
-        base: git::Oid,
-        oid: git::Oid,
-        /// Review comments resolved by this revision.
-        #[serde(default, skip_serializing_if = "BTreeSet::is_empty")]
-        resolves: BTreeSet<(EntryId, CommentId)>,
-    },
-    #[serde(rename = "revision.edit")]
-    RevisionEdit {
-        revision: RevisionId,
-        description: String,
-        /// Embeded content.
-        #[serde(default, skip_serializing_if = "Vec::is_empty")]
-        embeds: Vec<Embed<Uri>>,
-    },
-    /// React to the revision.
-    #[serde(rename = "revision.react")]
-    RevisionReact {
-        revision: RevisionId,
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        location: Option<CodeLocation>,
-        reaction: Reaction,
-        active: bool,
-    },
-    #[serde(rename = "revision.redact")]
-    RevisionRedact { revision: RevisionId },
-    #[serde(rename_all = "camelCase")]
-    #[serde(rename = "revision.comment")]
-    RevisionComment {
-        /// The revision to comment on.
-        revision: RevisionId,
-        /// For comments on the revision code.
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        location: Option<CodeLocation>,
-        /// Comment body.
-        body: String,
-        /// Comment this is a reply to.
-        /// Should be [`None`] if it's the top-level comment.
-        /// Should be the root [`CommentId`] if it's a top-level comment.
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        reply_to: Option<CommentId>,
-        /// Embeded content.
-        #[serde(default, skip_serializing_if = "Vec::is_empty")]
-        embeds: Vec<Embed<Uri>>,
-    },
-    /// Edit a revision comment.
-    #[serde(rename = "revision.comment.edit")]
-    RevisionCommentEdit {
-        revision: RevisionId,
-        comment: CommentId,
-        body: String,
-        embeds: Vec<Embed<Uri>>,
-    },
-    /// Redact a revision comment.
-    #[serde(rename = "revision.comment.redact")]
-    RevisionCommentRedact {
-        revision: RevisionId,
-        comment: CommentId,
-    },
-    /// React to a revision comment.
-    #[serde(rename = "revision.comment.react")]
-    RevisionCommentReact {
-        revision: RevisionId,
-        comment: CommentId,
-        reaction: Reaction,
-        active: bool,
-    },
-}
-
-impl CobAction for Action {
-    fn parents(&self) -> Vec<git::Oid> {
-        match self {
-            Self::Revision { base, oid, .. } => {
-                vec![*base, *oid]
-            }
-            Self::Merge { commit, .. } => {
-                vec![*commit]
-            }
-            _ => vec![],
-        }
-    }
-}
-
-/// Output of a merge.
-#[derive(Debug)]
-#[must_use]
-pub struct Merged<'a, R> {
-    pub patch: PatchId,
-    pub entry: EntryId,
-
-    stored: &'a R,
-}
-
-impl<'a, R: WriteRepository> Merged<'a, R> {
-    /// Cleanup after merging a patch.
-    ///
-    /// This removes Git refs relating to the patch, both in the working copy,
-    /// and the stored copy; and updates `rad/sigrefs`.
-    pub fn cleanup<G: Signer>(
-        self,
-        working: &git::raw::Repository,
-        signer: &G,
-    ) -> Result<(), storage::Error> {
-        let nid = signer.public_key();
-        let stored_ref = git::refs::patch(&self.patch).with_namespace(nid.into());
-        let working_ref = git::refs::workdir::patch_upstream(&self.patch);
-
-        working
-            .find_reference(&working_ref)
-            .and_then(|mut r| r.delete())
-            .ok();
-
-        self.stored
-            .raw()
-            .find_reference(&stored_ref)
-            .and_then(|mut r| r.delete())
-            .ok();
-        self.stored.sign_refs(signer)?;
-
-        Ok(())
-    }
-}
-
-/// Where a patch is intended to be merged.
-#[derive(Default, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum MergeTarget {
-    /// Intended for the default branch of the project delegates.
-    /// Note that if the delegations change while the patch is open,
-    /// this will always mean whatever the "current" delegation set is.
-    /// If it were otherwise, patches could become un-mergeable.
-    #[default]
-    Delegates,
-}
-
-impl MergeTarget {
-    /// Get the head of the target branch.
-    pub fn head<R: ReadRepository>(&self, repo: &R) -> Result<git::Oid, RepositoryError> {
-        match self {
-            MergeTarget::Delegates => {
-                let (_, target) = repo.head()?;
-                Ok(target)
-            }
-        }
-    }
-}
-
-/// Patch state.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Patch {
-    /// Title of the patch.
-    pub(super) title: String,
-    /// Patch author.
-    pub(super) author: Author,
-    /// Current state of the patch.
-    pub(super) state: State,
-    /// Target this patch is meant to be merged in.
-    pub(super) target: MergeTarget,
-    /// Associated labels.
-    /// Labels can be added and removed at will.
-    pub(super) labels: BTreeSet<Label>,
-    /// Patch merges.
-    ///
-    /// Only one merge is allowed per user.
-    ///
-    /// Merges can be removed and replaced, but not modified. Generally, once a revision is merged,
-    /// it stays that way. Being able to remove merges may be useful in case of force updates
-    /// on the target branch.
-    pub(super) merges: BTreeMap<ActorId, Merge>,
-    /// List of patch revisions. The initial changeset is part of the
-    /// first revision.
-    ///
-    /// Revisions can be redacted, but are otherwise immutable.
-    pub(super) revisions: BTreeMap<RevisionId, Option<Revision>>,
-    /// Users assigned to review this patch.
-    pub(super) assignees: BTreeSet<ActorId>,
-    /// Timeline of operations.
-    pub(super) timeline: Vec<EntryId>,
-    /// Reviews index. Keeps track of reviews for better performance.
-    pub(super) reviews: BTreeMap<ReviewId, Option<(RevisionId, ActorId)>>,
-}
-
-impl Patch {
-    /// Construct a new patch object from a revision.
-    pub fn new(title: String, target: MergeTarget, (id, revision): (RevisionId, Revision)) -> Self {
-        Self {
-            title,
-            author: revision.author.clone(),
-            state: State::default(),
-            target,
-            labels: BTreeSet::default(),
-            merges: BTreeMap::default(),
-            revisions: BTreeMap::from_iter([(id, Some(revision))]),
-            assignees: BTreeSet::default(),
-            timeline: vec![id.into_inner()],
-            reviews: BTreeMap::default(),
-        }
-    }
-
-    /// Title of the patch.
-    pub fn title(&self) -> &str {
-        self.title.as_str()
-    }
-
-    /// Current state of the patch.
-    pub fn state(&self) -> &State {
-        &self.state
-    }
-
-    /// Target this patch is meant to be merged in.
-    pub fn target(&self) -> MergeTarget {
-        self.target
-    }
-
-    /// Timestamp of the first revision of the patch.
-    pub fn timestamp(&self) -> Timestamp {
-        self.updates()
-            .next()
-            .map(|(_, r)| r)
-            .expect("Patch::timestamp: at least one revision is present")
-            .timestamp
-    }
-
-    /// Associated labels.
-    pub fn labels(&self) -> impl Iterator<Item = &Label> {
-        self.labels.iter()
-    }
-
-    /// Patch description.
-    pub fn description(&self) -> &str {
-        let (_, r) = self.root();
-        r.description()
-    }
-
-    /// Patch embeds.
-    pub fn embeds(&self) -> &Vec<Embed<Uri>> {
-        let (_, r) = self.root();
-        r.embeds()
-    }
-
-    /// Author of the first revision of the patch.
-    pub fn author(&self) -> &Author {
-        &self.author
-    }
-
-    /// All revision authors.
-    pub fn authors(&self) -> BTreeSet<&Author> {
-        self.revisions
-            .values()
-            .filter_map(|r| r.as_ref())
-            .map(|r| &r.author)
-            .collect()
-    }
-
-    /// Get the `Revision` by its `RevisionId`.
-    ///
-    /// None is returned if the `Revision` has been redacted (deleted).
-    pub fn revision(&self, id: &RevisionId) -> Option<&Revision> {
-        self.revisions.get(id).and_then(|o| o.as_ref())
-    }
-
-    /// List of patch revisions by the patch author. The initial changeset is part of the
-    /// first revision.
-    pub fn updates(&self) -> impl DoubleEndedIterator<Item = (RevisionId, &Revision)> {
-        self.revisions_by(self.author().public_key())
-    }
-
-    /// List of all patch revisions by all authors.
-    pub fn revisions(&self) -> impl DoubleEndedIterator<Item = (RevisionId, &Revision)> {
-        self.timeline.iter().filter_map(move |id| {
-            self.revisions
-                .get(id)
-                .and_then(|o| o.as_ref())
-                .map(|rev| (RevisionId(*id), rev))
-        })
-    }
-
-    /// List of patch revisions by the given author.
-    pub fn revisions_by<'a>(
-        &'a self,
-        author: &'a PublicKey,
-    ) -> impl DoubleEndedIterator<Item = (RevisionId, &Revision)> {
-        self.revisions()
-            .filter(move |(_, r)| (r.author.public_key() == author))
-    }
-
-    /// List of patch reviews of the given revision.
-    pub fn reviews_of(&self, rev: RevisionId) -> impl Iterator<Item = (&ReviewId, &Review)> {
-        self.reviews.iter().filter_map(move |(review_id, t)| {
-            t.and_then(|(rev_id, pk)| {
-                if rev == rev_id {
-                    self.revision(&rev_id)
-                        .and_then(|r| r.review_by(&pk))
-                        .map(|r| (review_id, r))
-                } else {
-                    None
-                }
-            })
-        })
-    }
-
-    /// List of patch assignees.
-    pub fn assignees(&self) -> impl Iterator<Item = Did> + '_ {
-        self.assignees.iter().map(Did::from)
-    }
-
-    /// Get the merges.
-    pub fn merges(&self) -> impl Iterator<Item = (&ActorId, &Merge)> {
-        self.merges.iter()
-    }
-
-    /// Reference to the Git object containing the code on the latest revision.
-    pub fn head(&self) -> &git::Oid {
-        &self.latest().1.oid
-    }
-
-    /// Get the commit of the target branch on which this patch is based.
-    /// This can change via a patch update.
-    pub fn base(&self) -> &git::Oid {
-        &self.latest().1.base
-    }
-
-    /// Get the merge base of this patch.
-    pub fn merge_base<R: ReadRepository>(&self, repo: &R) -> Result<git::Oid, git::ext::Error> {
-        repo.merge_base(self.base(), self.head())
-    }
-
-    /// Get the commit range of this patch.
-    pub fn range(&self) -> Result<(git::Oid, git::Oid), git::ext::Error> {
-        return Ok((*self.base(), *self.head()));
-    }
-
-    /// Index of latest revision in the revisions list.
-    pub fn version(&self) -> RevisionIx {
-        self.revisions
-            .len()
-            .checked_sub(1)
-            .expect("Patch::version: at least one revision is present")
-    }
-
-    /// Root revision.
-    ///
-    /// This is the revision that was created with the patch.
-    pub fn root(&self) -> (RevisionId, &Revision) {
-        self.updates()
-            .next()
-            .expect("Patch::root: there is always a root revision")
-    }
-
-    /// Latest revision by the patch author.
-    pub fn latest(&self) -> (RevisionId, &Revision) {
-        self.latest_by(self.author().public_key())
-            .expect("Patch::latest: there is always at least one revision")
-    }
-
-    /// Latest revision by the given author.
-    pub fn latest_by<'a>(&'a self, author: &'a PublicKey) -> Option<(RevisionId, &Revision)> {
-        self.revisions_by(author).next_back()
-    }
-
-    /// Time of last update.
-    pub fn updated_at(&self) -> Timestamp {
-        self.latest().1.timestamp()
-    }
-
-    /// Check if the patch is merged.
-    pub fn is_merged(&self) -> bool {
-        matches!(self.state(), State::Merged { .. })
-    }
-
-    /// Check if the patch is open.
-    pub fn is_open(&self) -> bool {
-        matches!(self.state(), State::Open { .. })
-    }
-
-    /// Check if the patch is archived.
-    pub fn is_archived(&self) -> bool {
-        matches!(self.state(), State::Archived)
-    }
-
-    /// Check if the patch is a draft.
-    pub fn is_draft(&self) -> bool {
-        matches!(self.state(), State::Draft)
-    }
-
-    /// Apply authorization rules on patch actions.
-    pub fn authorization(
-        &self,
-        action: &Action,
-        actor: &ActorId,
-        doc: &Doc<Verified>,
-    ) -> Result<Authorization, Error> {
-        if doc.is_delegate(actor) {
-            // A delegate is authorized to do all actions.
-            return Ok(Authorization::Allow);
-        }
-        let author = self.author().id().as_key();
-        let outcome = match action {
-            // The patch author can edit the patch and change its state.
-            Action::Edit { .. } => Authorization::from(actor == author),
-            Action::Lifecycle { state } => Authorization::from(match state {
-                Lifecycle::Open { .. } => actor == author,
-                Lifecycle::Draft { .. } => actor == author,
-                Lifecycle::Archived { .. } => actor == author,
-            }),
-            // Only delegates can carry out these actions.
-            Action::Label { labels } => {
-                if labels == &self.labels {
-                    // No-op is allowed for backwards compatibility.
-                    Authorization::Allow
-                } else {
-                    Authorization::Deny
-                }
-            }
-            Action::Assign { .. } => Authorization::Deny,
-            Action::Merge { .. } => match self.target() {
-                MergeTarget::Delegates => Authorization::Deny,
-            },
-            // Anyone can submit a review.
-            Action::Review { .. } => Authorization::Allow,
-            Action::ReviewRedact { review, .. } => {
-                if let Some((_, review)) = lookup::review(self, review)? {
-                    Authorization::from(actor == review.author.public_key())
-                } else {
-                    // Redacted.
-                    Authorization::Unknown
-                }
-            }
-            // Anyone can comment on a review.
-            Action::ReviewComment { .. } => Authorization::Allow,
-            // The comment author can edit and redact their own comment.
-            Action::ReviewCommentEdit {
-                review, comment, ..
-            }
-            | Action::ReviewCommentRedact { review, comment } => {
-                if let Some((_, review)) = lookup::review(self, review)? {
-                    if let Some(comment) = review.comments.comment(comment) {
-                        return Ok(Authorization::from(*actor == comment.author()));
-                    }
-                }
-                // Redacted.
-                Authorization::Unknown
-            }
-            // Anyone can react to a review comment.
-            Action::ReviewCommentReact { .. } => Authorization::Allow,
-            // The reviewer, commenter or revision author can resolve and unresolve review comments.
-            Action::ReviewCommentResolve { review, comment }
-            | Action::ReviewCommentUnresolve { review, comment } => {
-                if let Some((revision, review)) = lookup::review(self, review)? {
-                    if let Some(comment) = review.comments.comment(comment) {
-                        return Ok(Authorization::from(
-                            actor == &comment.author()
-                                || actor == review.author.public_key()
-                                || actor == revision.author.public_key(),
-                        ));
-                    }
-                }
-                // Redacted.
-                Authorization::Unknown
-            }
-            // Anyone can propose revisions.
-            Action::Revision { .. } => Authorization::Allow,
-            // Only the revision author can edit or redact their revision.
-            Action::RevisionEdit { revision, .. } | Action::RevisionRedact { revision, .. } => {
-                if let Some(revision) = lookup::revision(self, revision)? {
-                    Authorization::from(actor == revision.author.public_key())
-                } else {
-                    // Redacted.
-                    Authorization::Unknown
-                }
-            }
-            // Anyone can react to or comment on a revision.
-            Action::RevisionReact { .. } => Authorization::Allow,
-            Action::RevisionComment { .. } => Authorization::Allow,
-            // Only the comment author can edit or redact their comment.
-            Action::RevisionCommentEdit {
-                revision, comment, ..
-            }
-            | Action::RevisionCommentRedact {
-                revision, comment, ..
-            } => {
-                if let Some(revision) = lookup::revision(self, revision)? {
-                    if let Some(comment) = revision.discussion.comment(comment) {
-                        return Ok(Authorization::from(actor == &comment.author()));
-                    }
-                }
-                // Redacted.
-                Authorization::Unknown
-            }
-            // Anyone can react to a revision.
-            Action::RevisionCommentReact { .. } => Authorization::Allow,
-        };
-        Ok(outcome)
-    }
-}
-
-impl Patch {
-    /// Apply a single action to the patch.
-    fn action<R: ReadRepository>(
-        &mut self,
-        action: Action,
-        entry: EntryId,
-        author: ActorId,
-        timestamp: Timestamp,
-        _concurrent: &[&cob::Entry],
-        identity: &Doc<Verified>,
-        repo: &R,
-    ) -> Result<(), Error> {
-        match action {
-            Action::Edit { title, target } => {
-                self.title = title;
-                self.target = target;
-            }
-            Action::Lifecycle { state } => {
-                let valid = self.state == State::Draft
-                    || self.state == State::Archived
-                    || self.state == State::Open { conflicts: vec![] };
-
-                if valid {
-                    match state {
-                        Lifecycle::Open => {
-                            self.state = State::Open { conflicts: vec![] };
-                        }
-                        Lifecycle::Draft => {
-                            self.state = State::Draft;
-                        }
-                        Lifecycle::Archived => {
-                            self.state = State::Archived;
-                        }
-                    }
-                }
-            }
-            Action::Label { labels } => {
-                self.labels = BTreeSet::from_iter(labels);
-            }
-            Action::Assign { assignees } => {
-                self.assignees = BTreeSet::from_iter(assignees.into_iter().map(ActorId::from));
-            }
-            Action::RevisionEdit {
-                revision,
-                description,
-                embeds,
-            } => {
-                if let Some(redactable) = self.revisions.get_mut(&revision) {
-                    // If the revision was redacted concurrently, there's nothing to do.
-                    if let Some(revision) = redactable {
-                        revision.description.push(Edit::new(
-                            author,
-                            description,
-                            timestamp,
-                            embeds,
-                        ));
-                    }
-                } else {
-                    return Err(Error::Missing(revision.into_inner()));
-                }
-            }
-            Action::Revision {
-                description,
-                base,
-                oid,
-                resolves,
-            } => {
-                debug_assert!(!self.revisions.contains_key(&entry));
-                let id = RevisionId(entry);
-
-                self.revisions.insert(
-                    id,
-                    Some(Revision::new(
-                        id,
-                        author.into(),
-                        description,
-                        base,
-                        oid,
-                        timestamp,
-                        resolves,
-                    )),
-                );
-            }
-            Action::RevisionReact {
-                revision,
-                reaction,
-                active,
-                location,
-            } => {
-                if let Some(revision) = lookup::revision_mut(self, &revision)? {
-                    let key = (author, reaction);
-                    let reactions = revision.reactions.entry(location).or_default();
-
-                    if active {
-                        reactions.insert(key);
-                    } else {
-                        reactions.remove(&key);
-                    }
-                }
-            }
-            Action::RevisionRedact { revision } => {
-                // Not allowed to delete the root revision.
-                let (root, _) = self.root();
-                if revision == root {
-                    return Err(Error::NotAllowed(entry));
-                }
-                // Redactions must have observed a revision to be valid.
-                if let Some(r) = self.revisions.get_mut(&revision) {
-                    // If the revision has already been merged, ignore the redaction. We
-                    // don't want to redact merged revisions.
-                    if self.merges.values().any(|m| m.revision == revision) {
-                        return Ok(());
-                    }
-                    *r = None;
-                } else {
-                    return Err(Error::Missing(revision.into_inner()));
-                }
-            }
-            Action::Review {
-                revision,
-                ref summary,
-                verdict,
-                labels,
-            } => {
-                let Some(rev) = self.revisions.get_mut(&revision) else {
-                    // If the revision was redacted concurrently, there's nothing to do.
-                    return Ok(());
-                };
-                if summary.is_none() && verdict.is_none() {
-                    return Err(Error::EmptyReview);
-                }
-                if let Some(rev) = rev {
-                    let id = ReviewId(entry);
-                    let review = Review::new(
-                        id,
-                        Author::new(author),
-                        verdict,
-                        summary.to_owned(),
-                        labels,
-                        timestamp,
-                    );
-                    rev.reviews.entry(author).or_default().push(review);
-                    // Update reviews index. The latest review is what matters, the older
-                    // ones are kept for history.
-                    self.reviews.insert(id, Some((revision, author)));
-                }
-            }
-            Action::ReviewCommentReact {
-                review,
-                comment,
-                reaction,
-                active,
-            } => {
-                if let Some(review) = lookup::review_mut(self, &review)? {
-                    thread::react(
-                        &mut review.comments,
-                        entry,
-                        author,
-                        comment,
-                        reaction,
-                        active,
-                    )?;
-                }
-            }
-            Action::ReviewCommentRedact { review, comment } => {
-                if let Some(review) = lookup::review_mut(self, &review)? {
-                    thread::redact(&mut review.comments, entry, comment)?;
-                }
-            }
-            Action::ReviewCommentEdit {
-                review,
-                comment,
-                body,
-                embeds,
-            } => {
-                if let Some(review) = lookup::review_mut(self, &review)? {
-                    thread::edit(
-                        &mut review.comments,
-                        entry,
-                        author,
-                        comment,
-                        timestamp,
-                        body,
-                        embeds,
-                    )?;
-                }
-            }
-            Action::ReviewCommentResolve { review, comment } => {
-                if let Some(review) = lookup::review_mut(self, &review)? {
-                    thread::resolve(&mut review.comments, entry, comment)?;
-                }
-            }
-            Action::ReviewCommentUnresolve { review, comment } => {
-                if let Some(review) = lookup::review_mut(self, &review)? {
-                    thread::unresolve(&mut review.comments, entry, comment)?;
-                }
-            }
-            Action::ReviewComment {
-                review,
-                body,
-                location,
-                reply_to,
-                embeds,
-            } => {
-                if let Some(review) = lookup::review_mut(self, &review)? {
-                    thread::comment(
-                        &mut review.comments,
-                        entry,
-                        author,
-                        timestamp,
-                        body,
-                        reply_to,
-                        location,
-                        embeds,
-                    )?;
-                }
-            }
-            Action::ReviewRedact { review } => {
-                // Redactions must have observed a review to be valid.
-                let Some(locator) = self.reviews.get_mut(&review) else {
-                    return Err(Error::Missing(review.into_inner()));
-                };
-                // If the review is already redacted, do nothing.
-                let Some((revision, reviewer)) = locator else {
-                    return Ok(());
-                };
-                // The revision must have existed at some point.
-                let Some(redactable) = self.revisions.get_mut(revision) else {
-                    return Err(Error::Missing(revision.into_inner()));
-                };
-                // But it could be redacted.
-                let Some(revision) = redactable else {
-                    return Ok(());
-                };
-                // The reviews may have been removed concurrently.
-                let Some(reviews) = revision.reviews.get_mut(reviewer) else {
-                    return Ok(());
-                };
-                // Remove matching reviews for this author (there should only be one).
-                reviews.retain(|r| r.id != review);
-                // Set the review locator in the review index to redacted.
-                *locator = None;
-            }
-            Action::Merge { revision, commit } => {
-                // If the revision was redacted before the merge, ignore the merge.
-                if lookup::revision_mut(self, &revision)?.is_none() {
-                    return Ok(());
-                };
-                match self.target() {
-                    MergeTarget::Delegates => {
-                        let proj = identity.project()?;
-                        let branch = git::refs::branch(proj.default_branch());
-
-                        // Nb. We don't return an error in case the merge commit is not an
-                        // ancestor of the default branch. The default branch can change
-                        // *after* the merge action is created, which is out of the control
-                        // of the merge author. We simply skip it, which allows archiving in
-                        // case of a rebase off the master branch, or a redaction of the
-                        // merge.
-                        let Ok(head) = repo.reference_oid(&author, &branch) else {
-                            return Ok(());
-                        };
-                        if commit != head && !repo.is_ancestor_of(commit, head)? {
-                            return Ok(());
-                        }
-                    }
-                }
-                self.merges.insert(
-                    author,
-                    Merge {
-                        revision,
-                        commit,
-                        timestamp,
-                    },
-                );
-
-                let mut merges = self.merges.iter().fold(
-                    HashMap::<(RevisionId, git::Oid), usize>::new(),
-                    |mut acc, (_, merge)| {
-                        *acc.entry((merge.revision, merge.commit)).or_default() += 1;
-                        acc
-                    },
-                );
-                // Discard revisions that weren't merged by a threshold of delegates.
-                merges.retain(|_, count| *count >= identity.threshold);
-
-                match merges.into_keys().collect::<Vec<_>>().as_slice() {
-                    [] => {
-                        // None of the revisions met the quorum.
-                    }
-                    [(revision, commit)] => {
-                        // Patch is merged.
-                        self.state = State::Merged {
-                            revision: *revision,
-                            commit: *commit,
-                        };
-                    }
-                    revisions => {
-                        // More than one revision met the quorum.
-                        self.state = State::Open {
-                            conflicts: revisions.to_vec(),
-                        };
-                    }
-                }
-            }
-
-            Action::RevisionComment {
-                revision,
-                body,
-                reply_to,
-                embeds,
-                location,
-            } => {
-                if let Some(revision) = lookup::revision_mut(self, &revision)? {
-                    thread::comment(
-                        &mut revision.discussion,
-                        entry,
-                        author,
-                        timestamp,
-                        body,
-                        reply_to,
-                        location,
-                        embeds,
-                    )?;
-                }
-            }
-            Action::RevisionCommentEdit {
-                revision,
-                comment,
-                body,
-                embeds,
-            } => {
-                if let Some(revision) = lookup::revision_mut(self, &revision)? {
-                    thread::edit(
-                        &mut revision.discussion,
-                        entry,
-                        author,
-                        comment,
-                        timestamp,
-                        body,
-                        embeds,
-                    )?;
-                }
-            }
-            Action::RevisionCommentRedact { revision, comment } => {
-                if let Some(revision) = lookup::revision_mut(self, &revision)? {
-                    thread::redact(&mut revision.discussion, entry, comment)?;
-                }
-            }
-            Action::RevisionCommentReact {
-                revision,
-                comment,
-                reaction,
-                active,
-            } => {
-                if let Some(revision) = lookup::revision_mut(self, &revision)? {
-                    thread::react(
-                        &mut revision.discussion,
-                        entry,
-                        author,
-                        comment,
-                        reaction,
-                        active,
-                    )?;
-                }
-            }
-        }
-        Ok(())
-    }
-}
-
-impl store::Cob for Patch {
-    type Action = Action;
-    type Error = Error;
-
-    fn type_name() -> &'static TypeName {
-        &TYPENAME
-    }
-
-    fn from_root<R: ReadRepository>(op: Op, repo: &R) -> Result<Self, Self::Error> {
-        let doc = op.identity_doc(repo)?.ok_or(Error::MissingIdentity)?;
-        let mut actions = op.actions.into_iter();
-        let Some(Action::Revision {
-            description,
-            base,
-            oid,
-            resolves,
-        }) = actions.next()
-        else {
-            return Err(Error::Init("the first action must be of type `revision`"));
-        };
-        let Some(Action::Edit { title, target }) = actions.next() else {
-            return Err(Error::Init("the second action must be of type `edit`"));
-        };
-        let revision = Revision::new(
-            RevisionId(op.id),
-            op.author.into(),
-            description,
-            base,
-            oid,
-            op.timestamp,
-            resolves,
-        );
-        let mut patch = Patch::new(title, target, (RevisionId(op.id), revision));
-
-        for action in actions {
-            match patch.authorization(&action, &op.author, &doc)? {
-                Authorization::Allow => {
-                    patch.action(action, op.id, op.author, op.timestamp, &[], &doc, repo)?;
-                }
-                Authorization::Deny => {
-                    return Err(Error::NotAuthorized(op.author, action));
-                }
-                Authorization::Unknown => {
-                    // Note that this shouldn't really happen since there's no concurrency in the
-                    // root operation.
-                    continue;
-                }
-            }
-        }
-        Ok(patch)
-    }
-
-    fn op<'a, R: ReadRepository, I: IntoIterator<Item = &'a cob::Entry>>(
-        &mut self,
-        op: Op,
-        concurrent: I,
-        repo: &R,
-    ) -> Result<(), Error> {
-        debug_assert!(!self.timeline.contains(&op.id));
-        self.timeline.push(op.id);
-
-        let doc = op.identity_doc(repo)?.ok_or(Error::MissingIdentity)?;
-        let concurrent = concurrent.into_iter().collect::<Vec<_>>();
-
-        for action in op.actions {
-            match self.authorization(&action, &op.author, &doc)? {
-                Authorization::Allow => {
-                    self.action(
-                        action,
-                        op.id,
-                        op.author,
-                        op.timestamp,
-                        &concurrent,
-                        &doc,
-                        repo,
-                    )?;
-                }
-                Authorization::Deny => {
-                    return Err(Error::NotAuthorized(op.author, action));
-                }
-                Authorization::Unknown => {
-                    // In this case, since there is not enough information to determine
-                    // whether the action is authorized or not, we simply ignore it.
-                    // It's likely that the target object was redacted, and we can't
-                    // verify whether the action would have been allowed or not.
-                    continue;
-                }
-            }
-        }
-        Ok(())
-    }
-}
-
-impl<R: ReadRepository> cob::Evaluate<R> for Patch {
-    type Error = Error;
-
-    fn init(entry: &cob::Entry, repo: &R) -> Result<Self, Self::Error> {
-        let op = Op::try_from(entry)?;
-        let object = Patch::from_root(op, repo)?;
-
-        Ok(object)
-    }
-
-    fn apply<'a, I: Iterator<Item = (&'a EntryId, &'a cob::Entry)>>(
-        &mut self,
-        entry: &cob::Entry,
-        concurrent: I,
-        repo: &R,
-    ) -> Result<(), Self::Error> {
-        let op = Op::try_from(entry)?;
-
-        self.op(op, concurrent.map(|(_, e)| e), repo)
-    }
-}
-
-mod lookup {
-    use super::*;
-
-    pub fn revision<'a>(
-        patch: &'a Patch,
-        revision: &RevisionId,
-    ) -> Result<Option<&'a Revision>, Error> {
-        match patch.revisions.get(revision) {
-            Some(Some(revision)) => Ok(Some(revision)),
-            // Redacted.
-            Some(None) => Ok(None),
-            // Missing. Causal error.
-            None => Err(Error::Missing(revision.into_inner())),
-        }
-    }
-
-    pub fn revision_mut<'a>(
-        patch: &'a mut Patch,
-        revision: &RevisionId,
-    ) -> Result<Option<&'a mut Revision>, Error> {
-        match patch.revisions.get_mut(revision) {
-            Some(Some(revision)) => Ok(Some(revision)),
-            // Redacted.
-            Some(None) => Ok(None),
-            // Missing. Causal error.
-            None => Err(Error::Missing(revision.into_inner())),
-        }
-    }
-
-    pub fn review<'a>(
-        patch: &'a Patch,
-        review: &ReviewId,
-    ) -> Result<Option<(&'a Revision, &'a Review)>, Error> {
-        match patch.reviews.get(review) {
-            Some(Some((revision, author))) => {
-                match patch.revisions.get(revision) {
-                    Some(Some(r)) => {
-                        let Some(reviews) = r.reviews.get(author) else {
-                            return Err(Error::Missing(review.into_inner()));
-                        };
-                        Ok(reviews
-                            .iter()
-                            .find(|r| &r.id == review)
-                            .map(|review| (r, review)))
-                    }
-                    Some(None) => {
-                        // If the revision was redacted concurrently, there's nothing to do.
-                        // Likewise, if the review was redacted concurrently, there's nothing to do.
-                        Ok(None)
-                    }
-                    None => Err(Error::Missing(revision.into_inner())),
-                }
-            }
-            Some(None) => {
-                // Redacted.
-                Ok(None)
-            }
-            None => Err(Error::Missing(review.into_inner())),
-        }
-    }
-
-    pub fn review_mut<'a>(
-        patch: &'a mut Patch,
-        review: &ReviewId,
-    ) -> Result<Option<&'a mut Review>, Error> {
-        match patch.reviews.get(review) {
-            Some(Some((revision, author))) => {
-                match patch.revisions.get_mut(revision) {
-                    Some(Some(r)) => {
-                        let Some(reviews) = r.reviews.get_mut(author) else {
-                            return Err(Error::Missing(review.into_inner()));
-                        };
-                        Ok(reviews.iter_mut().find(|r| &r.id == review))
-                    }
-                    Some(None) => {
-                        // If the revision was redacted concurrently, there's nothing to do.
-                        // Likewise, if the review was redacted concurrently, there's nothing to do.
-                        Ok(None)
-                    }
-                    None => Err(Error::Missing(revision.into_inner())),
-                }
-            }
-            Some(None) => {
-                // Redacted.
-                Ok(None)
-            }
-            None => Err(Error::Missing(review.into_inner())),
-        }
-    }
-}
-
-/// A patch revision.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Revision {
-    /// Revision identifier.
-    pub(super) id: RevisionId,
-    /// Author of the revision.
-    pub(super) author: Author,
-    /// Revision description.
-    pub(super) description: NonEmpty<Edit>,
-    /// Base branch commit, used as a merge base.
-    pub(super) base: git::Oid,
-    /// Reference to the Git object containing the code (revision head).
-    pub(super) oid: git::Oid,
-    /// Discussion around this revision.
-    pub(super) discussion: Thread<Comment<CodeLocation>>,
-    /// Reviews of this revision's changes (all review edits are kept).
-    pub(super) reviews: BTreeMap<ActorId, Vec<Review>>,
-    /// When this revision was created.
-    pub(super) timestamp: Timestamp,
-    /// Review comments resolved by this revision.
-    pub(super) resolves: BTreeSet<(EntryId, CommentId)>,
-    /// Reactions on code locations and revision itself
-    #[serde(
-        serialize_with = "ser::serialize_reactions",
-        deserialize_with = "ser::deserialize_reactions"
-    )]
-    pub(super) reactions: BTreeMap<Option<CodeLocation>, Reactions>,
-}
-
-impl Revision {
-    pub fn new(
-        id: RevisionId,
-        author: Author,
-        description: String,
-        base: git::Oid,
-        oid: git::Oid,
-        timestamp: Timestamp,
-        resolves: BTreeSet<(EntryId, CommentId)>,
-    ) -> Self {
-        let description = Edit::new(*author.public_key(), description, timestamp, Vec::default());
-
-        Self {
-            id,
-            author,
-            description: NonEmpty::new(description),
-            base,
-            oid,
-            discussion: Thread::default(),
-            reviews: BTreeMap::default(),
-            timestamp,
-            resolves,
-            reactions: Default::default(),
-        }
-    }
-
-    pub fn id(&self) -> RevisionId {
-        self.id
-    }
-
-    pub fn description(&self) -> &str {
-        self.description.last().body.as_str()
-    }
-
-    pub fn edits(&self) -> impl Iterator<Item = &Edit> {
-        self.description.iter()
-    }
-
-    pub fn embeds(&self) -> &Vec<Embed<Uri>> {
-        &self.description.last().embeds
-    }
-
-    pub fn reactions(&self) -> &BTreeMap<Option<CodeLocation>, BTreeSet<(PublicKey, Reaction)>> {
-        &self.reactions
-    }
-
-    /// Author of the revision.
-    pub fn author(&self) -> &Author {
-        &self.author
-    }
-
-    /// Base branch commit, used as a merge base.
-    pub fn base(&self) -> &git::Oid {
-        &self.base
-    }
-
-    /// Reference to the Git object containing the code (revision head).
-    pub fn head(&self) -> git::Oid {
-        self.oid
-    }
-
-    /// Get the commit range of this revision.
-    pub fn range(&self) -> (git::Oid, git::Oid) {
-        (self.base, self.oid)
-    }
-
-    /// When this revision was created.
-    pub fn timestamp(&self) -> Timestamp {
-        self.timestamp
-    }
-
-    /// Discussion around this revision.
-    pub fn discussion(&self) -> &Thread<Comment<CodeLocation>> {
-        &self.discussion
-    }
-
-    /// Iterate over all top-level replies.
-    pub fn replies(&self) -> impl Iterator<Item = (&CommentId, &thread::Comment<CodeLocation>)> {
-        self.discussion.comments()
-    }
-
-    /// Reviews of this revision's changes (one per actor).
-    pub fn reviews(&self) -> impl DoubleEndedIterator<Item = (&PublicKey, &Review)> {
-        self.reviews
-            .iter()
-            .filter_map(|(author, review)| review.last().map(|r| (author, r)))
-    }
-
-    /// Get a review by author.
-    pub fn review_by(&self, author: &ActorId) -> Option<&Review> {
-        self.reviews.get(author).and_then(|o| o.last())
-    }
-
-    /// Get the chronological review history of an author.
-    pub fn review_history_by(&self, author: &ActorId) -> &[Review] {
-        self.reviews
-            .get(author)
-            .map(|r| r.as_slice())
-            .unwrap_or(&[])
-    }
-}
-
-/// Patch state.
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", tag = "status")]
-pub enum State {
-    Draft,
-    Open {
-        /// Revisions that were merged and are conflicting.
-        #[serde(skip_serializing_if = "Vec::is_empty")]
-        #[serde(default)]
-        conflicts: Vec<(RevisionId, git::Oid)>,
-    },
-    Archived,
-    Merged {
-        /// The revision that was merged.
-        revision: RevisionId,
-        /// The commit in the target branch that contains the changes.
-        commit: git::Oid,
-    },
-}
-
-impl Default for State {
-    fn default() -> Self {
-        Self::Open { conflicts: vec![] }
-    }
-}
-
-impl fmt::Display for State {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Archived => write!(f, "archived"),
-            Self::Draft => write!(f, "draft"),
-            Self::Open { .. } => write!(f, "open"),
-            Self::Merged { .. } => write!(f, "merged"),
-        }
-    }
-}
-
-impl From<&State> for Status {
-    fn from(value: &State) -> Self {
-        match value {
-            State::Draft => Self::Draft,
-            State::Open { .. } => Self::Open,
-            State::Archived => Self::Archived,
-            State::Merged { .. } => Self::Merged,
-        }
-    }
-}
-
-/// A simplified enumeration of a [`State`] that can be used for
-/// filtering purposes.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-pub enum Status {
-    Draft,
-    #[default]
-    Open,
-    Archived,
-    Merged,
-}
-
-impl fmt::Display for Status {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Archived => write!(f, "archived"),
-            Self::Draft => write!(f, "draft"),
-            Self::Open => write!(f, "open"),
-            Self::Merged => write!(f, "merged"),
-        }
-    }
-}
-
-/// A lifecycle operation, resulting in a new state.
-#[derive(Default, Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", tag = "status")]
-pub enum Lifecycle {
-    #[default]
-    Open,
-    Draft,
-    Archived,
-}
-
-/// A merged patch revision.
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
-#[serde(rename_all = "camelCase")]
-pub struct Merge {
-    /// Revision that was merged.
-    pub revision: RevisionId,
-    /// Base branch commit that contains the revision.
-    pub commit: git::Oid,
-    /// When this merge was performed.
-    pub timestamp: Timestamp,
-}
-
-/// A patch review verdict.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Verdict {
-    /// Accept patch.
-    Accept,
-    /// Reject patch.
-    Reject,
-}
-
-impl fmt::Display for Verdict {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Accept => write!(f, "accept"),
-            Self::Reject => write!(f, "reject"),
-        }
-    }
-}
-
-/// A patch review on a revision.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Review {
-    /// Review identifier.
-    pub(super) id: ReviewId,
-    /// Review author.
-    pub(super) author: Author,
-    /// Review verdict.
-    ///
-    /// The verdict cannot be changed, since revisions are immutable.
-    pub(super) verdict: Option<Verdict>,
-    /// Review summary.
-    ///
-    /// Can be edited or set to `None`.
-    pub(super) summary: Option<String>,
-    /// Review comments.
-    pub(super) comments: Thread<Comment<CodeLocation>>,
-    /// Labels qualifying the review. For example if this review only looks at the
-    /// concept or intention of the patch, it could have a "concept" label.
-    pub(super) labels: Vec<Label>,
-    /// Review timestamp.
-    pub(super) timestamp: Timestamp,
-}
-
-impl Review {
-    pub fn new(
-        id: ReviewId,
-        author: Author,
-        verdict: Option<Verdict>,
-        summary: Option<String>,
-        labels: Vec<Label>,
-        timestamp: Timestamp,
-    ) -> Self {
-        Self {
-            id,
-            author,
-            verdict,
-            summary,
-            comments: Thread::default(),
-            labels,
-            timestamp,
-        }
-    }
-
-    /// Review identifier.
-    pub fn id(&self) -> ReviewId {
-        self.id
-    }
-
-    /// Review author.
-    pub fn author(&self) -> &Author {
-        &self.author
-    }
-
-    /// Review verdict.
-    pub fn verdict(&self) -> Option<Verdict> {
-        self.verdict
-    }
-
-    /// Review inline code comments.
-    pub fn comments(&self) -> impl DoubleEndedIterator<Item = (&EntryId, &Comment<CodeLocation>)> {
-        self.comments.comments()
-    }
-
-    /// Review general comment.
-    pub fn summary(&self) -> Option<&str> {
-        self.summary.as_deref()
-    }
-
-    /// Review timestamp.
-    pub fn timestamp(&self) -> Timestamp {
-        self.timestamp
-    }
-}
-
-impl<R: ReadRepository> store::Transaction<Patch, R> {
-    pub fn edit(&mut self, title: impl ToString, target: MergeTarget) -> Result<(), store::Error> {
-        self.push(Action::Edit {
-            title: title.to_string(),
-            target,
-        })
-    }
-
-    pub fn edit_revision(
-        &mut self,
-        revision: RevisionId,
-        description: impl ToString,
-        embeds: Vec<Embed>,
-    ) -> Result<(), store::Error> {
-        let hashed = embeds.iter().map(|e| e.hashed()).collect();
-
-        self.embed(embeds)?;
-        self.push(Action::RevisionEdit {
-            revision,
-            description: description.to_string(),
-            embeds: hashed,
-        })
-    }
-
-    /// Redact the revision.
-    pub fn redact(&mut self, revision: RevisionId) -> Result<(), store::Error> {
-        self.push(Action::RevisionRedact { revision })
-    }
-
-    /// Start a patch revision discussion.
-    pub fn thread<S: ToString>(
-        &mut self,
-        revision: RevisionId,
-        body: S,
-    ) -> Result<(), store::Error> {
-        self.push(Action::RevisionComment {
-            revision,
-            body: body.to_string(),
-            reply_to: None,
-            location: None,
-            embeds: vec![],
-        })
-    }
-
-    /// React on a patch revision.
-    pub fn react(
-        &mut self,
-        revision: RevisionId,
-        reaction: Reaction,
-        location: Option<CodeLocation>,
-        active: bool,
-    ) -> Result<(), store::Error> {
-        self.push(Action::RevisionReact {
-            revision,
-            reaction,
-            location,
-            active,
-        })
-    }
-
-    /// Comment on a patch revision.
-    pub fn comment<S: ToString>(
-        &mut self,
-        revision: RevisionId,
-        body: S,
-        reply_to: Option<CommentId>,
-        location: Option<CodeLocation>,
-        embeds: Vec<Embed>,
-    ) -> Result<(), store::Error> {
-        let hashed = embeds.iter().map(|e| e.hashed()).collect();
-
-        self.embed(embeds)?;
-        self.push(Action::RevisionComment {
-            revision,
-            body: body.to_string(),
-            reply_to,
-            location,
-            embeds: hashed,
-        })
-    }
-
-    /// Edit a comment on a patch revision.
-    pub fn comment_edit<S: ToString>(
-        &mut self,
-        revision: RevisionId,
-        comment: CommentId,
-        body: S,
-        embeds: Vec<Embed>,
-    ) -> Result<(), store::Error> {
-        let hashed = embeds.iter().map(|e| e.hashed()).collect();
-
-        self.embed(embeds)?;
-        self.push(Action::RevisionCommentEdit {
-            revision,
-            comment,
-            body: body.to_string(),
-            embeds: hashed,
-        })
-    }
-
-    /// React a comment on a patch revision.
-    pub fn comment_react(
-        &mut self,
-        revision: RevisionId,
-        comment: CommentId,
-        reaction: Reaction,
-        active: bool,
-    ) -> Result<(), store::Error> {
-        self.push(Action::RevisionCommentReact {
-            revision,
-            comment,
-            reaction,
-            active,
-        })
-    }
-
-    /// Redact a comment on a patch revision.
-    pub fn comment_redact(
-        &mut self,
-        revision: RevisionId,
-        comment: CommentId,
-    ) -> Result<(), store::Error> {
-        self.push(Action::RevisionCommentRedact { revision, comment })
-    }
-
-    /// Comment on a review.
-    pub fn review_comment<S: ToString>(
-        &mut self,
-        review: ReviewId,
-        body: S,
-        location: Option<CodeLocation>,
-        reply_to: Option<CommentId>,
-        embeds: Vec<Embed>,
-    ) -> Result<(), store::Error> {
-        let hashed = embeds.iter().map(|e| e.hashed()).collect();
-        self.embed(embeds)?;
-
-        self.push(Action::ReviewComment {
-            review,
-            body: body.to_string(),
-            location,
-            reply_to,
-            embeds: hashed,
-        })
-    }
-
-    /// Resolve a review comment.
-    pub fn review_comment_resolve(
-        &mut self,
-        review: ReviewId,
-        comment: CommentId,
-    ) -> Result<(), store::Error> {
-        self.push(Action::ReviewCommentResolve { review, comment })
-    }
-
-    /// Unresolve a review comment.
-    pub fn review_comment_unresolve(
-        &mut self,
-        review: ReviewId,
-        comment: CommentId,
-    ) -> Result<(), store::Error> {
-        self.push(Action::ReviewCommentUnresolve { review, comment })
-    }
-
-    /// Edit review comment.
-    pub fn edit_review_comment<S: ToString>(
-        &mut self,
-        review: ReviewId,
-        comment: EntryId,
-        body: S,
-        embeds: Vec<Embed>,
-    ) -> Result<(), store::Error> {
-        let hashed = embeds.iter().map(|e| e.hashed()).collect();
-
-        self.embed(embeds)?;
-        self.push(Action::ReviewCommentEdit {
-            review,
-            comment,
-            body: body.to_string(),
-            embeds: hashed,
-        })
-    }
-
-    /// React to a review comment.
-    pub fn react_review_comment(
-        &mut self,
-        review: ReviewId,
-        comment: EntryId,
-        reaction: Reaction,
-        active: bool,
-    ) -> Result<(), store::Error> {
-        self.push(Action::ReviewCommentReact {
-            review,
-            comment,
-            reaction,
-            active,
-        })
-    }
-
-    /// Redact a review comment.
-    pub fn redact_review_comment(
-        &mut self,
-        review: ReviewId,
-        comment: EntryId,
-    ) -> Result<(), store::Error> {
-        self.push(Action::ReviewCommentRedact { review, comment })
-    }
-
-    /// Review a patch revision.
-    /// Overwrites an existing review for that revision, if any.
-    pub fn review(
-        &mut self,
-        revision: RevisionId,
-        verdict: Option<Verdict>,
-        summary: Option<String>,
-        labels: Vec<Label>,
-    ) -> Result<(), store::Error> {
-        self.push(Action::Review {
-            revision,
-            summary,
-            verdict,
-            labels,
-        })
-    }
-
-    /// Redact a patch review.
-    pub fn redact_review(&mut self, review: ReviewId) -> Result<(), store::Error> {
-        self.push(Action::ReviewRedact { review })
-    }
-
-    /// Merge a patch revision.
-    pub fn merge(&mut self, revision: RevisionId, commit: git::Oid) -> Result<(), store::Error> {
-        self.push(Action::Merge { revision, commit })
-    }
-
-    /// Update a patch with a new revision.
-    pub fn revision(
-        &mut self,
-        description: impl ToString,
-        base: impl Into<git::Oid>,
-        oid: impl Into<git::Oid>,
-    ) -> Result<(), store::Error> {
-        self.push(Action::Revision {
-            description: description.to_string(),
-            base: base.into(),
-            oid: oid.into(),
-            resolves: BTreeSet::new(),
-        })
-    }
-
-    /// Lifecycle a patch.
-    pub fn lifecycle(&mut self, state: Lifecycle) -> Result<(), store::Error> {
-        self.push(Action::Lifecycle { state })
-    }
-
-    /// Assign a patch.
-    pub fn assign(&mut self, assignees: BTreeSet<Did>) -> Result<(), store::Error> {
-        self.push(Action::Assign { assignees })
-    }
-
-    /// Label a patch.
-    pub fn label(&mut self, labels: impl IntoIterator<Item = Label>) -> Result<(), store::Error> {
-        self.push(Action::Label {
-            labels: labels.into_iter().collect(),
-        })
-    }
-}
-
-pub struct PatchMut<'a, 'g, R, C> {
-    pub id: ObjectId,
-
-    patch: Patch,
-    store: &'g mut Patches<'a, R>,
-    cache: &'g mut C,
-}
-
-impl<'a, 'g, R, C> PatchMut<'a, 'g, R, C>
-where
-    C: cob::cache::Update<Patch>,
-    R: ReadRepository + SignRepository + cob::Store,
-{
-    pub fn new(id: ObjectId, patch: Patch, cache: &'g mut Cache<Patches<'a, R>, C>) -> Self {
-        Self {
-            id,
-            patch,
-            store: &mut cache.store,
-            cache: &mut cache.cache,
-        }
-    }
-
-    pub fn id(&self) -> &ObjectId {
-        &self.id
-    }
-
-    /// Reload the patch data from storage.
-    pub fn reload(&mut self) -> Result<(), store::Error> {
-        self.patch = self
-            .store
-            .get(&self.id)?
-            .ok_or_else(|| store::Error::NotFound(TYPENAME.clone(), self.id))?;
-
-        Ok(())
-    }
-
-    pub fn transaction<G, F>(
-        &mut self,
-        message: &str,
-        signer: &G,
-        operations: F,
-    ) -> Result<EntryId, Error>
-    where
-        G: Signer,
-        F: FnOnce(&mut Transaction<Patch, R>) -> Result<(), store::Error>,
-    {
-        let mut tx = Transaction::default();
-        operations(&mut tx)?;
-
-        let (patch, commit) = tx.commit(message, self.id, &mut self.store.raw, signer)?;
-        self.cache
-            .update(&self.store.as_ref().id(), &self.id, &patch)
-            .map_err(|e| Error::CacheUpdate {
-                id: self.id,
-                err: e.into(),
-            })?;
-        self.patch = patch;
-
-        Ok(commit)
-    }
-
-    /// Edit patch metadata.
-    pub fn edit<G: Signer>(
-        &mut self,
-        title: String,
-        target: MergeTarget,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Edit", signer, |tx| tx.edit(title, target))
-    }
-
-    /// Edit revision metadata.
-    pub fn edit_revision<G: Signer>(
-        &mut self,
-        revision: RevisionId,
-        description: String,
-        embeds: impl IntoIterator<Item = Embed>,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Edit revision", signer, |tx| {
-            tx.edit_revision(revision, description, embeds.into_iter().collect())
-        })
-    }
-
-    /// Redact a revision.
-    pub fn redact<G: Signer>(
-        &mut self,
-        revision: RevisionId,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Redact revision", signer, |tx| tx.redact(revision))
-    }
-
-    /// Create a thread on a patch revision.
-    pub fn thread<G: Signer, S: ToString>(
-        &mut self,
-        revision: RevisionId,
-        body: S,
-        signer: &G,
-    ) -> Result<CommentId, Error> {
-        self.transaction("Create thread", signer, |tx| tx.thread(revision, body))
-    }
-
-    /// Comment on a patch revision.
-    pub fn comment<G: Signer, S: ToString>(
-        &mut self,
-        revision: RevisionId,
-        body: S,
-        reply_to: Option<CommentId>,
-        location: Option<CodeLocation>,
-        embeds: impl IntoIterator<Item = Embed>,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Comment", signer, |tx| {
-            tx.comment(
-                revision,
-                body,
-                reply_to,
-                location,
-                embeds.into_iter().collect(),
-            )
-        })
-    }
-
-    /// React on a patch revision.
-    pub fn react<G: Signer>(
-        &mut self,
-        revision: RevisionId,
-        reaction: Reaction,
-        location: Option<CodeLocation>,
-        active: bool,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("React", signer, |tx| {
-            tx.react(revision, reaction, location, active)
-        })
-    }
-
-    /// Edit a comment on a patch revision.
-    pub fn comment_edit<G: Signer, S: ToString>(
-        &mut self,
-        revision: RevisionId,
-        comment: CommentId,
-        body: S,
-        embeds: impl IntoIterator<Item = Embed>,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Edit comment", signer, |tx| {
-            tx.comment_edit(revision, comment, body, embeds.into_iter().collect())
-        })
-    }
-
-    /// React to a comment on a patch revision.
-    pub fn comment_react<G: Signer>(
-        &mut self,
-        revision: RevisionId,
-        comment: CommentId,
-        reaction: Reaction,
-        active: bool,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("React comment", signer, |tx| {
-            tx.comment_react(revision, comment, reaction, active)
-        })
-    }
-
-    /// Redact a comment on a patch revision.
-    pub fn comment_redact<G: Signer>(
-        &mut self,
-        revision: RevisionId,
-        comment: CommentId,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Redact comment", signer, |tx| {
-            tx.comment_redact(revision, comment)
-        })
-    }
-
-    /// Comment on a line of code as part of a review.
-    pub fn review_comment<G: Signer, S: ToString>(
-        &mut self,
-        review: ReviewId,
-        body: S,
-        location: Option<CodeLocation>,
-        reply_to: Option<CommentId>,
-        embeds: impl IntoIterator<Item = Embed>,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Review comment", signer, |tx| {
-            tx.review_comment(
-                review,
-                body,
-                location,
-                reply_to,
-                embeds.into_iter().collect(),
-            )
-        })
-    }
-
-    /// Edit review comment.
-    pub fn edit_review_comment<G: Signer, S: ToString>(
-        &mut self,
-        review: ReviewId,
-        comment: EntryId,
-        body: S,
-        embeds: impl IntoIterator<Item = Embed>,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Edit review comment", signer, |tx| {
-            tx.edit_review_comment(review, comment, body, embeds.into_iter().collect())
-        })
-    }
-
-    /// React to a review comment.
-    pub fn react_review_comment<G: Signer>(
-        &mut self,
-        review: ReviewId,
-        comment: EntryId,
-        reaction: Reaction,
-        active: bool,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("React to review comment", signer, |tx| {
-            tx.react_review_comment(review, comment, reaction, active)
-        })
-    }
-
-    /// React to a review comment.
-    pub fn redact_review_comment<G: Signer>(
-        &mut self,
-        review: ReviewId,
-        comment: EntryId,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Redact review comment", signer, |tx| {
-            tx.redact_review_comment(review, comment)
-        })
-    }
-
-    /// Review a patch revision.
-    pub fn review<G: Signer>(
-        &mut self,
-        revision: RevisionId,
-        verdict: Option<Verdict>,
-        summary: Option<String>,
-        labels: Vec<Label>,
-        signer: &G,
-    ) -> Result<ReviewId, Error> {
-        self.transaction("Review", signer, |tx| {
-            tx.review(revision, verdict, summary, labels)
-        })
-        .map(ReviewId)
-    }
-
-    /// Redact a patch review.
-    pub fn redact_review<G: Signer>(
-        &mut self,
-        review: ReviewId,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Redact review", signer, |tx| tx.redact_review(review))
-    }
-
-    /// Resolve a patch review comment.
-    pub fn resolve_review_comment<G: Signer>(
-        &mut self,
-        review: ReviewId,
-        comment: CommentId,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Resolve review comment", signer, |tx| {
-            tx.review_comment_resolve(review, comment)
-        })
-    }
-
-    /// Unresolve a patch review comment.
-    pub fn unresolve_review_comment<G: Signer>(
-        &mut self,
-        review: ReviewId,
-        comment: CommentId,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Unresolve review comment", signer, |tx| {
-            tx.review_comment_unresolve(review, comment)
-        })
-    }
-
-    /// Merge a patch revision.
-    pub fn merge<G: Signer>(
-        &mut self,
-        revision: RevisionId,
-        commit: git::Oid,
-        signer: &G,
-    ) -> Result<Merged<R>, Error> {
-        // TODO: Don't allow merging the same revision twice?
-        let entry = self.transaction("Merge revision", signer, |tx| tx.merge(revision, commit))?;
-
-        Ok(Merged {
-            entry,
-            patch: self.id,
-            stored: self.store.as_ref(),
-        })
-    }
-
-    /// Update a patch with a new revision.
-    pub fn update<G: Signer>(
-        &mut self,
-        description: impl ToString,
-        base: impl Into<git::Oid>,
-        oid: impl Into<git::Oid>,
-        signer: &G,
-    ) -> Result<RevisionId, Error> {
-        self.transaction("Add revision", signer, |tx| {
-            tx.revision(description, base, oid)
-        })
-        .map(RevisionId)
-    }
-
-    /// Lifecycle a patch.
-    pub fn lifecycle<G: Signer>(&mut self, state: Lifecycle, signer: &G) -> Result<EntryId, Error> {
-        self.transaction("Lifecycle", signer, |tx| tx.lifecycle(state))
-    }
-
-    /// Assign a patch.
-    pub fn assign<G: Signer>(
-        &mut self,
-        assignees: BTreeSet<Did>,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Assign", signer, |tx| tx.assign(assignees))
-    }
-
-    /// Archive a patch.
-    pub fn archive<G: Signer>(&mut self, signer: &G) -> Result<bool, Error> {
-        self.lifecycle(Lifecycle::Archived, signer)?;
-
-        Ok(true)
-    }
-
-    /// Mark an archived patch as ready to be reviewed again.
-    /// Returns `false` if the patch was not archived.
-    pub fn unarchive<G: Signer>(&mut self, signer: &G) -> Result<bool, Error> {
-        if !self.is_archived() {
-            return Ok(false);
-        }
-        self.lifecycle(Lifecycle::Open, signer)?;
-
-        Ok(true)
-    }
-
-    /// Mark a patch as ready to be reviewed.
-    /// Returns `false` if the patch was not a draft.
-    pub fn ready<G: Signer>(&mut self, signer: &G) -> Result<bool, Error> {
-        if !self.is_draft() {
-            return Ok(false);
-        }
-        self.lifecycle(Lifecycle::Open, signer)?;
-
-        Ok(true)
-    }
-
-    /// Mark an open patch as a draft.
-    /// Returns `false` if the patch was not open and free of merges.
-    pub fn unready<G: Signer>(&mut self, signer: &G) -> Result<bool, Error> {
-        if !matches!(self.state(), State::Open { conflicts } if conflicts.is_empty()) {
-            return Ok(false);
-        }
-        self.lifecycle(Lifecycle::Draft, signer)?;
-
-        Ok(true)
-    }
-
-    /// Label a patch.
-    pub fn label<G: Signer>(
-        &mut self,
-        labels: impl IntoIterator<Item = Label>,
-        signer: &G,
-    ) -> Result<EntryId, Error> {
-        self.transaction("Label", signer, |tx| tx.label(labels))
-    }
-}
-
-impl<'a, 'g, R, C> Deref for PatchMut<'a, 'g, R, C> {
-    type Target = Patch;
-
-    fn deref(&self) -> &Self::Target {
-        &self.patch
-    }
-}
-
-/// Detailed information on patch states
-#[derive(Debug, Default, PartialEq, Eq, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct PatchCounts {
-    pub open: usize,
-    pub draft: usize,
-    pub archived: usize,
-    pub merged: usize,
-}
-
-impl PatchCounts {
-    /// Total count.
-    pub fn total(&self) -> usize {
-        self.open + self.draft + self.archived + self.merged
-    }
-}
-
-/// Result of looking up a `Patch`'s `Revision`.
-///
-/// See [`Patches::find_by_revision`].
-#[derive(Debug, PartialEq, Eq)]
-pub struct ByRevision {
-    pub id: PatchId,
-    pub patch: Patch,
-    pub revision_id: RevisionId,
-    pub revision: Revision,
-}
-
-pub struct Patches<'a, R> {
-    raw: store::Store<'a, Patch, R>,
-}
-
-impl<'a, R> Deref for Patches<'a, R> {
-    type Target = store::Store<'a, Patch, R>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.raw
-    }
-}
-
-impl<'a, R> HasRepoId for Patches<'a, R>
-where
-    R: ReadRepository,
-{
-    fn rid(&self) -> RepoId {
-        self.as_ref().id()
-    }
-}
-
-impl<'a, R> Patches<'a, R>
-where
-    R: ReadRepository + cob::Store,
-{
-    /// Open a patches store.
-    pub fn open(repository: &'a R) -> Result<Self, RepositoryError> {
-        let identity = repository.identity_head()?;
-        let raw = store::Store::open(repository)?.identity(identity);
-
-        Ok(Self { raw })
-    }
-
-    /// Patches count by state.
-    pub fn counts(&self) -> Result<PatchCounts, store::Error> {
-        let all = self.all()?;
-        let state_groups =
-            all.filter_map(|s| s.ok())
-                .fold(PatchCounts::default(), |mut state, (_, p)| {
-                    match p.state() {
-                        State::Draft => state.draft += 1,
-                        State::Open { .. } => state.open += 1,
-                        State::Archived => state.archived += 1,
-                        State::Merged { .. } => state.merged += 1,
-                    }
-                    state
-                });
-
-        Ok(state_groups)
-    }
-
-    /// Find the `Patch` containing the given `Revision`.
-    pub fn find_by_revision(&self, revision: &RevisionId) -> Result<Option<ByRevision>, Error> {
-        // Revision may be the patch's first, making it have the same ID.
-        let p_id = ObjectId::from(revision.into_inner());
-        if let Some(p) = self.get(&p_id)? {
-            return Ok(p.revision(revision).map(|r| ByRevision {
-                id: p_id,
-                patch: p.clone(),
-                revision_id: *revision,
-                revision: r.clone(),
-            }));
-        }
-        let result = self
-            .all()?
-            .filter_map(|result| result.ok())
-            .find_map(|(p_id, p)| {
-                p.revision(revision).map(|r| ByRevision {
-                    id: p_id,
-                    patch: p.clone(),
-                    revision_id: *revision,
-                    revision: r.clone(),
-                })
-            });
-
-        Ok(result)
-    }
-
-    /// Get a patch.
-    pub fn get(&self, id: &ObjectId) -> Result<Option<Patch>, store::Error> {
-        self.raw.get(id)
-    }
-
-    /// Get proposed patches.
-    pub fn proposed(&self) -> Result<impl Iterator<Item = (PatchId, Patch)> + '_, Error> {
-        let all = self.all()?;
-
-        Ok(all
-            .into_iter()
-            .filter_map(|result| result.ok())
-            .filter(|(_, p)| p.is_open()))
-    }
-
-    /// Get patches proposed by the given key.
-    pub fn proposed_by<'b>(
-        &'b self,
-        who: &'b Did,
-    ) -> Result<impl Iterator<Item = (PatchId, Patch)> + '_, Error> {
-        Ok(self
-            .proposed()?
-            .filter(move |(_, p)| p.author().id() == who))
-    }
-}
-
-impl<'a, R> Patches<'a, R>
-where
-    R: ReadRepository + SignRepository + cob::Store,
-{
-    /// Open a new patch.
-    pub fn create<'g, C, G>(
-        &'g mut self,
-        title: impl ToString,
-        description: impl ToString,
-        target: MergeTarget,
-        base: impl Into<git::Oid>,
-        oid: impl Into<git::Oid>,
-        labels: &[Label],
-        cache: &'g mut C,
-        signer: &G,
-    ) -> Result<PatchMut<'a, 'g, R, C>, Error>
-    where
-        C: cob::cache::Update<Patch>,
-        G: Signer,
-    {
-        self._create(
-            title,
-            description,
-            target,
-            base,
-            oid,
-            labels,
-            Lifecycle::default(),
-            cache,
-            signer,
-        )
-    }
-
-    /// Draft a patch. This patch will be created in a [`State::Draft`] state.
-    pub fn draft<'g, C, G: Signer>(
-        &'g mut self,
-        title: impl ToString,
-        description: impl ToString,
-        target: MergeTarget,
-        base: impl Into<git::Oid>,
-        oid: impl Into<git::Oid>,
-        labels: &[Label],
-        cache: &'g mut C,
-        signer: &G,
-    ) -> Result<PatchMut<'a, 'g, R, C>, Error>
-    where
-        C: cob::cache::Update<Patch>,
-    {
-        self._create(
-            title,
-            description,
-            target,
-            base,
-            oid,
-            labels,
-            Lifecycle::Draft,
-            cache,
-            signer,
-        )
-    }
-
-    /// Get a patch mutably.
-    pub fn get_mut<'g, C>(
-        &'g mut self,
-        id: &ObjectId,
-        cache: &'g mut C,
-    ) -> Result<PatchMut<'a, 'g, R, C>, store::Error> {
-        let patch = self
-            .raw
-            .get(id)?
-            .ok_or_else(move || store::Error::NotFound(TYPENAME.clone(), *id))?;
-
-        Ok(PatchMut {
-            id: *id,
-            patch,
-            store: self,
-            cache,
-        })
-    }
-
-    /// Create a patch. This is an internal function used by `create` and `draft`.
-    fn _create<'g, C, G: Signer>(
-        &'g mut self,
-        title: impl ToString,
-        description: impl ToString,
-        target: MergeTarget,
-        base: impl Into<git::Oid>,
-        oid: impl Into<git::Oid>,
-        labels: &[Label],
-        state: Lifecycle,
-        cache: &'g mut C,
-        signer: &G,
-    ) -> Result<PatchMut<'a, 'g, R, C>, Error>
-    where
-        C: cob::cache::Update<Patch>,
-    {
-        let (id, patch) = Transaction::initial("Create patch", &mut self.raw, signer, |tx| {
-            tx.revision(description, base, oid)?;
-            tx.edit(title, target)?;
-
-            if !labels.is_empty() {
-                tx.label(labels.to_owned())?;
-            }
-            if state != Lifecycle::default() {
-                tx.lifecycle(state)?;
-            }
-            Ok(())
-        })?;
-        cache
-            .update(&self.raw.as_ref().id(), &id, &patch)
-            .map_err(|e| Error::CacheUpdate { id, err: e.into() })?;
-
-        Ok(PatchMut {
-            id,
-            patch,
-            store: self,
-            cache,
-        })
-    }
-}
-
-/// Helpers for de/serialization of patch data types.
-mod ser {
-    use std::collections::{BTreeMap, BTreeSet};
-
-    use serde::ser::SerializeSeq;
-
-    use crate::cob::{thread::Reactions, ActorId, CodeLocation};
-
-    /// Serialize a `Revision`'s reaction as an object containing the
-    /// `location`, `emoji`, and all `authors` that have performed the
-    /// same reaction.
-    #[derive(Debug, serde::Serialize, serde::Deserialize)]
-    #[serde(rename_all = "camelCase")]
-    struct Reaction {
-        location: Option<CodeLocation>,
-        emoji: super::Reaction,
-        authors: Vec<ActorId>,
-    }
-
-    impl Reaction {
-        fn as_revision_reactions(
-            reactions: Vec<Reaction>,
-        ) -> BTreeMap<Option<CodeLocation>, Reactions> {
-            reactions.into_iter().fold(
-                BTreeMap::<Option<CodeLocation>, Reactions>::new(),
-                |mut reactions,
-                 Reaction {
-                     location,
-                     emoji,
-                     authors,
-                 }| {
-                    let mut inner = authors
-                        .into_iter()
-                        .map(|author| (author, emoji))
-                        .collect::<BTreeSet<_>>();
-                    let entry = reactions.entry(location).or_default();
-                    entry.append(&mut inner);
-                    reactions
-                },
-            )
-        }
-    }
-
-    /// Helper to serialize a `Revision`'s reactions, since
-    /// `CodeLocation` cannot be a key for a JSON object.
-    ///
-    /// The set `reactions` are first turned into a set of
-    /// [`Reaction`]s and then serialized via a `Vec`.
-    pub fn serialize_reactions<S>(
-        reactions: &BTreeMap<Option<CodeLocation>, Reactions>,
-        serializer: S,
-    ) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        let reactions = reactions
-            .iter()
-            .flat_map(|(location, reaction)| {
-                let reactions = reaction.iter().fold(
-                    BTreeMap::new(),
-                    |mut acc: BTreeMap<&super::Reaction, Vec<_>>, (author, emoji)| {
-                        acc.entry(emoji).or_default().push(*author);
-                        acc
-                    },
-                );
-                reactions
-                    .into_iter()
-                    .map(|(emoji, authors)| Reaction {
-                        location: location.clone(),
-                        emoji: *emoji,
-                        authors,
-                    })
-                    .collect::<Vec<_>>()
-            })
-            .collect::<Vec<_>>();
-        let mut s = serializer.serialize_seq(Some(reactions.len()))?;
-        for r in &reactions {
-            s.serialize_element(r)?;
-        }
-        s.end()
-    }
-
-    /// Helper to deserialize a `Revision`'s reactions, the inverse of
-    /// `serialize_reactions`.
-    ///
-    /// The `Vec` of [`Reaction`]s are deserialized and converted to a
-    /// `BTreeMap<Option<CodeLocation>, Reactions>`.
-    pub fn deserialize_reactions<'de, D>(
-        deserializer: D,
-    ) -> Result<BTreeMap<Option<CodeLocation>, Reactions>, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        struct ReactionsVisitor;
-
-        impl<'de> serde::de::Visitor<'de> for ReactionsVisitor {
-            type Value = Vec<Reaction>;
-
-            fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
-                formatter.write_str("a reaction of the form {'location', 'emoji', 'authors'}")
-            }
-
-            fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
-            where
-                A: serde::de::SeqAccess<'de>,
-            {
-                let mut reactions = Vec::new();
-                while let Some(reaction) = seq.next_element()? {
-                    reactions.push(reaction);
-                }
-                Ok(reactions)
-            }
-        }
-
-        let reactions = deserializer.deserialize_seq(ReactionsVisitor)?;
-        Ok(Reaction::as_revision_reactions(reactions))
-    }
-}
-
-#[cfg(test)]
-#[allow(clippy::unwrap_used)]
-mod test {
-    use std::path::PathBuf;
-    use std::str::FromStr;
-    use std::vec;
-
-    use pretty_assertions::assert_eq;
-
-    use super::*;
-    use crate::cob::common::CodeRange;
-    use crate::cob::test::Actor;
-    use crate::crypto::test::signer::MockSigner;
-    use crate::identity;
-    use crate::patch::cache::Patches as _;
-    use crate::profile::env;
-    use crate::test;
-    use crate::test::arbitrary;
-    use crate::test::arbitrary::gen;
-    use crate::test::storage::MockRepository;
-
-    #[test]
-    fn test_json_serialization() {
-        let edit = Action::Label {
-            labels: BTreeSet::new(),
-        };
-        assert_eq!(
-            serde_json::to_string(&edit).unwrap(),
-            String::from(r#"{"type":"label","labels":[]}"#)
-        );
-    }
-
-    #[test]
-    fn test_reactions_json_serialization() {
-        #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
-        #[serde(rename_all = "camelCase")]
-        struct TestReactions {
-            #[serde(
-                serialize_with = "super::ser::serialize_reactions",
-                deserialize_with = "super::ser::deserialize_reactions"
-            )]
-            inner: BTreeMap<Option<CodeLocation>, Reactions>,
-        }
-
-        let reactions = TestReactions {
-            inner: [(
-                None,
-                [
-                    (
-                        "z6Mkk7oqY4pPxhMmGEotDYsFo97vhCj85BLY1H256HrJmjN8"
-                            .parse()
-                            .unwrap(),
-                        Reaction::new('🚀').unwrap(),
-                    ),
-                    (
-                        "z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
-                            .parse()
-                            .unwrap(),
-                        Reaction::new('🙏').unwrap(),
-                    ),
-                ]
-                .into_iter()
-                .collect(),
-            )]
-            .into_iter()
-            .collect(),
-        };
-
-        assert_eq!(
-            reactions,
-            serde_json::from_str(&serde_json::to_string(&reactions).unwrap()).unwrap()
-        );
-    }
-
-    #[test]
-    fn test_patch_create_and_get() {
-        let alice = test::setup::NodeWithRepo::default();
-        let checkout = alice.repo.checkout();
-        let branch = checkout.branch_with([("README", b"Hello World!")]);
-        let mut patches = Cache::no_cache(&*alice.repo).unwrap();
-        let author: Did = alice.signer.public_key().into();
-        let target = MergeTarget::Delegates;
-        let patch = patches
-            .create(
-                "My first patch",
-                "Blah blah blah.",
-                target,
-                branch.base,
-                branch.oid,
-                &[],
-                &alice.signer,
-            )
-            .unwrap();
-
-        let patch_id = patch.id;
-        let patch = patches.get(&patch_id).unwrap().unwrap();
-
-        assert_eq!(patch.title(), "My first patch");
-        assert_eq!(patch.description(), "Blah blah blah.");
-        assert_eq!(patch.author().id(), &author);
-        assert_eq!(patch.state(), &State::Open { conflicts: vec![] });
-        assert_eq!(patch.target(), target);
-        assert_eq!(patch.version(), 0);
-
-        let (rev_id, revision) = patch.latest();
-
-        assert_eq!(revision.author.id(), &author);
-        assert_eq!(revision.description(), "Blah blah blah.");
-        assert_eq!(revision.discussion.len(), 0);
-        assert_eq!(revision.oid, branch.oid);
-        assert_eq!(revision.base, branch.base);
-
-        let ByRevision { id, .. } = patches.find_by_revision(&rev_id).unwrap().unwrap();
-        assert_eq!(id, patch_id);
-    }
-
-    #[test]
-    fn test_patch_discussion() {
-        let alice = test::setup::NodeWithRepo::default();
-        let checkout = alice.repo.checkout();
-        let branch = checkout.branch_with([("README", b"Hello World!")]);
-        let mut patches = Cache::no_cache(&*alice.repo).unwrap();
-        let patch = patches
-            .create(
-                "My first patch",
-                "Blah blah blah.",
-                MergeTarget::Delegates,
-                branch.base,
-                branch.oid,
-                &[],
-                &alice.signer,
-            )
-            .unwrap();
-
-        let id = patch.id;
-        let mut patch = patches.get_mut(&id).unwrap();
-        let (revision_id, _) = patch.revisions().last().unwrap();
-        assert!(
-            patch
-                .comment(revision_id, "patch comment", None, None, [], &alice.signer)
-                .is_ok(),
-            "can comment on patch"
-        );
-
-        let (_, revision) = patch.revisions().last().unwrap();
-        let (_, comment) = revision.discussion.first().unwrap();
-        assert_eq!("patch comment", comment.body(), "comment body untouched");
-    }
-
-    #[test]
-    fn test_patch_merge() {
-        let alice = test::setup::NodeWithRepo::default();
-        let checkout = alice.repo.checkout();
-        let branch = checkout.branch_with([("README", b"Hello World!")]);
-        let mut patches = Cache::no_cache(&*alice.repo).unwrap();
-        let mut patch = patches
-            .create(
-                "My first patch",
-                "Blah blah blah.",
-                MergeTarget::Delegates,
-                branch.base,
-                branch.oid,
-                &[],
-                &alice.signer,
-            )
-            .unwrap();
-
-        let id = patch.id;
-        let (rid, _) = patch.revisions().next().unwrap();
-        let _merge = patch.merge(rid, branch.base, &alice.signer).unwrap();
-        let patch = patches.get(&id).unwrap().unwrap();
-
-        let merges = patch.merges.iter().collect::<Vec<_>>();
-        assert_eq!(merges.len(), 1);
-
-        let (merger, merge) = merges.first().unwrap();
-        assert_eq!(*merger, alice.signer.public_key());
-        assert_eq!(merge.commit, branch.base);
-    }
-
-    #[test]
-    fn test_patch_review() {
-        let alice = test::setup::NodeWithRepo::default();
-        let checkout = alice.repo.checkout();
-        let branch = checkout.branch_with([("README", b"Hello World!")]);
-        let mut patches = Cache::no_cache(&*alice.repo).unwrap();
-        let mut patch = patches
-            .create(
-                "My first patch",
-                "Blah blah blah.",
-                MergeTarget::Delegates,
-                branch.base,
-                branch.oid,
-                &[],
-                &alice.signer,
-            )
-            .unwrap();
-
-        let (revision_id, _) = patch.latest();
-        let review_id = patch
-            .review(
-                revision_id,
-                Some(Verdict::Accept),
-                Some("LGTM".to_owned()),
-                vec![],
-                &alice.signer,
-            )
-            .unwrap();
-
-        let id = patch.id;
-        let mut patch = patches.get_mut(&id).unwrap();
-        let (_, revision) = patch.latest();
-        assert_eq!(revision.reviews.len(), 1);
-
-        let review = revision.review_by(alice.signer.public_key()).unwrap();
-        assert_eq!(review.verdict(), Some(Verdict::Accept));
-        assert_eq!(review.summary(), Some("LGTM"));
-
-        patch.redact_review(review_id, &alice.signer).unwrap();
-        patch.reload().unwrap();
-
-        let (_, revision) = patch.latest();
-        assert_eq!(revision.reviews().count(), 0);
-
-        // This is fine, redacting an already-redacted review is a no-op.
-        patch.redact_review(review_id, &alice.signer).unwrap();
-        // If the review never existed, it's an error.
-        patch
-            .redact_review(ReviewId(arbitrary::entry_id()), &alice.signer)
-            .unwrap_err();
-    }
-
-    #[test]
-    fn test_patch_review_revision_redact() {
-        let alice = test::setup::NodeWithRepo::default();
-        let checkout = alice.repo.checkout();
-        let branch = checkout.branch_with([("README", b"Hello World!")]);
-        let mut patches = Cache::no_cache(&*alice.repo).unwrap();
-        let mut patch = patches
-            .create(
-                "My first patch",
-                "Blah blah blah.",
-                MergeTarget::Delegates,
-                branch.base,
-                branch.oid,
-                &[],
-                &alice.signer,
-            )
-            .unwrap();
-
-        let update = checkout.branch_with([("README", b"Hello Radicle!")]);
-        let updated = patch
-            .update("I've made changes.", branch.base, update.oid, &alice.signer)
-            .unwrap();
-
-        // It's fine to redact a review from a redacted revision.
-        let review = patch
-            .review(updated, Some(Verdict::Accept), None, vec![], &alice.signer)
-            .unwrap();
-        patch.redact(updated, &alice.signer).unwrap();
-        patch.redact_review(review, &alice.signer).unwrap();
-    }
-
-    #[test]
-    fn test_revision_review_merge_redacted() {
-        let base = git::Oid::from_str("cb18e95ada2bb38aadd8e6cef0963ce37a87add3").unwrap();
-        let oid = git::Oid::from_str("518d5069f94c03427f694bb494ac1cd7d1339380").unwrap();
-        let mut alice = Actor::new(MockSigner::default());
-        let rid = gen::<RepoId>(1);
-        let doc = Doc::new(
-            gen::<Project>(1),
-            nonempty::NonEmpty::new(alice.did()),
-            1,
-            identity::Visibility::Public,
-        )
-        .verified()
-        .unwrap();
-        let repo = MockRepository::new(rid, doc);
-
-        let a1 = alice.op::<Patch>([
-            Action::Revision {
-                description: String::new(),
-                base,
-                oid,
-                resolves: Default::default(),
-            },
-            Action::Edit {
-                title: String::from("My patch"),
-                target: MergeTarget::Delegates,
-            },
-        ]);
-        let a2 = alice.op::<Patch>([Action::Revision {
-            description: String::from("Second revision"),
-            base,
-            oid,
-            resolves: Default::default(),
-        }]);
-        let a3 = alice.op::<Patch>([Action::RevisionRedact {
-            revision: RevisionId(a2.id()),
-        }]);
-        let a4 = alice.op::<Patch>([Action::Review {
-            revision: RevisionId(a2.id()),
-            summary: None,
-            verdict: Some(Verdict::Accept),
-            labels: vec![],
-        }]);
-        let a5 = alice.op::<Patch>([Action::Merge {
-            revision: RevisionId(a2.id()),
-            commit: oid,
-        }]);
-
-        let mut patch = Patch::from_ops([a1, a2], &repo).unwrap();
-        assert_eq!(patch.revisions().count(), 2);
-
-        patch.op(a3, [], &repo).unwrap();
-        assert_eq!(patch.revisions().count(), 1);
-
-        patch.op(a4, [], &repo).unwrap();
-        patch.op(a5, [], &repo).unwrap();
-    }
-
-    #[test]
-    fn test_revision_edit_redact() {
-        let base = arbitrary::oid();
-        let oid = arbitrary::oid();
-        let repo = gen::<MockRepository>(1);
-        let time = env::local_time();
-        let alice = MockSigner::default();
-        let bob = MockSigner::default();
-        let mut h0: cob::test::HistoryBuilder<Patch> = cob::test::history(
-            &[
-                Action::Revision {
-                    description: String::from("Original"),
-                    base,
-                    oid,
-                    resolves: Default::default(),
-                },
-                Action::Edit {
-                    title: String::from("Some patch"),
-                    target: MergeTarget::Delegates,
-                },
-            ],
-            time.into(),
-            &alice,
-        );
-        let r1 = h0.commit(
-            &Action::Revision {
-                description: String::from("New"),
-                base,
-                oid,
-                resolves: Default::default(),
-            },
-            &alice,
-        );
-        let patch = Patch::from_history(&h0, &repo).unwrap();
-        assert_eq!(patch.revisions().count(), 2);
-
-        let mut h1 = h0.clone();
-        h1.commit(
-            &Action::RevisionRedact {
-                revision: RevisionId(r1),
-            },
-            &alice,
-        );
-
-        let mut h2 = h0.clone();
-        h2.commit(
-            &Action::RevisionEdit {
-                revision: RevisionId(*h0.root().id()),
-                description: String::from("Edited"),
-                embeds: Vec::default(),
-            },
-            &bob,
-        );
-
-        h0.merge(h1);
-        h0.merge(h2);
-
-        let patch = Patch::from_history(&h0, &repo).unwrap();
-        assert_eq!(patch.revisions().count(), 1);
-    }
-
-    #[test]
-    fn test_revision_reaction() {
-        let base = git::Oid::from_str("cb18e95ada2bb38aadd8e6cef0963ce37a87add3").unwrap();
-        let oid = git::Oid::from_str("518d5069f94c03427f694bb494ac1cd7d1339380").unwrap();
-        let mut alice = Actor::new(MockSigner::default());
-        let repo = gen::<MockRepository>(1);
-        let reaction = Reaction::new('👍').expect("failed to create a reaction");
-
-        let a1 = alice.op::<Patch>([
-            Action::Revision {
-                description: String::new(),
-                base,
-                oid,
-                resolves: Default::default(),
-            },
-            Action::Edit {
-                title: String::from("My patch"),
-                target: MergeTarget::Delegates,
-            },
-        ]);
-        let a2 = alice.op::<Patch>([Action::RevisionReact {
-            revision: RevisionId(a1.id()),
-            location: None,
-            reaction,
-            active: true,
-        }]);
-        let patch = Patch::from_ops([a1, a2], &repo).unwrap();
-
-        let (_, r1) = patch.revisions().next().unwrap();
-        assert!(!r1.reactions.is_empty());
-
-        let mut reactions = r1.reactions.get(&None).unwrap().clone();
-        assert!(!reactions.is_empty());
-
-        let (_, first_reaction) = reactions.pop_first().unwrap();
-        assert_eq!(first_reaction, reaction);
-    }
-
-    #[test]
-    fn test_patch_review_edit() {
-        let alice = test::setup::NodeWithRepo::default();
-        let checkout = alice.repo.checkout();
-        let branch = checkout.branch_with([("README", b"Hello World!")]);
-        let mut patches = Cache::no_cache(&*alice.repo).unwrap();
-        let mut patch = patches
-            .create(
-                "My first patch",
-                "Blah blah blah.",
-                MergeTarget::Delegates,
-                branch.base,
-                branch.oid,
-                &[],
-                &alice.signer,
-            )
-            .unwrap();
-
-        let (rid, _) = patch.latest();
-        patch
-            .review(
-                rid,
-                Some(Verdict::Accept),
-                Some("LGTM".to_owned()),
-                vec![],
-                &alice.signer,
-            )
-            .unwrap();
-        patch
-            .review(
-                rid,
-                Some(Verdict::Reject),
-                Some("Whoops!".to_owned()),
-                vec![],
-                &alice.signer,
-            )
-            .unwrap(); // Overwrite the comment.
-
-        let (_, revision) = patch.latest();
-        let review = revision.review_by(alice.signer.public_key()).unwrap();
-        assert_eq!(review.verdict(), Some(Verdict::Reject));
-        assert_eq!(review.summary(), Some("Whoops!"));
-    }
-
-    #[test]
-    fn test_patch_review_comment() {
-        let alice = test::setup::NodeWithRepo::default();
-        let checkout = alice.repo.checkout();
-        let branch = checkout.branch_with([("README", b"Hello World!")]);
-        let mut patches = Cache::no_cache(&*alice.repo).unwrap();
-        let mut patch = patches
-            .create(
-                "My first patch",
-                "Blah blah blah.",
-                MergeTarget::Delegates,
-                branch.base,
-                branch.oid,
-                &[],
-                &alice.signer,
-            )
-            .unwrap();
-
-        let (rid, _) = patch.latest();
-        let location = CodeLocation {
-            commit: branch.oid,
-            path: PathBuf::from_str("README").unwrap(),
-            old: None,
-            new: Some(CodeRange::Lines { range: 5..8 }),
-        };
-        let review = patch
-            .review(rid, Some(Verdict::Accept), None, vec![], &alice.signer)
-            .unwrap();
-        patch
-            .review_comment(
-                review,
-                "I like these lines of code",
-                Some(location.clone()),
-                None,
-                [],
-                &alice.signer,
-            )
-            .unwrap();
-
-        let (_, revision) = patch.latest();
-        let review = revision.review_by(alice.signer.public_key()).unwrap();
-        let (_, comment) = review.comments().next().unwrap();
-
-        assert_eq!(comment.body(), "I like these lines of code");
-        assert_eq!(comment.location(), Some(&location));
-    }
-
-    #[test]
-    fn test_patch_review_remove_summary() {
-        let alice = test::setup::NodeWithRepo::default();
-        let checkout = alice.repo.checkout();
-        let branch = checkout.branch_with([("README", b"Hello World!")]);
-        let mut patches = Cache::no_cache(&*alice.repo).unwrap();
-        let mut patch = patches
-            .create(
-                "My first patch",
-                "Blah blah blah.",
-                MergeTarget::Delegates,
-                branch.base,
-                branch.oid,
-                &[],
-                &alice.signer,
-            )
-            .unwrap();
-
-        let (rid, _) = patch.latest();
-        patch
-            .review(
-                rid,
-                Some(Verdict::Accept),
-                Some("Nah".to_owned()),
-                vec![],
-                &alice.signer,
-            )
-            .unwrap();
-        patch
-            .review(rid, Some(Verdict::Accept), None, vec![], &alice.signer)
-            .unwrap();
-
-        let id = patch.id;
-        let patch = patches.get_mut(&id).unwrap();
-        let (_, revision) = patch.latest();
-        let review = revision.review_by(alice.signer.public_key()).unwrap();
-
-        assert_eq!(review.verdict(), Some(Verdict::Accept));
-        assert_eq!(review.summary(), None);
-    }
-
-    #[test]
-    fn test_patch_update() {
-        let alice = test::setup::NodeWithRepo::default();
-        let checkout = alice.repo.checkout();
-        let branch = checkout.branch_with([("README", b"Hello World!")]);
-        let mut patches = Cache::no_cache(&*alice.repo).unwrap();
-        let mut patch = patches
-            .create(
-                "My first patch",
-                "Blah blah blah.",
-                MergeTarget::Delegates,
-                branch.base,
-                branch.oid,
-                &[],
-                &alice.signer,
-            )
-            .unwrap();
-
-        assert_eq!(patch.description(), "Blah blah blah.");
-        assert_eq!(patch.version(), 0);
-
-        let update = checkout.branch_with([("README", b"Hello Radicle!")]);
-        let _ = patch
-            .update("I've made changes.", branch.base, update.oid, &alice.signer)
-            .unwrap();
-
-        let id = patch.id;
-        let patch = patches.get(&id).unwrap().unwrap();
-        assert_eq!(patch.version(), 1);
-        assert_eq!(patch.revisions.len(), 2);
-        assert_eq!(patch.revisions().count(), 2);
-        assert_eq!(
-            patch.revisions().nth(0).unwrap().1.description(),
-            "Blah blah blah."
-        );
-        assert_eq!(
-            patch.revisions().nth(1).unwrap().1.description(),
-            "I've made changes."
-        );
-
-        let (_, revision) = patch.latest();
-
-        assert_eq!(patch.version(), 1);
-        assert_eq!(revision.oid, update.oid);
-        assert_eq!(revision.description(), "I've made changes.");
-    }
-
-    #[test]
-    fn test_patch_redact() {
-        let alice = test::setup::Node::default();
-        let repo = alice.project();
-        let branch = repo
-            .checkout()
-            .branch_with([("README.md", b"Hello, World!")]);
-        let mut patches = Cache::no_cache(&*repo).unwrap();
-        let mut patch = patches
-            .create(
-                "My first patch",
-                "Blah blah blah.",
-                MergeTarget::Delegates,
-                branch.base,
-                branch.oid,
-                &[],
-                &alice.signer,
-            )
-            .unwrap();
-        let patch_id = patch.id;
-
-        let update = repo
-            .checkout()
-            .branch_with([("README.md", b"Hello, Radicle!")]);
-        let revision_id = patch
-            .update("I've made changes.", branch.base, update.oid, &alice.signer)
-            .unwrap();
-        assert_eq!(patch.revisions().count(), 2);
-
-        patch.redact(revision_id, &alice.signer).unwrap();
-        assert_eq!(patch.latest().0, RevisionId(*patch_id));
-        assert_eq!(patch.revisions().count(), 1);
-
-        // The patch's root must always exist.
-        assert_eq!(patch.latest(), patch.root());
-        assert!(patch.redact(patch.latest().0, &alice.signer).is_err());
-    }
-
-    #[test]
-    fn test_json() {
-        use serde_json::json;
-
-        assert_eq!(
-            serde_json::to_value(Action::Lifecycle {
-                state: Lifecycle::Draft
-            })
-            .unwrap(),
-            json!({
-                "type": "lifecycle",
-                "state": { "status": "draft" }
-            })
-        );
-
-        let revision = RevisionId(arbitrary::entry_id());
-        assert_eq!(
-            serde_json::to_value(Action::Review {
-                revision,
-                summary: None,
-                verdict: None,
-                labels: vec![],
-            })
-            .unwrap(),
-            json!({
-                "type": "review",
-                "revision": revision,
-            })
-        );
-
-        assert_eq!(
-            serde_json::to_value(CodeRange::Lines { range: 4..8 }).unwrap(),
-            json!({
-                "type": "lines",
-                "range": { "start": 4, "end": 8 },
-            })
-        );
-    }
-}
diff --git a/radicle/src/cob/patch/cache.rs b/radicle/src/cob/patch/cache.rs
deleted file mode 100644
index 17736836c..000000000
--- a/radicle/src/cob/patch/cache.rs
+++ /dev/null
@@ -1,996 +0,0 @@
-use std::ops::ControlFlow;
-use std::str::FromStr;
-
-use sqlite as sql;
-use thiserror::Error;
-
-use crate::cob;
-use crate::cob::cache::{self, StoreReader};
-use crate::cob::cache::{Remove, StoreWriter, Update};
-use crate::cob::store;
-use crate::cob::{Label, ObjectId, TypeName};
-use crate::crypto::Signer;
-use crate::git;
-use crate::prelude::RepoId;
-use crate::storage::{HasRepoId, ReadRepository, RepositoryError, SignRepository, WriteRepository};
-
-use super::{
-    ByRevision, MergeTarget, Patch, PatchCounts, PatchId, PatchMut, Revision, RevisionId, State,
-    Status,
-};
-
-/// A set of read-only methods for a [`Patch`] store.
-pub trait Patches {
-    type Error: std::error::Error + Send + Sync + 'static;
-
-    /// An iterator for returning a set of patches from the store.
-    type Iter<'a>: Iterator<Item = Result<(PatchId, Patch), Self::Error>> + 'a
-    where
-        Self: 'a;
-
-    /// Get the `Patch`, identified by `id`, returning `None` if it
-    /// was not found.
-    fn get(&self, id: &PatchId) -> Result<Option<Patch>, Self::Error>;
-
-    /// Get the `Patch` and its `Revision`, identified by the revision
-    /// `id`, returning `None` if it was not found.
-    fn find_by_revision(&self, id: &RevisionId) -> Result<Option<ByRevision>, Self::Error>;
-
-    /// List all patches that are in the store.
-    fn list(&self) -> Result<Self::Iter<'_>, Self::Error>;
-
-    /// List all patches in the store that match the provided
-    /// `status`.
-    ///
-    /// Also see [`Patches::opened`], [`Patches::archived`],
-    /// [`Patches::drafted`], [`Patches::merged`].
-    fn list_by_status(&self, status: &Status) -> Result<Self::Iter<'_>, Self::Error>;
-
-    /// Get the [`PatchCounts`] of all the patches in the store.
-    fn counts(&self) -> Result<PatchCounts, Self::Error>;
-
-    /// List all opened patches in the store.
-    fn opened(&self) -> Result<Self::Iter<'_>, Self::Error> {
-        self.list_by_status(&Status::Open)
-    }
-
-    /// List all archived patches in the store.
-    fn archived(&self) -> Result<Self::Iter<'_>, Self::Error> {
-        self.list_by_status(&Status::Archived)
-    }
-
-    /// List all drafted patches in the store.
-    fn drafted(&self) -> Result<Self::Iter<'_>, Self::Error> {
-        self.list_by_status(&Status::Draft)
-    }
-
-    /// List all merged patches in the store.
-    fn merged(&self) -> Result<Self::Iter<'_>, Self::Error> {
-        self.list_by_status(&Status::Merged)
-    }
-
-    /// Returns `true` if there are no patches in the store.
-    fn is_empty(&self) -> Result<bool, Self::Error> {
-        Ok(self.counts()?.total() == 0)
-    }
-}
-
-/// [`Patches`] store that can also [`Update`] and [`Remove`]
-/// [`Patch`] in/from the store.
-pub trait PatchesMut: Patches + Update<Patch> + Remove<Patch> {}
-
-impl<T> PatchesMut for T where T: Patches + Update<Patch> + Remove<Patch> {}
-
-/// A `Patch` store that relies on the `cache` for reads and as a
-/// write-through cache.
-///
-/// The `store` is used for the main storage when performing a
-/// write-through. It is also used for identifying which `RepoId` is
-/// being used for the `cache`.
-pub struct Cache<R, C> {
-    pub(super) store: R,
-    pub(super) cache: C,
-}
-
-impl<R, C> Cache<R, C> {
-    pub fn new(store: R, cache: C) -> Self {
-        Self { store, cache }
-    }
-
-    pub fn rid(&self) -> RepoId
-    where
-        R: HasRepoId,
-    {
-        self.store.rid()
-    }
-}
-
-impl<'a, R, C> Cache<super::Patches<'a, R>, C> {
-    /// Create a new [`Patch`] using the [`super::Patches`] as the
-    /// main storage, and writing the update to the `cache`.
-    pub fn create<'g, G>(
-        &'g mut self,
-        title: impl ToString,
-        description: impl ToString,
-        target: MergeTarget,
-        base: impl Into<git::Oid>,
-        oid: impl Into<git::Oid>,
-        labels: &[Label],
-        signer: &G,
-    ) -> Result<PatchMut<'a, 'g, R, C>, super::Error>
-    where
-        R: WriteRepository + cob::Store,
-        G: Signer,
-        C: Update<Patch>,
-    {
-        self.store.create(
-            title,
-            description,
-            target,
-            base,
-            oid,
-            labels,
-            &mut self.cache,
-            signer,
-        )
-    }
-
-    /// Create a new [`Patch`], in a draft state, using the
-    /// [`super::Patches`] as the main storage, and writing the update
-    /// to the `cache`.
-    pub fn draft<'g, G>(
-        &'g mut self,
-        title: impl ToString,
-        description: impl ToString,
-        target: MergeTarget,
-        base: impl Into<git::Oid>,
-        oid: impl Into<git::Oid>,
-        labels: &[Label],
-        signer: &G,
-    ) -> Result<PatchMut<'a, 'g, R, C>, super::Error>
-    where
-        R: WriteRepository + cob::Store,
-        G: Signer,
-        C: Update<Patch>,
-    {
-        self.store.draft(
-            title,
-            description,
-            target,
-            base,
-            oid,
-            labels,
-            &mut self.cache,
-            signer,
-        )
-    }
-
-    /// Remove the given `id` from the [`super::Patches`] storage, and
-    /// removing the entry from the `cache`.
-    pub fn remove<G>(&mut self, id: &PatchId, signer: &G) -> Result<(), super::Error>
-    where
-        G: Signer,
-        R: ReadRepository + SignRepository + cob::Store,
-        C: Remove<Patch>,
-    {
-        self.store.remove(id, signer)?;
-        self.cache
-            .remove(id)
-            .map_err(|e| super::Error::CacheRemove {
-                id: *id,
-                err: e.into(),
-            })?;
-        Ok(())
-    }
-
-    /// Read the given `id` from the [`super::Patches`] store and
-    /// writing it to the `cache`.
-    pub fn write(&mut self, id: &PatchId) -> Result<(), super::Error>
-    where
-        R: ReadRepository + cob::Store,
-        C: Update<Patch>,
-    {
-        let issue = self
-            .store
-            .get(id)?
-            .ok_or_else(|| store::Error::NotFound((*super::TYPENAME).clone(), *id))?;
-        self.update(&self.rid(), id, &issue)
-            .map_err(|e| super::Error::CacheUpdate {
-                id: *id,
-                err: e.into(),
-            })?;
-        Ok(())
-    }
-
-    /// Read all the patches from the [`super::Patches`] store and
-    /// writing them to `cache`.
-    ///
-    /// The `callback` is used for reporting success, failures, and
-    /// progress to the caller. The caller may also decide to continue
-    /// or break from the process.
-    pub fn write_all(
-        &mut self,
-        callback: impl Fn(
-            &Result<(PatchId, Patch), store::Error>,
-            &cache::WriteAllProgress,
-        ) -> ControlFlow<()>,
-    ) -> Result<(), super::Error>
-    where
-        R: ReadRepository + cob::Store,
-        C: Update<Patch> + Remove<Patch>,
-    {
-        // Start by clearing the cache. This will get rid of patches that are cached but
-        // no longer exist in storage.
-        self.remove_all(&self.rid())
-            .map_err(|e| super::Error::CacheRemoveAll { err: e.into() })?;
-
-        let patches = self.store.all()?;
-        let mut progress = cache::WriteAllProgress::new(patches.len());
-        for patch in self.store.all()? {
-            progress.inc();
-            match callback(&patch, &progress) {
-                ControlFlow::Continue(()) => match patch {
-                    Ok((id, patch)) => {
-                        self.update(&self.rid(), &id, &patch)
-                            .map_err(|e| super::Error::CacheUpdate { id, err: e.into() })?;
-                    }
-                    Err(_) => continue,
-                },
-                ControlFlow::Break(()) => break,
-            }
-        }
-        Ok(())
-    }
-}
-
-impl<R> Cache<R, StoreReader> {
-    pub fn reader(store: R, cache: StoreReader) -> Self {
-        Self { store, cache }
-    }
-}
-
-impl<R> Cache<R, StoreWriter> {
-    pub fn open(store: R, cache: StoreWriter) -> Self {
-        Self { store, cache }
-    }
-}
-
-impl<'a, R> Cache<super::Patches<'a, R>, StoreWriter>
-where
-    R: ReadRepository + cob::Store,
-{
-    /// Get the [`PatchMut`], identified by `id`, using the
-    /// `StoreWriter` for retrieving the `Patch`.
-    pub fn get_mut<'g>(
-        &'g mut self,
-        id: &ObjectId,
-    ) -> Result<PatchMut<'a, 'g, R, StoreWriter>, Error> {
-        let patch = Patches::get(self, id)?
-            .ok_or_else(move || Error::NotFound(super::TYPENAME.clone(), *id))?;
-
-        Ok(PatchMut {
-            id: *id,
-            patch,
-            store: &mut self.store,
-            cache: &mut self.cache,
-        })
-    }
-}
-
-impl<'a, R> Cache<super::Patches<'a, R>, cache::NoCache>
-where
-    R: ReadRepository + cob::Store,
-{
-    /// Get a `Cache` that does no write-through modifications and
-    /// uses the [`super::Patches`] store for all reads and writes.
-    pub fn no_cache(repository: &'a R) -> Result<Self, RepositoryError> {
-        let store = super::Patches::open(repository)?;
-        Ok(Self {
-            store,
-            cache: cache::NoCache,
-        })
-    }
-
-    /// Get the [`PatchMut`], identified by `id`.
-    pub fn get_mut<'g>(
-        &'g mut self,
-        id: &ObjectId,
-    ) -> Result<PatchMut<'a, 'g, R, cache::NoCache>, super::Error> {
-        let patch = self
-            .store
-            .get(id)?
-            .ok_or_else(move || store::Error::NotFound(super::TYPENAME.clone(), *id))?;
-
-        Ok(PatchMut {
-            id: *id,
-            patch,
-            store: &mut self.store,
-            cache: &mut self.cache,
-        })
-    }
-}
-
-impl<R, C> cache::Update<Patch> for Cache<R, C>
-where
-    C: cache::Update<Patch>,
-{
-    type Out = <C as cache::Update<Patch>>::Out;
-    type UpdateError = <C as cache::Update<Patch>>::UpdateError;
-
-    fn update(
-        &mut self,
-        rid: &RepoId,
-        id: &radicle_cob::ObjectId,
-        object: &Patch,
-    ) -> Result<Self::Out, Self::UpdateError> {
-        self.cache.update(rid, id, object)
-    }
-}
-
-impl<R, C> cache::Remove<Patch> for Cache<R, C>
-where
-    C: cache::Remove<Patch>,
-{
-    type Out = <C as cache::Remove<Patch>>::Out;
-    type RemoveError = <C as cache::Remove<Patch>>::RemoveError;
-
-    fn remove(&mut self, id: &ObjectId) -> Result<Self::Out, Self::RemoveError> {
-        self.cache.remove(id)
-    }
-
-    fn remove_all(&mut self, rid: &RepoId) -> Result<Self::Out, Self::RemoveError> {
-        self.cache.remove_all(rid)
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum UpdateError {
-    #[error(transparent)]
-    Json(#[from] serde_json::Error),
-    #[error(transparent)]
-    Sql(#[from] sql::Error),
-}
-
-impl Update<Patch> for StoreWriter {
-    type Out = bool;
-    type UpdateError = UpdateError;
-
-    fn update(
-        &mut self,
-        rid: &RepoId,
-        id: &ObjectId,
-        object: &Patch,
-    ) -> Result<Self::Out, Self::UpdateError> {
-        let mut stmt = self.db.prepare(
-            "INSERT INTO patches (id, repo, patch)
-             VALUES (?1, ?2, ?3)
-             ON CONFLICT DO UPDATE
-             SET patch =  (?3)",
-        )?;
-
-        stmt.bind((1, sql::Value::String(id.to_string())))?;
-        stmt.bind((2, rid))?;
-        stmt.bind((3, sql::Value::String(serde_json::to_string(&object)?)))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count() > 0)
-    }
-}
-
-impl Remove<Patch> for StoreWriter {
-    type Out = bool;
-    type RemoveError = sql::Error;
-
-    fn remove(&mut self, id: &ObjectId) -> Result<Self::Out, Self::RemoveError> {
-        let mut stmt = self.db.prepare(
-            "DELETE FROM patches
-             WHERE id = ?1",
-        )?;
-
-        stmt.bind((1, sql::Value::String(id.to_string())))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count() > 0)
-    }
-
-    fn remove_all(&mut self, rid: &RepoId) -> Result<Self::Out, Self::RemoveError> {
-        let mut stmt = self.db.prepare(
-            "DELETE FROM patches
-             WHERE repo = ?1",
-        )?;
-
-        stmt.bind((1, rid))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count() > 0)
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum Error {
-    #[error("object `{1}` of type `{0}` was not found")]
-    NotFound(TypeName, ObjectId),
-    #[error(transparent)]
-    ObjectId(#[from] cob::object::ParseObjectId),
-    #[error("object {0} failed to parse: {1}")]
-    Object(ObjectId, serde_json::Error),
-    #[error(transparent)]
-    Json(#[from] serde_json::Error),
-    #[error(transparent)]
-    Sql(#[from] sql::Error),
-}
-
-/// Iterator that returns a set of patches based on an SQL query.
-///
-/// The query is expected to return rows with columns identified by
-/// the `id` and `patch` names.
-pub struct PatchesIter<'a> {
-    inner: sql::CursorWithOwnership<'a>,
-}
-
-impl<'a> PatchesIter<'a> {
-    fn parse_row(row: sql::Row) -> Result<(PatchId, Patch), Error> {
-        let id = PatchId::from_str(row.read::<&str, _>("id"))?;
-        let patch = serde_json::from_str::<Patch>(row.read::<&str, _>("patch"))
-            .map_err(|e| Error::Object(id, e))?;
-        Ok((id, patch))
-    }
-}
-
-impl<'a> Iterator for PatchesIter<'a> {
-    type Item = Result<(PatchId, Patch), Error>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let row = self.inner.next()?;
-        Some(row.map_err(Error::from).and_then(PatchesIter::parse_row))
-    }
-}
-
-impl<R> Patches for Cache<R, StoreReader>
-where
-    R: HasRepoId,
-{
-    type Error = Error;
-    type Iter<'b> = PatchesIter<'b>
-    where
-        Self: 'b;
-
-    fn get(&self, id: &PatchId) -> Result<Option<Patch>, Self::Error> {
-        query::get(&self.cache.db, &self.rid(), id)
-    }
-
-    fn find_by_revision(&self, id: &RevisionId) -> Result<Option<ByRevision>, Error> {
-        query::find_by_revision(&self.cache.db, &self.rid(), id)
-    }
-
-    fn list(&self) -> Result<Self::Iter<'_>, Self::Error> {
-        query::list(&self.cache.db, &self.rid())
-    }
-
-    fn list_by_status(&self, status: &Status) -> Result<Self::Iter<'_>, Self::Error> {
-        query::list_by_status(&self.cache.db, &self.rid(), status)
-    }
-
-    fn counts(&self) -> Result<PatchCounts, Self::Error> {
-        query::counts(&self.cache.db, &self.rid())
-    }
-}
-
-pub struct NoCacheIter<'a> {
-    inner: Box<dyn Iterator<Item = Result<(PatchId, Patch), super::Error>> + 'a>,
-}
-
-impl<'a> Iterator for NoCacheIter<'a> {
-    type Item = Result<(PatchId, Patch), super::Error>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.inner.next()
-    }
-}
-
-impl<'a, R> Patches for Cache<super::Patches<'a, R>, cache::NoCache>
-where
-    R: ReadRepository + cob::Store,
-{
-    type Error = super::Error;
-    type Iter<'b> = NoCacheIter<'b> where Self: 'b;
-
-    fn get(&self, id: &PatchId) -> Result<Option<Patch>, Self::Error> {
-        self.store.get(id).map_err(super::Error::from)
-    }
-
-    fn find_by_revision(&self, id: &RevisionId) -> Result<Option<ByRevision>, Self::Error> {
-        self.store.find_by_revision(id)
-    }
-
-    fn list(&self) -> Result<Self::Iter<'_>, Self::Error> {
-        self.store
-            .all()
-            .map(|inner| NoCacheIter {
-                inner: Box::new(inner.into_iter().map(|res| res.map_err(super::Error::from))),
-            })
-            .map_err(super::Error::from)
-    }
-
-    fn list_by_status(&self, status: &Status) -> Result<Self::Iter<'_>, Self::Error> {
-        let status = *status;
-        self.store
-            .all()
-            .map(move |inner| NoCacheIter {
-                inner: Box::new(inner.into_iter().filter_map(move |res| {
-                    match res {
-                        Ok((id, patch)) => (status == Status::from(&patch.state))
-                            .then_some((id, patch))
-                            .map(Ok),
-                        Err(e) => Some(Err(e.into())),
-                    }
-                })),
-            })
-            .map_err(super::Error::from)
-    }
-
-    fn counts(&self) -> Result<PatchCounts, Self::Error> {
-        self.store.counts().map_err(super::Error::from)
-    }
-}
-
-impl<R> Patches for Cache<R, StoreWriter>
-where
-    R: HasRepoId,
-{
-    type Error = Error;
-    type Iter<'b> = PatchesIter<'b>
-    where
-        Self: 'b;
-
-    fn get(&self, id: &PatchId) -> Result<Option<Patch>, Self::Error> {
-        query::get(&self.cache.db, &self.rid(), id)
-    }
-
-    fn find_by_revision(&self, id: &RevisionId) -> Result<Option<ByRevision>, Error> {
-        query::find_by_revision(&self.cache.db, &self.rid(), id)
-    }
-
-    fn list(&self) -> Result<Self::Iter<'_>, Self::Error> {
-        query::list(&self.cache.db, &self.rid())
-    }
-
-    fn list_by_status(&self, status: &Status) -> Result<Self::Iter<'_>, Self::Error> {
-        query::list_by_status(&self.cache.db, &self.rid(), status)
-    }
-
-    fn counts(&self) -> Result<PatchCounts, Self::Error> {
-        query::counts(&self.cache.db, &self.rid())
-    }
-}
-
-/// Helper SQL queries for [ `Patches`] trait implementations.
-mod query {
-    use sqlite as sql;
-
-    use crate::patch::Status;
-
-    use super::*;
-
-    pub(super) fn get(
-        db: &sql::ConnectionThreadSafe,
-        rid: &RepoId,
-        id: &PatchId,
-    ) -> Result<Option<Patch>, Error> {
-        let key = sql::Value::String(id.to_string());
-        let mut stmt = db.prepare(
-            "SELECT patch
-             FROM patches
-             WHERE id = ?1 AND repo = ?2",
-        )?;
-
-        stmt.bind((1, key))?;
-        stmt.bind((2, rid))?;
-
-        match stmt.into_iter().next().transpose()? {
-            None => Ok(None),
-            Some(row) => {
-                let patch = row.read::<&str, _>("patch");
-                let patch = serde_json::from_str(patch).map_err(|e| Error::Object(*id, e))?;
-                Ok(Some(patch))
-            }
-        }
-    }
-
-    pub(super) fn find_by_revision(
-        db: &sql::ConnectionThreadSafe,
-        rid: &RepoId,
-        id: &RevisionId,
-    ) -> Result<Option<ByRevision>, Error> {
-        let revision_id = *id;
-        let mut stmt = db.prepare(
-            "SELECT patches.id, patch, revisions.value AS revision
-             FROM patches, json_tree(patches.patch, '$.revisions') AS revisions
-             WHERE repo = ?1
-             AND revisions.key = ?2
-            ",
-        )?;
-        stmt.bind((1, rid))?;
-        stmt.bind((2, sql::Value::String(id.to_string())))?;
-
-        match stmt.into_iter().next().transpose()? {
-            None => Ok(None),
-            Some(row) => {
-                let id = PatchId::from_str(row.read::<&str, _>("id"))?;
-                let patch = serde_json::from_str::<Patch>(row.read::<&str, _>("patch"))
-                    .map_err(|e| Error::Object(id, e))?;
-                let revision = serde_json::from_str::<Revision>(row.read::<&str, _>("revision"))?;
-                Ok(Some(ByRevision {
-                    id,
-                    patch,
-                    revision_id,
-                    revision,
-                }))
-            }
-        }
-    }
-
-    pub(super) fn list<'a>(
-        db: &'a sql::ConnectionThreadSafe,
-        rid: &RepoId,
-    ) -> Result<PatchesIter<'a>, Error> {
-        let mut stmt = db.prepare(
-            "SELECT id, patch
-             FROM patches
-             WHERE repo = ?1
-             ORDER BY id
-            ",
-        )?;
-        stmt.bind((1, rid))?;
-        Ok(PatchesIter {
-            inner: stmt.into_iter(),
-        })
-    }
-
-    pub(super) fn list_by_status<'a>(
-        db: &'a sql::ConnectionThreadSafe,
-        rid: &RepoId,
-        filter: &Status,
-    ) -> Result<PatchesIter<'a>, Error> {
-        let mut stmt = db.prepare(
-            "SELECT patches.id, patch
-             FROM patches
-             WHERE repo = ?1
-             AND patch->>'$.state.status' = ?2
-             ORDER BY id
-            ",
-        )?;
-        stmt.bind((1, rid))?;
-        stmt.bind((2, sql::Value::String(filter.to_string())))?;
-        Ok(PatchesIter {
-            inner: stmt.into_iter(),
-        })
-    }
-
-    pub(super) fn counts(
-        db: &sql::ConnectionThreadSafe,
-        rid: &RepoId,
-    ) -> Result<PatchCounts, Error> {
-        let mut stmt = db.prepare(
-            "SELECT
-                 patch->'$.state' AS state,
-                 COUNT(*) AS count
-             FROM patches
-             WHERE repo = ?1
-             GROUP BY patch->'$.state.status'",
-        )?;
-        stmt.bind((1, rid))?;
-
-        stmt.into_iter()
-            .try_fold(PatchCounts::default(), |mut counts, row| {
-                let row = row?;
-                let count = row.read::<i64, _>("count") as usize;
-                let status = serde_json::from_str::<State>(row.read::<&str, _>("state"))?;
-                match status {
-                    State::Draft => counts.draft += count,
-                    State::Open { .. } => counts.open += count,
-                    State::Archived => counts.archived += count,
-                    State::Merged { .. } => counts.merged += count,
-                }
-                Ok(counts)
-            })
-    }
-}
-
-#[allow(clippy::unwrap_used)]
-#[cfg(test)]
-mod tests {
-    use std::collections::{BTreeMap, BTreeSet};
-    use std::num::NonZeroU8;
-    use std::str::FromStr;
-
-    use amplify::Wrapper;
-    use radicle_cob::ObjectId;
-
-    use crate::cob::cache::{Store, Update, Write};
-    use crate::cob::thread::{Comment, Thread};
-    use crate::cob::Author;
-    use crate::patch::{
-        ByRevision, MergeTarget, Patch, PatchCounts, PatchId, Revision, RevisionId, State, Status,
-    };
-    use crate::prelude::Did;
-    use crate::profile::env;
-    use crate::test::arbitrary;
-    use crate::test::storage::MockRepository;
-
-    use super::{Cache, Patches};
-
-    fn memory(store: MockRepository) -> Cache<MockRepository, Store<Write>> {
-        let cache = Store::<Write>::memory().unwrap();
-        Cache { store, cache }
-    }
-
-    fn revision() -> (RevisionId, Revision) {
-        let author = arbitrary::gen::<Did>(1);
-        let description = arbitrary::gen::<String>(1);
-        let base = arbitrary::oid();
-        let oid = arbitrary::oid();
-        let timestamp = env::local_time();
-        let resolves = BTreeSet::new();
-        let id = RevisionId::from(arbitrary::oid());
-        let mut revision = Revision::new(
-            id,
-            Author { id: author },
-            description,
-            base,
-            oid,
-            timestamp.into(),
-            resolves,
-        );
-        let comment = Comment::new(
-            *author,
-            "#1 comment".to_string(),
-            None,
-            None,
-            vec![],
-            timestamp.into(),
-        );
-        let thread = Thread::new(arbitrary::oid(), comment);
-        revision.discussion = thread;
-        (id, revision)
-    }
-
-    #[test]
-    fn test_is_empty() {
-        let repo = arbitrary::gen::<MockRepository>(1);
-        let mut cache = memory(repo);
-        assert!(cache.is_empty().unwrap());
-
-        let patch = Patch::new("Patch #1".to_string(), MergeTarget::Delegates, revision());
-        let id = ObjectId::from_str("47799cbab2eca047b6520b9fce805da42b49ecab").unwrap();
-        cache.update(&cache.rid(), &id, &patch).unwrap();
-
-        let patch = Patch {
-            state: State::Archived,
-            ..Patch::new("Patch #2".to_string(), MergeTarget::Delegates, revision())
-        };
-        let id = ObjectId::from_str("ae981ded6ed2ed2cdba34c8603714782667f18a3").unwrap();
-        cache.update(&cache.rid(), &id, &patch).unwrap();
-
-        assert!(!cache.is_empty().unwrap())
-    }
-
-    #[test]
-    fn test_counts() {
-        let repo = arbitrary::gen::<MockRepository>(1);
-        let mut cache = memory(repo);
-        let n_open = arbitrary::gen::<u8>(0);
-        let n_draft = arbitrary::gen::<u8>(1);
-        let n_archived = arbitrary::gen::<u8>(1);
-        let n_merged = arbitrary::gen::<u8>(1);
-        let open_ids = (0..n_open)
-            .map(|_| PatchId::from(arbitrary::oid()))
-            .collect::<BTreeSet<PatchId>>();
-        let draft_ids = (0..n_draft)
-            .map(|_| PatchId::from(arbitrary::oid()))
-            .collect::<BTreeSet<PatchId>>();
-        let archived_ids = (0..n_archived)
-            .map(|_| PatchId::from(arbitrary::oid()))
-            .collect::<BTreeSet<PatchId>>();
-        let merged_ids = (0..n_merged)
-            .map(|_| PatchId::from(arbitrary::oid()))
-            .collect::<BTreeSet<PatchId>>();
-
-        for id in open_ids.iter() {
-            let patch = Patch::new(id.to_string(), MergeTarget::Delegates, revision());
-            cache
-                .update(&cache.rid(), &PatchId::from(*id), &patch)
-                .unwrap();
-        }
-
-        for id in draft_ids.iter() {
-            let patch = Patch {
-                state: State::Draft,
-                ..Patch::new(id.to_string(), MergeTarget::Delegates, revision())
-            };
-            cache
-                .update(&cache.rid(), &PatchId::from(*id), &patch)
-                .unwrap();
-        }
-
-        for id in archived_ids.iter() {
-            let patch = Patch {
-                state: State::Archived,
-                ..Patch::new(id.to_string(), MergeTarget::Delegates, revision())
-            };
-            cache
-                .update(&cache.rid(), &PatchId::from(*id), &patch)
-                .unwrap();
-        }
-
-        for id in merged_ids.iter() {
-            let patch = Patch {
-                state: State::Merged {
-                    revision: arbitrary::oid().into(),
-                    commit: arbitrary::oid(),
-                },
-                ..Patch::new(id.to_string(), MergeTarget::Delegates, revision())
-            };
-            cache
-                .update(&cache.rid(), &PatchId::from(*id), &patch)
-                .unwrap();
-        }
-
-        assert_eq!(
-            cache.counts().unwrap(),
-            PatchCounts {
-                open: open_ids.len(),
-                draft: draft_ids.len(),
-                archived: archived_ids.len(),
-                merged: merged_ids.len(),
-            }
-        );
-    }
-
-    #[test]
-    fn test_get() {
-        let repo = arbitrary::gen::<MockRepository>(1);
-        let mut cache = memory(repo);
-        let ids = (0..arbitrary::gen::<u8>(1))
-            .map(|_| PatchId::from(arbitrary::oid()))
-            .collect::<BTreeSet<PatchId>>();
-        let missing = (0..arbitrary::gen::<u8>(2))
-            .filter_map(|_| {
-                let id = PatchId::from(arbitrary::oid());
-                (!ids.contains(&id)).then_some(id)
-            })
-            .collect::<BTreeSet<PatchId>>();
-        let mut patches = Vec::with_capacity(ids.len());
-
-        for id in ids.iter() {
-            let patch = Patch::new(id.to_string(), MergeTarget::Delegates, revision());
-            cache
-                .update(&cache.rid(), &PatchId::from(*id), &patch)
-                .unwrap();
-            patches.push((*id, patch));
-        }
-
-        for (id, patch) in patches.into_iter() {
-            assert_eq!(Some(patch), cache.get(&id).unwrap());
-        }
-
-        for id in &missing {
-            assert_eq!(cache.get(id).unwrap(), None);
-        }
-    }
-
-    #[test]
-    fn test_find_by_revision() {
-        let repo = arbitrary::gen::<MockRepository>(1);
-        let mut cache = memory(repo);
-        let patch_id = PatchId::from(arbitrary::oid());
-        let revisions = (0..arbitrary::gen::<NonZeroU8>(1).into())
-            .map(|_| revision())
-            .collect::<BTreeMap<RevisionId, Revision>>();
-        let (rev_id, rev) = revisions
-            .iter()
-            .next()
-            .expect("at least one revision should have been created");
-        let mut patch = Patch::new(
-            patch_id.to_string(),
-            MergeTarget::Delegates,
-            (*rev_id, rev.clone()),
-        );
-        let timeline = revisions.keys().copied().collect::<Vec<_>>();
-        patch
-            .timeline
-            .extend(timeline.iter().map(|id| id.into_inner()));
-        patch
-            .revisions
-            .extend(revisions.iter().map(|(id, rev)| (*id, Some(rev.clone()))));
-        cache
-            .update(&cache.rid(), &PatchId::from(*patch_id), &patch)
-            .unwrap();
-
-        for entry in timeline {
-            let rev = revisions.get(&entry).unwrap().clone();
-            assert_eq!(
-                Some(ByRevision {
-                    id: patch_id,
-                    patch: patch.clone(),
-                    revision_id: entry,
-                    revision: rev
-                }),
-                cache.find_by_revision(&entry).unwrap()
-            );
-        }
-    }
-
-    #[test]
-    fn test_list() {
-        let repo = arbitrary::gen::<MockRepository>(1);
-        let mut cache = memory(repo);
-        let ids = (0..arbitrary::gen::<u8>(1))
-            .map(|_| PatchId::from(arbitrary::oid()))
-            .collect::<BTreeSet<PatchId>>();
-        let mut patches = Vec::with_capacity(ids.len());
-
-        for id in ids.iter() {
-            let patch = Patch::new(id.to_string(), MergeTarget::Delegates, revision());
-            cache
-                .update(&cache.rid(), &PatchId::from(*id), &patch)
-                .unwrap();
-            patches.push((*id, patch));
-        }
-
-        let mut list = cache
-            .list()
-            .unwrap()
-            .collect::<Result<Vec<_>, _>>()
-            .unwrap();
-        list.sort_by_key(|(id, _)| *id);
-        patches.sort_by_key(|(id, _)| *id);
-        assert_eq!(patches, list);
-    }
-
-    #[test]
-    fn test_list_by_status() {
-        let repo = arbitrary::gen::<MockRepository>(1);
-        let mut cache = memory(repo);
-        let ids = (0..arbitrary::gen::<u8>(1))
-            .map(|_| PatchId::from(arbitrary::oid()))
-            .collect::<BTreeSet<PatchId>>();
-        let mut patches = Vec::with_capacity(ids.len());
-
-        for id in ids.iter() {
-            let patch = Patch::new(id.to_string(), MergeTarget::Delegates, revision());
-            cache
-                .update(&cache.rid(), &PatchId::from(*id), &patch)
-                .unwrap();
-            patches.push((*id, patch));
-        }
-
-        let mut list = cache
-            .list_by_status(&Status::Open)
-            .unwrap()
-            .collect::<Result<Vec<_>, _>>()
-            .unwrap();
-        list.sort_by_key(|(id, _)| *id);
-        patches.sort_by_key(|(id, _)| *id);
-        assert_eq!(patches, list);
-    }
-
-    #[test]
-    fn test_remove() {
-        let repo = arbitrary::gen::<MockRepository>(1);
-        let mut cache = memory(repo);
-        let ids = (0..arbitrary::gen::<u8>(1))
-            .map(|_| PatchId::from(arbitrary::oid()))
-            .collect::<BTreeSet<PatchId>>();
-
-        for id in ids.iter() {
-            let patch = Patch::new(id.to_string(), MergeTarget::Delegates, revision());
-            cache
-                .update(&cache.rid(), &PatchId::from(*id), &patch)
-                .unwrap();
-            assert_eq!(Some(patch), cache.get(id).unwrap());
-            super::Remove::remove(&mut cache, id).unwrap();
-            assert_eq!(None, cache.get(id).unwrap());
-        }
-    }
-}
diff --git a/radicle/src/cob/store.rs b/radicle/src/cob/store.rs
deleted file mode 100644
index c34a7fb03..000000000
--- a/radicle/src/cob/store.rs
+++ /dev/null
@@ -1,420 +0,0 @@
-//! Generic COB storage.
-#![allow(clippy::large_enum_variant)]
-#![allow(clippy::type_complexity)]
-use std::fmt::Debug;
-use std::marker::PhantomData;
-
-use nonempty::NonEmpty;
-use radicle_cob::CollaborativeObject;
-use serde::{Deserialize, Serialize};
-
-use crate::cob::op::Op;
-use crate::cob::{Create, Embed, EntryId, ObjectId, TypeName, Update, Updated, Version};
-use crate::git;
-use crate::prelude::*;
-use crate::storage::git as storage;
-use crate::storage::SignRepository;
-use crate::{cob, identity};
-
-pub trait CobAction: Debug {
-    /// Parent objects this action depends on. For example, patch revisions
-    /// have the commit objects as their parent.
-    fn parents(&self) -> Vec<git::Oid> {
-        Vec::new()
-    }
-}
-
-/// A collaborative object. Can be materialized from an operation history.
-pub trait Cob: Sized + PartialEq + Debug {
-    /// The underlying action composing each operation.
-    type Action: CobAction + for<'de> Deserialize<'de> + Serialize;
-    /// Error returned by `apply` function.
-    type Error: std::error::Error + Send + Sync + 'static;
-
-    /// The object type name.
-    fn type_name() -> &'static TypeName;
-
-    /// Initialize a collarorative object from a root operation.
-    fn from_root<R: ReadRepository>(op: Op<Self::Action>, repo: &R) -> Result<Self, Self::Error>;
-
-    /// Apply an operation to the state.
-    fn op<'a, R: ReadRepository, I: IntoIterator<Item = &'a cob::Entry>>(
-        &mut self,
-        op: Op<Self::Action>,
-        concurrent: I,
-        repo: &R,
-    ) -> Result<(), <Self as Cob>::Error>;
-
-    #[cfg(test)]
-    /// Create an object from a history.
-    fn from_history<R: ReadRepository>(
-        history: &crate::cob::History,
-        repo: &R,
-    ) -> Result<Self, test::HistoryError<Self>> {
-        test::from_history::<R, Self>(history, repo)
-    }
-
-    #[cfg(test)]
-    /// Create an object from individual operations.
-    /// Returns an error if any of the operations fails to apply.
-    fn from_ops<R: ReadRepository>(
-        ops: impl IntoIterator<Item = Op<Self::Action>>,
-        repo: &R,
-    ) -> Result<Self, Self::Error> {
-        let mut ops = ops.into_iter();
-        let Some(init) = ops.next() else {
-            panic!("FromHistory::from_ops: operations list is empty");
-        };
-        let mut state = Self::from_root(init, repo)?;
-        for op in ops {
-            state.op(op, [].into_iter(), repo)?;
-        }
-        Ok(state)
-    }
-}
-
-/// Store error.
-#[derive(Debug, thiserror::Error)]
-pub enum Error {
-    #[error("create error: {0}")]
-    Create(#[from] cob::error::Create),
-    #[error("update error: {0}")]
-    Update(#[from] cob::error::Update),
-    #[error("retrieve error: {0}")]
-    Retrieve(#[from] cob::error::Retrieve),
-    #[error("remove error: {0}")]
-    Remove(#[from] cob::error::Remove),
-    #[error(transparent)]
-    Identity(#[from] identity::doc::DocError),
-    #[error(transparent)]
-    Serialize(#[from] serde_json::Error),
-    #[error("object `{1}` of type `{0}` was not found")]
-    NotFound(TypeName, ObjectId),
-    #[error("signed refs: {0}")]
-    SignRefs(#[from] storage::Error),
-    #[error("failed to find reference '{name}': {err}")]
-    RefLookup {
-        name: git::RefString,
-        #[source]
-        err: git::raw::Error,
-    },
-}
-
-/// Storage for collaborative objects of a specific type `T` in a single repository.
-pub struct Store<'a, T, R> {
-    identity: Option<git::Oid>,
-    repo: &'a R,
-    witness: PhantomData<T>,
-}
-
-impl<'a, T, R> AsRef<R> for Store<'a, T, R> {
-    fn as_ref(&self) -> &R {
-        self.repo
-    }
-}
-
-impl<'a, T, R> Store<'a, T, R>
-where
-    R: ReadRepository + cob::Store,
-{
-    /// Open a new generic store.
-    pub fn open(repo: &'a R) -> Result<Self, Error> {
-        Ok(Self {
-            repo,
-            identity: None,
-            witness: PhantomData,
-        })
-    }
-
-    /// Return a new store with the attached identity.
-    pub fn identity(self, identity: git::Oid) -> Self {
-        Self {
-            repo: self.repo,
-            witness: self.witness,
-            identity: Some(identity),
-        }
-    }
-}
-
-impl<'a, T, R> Store<'a, T, R>
-where
-    R: ReadRepository + SignRepository + cob::Store,
-    T: Cob + cob::Evaluate<R>,
-    T::Action: Serialize,
-{
-    /// Update an object.
-    pub fn update<G: Signer>(
-        &self,
-        object_id: ObjectId,
-        message: &str,
-        actions: impl Into<NonEmpty<T::Action>>,
-        embeds: Vec<Embed>,
-        signer: &G,
-    ) -> Result<Updated<T>, Error> {
-        let actions = actions.into();
-        let related = actions.iter().flat_map(T::Action::parents).collect();
-        let changes = actions.try_map(encoding::encode)?;
-        let updated = cob::update(
-            self.repo,
-            signer,
-            self.identity,
-            related,
-            signer.public_key(),
-            Update {
-                object_id,
-                type_name: T::type_name().clone(),
-                message: message.to_owned(),
-                embeds,
-                changes,
-            },
-        )?;
-        self.repo.sign_refs(signer).map_err(Error::SignRefs)?;
-
-        Ok(updated)
-    }
-
-    /// Create an object.
-    pub fn create<G: Signer>(
-        &self,
-        message: &str,
-        actions: impl Into<NonEmpty<T::Action>>,
-        embeds: Vec<Embed>,
-        signer: &G,
-    ) -> Result<(ObjectId, T), Error> {
-        let actions = actions.into();
-        let parents = actions.iter().flat_map(T::Action::parents).collect();
-        let contents = actions.try_map(encoding::encode)?;
-        let cob = cob::create::<T, _, G>(
-            self.repo,
-            signer,
-            self.identity,
-            parents,
-            signer.public_key(),
-            Create {
-                type_name: T::type_name().clone(),
-                version: Version::default(),
-                message: message.to_owned(),
-                embeds,
-                contents,
-            },
-        )?;
-        self.repo.sign_refs(signer).map_err(Error::SignRefs)?;
-
-        Ok((*cob.id(), cob.object))
-    }
-
-    /// Remove an object.
-    pub fn remove<G: Signer>(&self, id: &ObjectId, signer: &G) -> Result<(), Error> {
-        let name = git::refs::storage::cob(signer.public_key(), T::type_name(), id);
-        match self
-            .repo
-            .reference_oid(signer.public_key(), &name.strip_namespace())
-        {
-            Ok(_) => {
-                cob::remove(self.repo, signer.public_key(), T::type_name(), id)?;
-                self.repo.sign_refs(signer).map_err(Error::SignRefs)?;
-                Ok(())
-            }
-            Err(err) if err.code() == git::raw::ErrorCode::NotFound => Ok(()),
-            Err(err) => Err(Error::RefLookup {
-                name: name.to_ref_string(),
-                err,
-            }),
-        }
-    }
-}
-
-impl<'a, T, R> Store<'a, T, R>
-where
-    R: ReadRepository + cob::Store,
-    T: cob::Evaluate<R> + Cob,
-    T::Action: Serialize,
-{
-    /// Get an object.
-    pub fn get(&self, id: &ObjectId) -> Result<Option<T>, Error> {
-        cob::get::<T, _>(self.repo, T::type_name(), id)
-            .map(|r| r.map(|cob| cob.object))
-            .map_err(Error::from)
-    }
-
-    /// Return all objects.
-    pub fn all(
-        &self,
-    ) -> Result<impl ExactSizeIterator<Item = Result<(ObjectId, T), Error>> + 'a, Error> {
-        let raw = cob::list::<T, _>(self.repo, T::type_name())?;
-
-        Ok(raw.into_iter().map(|o| Ok((*o.id(), o.object))))
-    }
-
-    /// Return true if the list of issues is empty.
-    pub fn is_empty(&self) -> Result<bool, Error> {
-        Ok(self.count()? == 0)
-    }
-
-    /// Return objects count.
-    pub fn count(&self) -> Result<usize, Error> {
-        let raw = cob::list::<T, _>(self.repo, T::type_name())?;
-
-        Ok(raw.len())
-    }
-}
-
-/// Allows operations to be batched atomically.
-#[derive(Debug)]
-pub struct Transaction<T: Cob + cob::Evaluate<R>, R> {
-    actions: Vec<T::Action>,
-    embeds: Vec<Embed>,
-    repo: PhantomData<R>,
-}
-
-impl<T: Cob + cob::Evaluate<R>, R> Default for Transaction<T, R> {
-    fn default() -> Self {
-        Self {
-            actions: Vec::new(),
-            embeds: Vec::new(),
-            repo: PhantomData,
-        }
-    }
-}
-
-impl<T, R> Transaction<T, R>
-where
-    T: Cob + cob::Evaluate<R>,
-{
-    /// Create a new transaction to be used as the initial set of operations for a COB.
-    pub fn initial<G, F>(
-        message: &str,
-        store: &mut Store<T, R>,
-        signer: &G,
-        operations: F,
-    ) -> Result<(ObjectId, T), Error>
-    where
-        G: Signer,
-        F: FnOnce(&mut Self) -> Result<(), Error>,
-        R: ReadRepository + SignRepository + cob::Store,
-        T::Action: Serialize + Clone,
-    {
-        let mut tx = Transaction::default();
-        operations(&mut tx)?;
-
-        let actions = NonEmpty::from_vec(tx.actions)
-            .expect("Transaction::initial: transaction must contain at least one action");
-
-        store.create(message, actions, tx.embeds, signer)
-    }
-
-    /// Add an operation to this transaction.
-    pub fn push(&mut self, action: T::Action) -> Result<(), Error> {
-        self.actions.push(action);
-
-        Ok(())
-    }
-
-    /// Embed media into the transaction.
-    pub fn embed(&mut self, embeds: impl IntoIterator<Item = Embed>) -> Result<(), Error> {
-        self.embeds.extend(embeds);
-
-        Ok(())
-    }
-
-    /// Commit transaction.
-    ///
-    /// Returns an operation that can be applied onto an in-memory state.
-    pub fn commit<G: Signer>(
-        self,
-        msg: &str,
-        id: ObjectId,
-        store: &mut Store<T, R>,
-        signer: &G,
-    ) -> Result<(T, EntryId), Error>
-    where
-        R: ReadRepository + SignRepository + cob::Store,
-        T::Action: Serialize + Clone,
-    {
-        let actions = NonEmpty::from_vec(self.actions)
-            .expect("Transaction::commit: transaction must not be empty");
-        let Updated {
-            head,
-            object: CollaborativeObject { object, .. },
-            ..
-        } = store.update(id, msg, actions, self.embeds, signer)?;
-
-        Ok((object, head))
-    }
-}
-
-/// Get an object's operations without decoding them.
-pub fn ops<R: cob::Store>(
-    id: &ObjectId,
-    type_name: &TypeName,
-    repo: &R,
-) -> Result<NonEmpty<Op<Vec<u8>>>, Error> {
-    let cob = cob::get::<NonEmpty<cob::Entry>, _>(repo, type_name, id)?;
-
-    if let Some(cob) = cob {
-        Ok(cob.object.map(Op::from))
-    } else {
-        Err(Error::NotFound(type_name.clone(), *id))
-    }
-}
-
-pub mod encoding {
-    use serde::Serialize;
-
-    use crate::canonical::formatter::CanonicalFormatter;
-
-    /// Serialize the change into a byte string.
-    pub fn encode<A: Serialize>(action: A) -> Result<Vec<u8>, serde_json::Error> {
-        let mut buf = Vec::new();
-        let mut serializer =
-            serde_json::Serializer::with_formatter(&mut buf, CanonicalFormatter::new());
-
-        action.serialize(&mut serializer)?;
-
-        Ok(buf)
-    }
-}
-
-#[cfg(test)]
-pub mod test {
-    use super::*;
-
-    #[derive(Debug, thiserror::Error)]
-    pub enum HistoryError<T: Cob> {
-        #[error("apply: {0}")]
-        Apply(T::Error),
-        #[error("operation decoding failed: {0}")]
-        Op(#[from] cob::op::OpEncodingError),
-    }
-
-    /// Turn a history into a concrete type, by traversing the history and applying each operation
-    /// to the state, skipping branches that return errors.
-    pub fn from_history<R: ReadRepository, T: Cob>(
-        history: &crate::cob::History,
-        repo: &R,
-    ) -> Result<T, HistoryError<T>> {
-        use std::ops::ControlFlow;
-
-        let root = history.root();
-        let children = history.children_of(root.id());
-        let op = Op::try_from(root)?;
-        let initial = T::from_root(op, repo).map_err(HistoryError::Apply)?;
-        let obj = history.traverse(initial, &children, |mut acc, _, entry| {
-            match Op::try_from(entry) {
-                Ok(op) => {
-                    if let Err(err) = acc.op(op, [], repo) {
-                        log::warn!("Error applying op to `{}` state: {err}", T::type_name());
-                        return ControlFlow::Break(acc);
-                    }
-                }
-                Err(err) => {
-                    log::warn!("Error decoding ops for `{}` state: {err}", T::type_name());
-                    return ControlFlow::Break(acc);
-                }
-            }
-            ControlFlow::Continue(acc)
-        });
-
-        Ok(obj)
-    }
-}
diff --git a/radicle/src/cob/test.rs b/radicle/src/cob/test.rs
deleted file mode 100644
index d008d5389..000000000
--- a/radicle/src/cob/test.rs
+++ /dev/null
@@ -1,278 +0,0 @@
-#![allow(clippy::unwrap_used)]
-use std::marker::PhantomData;
-use std::ops::Deref;
-
-use nonempty::NonEmpty;
-use radicle_crypto::ssh::ExtendedSignature;
-use serde::{Deserialize, Serialize};
-
-use crate::cob::op::Op;
-use crate::cob::patch;
-use crate::cob::patch::Patch;
-use crate::cob::store::encoding;
-use crate::cob::{Entry, History, Manifest, Timestamp, Version};
-use crate::crypto::Signer;
-use crate::git;
-use crate::git::ext::author::Author;
-use crate::git::ext::commit::headers::Headers;
-use crate::git::ext::commit::{trailers::OwnedTrailer, Commit};
-use crate::git::Oid;
-use crate::prelude::Did;
-use crate::profile::env;
-use crate::storage::ReadRepository;
-use crate::test::arbitrary;
-
-use super::store::Cob;
-use super::thread;
-
-/// Convenience type for building histories.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct HistoryBuilder<T> {
-    history: History,
-    resource: Option<Oid>,
-    time: Timestamp,
-    witness: PhantomData<T>,
-}
-
-impl<T> AsRef<History> for HistoryBuilder<T> {
-    fn as_ref(&self) -> &History {
-        &self.history
-    }
-}
-
-impl HistoryBuilder<thread::Thread> {
-    pub fn comment<G: Signer>(
-        &mut self,
-        body: impl ToString,
-        reply_to: Option<thread::CommentId>,
-        signer: &G,
-    ) -> Oid {
-        let action = thread::Action::Comment {
-            body: body.to_string(),
-            reply_to,
-        };
-        self.commit(&action, signer)
-    }
-}
-
-impl<T: Cob> HistoryBuilder<T>
-where
-    T::Action: for<'de> Deserialize<'de> + Serialize + Eq + 'static,
-{
-    pub fn new<G: Signer>(actions: &[T::Action], time: Timestamp, signer: &G) -> HistoryBuilder<T> {
-        let resource = Some(arbitrary::oid());
-        let revision = arbitrary::oid();
-        let (contents, oids): (Vec<Vec<u8>>, Vec<Oid>) = actions
-            .iter()
-            .map(|a| encoded::<T, _>(a, time, [], signer))
-            .unzip();
-        let contents = NonEmpty::from_vec(contents).unwrap();
-        let root = oids.first().unwrap();
-        let manifest = Manifest::new(T::type_name().clone(), Version::default());
-        let signature = signer.sign(&[0]);
-        let signature = ExtendedSignature::new(*signer.public_key(), signature);
-        let change = Entry {
-            id: *root,
-            signature,
-            resource,
-            contents,
-            timestamp: time.as_secs(),
-            revision,
-            parents: vec![],
-            related: vec![],
-            manifest,
-        };
-
-        Self {
-            history: History::new_from_root(change),
-            time,
-            resource,
-            witness: PhantomData,
-        }
-    }
-
-    pub fn root(&self) -> &Entry {
-        self.history.root()
-    }
-
-    pub fn merge(&mut self, other: Self) {
-        self.history.merge(other.history);
-    }
-
-    pub fn commit<G: Signer>(&mut self, action: &T::Action, signer: &G) -> git::ext::Oid {
-        let timestamp = self.time;
-        let tips = self.tips();
-        let revision = arbitrary::oid();
-        let (data, oid) = encoded::<T, _>(action, timestamp, tips, signer);
-        let manifest = Manifest::new(T::type_name().clone(), Version::default());
-        let signature = signer.sign(data.as_slice());
-        let signature = ExtendedSignature::new(*signer.public_key(), signature);
-        let change = Entry {
-            id: oid,
-            signature,
-            resource: self.resource,
-            contents: NonEmpty::new(data),
-            timestamp: timestamp.as_secs(),
-            revision,
-            parents: vec![],
-            related: vec![],
-            manifest,
-        };
-        self.history.extend(change);
-
-        oid
-    }
-}
-
-impl<A> Deref for HistoryBuilder<A> {
-    type Target = History;
-
-    fn deref(&self) -> &Self::Target {
-        &self.history
-    }
-}
-
-/// Create a new test history.
-pub fn history<T: Cob, G: Signer>(
-    actions: &[T::Action],
-    time: Timestamp,
-    signer: &G,
-) -> HistoryBuilder<T>
-where
-    T::Action: Serialize + Eq + 'static,
-{
-    HistoryBuilder::new(actions, time, signer)
-}
-
-/// An object that can be used to create and sign operations.
-pub struct Actor<G> {
-    pub signer: G,
-}
-
-impl<G: Default> Default for Actor<G> {
-    fn default() -> Self {
-        Self::new(G::default())
-    }
-}
-
-impl<G> Actor<G> {
-    pub fn new(signer: G) -> Self {
-        Self { signer }
-    }
-}
-
-impl<G: Signer> Actor<G> {
-    /// Create a new operation.
-    pub fn op_with<T: Cob>(
-        &mut self,
-        actions: impl IntoIterator<Item = T::Action>,
-        identity: Option<Oid>,
-        timestamp: Timestamp,
-    ) -> Op<T::Action>
-    where
-        T::Action: Clone + Serialize,
-    {
-        let actions = actions.into_iter().collect::<Vec<_>>();
-        let data = encoding::encode(serde_json::json!({
-            "action": actions,
-            "nonce": fastrand::u64(..),
-        }))
-        .unwrap();
-        let oid = git::raw::Oid::hash_object(git::raw::ObjectType::Blob, &data).unwrap();
-        let id = oid.into();
-        let author = *self.signer.public_key();
-        let actions = NonEmpty::from_vec(actions).unwrap();
-        let manifest = Manifest::new(T::type_name().clone(), Version::default());
-        let parents = vec![];
-        let related = vec![];
-
-        Op {
-            id,
-            actions,
-            author,
-            parents,
-            related,
-            timestamp,
-            identity,
-            manifest,
-        }
-    }
-
-    /// Create a new operation.
-    pub fn op<T: Cob>(&mut self, actions: impl IntoIterator<Item = T::Action>) -> Op<T::Action>
-    where
-        T::Action: Clone + Serialize,
-    {
-        let identity = arbitrary::oid();
-        let timestamp = env::commit_time();
-
-        self.op_with::<T>(actions, Some(identity), timestamp.into())
-    }
-
-    /// Get the actor's DID.
-    pub fn did(&self) -> Did {
-        self.signer.public_key().into()
-    }
-}
-
-impl<G: Signer> Actor<G> {
-    /// Create a patch.
-    pub fn patch<R: ReadRepository>(
-        &mut self,
-        title: impl ToString,
-        description: impl ToString,
-        base: git::Oid,
-        oid: git::Oid,
-        repo: &R,
-    ) -> Result<Patch, patch::Error> {
-        Patch::from_root(
-            self.op::<Patch>([
-                patch::Action::Revision {
-                    description: description.to_string(),
-                    base,
-                    oid,
-                    resolves: Default::default(),
-                },
-                patch::Action::Edit {
-                    title: title.to_string(),
-                    target: patch::MergeTarget::default(),
-                },
-            ]),
-            repo,
-        )
-    }
-}
-
-/// Encode an action and return its hash.
-///
-/// Doesn't encode in the same way as we do in production, but attempts to include the same data
-/// that feeds into the hash entropy, so that changing any input will change the resulting oid.
-pub fn encoded<T: Cob, G: Signer>(
-    action: &T::Action,
-    timestamp: Timestamp,
-    parents: impl IntoIterator<Item = Oid>,
-    signer: &G,
-) -> (Vec<u8>, git::ext::Oid) {
-    let data = encoding::encode(action).unwrap();
-    let oid = git::raw::Oid::hash_object(git::raw::ObjectType::Blob, &data).unwrap();
-    let parents = parents.into_iter().map(|o| *o);
-    let author = Author {
-        name: "radicle".to_owned(),
-        email: signer.public_key().to_human(),
-        time: git_ext::author::Time::new(timestamp.as_secs() as i64, 0),
-    };
-    let commit = Commit::new::<_, _, OwnedTrailer>(
-        oid,
-        parents,
-        author.clone(),
-        author,
-        Headers::new(),
-        String::default(),
-        [],
-    )
-    .to_string();
-
-    let hash = git::raw::Oid::hash_object(git::raw::ObjectType::Commit, commit.as_bytes()).unwrap();
-
-    (data, hash.into())
-}
diff --git a/radicle/src/cob/thread.rs b/radicle/src/cob/thread.rs
deleted file mode 100644
index eca10cdfd..000000000
--- a/radicle/src/cob/thread.rs
+++ /dev/null
@@ -1,944 +0,0 @@
-use std::cmp::Ordering;
-use std::collections::{BTreeMap, BTreeSet};
-use std::str::FromStr;
-
-use once_cell::sync::Lazy;
-use serde::{ser::SerializeStruct, Deserialize, Serialize};
-use thiserror::Error;
-
-use crate::cob;
-use crate::cob::common::{Reaction, Timestamp, Uri};
-use crate::cob::store::Cob;
-use crate::cob::{op, ActorId, Embed, EntryId, Op};
-use crate::git;
-use crate::prelude::ReadRepository;
-
-/// Type name of a thread, as well as the domain for all thread operations.
-/// Note that threads are not usually used standalone. They are embeded into other COBs.
-pub static TYPENAME: Lazy<cob::TypeName> =
-    Lazy::new(|| FromStr::from_str("xyz.radicle.thread").expect("type name is valid"));
-
-/// Error applying an operation onto a state.
-#[derive(Error, Debug)]
-pub enum Error {
-    /// Causal dependency missing.
-    ///
-    /// This error indicates that the operations are not being applied
-    /// in causal order, which is a requirement for this CRDT.
-    ///
-    /// For example, this can occur if an operation references anothern operation
-    /// that hasn't happened yet.
-    #[error("causal dependency {0:?} missing")]
-    Missing(EntryId),
-    /// The identity doc is missing.
-    #[error("identity document missing")]
-    MissingIdentity,
-    /// Error with comment operation.
-    #[error("comment {0} is invalid")]
-    Comment(EntryId),
-    /// Error with edit operation.
-    #[error("edit {0} is invalid")]
-    Edit(EntryId),
-    /// Object initialization failed.
-    #[error("initialization failed: {0}")]
-    Init(&'static str),
-    #[error("op decoding failed: {0}")]
-    Op(#[from] op::OpEncodingError),
-}
-
-/// Identifies a comment.
-pub type CommentId = EntryId;
-
-/// Reactions to a comment or other action.
-pub type Reactions = BTreeSet<(ActorId, Reaction)>;
-
-/// A comment edit is just some text and an edit time.
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Edit {
-    /// Edit author.
-    pub author: ActorId,
-    /// When the edit was made.
-    pub timestamp: Timestamp,
-    /// Edit contents. Replaces previous edits.
-    pub body: String,
-    /// Edit embed list.
-    pub embeds: Vec<Embed<Uri>>,
-}
-
-impl Edit {
-    /// Create a new edit.
-    pub fn new(
-        author: ActorId,
-        body: String,
-        timestamp: Timestamp,
-        embeds: Vec<Embed<Uri>>,
-    ) -> Self {
-        Self {
-            author,
-            timestamp,
-            body,
-            embeds,
-        }
-    }
-}
-
-/// The `Infallible` type does not have a `Serialize`/`Deserialize`
-/// implementation. The `Never` type imitates `Infallible` and
-/// provides the derived implementations.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub enum Never {}
-
-/// A comment on a discussion thread.
-#[derive(Debug, Clone, PartialEq, Eq, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Comment<T = Never> {
-    /// Comment author.
-    pub(in crate::cob) author: ActorId,
-    /// The comment body.
-    pub(in crate::cob) edits: Vec<Edit>,
-    /// Reactions to this comment.
-    pub(in crate::cob) reactions: Reactions,
-    /// Comment this is a reply to.
-    /// Should always be set, except for the root comment.
-    pub(in crate::cob) reply_to: Option<CommentId>,
-    /// Location of comment, if this is an inline comment.
-    pub(in crate::cob) location: Option<T>,
-    /// Whether the comment has been resolved.
-    pub(in crate::cob) resolved: bool,
-}
-
-impl<T: Serialize> Serialize for Comment<T> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::ser::Serializer,
-    {
-        let mut state = serializer.serialize_struct("Comment", 8)?;
-        state.serialize_field("author", &self.author())?;
-        if let Some(to) = self.reply_to {
-            state.serialize_field("replyTo", &to)?;
-        }
-        state.serialize_field("reactions", &self.reactions)?;
-        state.serialize_field("resolved", &self.resolved)?;
-        state.serialize_field("body", self.body())?;
-        state.serialize_field("edits", &self.edits)?;
-        if let Some(location) = self.location() {
-            state.serialize_field("location", &location)?;
-        }
-
-        let embeds = self.embeds();
-        if !embeds.is_empty() {
-            state.serialize_field("embeds", self.embeds())?;
-        }
-        state.end()
-    }
-}
-
-impl<L> Comment<L> {
-    /// Create a new comment.
-    pub fn new(
-        author: ActorId,
-        body: String,
-        reply_to: Option<CommentId>,
-        location: Option<L>,
-        embeds: Vec<Embed<Uri>>,
-        timestamp: Timestamp,
-    ) -> Self {
-        let edit = Edit::new(author, body, timestamp, embeds);
-
-        Self {
-            author,
-            reactions: BTreeSet::default(),
-            edits: vec![edit],
-            reply_to,
-            location,
-            resolved: false,
-        }
-    }
-
-    /// Get the comment body. If there are multiple edits, gets the value at the latest edit.
-    pub fn body(&self) -> &str {
-        // SAFETY: There is always at least one edit. This is guaranteed by the [`Comment`]
-        // constructor.
-        #[allow(clippy::unwrap_used)]
-        self.edits.last().unwrap().body.as_str()
-    }
-
-    /// Get the comment timestamp, which is the time of the *original* edit. To get the timestamp
-    /// of the latest edit, use the [`Comment::edits`] function.
-    pub fn timestamp(&self) -> Timestamp {
-        // SAFETY: There is always at least one edit. This is guaranteed by the [`Comment`]
-        // constructor.
-        #[allow(clippy::unwrap_used)]
-        self.edits.first().unwrap().timestamp
-    }
-
-    /// Return the comment author.
-    pub fn author(&self) -> ActorId {
-        self.author
-    }
-
-    /// Return the comment this is a reply to. Returns nothing if this is the root comment.
-    pub fn reply_to(&self) -> Option<CommentId> {
-        self.reply_to
-    }
-
-    /// Return the ordered list of edits for this comment, including the original version.
-    pub fn edits(&self) -> impl Iterator<Item = &Edit> {
-        self.edits.iter()
-    }
-
-    /// Add an edit.
-    pub fn edit(
-        &mut self,
-        author: ActorId,
-        body: String,
-        embeds: Vec<Embed<Uri>>,
-        timestamp: Timestamp,
-    ) {
-        self.edits.push(Edit::new(author, body, timestamp, embeds));
-    }
-
-    /// Comment reactions.
-    pub fn reactions(&self) -> BTreeMap<&Reaction, Vec<&ActorId>> {
-        self.reactions
-            .iter()
-            .fold(BTreeMap::new(), |mut acc, (author, reaction)| {
-                acc.entry(reaction).or_default().push(author);
-                acc
-            })
-    }
-
-    /// Get comment location, if any.
-    pub fn location(&self) -> Option<&L> {
-        self.location.as_ref()
-    }
-
-    /// Get comment resolution status.
-    pub fn is_resolved(&self) -> bool {
-        self.resolved
-    }
-
-    /// Return the embedded media.
-    pub fn embeds(&self) -> &[Embed<Uri>] {
-        // SAFETY: There is always at least one edit. This is guaranteed by the [`Comment`]
-        // constructor.
-        #[allow(clippy::unwrap_used)]
-        &self.edits.last().unwrap().embeds
-    }
-
-    pub fn resolve(&mut self) {
-        self.resolved = true;
-    }
-
-    pub fn unresolve(&mut self) {
-        self.resolved = false;
-    }
-}
-
-impl<T: PartialOrd> PartialOrd for Comment<T> {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        if self == other {
-            Some(Ordering::Equal)
-        } else {
-            None
-        }
-    }
-}
-
-/// An action that can be carried out in a change.
-#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
-#[serde(tag = "type", rename_all = "camelCase")]
-pub enum Action {
-    /// Comment on a thread.
-    #[serde(rename_all = "camelCase")]
-    Comment {
-        /// Comment body.
-        body: String,
-        /// Comment this is a reply to.
-        /// Should be [`None`] if it's the top-level comment.
-        /// Should be the root [`CommentId`] if it's a top-level comment.
-        reply_to: Option<CommentId>,
-    },
-    /// Edit a comment.
-    Edit { id: CommentId, body: String },
-    /// Redact a change. Not all changes can be redacted.
-    Redact { id: CommentId },
-    /// React to a comment.
-    React {
-        to: CommentId,
-        reaction: Reaction,
-        active: bool,
-    },
-}
-
-impl cob::store::CobAction for Action {}
-
-impl From<Action> for nonempty::NonEmpty<Action> {
-    fn from(action: Action) -> Self {
-        Self::new(action)
-    }
-}
-
-/// A discussion thread.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Thread<T = Comment> {
-    /// The comments under the thread.
-    pub(crate) comments: BTreeMap<CommentId, Option<T>>,
-    /// Comment timeline.
-    pub(crate) timeline: Vec<CommentId>,
-}
-
-impl<T> Default for Thread<T> {
-    fn default() -> Self {
-        Self {
-            comments: BTreeMap::default(),
-            timeline: Vec::default(),
-        }
-    }
-}
-
-impl<T> Thread<T> {
-    pub fn new(id: CommentId, comment: T) -> Self {
-        Self {
-            comments: BTreeMap::from_iter([(id, Some(comment))]),
-            timeline: vec![id],
-        }
-    }
-
-    pub fn is_initialized(&self) -> bool {
-        !self.comments.is_empty()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
-
-    pub fn len(&self) -> usize {
-        self.comments.len()
-    }
-
-    pub fn comment(&self, id: &CommentId) -> Option<&T> {
-        self.comments.get(id).and_then(|o| o.as_ref())
-    }
-
-    pub fn root(&self) -> Option<(&CommentId, &T)> {
-        self.first()
-    }
-
-    pub fn first(&self) -> Option<(&CommentId, &T)> {
-        self.comments().next()
-    }
-
-    pub fn last(&self) -> Option<(&CommentId, &T)> {
-        self.comments().next_back()
-    }
-
-    pub fn comments(&self) -> impl DoubleEndedIterator<Item = (&CommentId, &T)> + '_ {
-        self.timeline.iter().filter_map(|id| {
-            self.comments
-                .get(id)
-                .and_then(|o| o.as_ref())
-                .map(|comment| (id, comment))
-        })
-    }
-
-    pub fn timeline(&self) -> impl DoubleEndedIterator<Item = &EntryId> + '_ {
-        self.timeline.iter()
-    }
-}
-
-impl Thread {
-    /// Apply a single action to the thread.
-    fn action<R: ReadRepository>(
-        &mut self,
-        action: Action,
-        entry: EntryId,
-        author: ActorId,
-        timestamp: Timestamp,
-        _concurrent: &[&cob::Entry],
-        _identity: git::Oid,
-        _repo: &R,
-    ) -> Result<(), Error> {
-        match action {
-            Action::Comment { body, reply_to } => {
-                comment(self, entry, author, timestamp, body, reply_to, None, vec![])?;
-            }
-            Action::Edit { id, body } => {
-                edit(self, entry, author, id, timestamp, body, vec![])?;
-            }
-            Action::Redact { id } => {
-                redact(self, entry, id)?;
-            }
-            Action::React {
-                to,
-                reaction,
-                active,
-            } => {
-                react(self, entry, author, to, reaction, active)?;
-            }
-        }
-        Ok(())
-    }
-}
-
-impl<L> Thread<Comment<L>> {
-    pub fn replies<'a>(
-        &'a self,
-        to: &'a CommentId,
-    ) -> impl Iterator<Item = (&CommentId, &Comment<L>)> {
-        self.comments().filter_map(move |(id, c)| {
-            if let Some(reply_to) = c.reply_to {
-                if &reply_to == to {
-                    return Some((id, c));
-                }
-            }
-            None
-        })
-    }
-}
-
-impl cob::store::Cob for Thread {
-    type Action = Action;
-    type Error = Error;
-
-    fn type_name() -> &'static radicle_cob::TypeName {
-        &TYPENAME
-    }
-
-    fn from_root<R: ReadRepository>(op: Op<Action>, repo: &R) -> Result<Self, Self::Error> {
-        let author = op.author;
-        let entry = op.id;
-        let timestamp = op.timestamp;
-        let identity = op.identity.ok_or(Error::MissingIdentity)?;
-        let mut actions = op.actions.into_iter();
-        let Some(Action::Comment {
-            body,
-            reply_to: None,
-        }) = actions.next()
-        else {
-            return Err(Error::Init("missing initial comment"));
-        };
-
-        let mut thread = Thread::default();
-        comment(
-            &mut thread,
-            entry,
-            author,
-            timestamp,
-            body,
-            None,
-            None,
-            vec![],
-        )?;
-
-        for action in actions {
-            thread.action(action, entry, author, timestamp, &[], identity, repo)?;
-        }
-        Ok(thread)
-    }
-
-    fn op<'a, R: ReadRepository, I: IntoIterator<Item = &'a cob::Entry>>(
-        &mut self,
-        op: Op<Action>,
-        concurrent: I,
-        repo: &R,
-    ) -> Result<(), Error> {
-        let identity = op.identity.ok_or(Error::MissingIdentity)?;
-        let concurrent = concurrent.into_iter().collect::<Vec<_>>();
-        for action in op.actions {
-            self.action(
-                action,
-                op.id,
-                op.author,
-                op.timestamp,
-                &concurrent,
-                identity,
-                repo,
-            )?;
-        }
-        Ok(())
-    }
-}
-
-impl<R: ReadRepository> cob::Evaluate<R> for Thread {
-    type Error = Error;
-
-    fn init(entry: &cob::Entry, repo: &R) -> Result<Self, Self::Error> {
-        let op = Op::try_from(entry)?;
-        let object = <Thread as Cob>::from_root(op, repo)?;
-
-        Ok(object)
-    }
-
-    fn apply<'a, I: Iterator<Item = (&'a EntryId, &'a cob::Entry)>>(
-        &mut self,
-        entry: &cob::Entry,
-        concurrent: I,
-        repo: &R,
-    ) -> Result<(), Self::Error> {
-        let op = Op::try_from(entry)?;
-
-        self.op(op, concurrent.map(|(_, e)| e), repo)
-    }
-}
-
-pub fn comment<L>(
-    thread: &mut Thread<Comment<L>>,
-    id: EntryId,
-    author: ActorId,
-    timestamp: Timestamp,
-    body: String,
-    reply_to: Option<CommentId>,
-    location: Option<L>,
-    embeds: Vec<Embed<Uri>>,
-) -> Result<(), Error> {
-    if body.is_empty() {
-        return Err(Error::Comment(id));
-    }
-    if let Some(id) = reply_to {
-        if !thread.comments.contains_key(&id) {
-            return Err(Error::Missing(id));
-        }
-    }
-    debug_assert!(!thread.timeline.contains(&id));
-    thread.timeline.push(id);
-
-    // Nb. If a comment is already present, it must be redacted, because the
-    // underlying store guarantees exactly-once delivery of ops.
-    thread.comments.insert(
-        id,
-        Some(Comment::new(
-            author, body, reply_to, location, embeds, timestamp,
-        )),
-    );
-
-    Ok(())
-}
-
-pub fn edit<L>(
-    thread: &mut Thread<Comment<L>>,
-    id: EntryId,
-    author: ActorId,
-    comment: EntryId,
-    timestamp: Timestamp,
-    body: String,
-    embeds: Vec<Embed<Uri>>,
-) -> Result<(), Error> {
-    if body.is_empty() {
-        return Err(Error::Edit(id));
-    }
-    debug_assert!(!thread.timeline.contains(&id));
-    thread.timeline.push(id);
-
-    // It's possible for a comment to be redacted before we're able to edit it, in
-    // case of a concurrent update.
-    //
-    // However, it's *not* possible for the comment to be absent. Therefore we treat
-    // that as an error.
-    if let Some(comment) = thread.comments.get_mut(&comment) {
-        if let Some(comment) = comment {
-            comment.edit(author, body, embeds, timestamp);
-        }
-    } else {
-        return Err(Error::Missing(comment));
-    }
-    Ok(())
-}
-
-pub fn redact<T>(thread: &mut Thread<T>, id: EntryId, comment: EntryId) -> Result<(), Error> {
-    if let Some(comment) = thread.comments.get_mut(&comment) {
-        debug_assert!(!thread.timeline.contains(&id));
-        thread.timeline.push(id);
-
-        *comment = None;
-    } else {
-        return Err(Error::Missing(id));
-    }
-    Ok(())
-}
-
-pub fn react<T>(
-    thread: &mut Thread<Comment<T>>,
-    id: EntryId,
-    author: ActorId,
-    comment: EntryId,
-    reaction: Reaction,
-    active: bool,
-) -> Result<(), Error> {
-    let key = (author, reaction);
-    let Some(comment) = thread.comments.get_mut(&comment) else {
-        return Err(Error::Missing(comment));
-    };
-    if let Some(comment) = comment {
-        debug_assert!(!thread.timeline.contains(&id));
-        thread.timeline.push(id);
-
-        if active {
-            comment.reactions.insert(key);
-        } else {
-            comment.reactions.remove(&key);
-        }
-    }
-    Ok(())
-}
-
-pub fn resolve<T>(
-    thread: &mut Thread<Comment<T>>,
-    id: EntryId,
-    comment: EntryId,
-) -> Result<(), Error> {
-    let Some(comment) = thread.comments.get_mut(&comment) else {
-        return Err(Error::Missing(comment));
-    };
-
-    if let Some(comment) = comment {
-        debug_assert!(!thread.timeline.contains(&id));
-        thread.timeline.push(id);
-        comment.resolve();
-    }
-    Ok(())
-}
-
-pub fn unresolve<T>(
-    thread: &mut Thread<Comment<T>>,
-    id: EntryId,
-    comment: EntryId,
-) -> Result<(), Error> {
-    let Some(comment) = thread.comments.get_mut(&comment) else {
-        return Err(Error::Missing(comment));
-    };
-
-    if let Some(comment) = comment {
-        debug_assert!(!thread.timeline.contains(&id));
-        thread.timeline.push(id);
-        comment.unresolve();
-    }
-    Ok(())
-}
-
-#[cfg(test)]
-#[allow(clippy::unwrap_used)]
-mod tests {
-    use std::ops::{Deref, DerefMut};
-
-    use pretty_assertions::assert_eq;
-    use qcheck_macros::quickcheck;
-
-    use super::*;
-    use crate as radicle;
-    use crate::cob::store::Cob;
-    use crate::cob::test;
-    use crate::crypto::test::signer::MockSigner;
-    use crate::crypto::Signer;
-    use crate::profile::env;
-    use crate::test::arbitrary;
-    use crate::test::arbitrary::gen;
-    use crate::test::storage::MockRepository;
-
-    /// An object that can be used to create and sign changes.
-    pub struct Actor<G> {
-        inner: cob::test::Actor<G>,
-    }
-
-    impl<G: Default + Signer> Default for Actor<G> {
-        fn default() -> Self {
-            Self {
-                inner: cob::test::Actor::new(G::default()),
-            }
-        }
-    }
-
-    impl<G: Signer> Actor<G> {
-        pub fn new(signer: G) -> Self {
-            Self {
-                inner: cob::test::Actor::new(signer),
-            }
-        }
-
-        /// Create a new comment.
-        pub fn comment(&mut self, body: &str, reply_to: Option<CommentId>) -> Op<Action> {
-            self.op::<Thread>([Action::Comment {
-                body: String::from(body),
-                reply_to,
-            }])
-        }
-
-        /// Create a new redaction.
-        pub fn redact(&mut self, id: CommentId) -> Op<Action> {
-            self.op::<Thread>([Action::Redact { id }])
-        }
-
-        /// Edit a comment.
-        pub fn edit(&mut self, id: CommentId, body: &str) -> Op<Action> {
-            self.op::<Thread>([Action::Edit {
-                id,
-                body: body.to_owned(),
-            }])
-        }
-    }
-
-    impl<G> Deref for Actor<G> {
-        type Target = cob::test::Actor<G>;
-
-        fn deref(&self) -> &Self::Target {
-            &self.inner
-        }
-    }
-
-    impl<G> DerefMut for Actor<G> {
-        fn deref_mut(&mut self) -> &mut Self::Target {
-            &mut self.inner
-        }
-    }
-
-    #[test]
-    fn test_redact_comment() {
-        let radicle::test::setup::Node { signer, .. } = radicle::test::setup::Node::default();
-        let repo = gen::<MockRepository>(1);
-        let mut alice = Actor::new(signer);
-
-        let a0 = alice.comment("First comment", None);
-        let a1 = alice.comment("Second comment", Some(a0.id()));
-        let a2 = alice.comment("Third comment", Some(a0.id()));
-
-        let mut thread = Thread::from_ops([a0, a1.clone(), a2], &repo).unwrap();
-        assert_eq!(thread.comments().count(), 3);
-
-        // Redact the second comment.
-        let a3 = alice.redact(a1.id());
-        thread.op(a3, [], &repo).unwrap();
-
-        let (_, comment0) = thread.comments().nth(0).unwrap();
-        let (_, comment1) = thread.comments().nth(1).unwrap();
-
-        assert_eq!(thread.comments().count(), 2);
-        assert_eq!(comment0.body(), "First comment");
-        assert_eq!(comment1.body(), "Third comment"); // Second comment was redacted.
-    }
-
-    #[test]
-    fn test_edit_comment() {
-        let mut alice = Actor::<MockSigner>::default();
-        let repo = gen::<MockRepository>(1);
-
-        let c0 = alice.comment("Hello world!", None);
-        let c1 = alice.edit(c0.id(), "Goodbye world.");
-        let c2 = alice.edit(c0.id(), "Goodbye world!");
-
-        let t1 = Thread::from_ops([c0.clone(), c1, c2], &repo).unwrap();
-
-        let comment = t1.comment(&c0.id());
-        let edits = comment.unwrap().edits().collect::<Vec<_>>();
-
-        assert_eq!(edits[0].body.as_str(), "Hello world!");
-        assert_eq!(edits[1].body.as_str(), "Goodbye world.");
-        assert_eq!(edits[2].body.as_str(), "Goodbye world!");
-        assert_eq!(t1.comment(&c0.id()).unwrap().body(), "Goodbye world!");
-    }
-
-    #[test]
-    fn test_timeline() {
-        let alice = MockSigner::default();
-        let bob = MockSigner::default();
-        let eve = MockSigner::default();
-        let repo = gen::<MockRepository>(1);
-        let time = env::local_time();
-
-        let mut a = test::history::<Thread, _>(
-            &[Action::Comment {
-                body: "Thread root".to_owned(),
-                reply_to: None,
-            }],
-            time.into(),
-            &alice,
-        );
-        a.comment("Alice comment", Some(*a.root().id()), &alice);
-
-        let mut b = a.clone();
-        let b1 = b.comment("Bob comment", Some(*a.root().id()), &bob);
-
-        let mut e = a.clone();
-        let e1 = e.comment("Eve comment", Some(*a.root().id()), &eve);
-
-        assert_eq!(a.as_ref().len(), 2);
-        assert_eq!(b.as_ref().len(), 3);
-        assert_eq!(e.as_ref().len(), 3);
-
-        a.merge(b.clone());
-        a.merge(e.clone());
-
-        assert_eq!(a.as_ref().len(), 4);
-
-        b.merge(a.clone());
-        b.merge(e.clone());
-
-        e.merge(a.clone());
-        e.merge(b.clone());
-
-        assert_eq!(a, b);
-        assert_eq!(b, e);
-
-        let t1 = Thread::from_history(&a, &repo).unwrap();
-        let t2 = Thread::from_history(&b, &repo).unwrap();
-        let t3 = Thread::from_history(&e, &repo).unwrap();
-
-        assert_eq!(t1, t2);
-        assert_eq!(t2, t3);
-
-        let timeline1 = t1.comments().collect::<Vec<_>>();
-        let timeline2 = t2.comments().collect::<Vec<_>>();
-        let timeline3 = t3.comments().collect::<Vec<_>>();
-
-        assert_eq!(timeline1, timeline2);
-        assert_eq!(timeline2, timeline3);
-        assert_eq!(timeline1.len(), 4);
-        assert_eq!(
-            timeline1.iter().map(|(_, c)| c.body()).collect::<Vec<_>>(),
-            // Since the operations are concurrent, the ordering depends on the ordering between
-            // the operation ids.
-            if e1 > b1 {
-                vec!["Thread root", "Alice comment", "Bob comment", "Eve comment"]
-            } else {
-                vec!["Thread root", "Alice comment", "Eve comment", "Bob comment"]
-            }
-        );
-    }
-
-    #[test]
-    fn test_duplicate_comments() {
-        let repo = gen::<MockRepository>(1);
-        let alice = MockSigner::default();
-        let bob = MockSigner::default();
-        let time = env::local_time();
-
-        let mut a = test::history::<Thread, _>(
-            &[Action::Comment {
-                body: "Thread root".to_owned(),
-                reply_to: None,
-            }],
-            time.into(),
-            &alice,
-        );
-        let mut b = a.clone();
-
-        a.comment("Hello World!", None, &alice);
-        b.comment("Hello World!", None, &bob);
-
-        a.merge(b);
-
-        let thread = Thread::from_history(&a, &repo).unwrap();
-
-        assert_eq!(thread.comments().count(), 3);
-
-        let (first_id, first) = thread.comments().nth(1).unwrap();
-        let (second_id, second) = thread.comments().nth(2).unwrap();
-
-        assert!(first_id != second_id); // The ids are not the same,
-        assert_eq!(
-            first
-                .edits
-                .iter()
-                .map(|e| (&e.body, e.timestamp))
-                .collect::<Vec<_>>(),
-            second
-                .edits
-                .iter()
-                .map(|e| (&e.body, e.timestamp))
-                .collect::<Vec<_>>(),
-        ); // despite the content being the same.
-    }
-
-    #[quickcheck]
-    fn prop_ordering(timestamp: u64) {
-        let repo = gen::<MockRepository>(1);
-        let alice = MockSigner::default();
-        let bob = MockSigner::default();
-        let timestamp = Timestamp::from_secs(timestamp);
-
-        let h0 = test::history::<Thread, _>(
-            &[Action::Comment {
-                body: "Thread root".to_owned(),
-                reply_to: None,
-            }],
-            timestamp,
-            &alice,
-        );
-        let mut h1 = h0.clone();
-        let mut h2 = h0.clone();
-
-        let e1 = h1.commit(
-            &Action::Edit {
-                id: *h0.root().id(),
-                body: String::from("Bye World."),
-            },
-            &alice,
-        );
-        let e2 = h2.commit(
-            &Action::Edit {
-                id: *h0.root().id(),
-                body: String::from("Hi World."),
-            },
-            &bob,
-        );
-
-        h1.merge(h2);
-
-        let thread = Thread::from_history(&h1, &repo).unwrap();
-        let (_, comment) = thread.comments().next().unwrap();
-
-        // E1 and E2 are concurrent, so the final edit will depend on which is the greater hash.
-        if e2 > e1 {
-            assert_eq!(comment.body(), "Hi World.");
-        } else {
-            assert_eq!(comment.body(), "Bye World.");
-        }
-
-        let _e3 = h1.commit(
-            &Action::Edit {
-                id: *h0.root().id(),
-                body: String::from("Hoho World!"),
-            },
-            &alice,
-        );
-        let thread = Thread::from_history(&h1, &repo).unwrap();
-        let (_, comment) = thread.comments().next().unwrap();
-
-        // E3 is causally dependent on E1 and E2, so it always wins.
-        assert_eq!(comment.body(), "Hoho World!");
-    }
-
-    #[test]
-    fn test_comment_redact_missing() {
-        let repo = gen::<MockRepository>(1);
-        let mut alice = Actor::<MockSigner>::default();
-        let mut t = Thread::default();
-        let id = arbitrary::entry_id();
-
-        t.op(alice.redact(id), [], &repo).unwrap_err();
-    }
-
-    #[test]
-    fn test_comment_edit_missing() {
-        let repo = gen::<MockRepository>(1);
-        let mut alice = Actor::<MockSigner>::default();
-        let mut t = Thread::default();
-        let id = arbitrary::entry_id();
-
-        t.op(alice.edit(id, "Edited"), [], &repo).unwrap_err();
-    }
-
-    #[test]
-    fn test_comment_edit_redacted() {
-        let repo = gen::<MockRepository>(1);
-        let mut alice = Actor::<MockSigner>::default();
-
-        let a1 = alice.comment("Hi", None);
-        let a2 = alice.redact(a1.id);
-        let a3 = alice.edit(a1.id, "Edited");
-
-        let t = Thread::from_ops([a1, a2, a3], &repo).unwrap();
-        assert_eq!(t.comments().count(), 0);
-    }
-}
diff --git a/radicle/src/collections.rs b/radicle/src/collections.rs
deleted file mode 100644
index 15ddddfdb..000000000
--- a/radicle/src/collections.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-//! Useful collections for peer-to-peer networking.
-use siphasher::sip::SipHasher13;
-
-/// A `HashMap` which uses [`fastrand::Rng`] for its random state.
-pub type RandomMap<K, V> = std::collections::HashMap<K, V, RandomState>;
-
-/// A `HashSet` which uses [`fastrand::Rng`] for its random state.
-pub type RandomSet<K> = std::collections::HashSet<K, RandomState>;
-
-/// Random hasher state.
-#[derive(Clone)]
-pub struct RandomState {
-    key1: u64,
-    key2: u64,
-}
-
-impl Default for RandomState {
-    fn default() -> Self {
-        Self::new(crate::profile::env::rng())
-    }
-}
-
-impl RandomState {
-    fn new(mut rng: fastrand::Rng) -> Self {
-        Self {
-            key1: rng.u64(..),
-            key2: rng.u64(..),
-        }
-    }
-}
-
-impl std::hash::BuildHasher for RandomState {
-    type Hasher = SipHasher13;
-
-    fn build_hasher(&self) -> Self::Hasher {
-        SipHasher13::new_with_keys(self.key1, self.key2)
-    }
-}
-
-impl From<fastrand::Rng> for RandomState {
-    fn from(rng: fastrand::Rng) -> Self {
-        Self::new(rng)
-    }
-}
diff --git a/radicle/src/explorer.rs b/radicle/src/explorer.rs
deleted file mode 100644
index c73a2d1cc..000000000
--- a/radicle/src/explorer.rs
+++ /dev/null
@@ -1,128 +0,0 @@
-use std::str::FromStr;
-
-use thiserror::Error;
-
-use crate::prelude::RepoId;
-use crate::{cob, git};
-
-#[derive(Debug, Error)]
-pub enum ExplorerError {
-    #[error("invalid explorer URL {0:?}: unknown protocol")]
-    UnknownProtocol(String),
-    #[error("invalid explorer URL {0:?}: missing `$host` component")]
-    MissingHost(String),
-    #[error("invalid explorer URL {0:?}: missing `$rid` component")]
-    MissingRid(String),
-    #[error("invalid explorer URL {0:?}: missing `$path` component")]
-    MissingPath(String),
-}
-
-/// A resource such as a branch, patch or commit.
-#[derive(Debug, Hash, PartialEq, Eq)]
-pub enum ExplorerResource {
-    /// Git tree object. Used for the repository root.
-    Tree { oid: git::Oid },
-    /// A Patch COB.
-    Patch { id: cob::ObjectId },
-}
-
-impl std::fmt::Display for ExplorerResource {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Tree { oid } => {
-                write!(f, "/tree/{oid}")
-            }
-            Self::Patch { id } => {
-                write!(f, "/patches/{id}")
-            }
-        }
-    }
-}
-
-/// A URL to a specific repository or resource within a repository.
-#[derive(Debug, PartialEq, Eq)]
-pub struct ExplorerUrl {
-    /// URL template.
-    pub template: Explorer,
-    /// Host serving the repository.
-    pub host: String,
-    /// Repository.
-    pub rid: RepoId,
-    /// Resource under the repository.
-    pub resource: Option<ExplorerResource>,
-}
-
-impl ExplorerUrl {
-    /// Set a resource on for this URL.
-    pub fn resource(mut self, resource: ExplorerResource) -> Self {
-        self.resource = Some(resource);
-        self
-    }
-}
-
-impl std::fmt::Display for ExplorerUrl {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str(
-            self.template
-                .0
-                .replace("$host", &self.host)
-                .replace("$rid", self.rid.urn().as_str())
-                .replace(
-                    "$path",
-                    self.resource
-                        .as_ref()
-                        .map(|r| r.to_string())
-                        .as_deref()
-                        .unwrap_or(""),
-                )
-                .as_str(),
-        )
-    }
-}
-
-/// A public explorer, eg. `https://app.radicle.xyz`.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, PartialEq, Eq)]
-#[serde(transparent)]
-pub struct Explorer(String);
-
-impl Default for Explorer {
-    fn default() -> Self {
-        Self(String::from(
-            "https://app.radicle.xyz/nodes/$host/$rid$path",
-        ))
-    }
-}
-
-impl Explorer {
-    /// Get the explorer URL, filling in the host and RID.
-    pub fn url(&self, host: impl ToString, rid: RepoId) -> ExplorerUrl {
-        ExplorerUrl {
-            template: self.clone(),
-            host: host.to_string(),
-            rid,
-            resource: None,
-        }
-    }
-}
-
-impl FromStr for Explorer {
-    type Err = ExplorerError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let url = s.to_owned();
-
-        if !url.starts_with("http://") && !url.starts_with("https://") {
-            return Err(ExplorerError::UnknownProtocol(url));
-        }
-        if !url.contains("$host") {
-            return Err(ExplorerError::MissingHost(url));
-        }
-        if !url.contains("$rid") {
-            return Err(ExplorerError::MissingRid(url));
-        }
-        if !url.contains("$path") {
-            return Err(ExplorerError::MissingPath(url));
-        }
-        Ok(Explorer(url))
-    }
-}
diff --git a/radicle/src/git.rs b/radicle/src/git.rs
deleted file mode 100644
index 8677a1ae2..000000000
--- a/radicle/src/git.rs
+++ /dev/null
@@ -1,821 +0,0 @@
-pub mod canonical;
-
-use std::io;
-use std::path::Path;
-use std::process::Command;
-use std::str::FromStr;
-
-use git_ext::ref_format as format;
-use once_cell::sync::Lazy;
-
-use crate::collections::RandomMap;
-use crate::crypto::PublicKey;
-use crate::node::Alias;
-use crate::storage;
-use crate::storage::refs::Refs;
-use crate::storage::RemoteId;
-
-pub use ext::is_not_found_err;
-pub use ext::Error;
-pub use ext::NotFound;
-pub use ext::Oid;
-pub use git2 as raw;
-pub use git_ext::ref_format as fmt;
-pub use git_ext::ref_format::{
-    component, lit, name, qualified, refname, refspec,
-    refspec::{PatternStr, PatternString, Refspec},
-    Component, Namespaced, Qualified, RefStr, RefString,
-};
-pub use radicle_git_ext as ext;
-pub use storage::git::transport::local::Url;
-pub use storage::BranchName;
-
-/// Default port of the `git` transport protocol.
-pub const PROTOCOL_PORT: u16 = 9418;
-/// Minimum required git version.
-pub const VERSION_REQUIRED: Version = Version {
-    major: 2,
-    minor: 31,
-    patch: 0,
-};
-
-/// A parsed git version.
-#[derive(PartialEq, Eq, Debug, PartialOrd, Ord)]
-pub struct Version {
-    pub major: u8,
-    pub minor: u8,
-    pub patch: u8,
-}
-
-impl std::fmt::Display for Version {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}.{}.{}", self.major, self.minor, self.patch)
-    }
-}
-
-#[derive(thiserror::Error, Debug)]
-pub enum VersionError {
-    #[error("malformed git version string")]
-    Malformed,
-    #[error("malformed git version string: {0}")]
-    ParseInt(#[from] std::num::ParseIntError),
-    #[error("malformed git version string: {0}")]
-    Utf8(#[from] std::string::FromUtf8Error),
-    #[error("error retrieving git version: {0}")]
-    Io(#[from] io::Error),
-    #[error("error retrieving git version: {0}")]
-    Other(String),
-}
-
-impl std::str::FromStr for Version {
-    type Err = VersionError;
-
-    fn from_str(input: &str) -> Result<Self, Self::Err> {
-        let rest = input
-            .strip_prefix("git version ")
-            .ok_or(VersionError::Malformed)?;
-        let rest = rest.split(' ').next().ok_or(VersionError::Malformed)?;
-        let rest = rest.trim_end();
-
-        let mut parts = rest.split('.');
-        let major = parts.next().ok_or(VersionError::Malformed)?.parse()?;
-        let minor = parts.next().ok_or(VersionError::Malformed)?.parse()?;
-
-        let patch = match parts.next() {
-            None => 0,
-            Some(patch) => patch.parse()?,
-        };
-
-        Ok(Self {
-            major,
-            minor,
-            patch,
-        })
-    }
-}
-
-/// Get the system's git version.
-pub fn version() -> Result<Version, VersionError> {
-    let output = Command::new("git").arg("version").output()?;
-
-    if output.status.success() {
-        let output = String::from_utf8(output.stdout)?;
-        let version = output.parse()?;
-
-        return Ok(version);
-    }
-    Err(VersionError::Other(
-        String::from_utf8_lossy(&output.stderr).to_string(),
-    ))
-}
-
-#[derive(thiserror::Error, Debug)]
-pub enum RefError {
-    #[error("ref name is not valid UTF-8")]
-    InvalidName,
-    #[error("unexpected unqualified ref: {0}")]
-    Unqualified(RefString),
-    #[error("invalid ref format: {0}")]
-    Format(#[from] format::Error),
-    #[error("reference has no target")]
-    NoTarget,
-    #[error("expected ref to begin with 'refs/namespaces' but found '{0}'")]
-    MissingNamespace(format::RefString),
-    #[error("ref name contains invalid namespace identifier '{name}'")]
-    InvalidNamespace {
-        name: format::RefString,
-        #[source]
-        err: Box<dyn std::error::Error + Send + Sync + 'static>,
-    },
-    #[error(transparent)]
-    Other(#[from] git2::Error),
-}
-
-#[derive(thiserror::Error, Debug)]
-pub enum ListRefsError {
-    #[error("git error: {0}")]
-    Git(#[from] git2::Error),
-    #[error("invalid ref: {0}")]
-    InvalidRef(#[from] RefError),
-}
-
-pub mod refs {
-    use super::*;
-    use radicle_cob as cob;
-
-    /// Try to get a qualified reference from a generic reference.
-    pub fn qualified_from<'a>(r: &'a git2::Reference) -> Result<(Qualified<'a>, Oid), RefError> {
-        let name = r.name().ok_or(RefError::InvalidName)?;
-        let refstr = RefStr::try_from_str(name)?;
-        let target = r.resolve()?.target().ok_or(RefError::NoTarget)?;
-        let qualified = Qualified::from_refstr(refstr)
-            .ok_or_else(|| RefError::Unqualified(refstr.to_owned()))?;
-
-        Ok((qualified, target.into()))
-    }
-
-    /// Create a qualified branch reference.
-    ///
-    /// `refs/heads/<branch>`
-    ///
-    pub fn branch<'a>(branch: &RefStr) -> Qualified<'a> {
-        Qualified::from(lit::refs_heads(branch))
-    }
-
-    /// A patch reference.
-    ///
-    /// `refs/heads/patches/<object_id>`
-    ///
-    pub fn patch<'a>(object_id: &cob::ObjectId) -> Qualified<'a> {
-        Qualified::from_components(
-            name::component!("heads"),
-            name::component!("patches"),
-            Some(object_id.into()),
-        )
-    }
-
-    pub mod storage {
-        use format::{
-            lit,
-            name::component,
-            refspec::{self, PatternString},
-        };
-
-        use super::*;
-
-        /// Where the project's identity document is stored.
-        ///
-        /// `refs/rad/id`
-        ///
-        pub static IDENTITY_BRANCH: Lazy<Qualified> = Lazy::new(|| {
-            Qualified::from_components(name::component!("rad"), name::component!("id"), None)
-        });
-
-        /// Where the project's signed references are stored.
-        ///
-        /// `refs/rad/sigrefs`
-        ///
-        pub static SIGREFS_BRANCH: Lazy<Qualified> = Lazy::new(|| {
-            Qualified::from_components(name::component!("rad"), name::component!("sigrefs"), None)
-        });
-
-        /// The set of special references used in the Heartwood protocol.
-        #[derive(Clone, Copy, Debug)]
-        pub enum Special {
-            /// `rad/id`
-            Id,
-            /// `rad/sigrefs`
-            SignedRefs,
-        }
-
-        impl From<Special> for Qualified<'_> {
-            fn from(s: Special) -> Self {
-                match s {
-                    Special::Id => (*IDENTITY_BRANCH).clone(),
-                    Special::SignedRefs => (*SIGREFS_BRANCH).clone(),
-                }
-            }
-        }
-
-        impl Special {
-            pub fn namespaced<'a>(&self, remote: &PublicKey) -> Namespaced<'a> {
-                Qualified::from(*self).with_namespace(Component::from(remote))
-            }
-
-            pub fn from_qualified(refname: &Qualified) -> Option<Self> {
-                if refname == &*IDENTITY_BRANCH {
-                    Some(Special::Id)
-                } else if refname == &*SIGREFS_BRANCH {
-                    Some(Special::SignedRefs)
-                } else {
-                    None
-                }
-            }
-        }
-
-        /// Create the [`Namespaced`] `branch` under the `remote` namespace, i.e.
-        ///
-        /// `refs/namespaces/<remote>/refs/heads/<branch>`
-        ///
-        pub fn branch_of<'a>(remote: &RemoteId, branch: &RefStr) -> Namespaced<'a> {
-            Qualified::from(lit::refs_heads(branch)).with_namespace(remote.into())
-        }
-
-        /// Get the branch where the project's identity document is stored.
-        ///
-        /// `refs/namespaces/<remote>/refs/rad/id`
-        ///
-        pub fn id(remote: &RemoteId) -> Namespaced {
-            IDENTITY_BRANCH.with_namespace(remote.into())
-        }
-
-        /// Get the branch where the `remote`'s signed references are
-        /// stored.
-        ///
-        /// `refs/namespaces/<remote>/refs/rad/sigrefs`
-        ///
-        pub fn sigrefs(remote: &RemoteId) -> Namespaced {
-            SIGREFS_BRANCH.with_namespace(remote.into())
-        }
-
-        /// The collaborative object reference, identified by `typename` and `object_id`, under the given `remote`.
-        ///
-        /// `refs/namespaces/<remote>/refs/cobs/<typename>/<object_id>`
-        ///
-        pub fn cob<'a>(
-            remote: &RemoteId,
-            typename: &cob::TypeName,
-            object_id: &cob::ObjectId,
-        ) -> Namespaced<'a> {
-            Qualified::from_components(
-                component!("cobs"),
-                Component::from(typename),
-                Some(object_id.into()),
-            )
-            .with_namespace(remote.into())
-        }
-
-        /// All collaborative objects, identified by `typename` and `object_id`, for all remotes.
-        ///
-        /// `refs/namespaces/*/refs/cobs/<typename>/<object_id>`
-        ///
-        pub fn cobs(typename: &cob::TypeName, object_id: &cob::ObjectId) -> PatternString {
-            refspec::pattern!("refs/namespaces/*")
-                .join(refname!("refs/cobs"))
-                .join(Component::from(typename))
-                .join(Component::from(object_id))
-        }
-
-        /// Draft references.
-        ///
-        /// These references are not replicated or signed.
-        pub mod draft {
-            use super::*;
-
-            /// Review draft reference. Points to the non-COB part of a patch review.
-            ///
-            /// `refs/namespaces/<remote>/refs/drafts/reviews/<patch-id>`
-            ///
-            /// When building a patch review, we store the intermediate state in this ref.
-            pub fn review<'a>(remote: &RemoteId, patch: &cob::ObjectId) -> Namespaced<'a> {
-                Qualified::from_components(
-                    component!("drafts"),
-                    component!("reviews"),
-                    Some(Component::from(patch)),
-                )
-                .with_namespace(remote.into())
-            }
-
-            /// A draft collaborative object. This can also be a draft operation on an existing
-            /// object.
-            ///
-            /// `refs/namespaces/<remote>/refs/drafts/cobs/<typename>/<object_id>`
-            ///
-            pub fn cob<'a>(
-                remote: &RemoteId,
-                typename: &cob::TypeName,
-                object_id: &cob::ObjectId,
-            ) -> Namespaced<'a> {
-                Qualified::from_components(
-                    component!("drafts"),
-                    component!("cobs"),
-                    [Component::from(typename), object_id.into()],
-                )
-                .with_namespace(remote.into())
-            }
-
-            /// Draft collaborative objects of a type.
-            ///
-            /// `refs/namespaces/<remote>/refs/drafts/cobs/<typename>/*`
-            ///
-            pub fn cobs(remote: &RemoteId, typename: &cob::TypeName) -> PatternString {
-                Qualified::from_components(
-                    component!("drafts"),
-                    component!("cobs"),
-                    Some(Component::from(typename)),
-                )
-                .with_namespace(remote.into())
-                .to_pattern(refspec::pattern!("*"))
-            }
-        }
-
-        /// Staging/temporary references.
-        pub mod staging {
-            use super::*;
-
-            /// Where patch heads are pushed initially, before patch creation.
-            /// This is a short-lived reference, which is deleted after the patch has been opened.
-            /// The `<oid>` is the commit proposed in the patch.
-            ///
-            /// `refs/namespaces/<remote>/refs/tmp/heads/<oid>`
-            ///
-            pub fn patch<'a>(remote: &RemoteId, oid: impl Into<Oid>) -> Namespaced<'a> {
-                // SAFETY: OIDs are valid reference names and valid path component.
-                #[allow(clippy::unwrap_used)]
-                let oid = RefString::try_from(oid.into().to_string()).unwrap();
-                #[allow(clippy::unwrap_used)]
-                let oid = Component::from_refstr(oid).unwrap();
-
-                Qualified::from_components(component!("tmp"), component!("heads"), Some(oid))
-                    .with_namespace(remote.into())
-            }
-        }
-    }
-
-    pub mod workdir {
-        use super::*;
-        use format::name::component;
-
-        /// Create a [`RefString`] that corresponds to `refs/heads/<branch>`.
-        pub fn branch(branch: &RefStr) -> RefString {
-            refname!("refs/heads").join(branch)
-        }
-
-        /// Create a [`RefString`] that corresponds to `refs/notes/<name>`.
-        pub fn note(name: &RefStr) -> RefString {
-            refname!("refs/notes").join(name)
-        }
-
-        /// Create a [`RefString`] that corresponds to `refs/remotes/<remote>/<branch>`.
-        pub fn remote_branch(remote: &RefStr, branch: &RefStr) -> RefString {
-            refname!("refs/remotes").and(remote).and(branch)
-        }
-
-        /// Create a [`RefString`] that corresponds to `refs/tags/<branch>`.
-        pub fn tag(name: &RefStr) -> RefString {
-            refname!("refs/tags").join(name)
-        }
-
-        /// A patch head.
-        ///
-        /// `refs/remotes/rad/patches/<patch-id>`
-        ///
-        pub fn patch_upstream<'a>(patch_id: &cob::ObjectId) -> Qualified<'a> {
-            Qualified::from_components(
-                component!("remotes"),
-                crate::rad::REMOTE_COMPONENT.clone(),
-                [component!("patches"), patch_id.into()],
-            )
-        }
-    }
-}
-
-/// List remote refs of a project, given the remote URL.
-pub fn remote_refs(url: &Url) -> Result<RandomMap<RemoteId, Refs>, ListRefsError> {
-    let url = url.to_string();
-    let mut remotes = RandomMap::default();
-    let mut remote = git2::Remote::create_detached(url)?;
-
-    remote.connect(git2::Direction::Fetch)?;
-
-    let refs = remote.list()?;
-    for r in refs {
-        // Skip the `HEAD` reference, as it is untrusted.
-        if r.name() == "HEAD" {
-            continue;
-        }
-        // Nb. skip refs that don't have a public key namespace.
-        if let (Some(id), refname) = parse_ref::<PublicKey>(r.name())? {
-            let entry = remotes.entry(id).or_insert_with(Refs::default);
-            entry.insert(refname.into(), r.oid().into());
-        }
-    }
-
-    Ok(remotes)
-}
-
-/// Parse a ref string. Returns an error if it isn't namespaced.
-pub fn parse_ref_namespaced<T>(s: &str) -> Result<(T, format::Qualified), RefError>
-where
-    T: FromStr,
-    T::Err: std::error::Error + Send + Sync + 'static,
-{
-    match parse_ref::<T>(s) {
-        Ok((None, refname)) => Err(RefError::MissingNamespace(refname.to_ref_string())),
-        Ok((Some(t), r)) => Ok((t, r)),
-        Err(err) => Err(err),
-    }
-}
-
-/// Parse a ref string. Optionally returns a namespace.
-pub fn parse_ref<T>(s: &str) -> Result<(Option<T>, format::Qualified), RefError>
-where
-    T: FromStr,
-    T::Err: std::error::Error + Send + Sync + 'static,
-{
-    let input = format::RefStr::try_from_str(s)?;
-    match input.to_namespaced() {
-        None => {
-            let refname = Qualified::from_refstr(input)
-                .ok_or_else(|| RefError::Unqualified(input.to_owned()))?;
-
-            Ok((None, refname))
-        }
-        Some(ns) => {
-            let id = ns
-                .namespace()
-                .as_str()
-                .parse()
-                .map_err(|err| RefError::InvalidNamespace {
-                    name: input.to_owned(),
-                    err: Box::new(err),
-                })?;
-            let rest = ns.strip_namespace();
-
-            Ok((Some(id), rest))
-        }
-    }
-}
-
-/// Create an initial empty commit.
-pub fn initial_commit<'a>(
-    repo: &'a git2::Repository,
-    sig: &git2::Signature,
-) -> Result<git2::Commit<'a>, git2::Error> {
-    let tree_id = repo.index()?.write_tree()?;
-    let tree = repo.find_tree(tree_id)?;
-    let oid = repo.commit(None, sig, sig, "Initial commit", &tree, &[])?;
-    let commit = repo.find_commit(oid)?;
-
-    Ok(commit)
-}
-
-/// Create a commit and update the given ref to it.
-pub fn commit<'a>(
-    repo: &'a git2::Repository,
-    parent: &'a git2::Commit,
-    target: &RefStr,
-    message: &str,
-    sig: &git2::Signature,
-    tree: &git2::Tree,
-) -> Result<git2::Commit<'a>, git2::Error> {
-    let oid = repo.commit(Some(target.as_str()), sig, sig, message, tree, &[parent])?;
-    let commit = repo.find_commit(oid)?;
-
-    Ok(commit)
-}
-
-/// Get the repository head.
-pub fn head(repo: &git2::Repository) -> Result<git2::Commit, git2::Error> {
-    let head = repo.head()?.peel_to_commit()?;
-
-    Ok(head)
-}
-
-/// Write a tree with the given blob at the given path.
-pub fn write_tree<'r>(
-    path: &Path,
-    bytes: &[u8],
-    repo: &'r git2::Repository,
-) -> Result<git2::Tree<'r>, Error> {
-    let blob_id = repo.blob(bytes)?;
-    let mut builder = repo.treebuilder(None)?;
-    builder.insert(path, blob_id, 0o100_644)?;
-
-    let tree_id = builder.write()?;
-    let tree = repo.find_tree(tree_id)?;
-
-    Ok(tree)
-}
-
-/// Configure a radicle repository.
-///
-/// * Sets `push.default = upstream`.
-pub fn configure_repository(repo: &git2::Repository) -> Result<(), git2::Error> {
-    let mut cfg = repo.config()?;
-    cfg.set_str("push.default", "upstream")?;
-
-    Ok(())
-}
-
-/// Configure a repository's radicle remote.
-///
-/// The entry for this remote will be:
-/// ```text
-/// [remote.<name>]
-///   url = <fetch>
-///   pushurl = <push>
-///   fetch +refs/heads/*:refs/remotes/<name>/*
-/// ```
-pub fn configure_remote<'r>(
-    repo: &'r git2::Repository,
-    name: &str,
-    fetch: &Url,
-    push: &Url,
-) -> Result<git2::Remote<'r>, git2::Error> {
-    let fetchspec = format!("+refs/heads/*:refs/remotes/{name}/*");
-    let remote = repo.remote_with_fetch(name, fetch.to_string().as_str(), &fetchspec)?;
-
-    if push != fetch {
-        repo.remote_set_pushurl(name, Some(push.to_string().as_str()))?;
-    }
-    Ok(remote)
-}
-
-/// Fetch from the given `remote`.
-pub fn fetch(repo: &git2::Repository, remote: &str) -> Result<(), git2::Error> {
-    repo.find_remote(remote)?.fetch::<&str>(
-        &[],
-        Some(
-            git2::FetchOptions::new()
-                .update_fetchhead(false)
-                .prune(git2::FetchPrune::On)
-                .download_tags(git2::AutotagOption::None),
-        ),
-        None,
-    )
-}
-
-/// Push `refspecs` to the given `remote` using the provided `namespace`.
-pub fn push<'a>(
-    repo: &git2::Repository,
-    remote: &str,
-    refspecs: impl IntoIterator<Item = (&'a Qualified<'a>, &'a Qualified<'a>)>,
-) -> Result<(), git2::Error> {
-    let refspecs = refspecs
-        .into_iter()
-        .map(|(src, dst)| format!("{src}:{dst}"));
-
-    repo.find_remote(remote)?
-        .push(refspecs.collect::<Vec<_>>().as_slice(), None)?;
-
-    Ok(())
-}
-
-/// Set the upstream of the given branch to the given remote.
-///
-/// This writes to the `config` directly. The entry will look like the
-/// following:
-///
-/// ```text
-/// [branch "main"]
-///     remote = rad
-///     merge = refs/heads/main
-/// ```
-pub fn set_upstream(
-    repo: &git2::Repository,
-    remote: impl AsRef<str>,
-    branch: impl AsRef<str>,
-    merge: impl AsRef<str>,
-) -> Result<(), git2::Error> {
-    let remote = remote.as_ref();
-    let branch = branch.as_ref();
-    let merge = merge.as_ref();
-
-    let mut config = repo.config()?;
-    let branch_remote = format!("branch.{branch}.remote");
-    let branch_merge = format!("branch.{branch}.merge");
-
-    config.remove_multivar(&branch_remote, ".*").or_else(|e| {
-        if ext::is_not_found_err(&e) {
-            Ok(())
-        } else {
-            Err(e)
-        }
-    })?;
-    config.remove_multivar(&branch_merge, ".*").or_else(|e| {
-        if ext::is_not_found_err(&e) {
-            Ok(())
-        } else {
-            Err(e)
-        }
-    })?;
-    config.set_multivar(&branch_remote, ".*", remote)?;
-    config.set_multivar(&branch_merge, ".*", merge)?;
-
-    Ok(())
-}
-
-/// Execute a git command by spawning a child process.
-pub fn run<P, S, K, V>(
-    repo: P,
-    args: impl IntoIterator<Item = S>,
-    envs: impl IntoIterator<Item = (K, V)>,
-) -> Result<String, io::Error>
-where
-    P: AsRef<Path>,
-    S: AsRef<std::ffi::OsStr>,
-    K: AsRef<std::ffi::OsStr>,
-    V: AsRef<std::ffi::OsStr>,
-{
-    let output = Command::new("git")
-        .current_dir(repo)
-        .envs(envs)
-        .args(args)
-        .output()?;
-
-    if output.status.success() {
-        let out = if output.stdout.is_empty() {
-            &output.stderr
-        } else {
-            &output.stdout
-        };
-        return Ok(String::from_utf8_lossy(out).into());
-    }
-
-    Err(io::Error::new(
-        io::ErrorKind::Other,
-        String::from_utf8_lossy(&output.stderr),
-    ))
-}
-
-/// Functions that call to the `git` CLI instead of `git2`.
-pub mod process {
-    use std::io;
-    use std::path::Path;
-
-    use crate::storage::ReadRepository;
-
-    use super::{run, url, Oid};
-
-    /// Perform a local fetch, i.e. `file://<storage path>`.
-    ///
-    /// `oids` are the set of [`Oid`]s that are being fetched from the
-    /// `storage`.
-    pub fn fetch_local<R>(
-        working: &Path,
-        storage: &R,
-        oids: impl IntoIterator<Item = Oid>,
-    ) -> Result<(), io::Error>
-    where
-        R: ReadRepository,
-    {
-        let mut fetch = vec![
-            "fetch".to_string(),
-            url::File::new(storage.path()).to_string(),
-            // N.b. avoid writing fetch head since we're only fetching objects
-            "--no-write-fetch-head".to_string(),
-        ];
-        fetch.extend(oids.into_iter().map(|oid| oid.to_string()));
-        // N.b. `.` is used since we're fetching within the working copy
-        run::<_, _, &str, &str>(working, fetch, [])?;
-        Ok(())
-    }
-}
-
-/// Git URLs.
-pub mod url {
-    use std::path::PathBuf;
-
-    use crate::prelude::RepoId;
-
-    /// A Git URL using the `file://` scheme.
-    pub struct File {
-        pub path: PathBuf,
-    }
-
-    impl File {
-        /// Create a new file URL pointing to the given path.
-        pub fn new(path: impl Into<PathBuf>) -> Self {
-            Self { path: path.into() }
-        }
-
-        /// Return a URL with the given RID set.
-        pub fn rid(mut self, rid: RepoId) -> Self {
-            self.path.push(rid.canonical());
-            self
-        }
-    }
-
-    impl std::fmt::Display for File {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(f, "file://{}", self.path.display())
-        }
-    }
-}
-
-/// Git environment variables.
-pub mod env {
-    /// Set of environment vars to reset git's configuration to default.
-    pub const GIT_DEFAULT_CONFIG: [(&str, &str); 2] = [
-        ("GIT_CONFIG_GLOBAL", "/dev/null"),
-        ("GIT_CONFIG_NOSYSTEM", "1"),
-    ];
-}
-
-/// The user information used for signing commits and configuring the
-/// `name` and `email` fields in the Git config.
-#[derive(Debug, Clone)]
-pub struct UserInfo {
-    /// Alias of the local peer.
-    pub alias: Alias,
-    /// [`PublicKey`] of the local peer.
-    pub key: PublicKey,
-}
-
-impl UserInfo {
-    /// The name of the user, i.e. the `alias`.
-    pub fn name(&self) -> Alias {
-        self.alias.clone()
-    }
-
-    /// The "email" of the user, which is in the form
-    /// `<alias>@<public key>`.
-    pub fn email(&self) -> String {
-        format!("{}@{}", self.alias, self.key)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use std::str::FromStr;
-
-    #[test]
-    fn test_version_ord() {
-        assert!(
-            Version {
-                major: 2,
-                minor: 34,
-                patch: 1
-            } > Version {
-                major: 2,
-                minor: 34,
-                patch: 0
-            }
-        );
-        assert!(
-            Version {
-                major: 2,
-                minor: 24,
-                patch: 12
-            } < Version {
-                major: 2,
-                minor: 34,
-                patch: 0
-            }
-        );
-    }
-
-    #[test]
-    fn test_version_from_str() {
-        assert_eq!(
-            Version::from_str("git version 2.34.1\n").ok(),
-            Some(Version {
-                major: 2,
-                minor: 34,
-                patch: 1
-            })
-        );
-
-        assert_eq!(
-            Version::from_str("git version 2.34.1 (macOS)").ok(),
-            Some(Version {
-                major: 2,
-                minor: 34,
-                patch: 1
-            })
-        );
-
-        assert_eq!(
-            Version::from_str("git version 2.34").ok(),
-            Some(Version {
-                major: 2,
-                minor: 34,
-                patch: 0
-            })
-        );
-
-        assert!(Version::from_str("2.34").is_err());
-    }
-}
diff --git a/radicle/src/git/canonical.rs b/radicle/src/git/canonical.rs
deleted file mode 100644
index 67b2cd180..000000000
--- a/radicle/src/git/canonical.rs
+++ /dev/null
@@ -1,460 +0,0 @@
-use std::collections::BTreeMap;
-
-use nonempty::NonEmpty;
-use raw::Repository;
-use thiserror::Error;
-
-use crate::prelude::Did;
-use crate::prelude::Project;
-use crate::storage::ReadRepository;
-
-use super::raw;
-use super::{lit, Oid, Qualified};
-
-/// A collection of [`Did`]s and their [`Oid`]s that is the tip for a given
-/// reference for that [`Did`].
-///
-/// The general construction of `Canonical` is by using the
-/// [`Canonical::reference`] constructor. For the default branch of a
-/// [`Project`], use [`Canonical::default_branch`].
-///
-/// `Canonical` can then be used for performing calculations about the
-/// canonicity of the reference, most importantly the [`Canonical::quorum`].
-pub struct Canonical {
-    tips: BTreeMap<Did, Oid>,
-}
-
-/// Error that can occur when calculation the [`Canonical::quorum`].
-#[derive(Debug, Error)]
-pub enum QuorumError {
-    /// Could not determine a quorum [`Oid`].
-    #[error("no quorum was found")]
-    NoQuorum,
-    /// An error occurred from [`git2`].
-    #[error(transparent)]
-    Git(#[from] git2::Error),
-}
-
-impl Canonical {
-    /// Construct the set of canonical tips of the `Project::default_branch` for
-    /// the given `delegates`.
-    pub fn default_branch<S>(
-        repo: &S,
-        project: &Project,
-        delegates: &NonEmpty<Did>,
-    ) -> Result<Self, raw::Error>
-    where
-        S: ReadRepository,
-    {
-        Self::reference(
-            repo,
-            delegates,
-            &lit::refs_heads(project.default_branch()).into(),
-        )
-    }
-
-    /// Construct the set of canonical tips given for the given `delegates` and
-    /// the reference `name`.
-    pub fn reference<S>(
-        repo: &S,
-        delegates: &NonEmpty<Did>,
-        name: &Qualified,
-    ) -> Result<Self, raw::Error>
-    where
-        S: ReadRepository,
-    {
-        let mut tips = BTreeMap::new();
-        for delegate in delegates.iter() {
-            match repo.reference_oid(delegate, name) {
-                Ok(tip) => {
-                    tips.insert(*delegate, tip);
-                }
-                Err(e) if super::ext::is_not_found_err(&e) => {
-                    log::warn!(
-                        target: "radicle",
-                        "Missing `refs/namespaces/{}/{name}` while calculating the canonical reference",
-                        delegate.as_key()
-                    );
-                }
-                Err(e) => return Err(e),
-            }
-        }
-        Ok(Canonical { tips })
-    }
-
-    /// Return the set of [`Did`]s and their [`Oid`] tip.
-    pub fn tips(&self) -> impl Iterator<Item = (&Did, &Oid)> {
-        self.tips.iter()
-    }
-}
-
-/// Check that a given `target` converges with any of the provided `tips`.
-///
-/// It converges if the `target` is either equal to, ahead of, or behind any of
-/// the tips.
-pub fn converges<'a>(
-    tips: impl Iterator<Item = &'a Oid>,
-    target: Oid,
-    repo: &Repository,
-) -> Result<bool, raw::Error> {
-    for tip in tips {
-        match repo.graph_ahead_behind(*target, **tip)? {
-            (0, 0) => return Ok(true),
-            (ahead, behind) if ahead > 0 && behind == 0 => return Ok(true),
-            (ahead, behind) if behind > 0 && ahead == 0 => return Ok(true),
-            (_, _) => {}
-        }
-    }
-    Ok(false)
-}
-
-impl Canonical {
-    /// In some cases, we allow the vote to be modified. For example, when the
-    /// `did` is pushing a new commit, we may want to see if the new commit will
-    /// reach a quorum.
-    pub fn modify_vote(&mut self, did: Did, new: Oid) {
-        self.tips.insert(did, new);
-    }
-
-    /// Computes the quorum or "canonical" tip based on the tips, of `Canonical`,
-    /// and the threshold. This can be described as the latest commit that is
-    /// included in at least `threshold` histories. In case there are multiple tips
-    /// passing the threshold, and they are divergent, an error is returned.
-    ///
-    /// Also returns an error if `heads` is empty or `threshold` cannot be
-    /// satisified with the number of heads given.
-    pub fn quorum(&self, threshold: usize, repo: &raw::Repository) -> Result<Oid, QuorumError> {
-        let mut candidates = BTreeMap::<_, usize>::new();
-
-        // Build a list of candidate commits and count how many "votes" each of them has.
-        // Commits get a point for each direct vote, as well as for being part of the ancestry
-        // of a commit given to this function. Only commits given to the function are considered.
-        for (i, head) in self.tips.values().enumerate() {
-            // Add a direct vote for this head.
-            *candidates.entry(*head).or_default() += 1;
-
-            // Compare this head to all other heads ahead of it in the list.
-            for other in self.tips.values().skip(i + 1) {
-                // N.b. if heads are equal then skip it, otherwise it will end up as
-                // a double vote.
-                if *head == *other {
-                    continue;
-                }
-                let base = Oid::from(repo.merge_base(**head, **other)?);
-
-                if base == *other || base == *head {
-                    *candidates.entry(base).or_default() += 1;
-                }
-            }
-        }
-        // Keep commits which pass the threshold.
-        candidates.retain(|_, votes| *votes >= threshold);
-
-        // Keep track of the longest identity branch.
-        let (mut longest, _) = candidates.pop_first().ok_or(QuorumError::NoQuorum)?;
-
-        // Now that all scores are calculated, figure out what is the longest branch
-        // that passes the threshold. In case of divergence, return an error.
-        for head in candidates.keys() {
-            let base = repo.merge_base(**head, *longest)?;
-
-            if base == *longest {
-                // `head` is a successor of `longest`. Update `longest`.
-                //
-                //   o head
-                //   |
-                //   o longest (base)
-                //   |
-                //
-                longest = *head;
-            } else if base == **head || *head == longest {
-                // `head` is an ancestor of `longest`, or equal to it. Do nothing.
-                //
-                //   o longest             o longest, head (base)
-                //   |                     |
-                //   o head (base)   OR    o
-                //   |                     |
-                //
-            } else {
-                // The merge base between `head` and `longest` (`base`)
-                // is neither `head` nor `longest`. Therefore, the branches have
-                // diverged.
-                //
-                //    longest   head
-                //           \ /
-                //            o (base)
-                //            |
-                //
-                return Err(QuorumError::NoQuorum);
-            }
-        }
-        Ok((*longest).into())
-    }
-}
-
-#[cfg(test)]
-#[allow(clippy::unwrap_used)]
-mod tests {
-    use crypto::test::signer::MockSigner;
-    use radicle_crypto::Signer;
-
-    use super::*;
-    use crate::assert_matches;
-    use crate::git;
-    use crate::test::fixtures;
-
-    /// Test helper to construct a Canonical and get the quorum
-    fn quorum(
-        heads: &[git::raw::Oid],
-        threshold: usize,
-        repo: &git::raw::Repository,
-    ) -> Result<Oid, QuorumError> {
-        let tips = heads
-            .iter()
-            .enumerate()
-            .map(|(i, head)| {
-                let signer = MockSigner::from_seed([(i + 1) as u8; 32]);
-                let did = Did::from(signer.public_key());
-                (did, (*head).into())
-            })
-            .collect();
-        Canonical { tips }.quorum(threshold, repo)
-    }
-
-    #[test]
-    fn test_quorum_properties() {
-        let tmp = tempfile::tempdir().unwrap();
-        let (repo, c0) = fixtures::repository(tmp.path());
-        let c0: git::Oid = c0.into();
-        let a1 = fixtures::commit("A1", &[*c0], &repo);
-        let a2 = fixtures::commit("A2", &[*a1], &repo);
-        let d1 = fixtures::commit("D1", &[*c0], &repo);
-        let c1 = fixtures::commit("C1", &[*c0], &repo);
-        let c2 = fixtures::commit("C2", &[*c1], &repo);
-        let b2 = fixtures::commit("B2", &[*c1], &repo);
-        let a1 = fixtures::commit("A1", &[*c0], &repo);
-        let m1 = fixtures::commit("M1", &[*c2, *b2], &repo);
-        let m2 = fixtures::commit("M2", &[*a1, *b2], &repo);
-        let mut rng = fastrand::Rng::new();
-        let choices = [*c0, *c1, *c2, *b2, *a1, *a2, *d1, *m1, *m2];
-
-        for _ in 0..100 {
-            let count = rng.usize(1..=choices.len());
-            let threshold = rng.usize(1..=count);
-            let mut heads = Vec::new();
-
-            for _ in 0..count {
-                let ix = rng.usize(0..choices.len());
-                heads.push(choices[ix]);
-            }
-            rng.shuffle(&mut heads);
-
-            if let Ok(canonical) = quorum(&heads, threshold, &repo) {
-                assert!(heads.contains(&canonical));
-            }
-        }
-    }
-
-    #[test]
-    fn test_quorum() {
-        let tmp = tempfile::tempdir().unwrap();
-        let (repo, c0) = fixtures::repository(tmp.path());
-        let c0: git::Oid = c0.into();
-        let c1 = fixtures::commit("C1", &[*c0], &repo);
-        let c2 = fixtures::commit("C2", &[*c1], &repo);
-        let c3 = fixtures::commit("C3", &[*c1], &repo);
-        let b2 = fixtures::commit("B2", &[*c1], &repo);
-        let a1 = fixtures::commit("A1", &[*c0], &repo);
-        let m1 = fixtures::commit("M1", &[*c2, *b2], &repo);
-        let m2 = fixtures::commit("M2", &[*a1, *b2], &repo);
-
-        eprintln!("C0: {c0}");
-        eprintln!("C1: {c1}");
-        eprintln!("C2: {c2}");
-        eprintln!("C3: {c3}");
-        eprintln!("B2: {b2}");
-        eprintln!("A1: {a1}");
-        eprintln!("M1: {m1}");
-        eprintln!("M2: {m2}");
-
-        assert_eq!(quorum(&[*c0], 1, &repo).unwrap(), c0);
-        assert_eq!(quorum(&[*c1], 1, &repo).unwrap(), c1);
-        assert_eq!(quorum(&[*c2], 1, &repo).unwrap(), c2);
-        assert_eq!(quorum(&[*c0], 0, &repo).unwrap(), c0);
-        assert_matches!(quorum(&[], 0, &repo), Err(QuorumError::NoQuorum));
-        assert_matches!(quorum(&[*c0], 2, &repo), Err(QuorumError::NoQuorum));
-
-        //  C1
-        //  |
-        // C0
-        assert_eq!(quorum(&[*c1], 1, &repo).unwrap(), c1);
-
-        //   C2
-        //   |
-        //  C1
-        //  |
-        // C0
-        assert_eq!(quorum(&[*c1, *c2], 1, &repo).unwrap(), c2);
-        assert_eq!(quorum(&[*c1, *c2], 2, &repo).unwrap(), c1);
-        assert_eq!(quorum(&[*c0, *c1, *c2], 3, &repo).unwrap(), c0);
-        assert_eq!(quorum(&[*c1, *c1, *c2], 2, &repo).unwrap(), c1);
-        assert_eq!(quorum(&[*c1, *c1, *c2], 1, &repo).unwrap(), c2);
-        assert_eq!(quorum(&[*c2, *c2, *c1], 1, &repo).unwrap(), c2);
-
-        // B2 C2
-        //   \|
-        //   C1
-        //   |
-        //  C0
-        assert_matches!(
-            quorum(&[*c1, *c2, *b2], 1, &repo),
-            Err(QuorumError::NoQuorum)
-        );
-        assert_matches!(quorum(&[*c2, *b2], 1, &repo), Err(QuorumError::NoQuorum));
-        assert_matches!(quorum(&[*b2, *c2], 1, &repo), Err(QuorumError::NoQuorum));
-        assert_matches!(quorum(&[*c2, *b2], 2, &repo), Err(QuorumError::NoQuorum));
-        assert_matches!(quorum(&[*b2, *c2], 2, &repo), Err(QuorumError::NoQuorum));
-        assert_eq!(quorum(&[*c1, *c2, *b2], 2, &repo).unwrap(), c1);
-        assert_eq!(quorum(&[*c1, *c2, *b2], 3, &repo).unwrap(), c1);
-        assert_eq!(quorum(&[*b2, *b2, *c2], 2, &repo).unwrap(), b2);
-        assert_eq!(quorum(&[*b2, *c2, *c2], 2, &repo).unwrap(), c2);
-        assert_matches!(
-            quorum(&[*b2, *b2, *c2, *c2], 2, &repo),
-            Err(QuorumError::NoQuorum)
-        );
-
-        // B2 C2 C3
-        //  \ | /
-        //    C1
-        //    |
-        //    C0
-        assert_eq!(quorum(&[*b2, *c2, *c2], 2, &repo).unwrap(), c2);
-        assert_matches!(
-            quorum(&[*b2, *c2, *c2], 3, &repo),
-            Err(QuorumError::NoQuorum)
-        );
-        assert_matches!(
-            quorum(&[*b2, *c2, *b2, *c2], 3, &repo),
-            Err(QuorumError::NoQuorum)
-        );
-        assert_matches!(
-            quorum(&[*c3, *b2, *c2, *b2, *c2, *c3], 3, &repo),
-            Err(QuorumError::NoQuorum)
-        );
-
-        //  B2 C2
-        //    \|
-        // A1 C1
-        //   \|
-        //   C0
-        assert_matches!(
-            quorum(&[*c2, *b2, *a1], 1, &repo),
-            Err(QuorumError::NoQuorum)
-        );
-        assert_matches!(
-            quorum(&[*c2, *b2, *a1], 2, &repo),
-            Err(QuorumError::NoQuorum)
-        );
-        assert_matches!(
-            quorum(&[*c2, *b2, *a1], 3, &repo),
-            Err(QuorumError::NoQuorum)
-        );
-        assert_matches!(
-            quorum(&[*c1, *c2, *b2, *a1], 4, &repo),
-            Err(QuorumError::NoQuorum)
-        );
-        assert_eq!(quorum(&[*c0, *c1, *c2, *b2, *a1], 2, &repo).unwrap(), c1,);
-        assert_eq!(quorum(&[*c0, *c1, *c2, *b2, *a1], 3, &repo).unwrap(), c1,);
-        assert_eq!(quorum(&[*c0, *c2, *b2, *a1], 3, &repo).unwrap(), c0);
-        assert_eq!(quorum(&[*c0, *c1, *c2, *b2, *a1], 4, &repo).unwrap(), c0,);
-        assert_matches!(
-            quorum(&[*a1, *a1, *c2, *c2, *c1], 2, &repo),
-            Err(QuorumError::NoQuorum)
-        );
-        assert_matches!(
-            quorum(&[*a1, *a1, *c2, *c2, *c1], 1, &repo),
-            Err(QuorumError::NoQuorum)
-        );
-        assert_matches!(
-            quorum(&[*a1, *a1, *c2], 1, &repo),
-            Err(QuorumError::NoQuorum)
-        );
-        assert_matches!(
-            quorum(&[*b2, *b2, *c2, *c2], 1, &repo),
-            Err(QuorumError::NoQuorum)
-        );
-        assert_matches!(
-            quorum(&[*b2, *b2, *c2, *c2, *a1], 1, &repo),
-            Err(QuorumError::NoQuorum)
-        );
-
-        //    M2  M1
-        //    /\  /\
-        //    \ B2 C2
-        //     \  \|
-        //     A1 C1
-        //       \|
-        //       C0
-        assert_eq!(quorum(&[*m1], 1, &repo).unwrap(), m1);
-        assert_matches!(quorum(&[*m1, *m2], 1, &repo), Err(QuorumError::NoQuorum));
-        assert_matches!(quorum(&[*m2, *m1], 1, &repo), Err(QuorumError::NoQuorum));
-        assert_matches!(quorum(&[*m1, *m2], 2, &repo), Err(QuorumError::NoQuorum));
-        assert_matches!(
-            quorum(&[*m1, *m2, *c2], 1, &repo),
-            Err(QuorumError::NoQuorum)
-        );
-        assert_matches!(quorum(&[*m1, *a1], 1, &repo), Err(QuorumError::NoQuorum));
-        assert_matches!(quorum(&[*m1, *a1], 2, &repo), Err(QuorumError::NoQuorum));
-        assert_eq!(quorum(&[*m1, *m2, *b2, *c1], 4, &repo).unwrap(), c1);
-        assert_eq!(quorum(&[*m1, *m1, *b2], 2, &repo).unwrap(), m1);
-        assert_eq!(quorum(&[*m1, *m1, *c2], 2, &repo).unwrap(), m1);
-        assert_eq!(quorum(&[*m2, *m2, *b2], 2, &repo).unwrap(), m2);
-        assert_eq!(quorum(&[*m2, *m2, *a1], 2, &repo).unwrap(), m2);
-        assert_eq!(quorum(&[*m1, *m1, *b2, *b2], 2, &repo).unwrap(), m1);
-        assert_eq!(quorum(&[*m1, *m1, *c2, *c2], 2, &repo).unwrap(), m1);
-        assert_eq!(quorum(&[*m1, *b2, *c1, *c0], 3, &repo).unwrap(), c1);
-        assert_eq!(quorum(&[*m1, *b2, *c1, *c0], 4, &repo).unwrap(), c0);
-    }
-
-    #[test]
-    fn test_quorum_merges() {
-        let tmp = tempfile::tempdir().unwrap();
-        let (repo, c0) = fixtures::repository(tmp.path());
-        let c0: git::Oid = c0.into();
-        let c1 = fixtures::commit("C1", &[*c0], &repo);
-        let c2 = fixtures::commit("C2", &[*c0], &repo);
-        let c3 = fixtures::commit("C3", &[*c0], &repo);
-
-        let m1 = fixtures::commit("M1", &[*c1, *c2], &repo);
-        let m2 = fixtures::commit("M2", &[*c2, *c3], &repo);
-
-        eprintln!("C0: {c0}");
-        eprintln!("C1: {c1}");
-        eprintln!("C2: {c2}");
-        eprintln!("C3: {c3}");
-        eprintln!("M1: {m1}");
-        eprintln!("M2: {m2}");
-
-        //    M2  M1
-        //    /\  /\
-        //   C1 C2 C3
-        //     \| /
-        //      C0
-        assert_matches!(quorum(&[*m1, *m2], 1, &repo), Err(QuorumError::NoQuorum));
-        assert_matches!(quorum(&[*m1, *m2], 2, &repo), Err(QuorumError::NoQuorum));
-
-        let m3 = fixtures::commit("M3", &[*c2, *c1], &repo);
-
-        //   M3/M2 M1
-        //    /\  /\
-        //   C1 C2 C3
-        //     \| /
-        //      C0
-        assert_matches!(quorum(&[*m1, *m3], 1, &repo), Err(QuorumError::NoQuorum));
-        assert_matches!(quorum(&[*m1, *m3], 2, &repo), Err(QuorumError::NoQuorum));
-        assert_matches!(quorum(&[*m3, *m1], 1, &repo), Err(QuorumError::NoQuorum));
-        assert_matches!(quorum(&[*m3, *m1], 2, &repo), Err(QuorumError::NoQuorum));
-        assert_matches!(quorum(&[*m3, *m2], 1, &repo), Err(QuorumError::NoQuorum));
-        assert_matches!(quorum(&[*m3, *m2], 2, &repo), Err(QuorumError::NoQuorum));
-    }
-}
diff --git a/radicle/src/identity.rs b/radicle/src/identity.rs
deleted file mode 100644
index 64f082f07..000000000
--- a/radicle/src/identity.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#![warn(clippy::unwrap_used)]
-pub mod did;
-pub mod doc;
-pub mod project;
-
-pub use crypto::PublicKey;
-pub use did::Did;
-pub use doc::{Doc, DocAt, DocError, IdError, PayloadError, RepoId, Visibility};
-pub use project::Project;
-
-pub use crate::cob::identity::{Error, Identity, IdentityMut};
diff --git a/radicle/src/identity/did.rs b/radicle/src/identity/did.rs
deleted file mode 100644
index fb61c9888..000000000
--- a/radicle/src/identity/did.rs
+++ /dev/null
@@ -1,124 +0,0 @@
-use std::ops::Deref;
-use std::{fmt, str::FromStr};
-
-use serde::{Deserialize, Serialize};
-use thiserror::Error;
-
-use crate::crypto;
-
-#[derive(Error, Debug)]
-pub enum DidError {
-    #[error("invalid did: {0}")]
-    Did(String),
-    #[error("invalid public key: {0}")]
-    PublicKey(#[from] crypto::PublicKeyError),
-}
-
-#[derive(Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-#[serde(into = "String", try_from = "String")]
-pub struct Did(crypto::PublicKey);
-
-impl Did {
-    /// We use the format specified by the DID `key` method, which is described as:
-    ///
-    /// `did:key:MULTIBASE(base58-btc, MULTICODEC(public-key-type, raw-public-key-bytes))`
-    ///
-    pub fn encode(&self) -> String {
-        format!("did:key:{}", self.0.to_human())
-    }
-
-    pub fn decode(input: &str) -> Result<Self, DidError> {
-        let key = input
-            .strip_prefix("did:key:")
-            .ok_or_else(|| DidError::Did(input.to_owned()))?;
-
-        crypto::PublicKey::from_str(key)
-            .map(Did)
-            .map_err(DidError::from)
-    }
-
-    pub fn as_key(&self) -> &crypto::PublicKey {
-        self.deref()
-    }
-}
-
-impl From<&crypto::PublicKey> for Did {
-    fn from(key: &crypto::PublicKey) -> Self {
-        Self(*key)
-    }
-}
-
-impl From<crypto::PublicKey> for Did {
-    fn from(key: crypto::PublicKey) -> Self {
-        (&key).into()
-    }
-}
-
-impl From<Did> for crypto::PublicKey {
-    fn from(Did(key): Did) -> Self {
-        key
-    }
-}
-
-impl From<Did> for String {
-    fn from(other: Did) -> Self {
-        other.encode()
-    }
-}
-
-impl FromStr for Did {
-    type Err = DidError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Self::decode(s)
-    }
-}
-
-impl TryFrom<String> for Did {
-    type Error = DidError;
-
-    fn try_from(value: String) -> Result<Self, Self::Error> {
-        Self::decode(&value)
-    }
-}
-
-impl fmt::Display for Did {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.encode())
-    }
-}
-
-impl fmt::Debug for Did {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "Did({:?})", self.to_string())
-    }
-}
-
-impl Deref for Did {
-    type Target = crypto::PublicKey;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-#[cfg(test)]
-#[allow(clippy::unwrap_used)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_did_encode_decode() {
-        let input = "did:key:z6MkhaXgBZDvotDkL5257faiztiGiC2QtKLGpbnnEGta2doK";
-        let Did(key) = Did::decode(input).unwrap();
-
-        assert_eq!(Did::from(key).encode(), input);
-    }
-
-    #[test]
-    fn test_did_vectors() {
-        Did::decode("did:key:z6MkiTBz1ymuepAQ4HEHYSF1H8quG5GLVVQR3djdX3mDooWp").unwrap();
-        Did::decode("did:key:z6MkjchhfUsD6mmvni8mCdXHw216Xrm9bQe2mBH1P5RDjVJG").unwrap();
-        Did::decode("did:key:z6MknGc3ocHs3zdPiJbnaaqDi58NGb4pk1Sp9WxWufuXSdxf").unwrap();
-    }
-}
diff --git a/radicle/src/identity/doc.rs b/radicle/src/identity/doc.rs
deleted file mode 100644
index e0b2e854c..000000000
--- a/radicle/src/identity/doc.rs
+++ /dev/null
@@ -1,552 +0,0 @@
-mod id;
-
-use std::collections::{BTreeMap, BTreeSet};
-use std::fmt;
-use std::marker::PhantomData;
-use std::ops::{Deref, Not};
-use std::path::Path;
-use std::str::FromStr;
-
-use nonempty::NonEmpty;
-use once_cell::sync::Lazy;
-use radicle_cob::type_name::{TypeName, TypeNameParse};
-use radicle_git_ext::Oid;
-use serde::{Deserialize, Serialize};
-use thiserror::Error;
-
-use crate::canonical::formatter::CanonicalFormatter;
-use crate::cob::identity;
-use crate::crypto;
-use crate::crypto::{Signature, Unverified, Verified};
-use crate::git;
-use crate::identity::{project::Project, Did};
-use crate::storage;
-use crate::storage::{ReadRepository, RepositoryError};
-
-pub use crypto::PublicKey;
-pub use id::*;
-
-/// Path to the identity document in the identity branch.
-pub static PATH: Lazy<&Path> = Lazy::new(|| Path::new("radicle.json"));
-/// Maximum length of a string in the identity document.
-pub const MAX_STRING_LENGTH: usize = 255;
-/// Maximum number of a delegates in the identity document.
-pub const MAX_DELEGATES: usize = 255;
-
-#[derive(Error, Debug)]
-pub enum DocError {
-    #[error("json: {0}")]
-    Json(#[from] serde_json::Error),
-    #[error("invalid delegates: {0}")]
-    Delegates(&'static str),
-    #[error("invalid threshold `{0}`: {1}")]
-    Threshold(usize, &'static str),
-    #[error("git: {0}")]
-    GitExt(#[from] git::Error),
-    #[error("git: {0}")]
-    Git(#[from] git2::Error),
-    #[error("missing identity document")]
-    Missing,
-}
-
-impl DocError {
-    /// Whether this error is caused by the document not being found.
-    pub fn is_not_found(&self) -> bool {
-        match self {
-            Self::GitExt(git::Error::NotFound(_)) => true,
-            Self::GitExt(git::Error::Git(e)) if git::is_not_found_err(e) => true,
-            Self::Git(err) if git::is_not_found_err(err) => true,
-            _ => false,
-        }
-    }
-}
-
-/// Identifies an identity document payload type.
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
-#[serde(transparent)]
-pub struct PayloadId(TypeName);
-
-impl fmt::Display for PayloadId {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-impl FromStr for PayloadId {
-    type Err = TypeNameParse;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        TypeName::from_str(s).map(Self)
-    }
-}
-
-impl PayloadId {
-    /// Project payload type.
-    pub fn project() -> Self {
-        Self(
-            // SAFETY: We know this is valid.
-            TypeName::from_str("xyz.radicle.project")
-                .expect("PayloadId::project: type name is valid"),
-        )
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum PayloadError {
-    #[error("json: {0}")]
-    Json(#[from] serde_json::Error),
-    #[error("payload '{0}' not found in identity document")]
-    NotFound(PayloadId),
-}
-
-/// Payload value.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(transparent)]
-pub struct Payload {
-    value: serde_json::Value,
-}
-
-impl Payload {
-    /// Get a mutable reference to the JSON map, or `None` if the payload is not a map.
-    pub fn as_object_mut(
-        &mut self,
-    ) -> Option<&mut serde_json::value::Map<String, serde_json::Value>> {
-        self.value.as_object_mut()
-    }
-}
-
-impl From<serde_json::Value> for Payload {
-    fn from(value: serde_json::Value) -> Self {
-        Self { value }
-    }
-}
-
-impl Deref for Payload {
-    type Target = serde_json::Value;
-
-    fn deref(&self) -> &Self::Target {
-        &self.value
-    }
-}
-
-/// A verified identity document at a specific commit.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct DocAt {
-    /// The commit at which this document exists.
-    pub commit: Oid,
-    /// The document blob at this commit.
-    pub blob: Oid,
-    /// The parsed document.
-    pub doc: Doc<Verified>,
-}
-
-impl Deref for DocAt {
-    type Target = Doc<Verified>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.doc
-    }
-}
-
-impl From<DocAt> for Doc<Verified> {
-    fn from(value: DocAt) -> Self {
-        value.doc
-    }
-}
-
-impl AsRef<Doc<Verified>> for DocAt {
-    fn as_ref(&self) -> &Doc<Verified> {
-        &self.doc
-    }
-}
-
-/// Repository visibility.
-#[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", tag = "type")]
-pub enum Visibility {
-    /// Anyone and everyone.
-    #[default]
-    Public,
-    /// Delegates plus the allowed DIDs.
-    Private {
-        #[serde(default, skip_serializing_if = "BTreeSet::is_empty")]
-        allow: BTreeSet<Did>,
-    },
-}
-
-#[derive(Error, Debug)]
-#[error("'{0}' is not a valid visibility type")]
-pub struct VisibilityParseError(String);
-
-impl FromStr for Visibility {
-    type Err = VisibilityParseError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
-            "public" => Ok(Visibility::Public),
-            "private" => Ok(Visibility::private([])),
-            _ => Err(VisibilityParseError(s.to_owned())),
-        }
-    }
-}
-
-impl Visibility {
-    /// Check whether the visibility is public.
-    pub fn is_public(&self) -> bool {
-        matches!(self, Self::Public)
-    }
-
-    /// Check whether the visibility is private.
-    pub fn is_private(&self) -> bool {
-        matches!(self, Self::Private { .. })
-    }
-
-    /// Private visibility with list of allowed DIDs beyond the repository delegates.
-    pub fn private(allow: impl IntoIterator<Item = Did>) -> Self {
-        Self::Private {
-            allow: BTreeSet::from_iter(allow),
-        }
-    }
-}
-
-/// An identity document.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Doc<V> {
-    /// The payload section.
-    pub payload: BTreeMap<PayloadId, Payload>,
-    /// The delegates section.
-    pub delegates: NonEmpty<Did>,
-    /// The signature threshold.
-    pub threshold: usize,
-    /// Repository visibility.
-    #[serde(default, skip_serializing_if = "Visibility::is_public")]
-    pub visibility: Visibility,
-
-    #[serde(skip)]
-    verified: PhantomData<V>,
-}
-
-impl<V> Doc<V> {
-    /// Check whether this document and the associated repository is visible to the given peer.
-    pub fn is_visible_to(&self, peer: &PublicKey) -> bool {
-        match &self.visibility {
-            Visibility::Public => true,
-            Visibility::Private { allow } => {
-                allow.contains(&Did::from(*peer)) || self.is_delegate(peer)
-            }
-        }
-    }
-
-    /// Validate signature using this document's delegates, against a given document blob.
-    pub fn verify_signature(
-        &self,
-        key: &PublicKey,
-        signature: &Signature,
-        blob: Oid,
-    ) -> Result<(), PublicKey> {
-        if !self.is_delegate(key) {
-            return Err(*key);
-        }
-        if key.verify(blob.as_bytes(), signature).is_err() {
-            return Err(*key);
-        }
-        Ok(())
-    }
-
-    pub fn is_majority(&self, votes: usize) -> bool {
-        votes >= self.majority()
-    }
-
-    pub fn majority(&self) -> usize {
-        self.delegates.len() / 2 + 1
-    }
-
-    pub fn blob_at<R: ReadRepository>(commit: Oid, repo: &R) -> Result<git2::Blob, DocError> {
-        let path = Path::new("embeds").join(*PATH);
-        repo.blob_at(commit, path.as_path()).map_err(DocError::from)
-    }
-
-    pub fn is_delegate(&self, key: &crypto::PublicKey) -> bool {
-        self.delegates.contains(&key.into())
-    }
-}
-
-impl Doc<Verified> {
-    pub fn encode(&self) -> Result<(git::Oid, Vec<u8>), DocError> {
-        let mut buf = Vec::new();
-        let mut serializer =
-            serde_json::Serializer::with_formatter(&mut buf, CanonicalFormatter::new());
-
-        self.serialize(&mut serializer)?;
-        let oid = git2::Oid::hash_object(git2::ObjectType::Blob, &buf)?;
-
-        Ok((oid.into(), buf))
-    }
-
-    /// Attempt to add a new delegate to the document. Returns `true` if it wasn't there before.
-    pub fn delegate(&mut self, key: &crypto::PublicKey) -> bool {
-        let delegate = Did::from(key);
-        if self.delegates.iter().all(|id| id != &delegate) {
-            self.delegates.push(delegate);
-            return true;
-        }
-        false
-    }
-
-    pub fn rescind(&mut self, key: &crypto::PublicKey) -> Result<Option<Did>, DocError> {
-        let delegate = Did::from(key);
-        let (matches, delegates) = self.delegates.iter().partition(|d| **d == delegate);
-        match NonEmpty::from_vec(delegates) {
-            Some(delegates) => {
-                self.delegates = delegates;
-                if self.threshold > self.delegates.len() {
-                    return Err(DocError::Threshold(
-                        self.threshold,
-                        "the thresholds exceeds the new delegate count after removal",
-                    ));
-                }
-                Ok(matches.is_empty().not().then_some(delegate))
-            }
-            None => Err(DocError::Delegates("cannot remove the last delegate")),
-        }
-    }
-
-    /// Get the project payload, if it exists and is valid, out of this document.
-    pub fn project(&self) -> Result<Project, PayloadError> {
-        let value = self
-            .payload
-            .get(&PayloadId::project())
-            .ok_or_else(|| PayloadError::NotFound(PayloadId::project()))?;
-        let proj: Project = serde_json::from_value((**value).clone())?;
-
-        Ok(proj)
-    }
-
-    pub fn sign<G: crypto::Signer>(
-        &self,
-        signer: &G,
-    ) -> Result<(git::Oid, Vec<u8>, Signature), DocError> {
-        let (oid, bytes) = self.encode()?;
-        let sig = signer.sign(oid.as_bytes());
-
-        Ok((oid, bytes, sig))
-    }
-
-    pub fn signature_of<G: crypto::Signer>(&self, signer: &G) -> Result<Signature, DocError> {
-        let (_, _, sig) = self.sign(signer)?;
-
-        Ok(sig)
-    }
-
-    pub fn load_at<R: ReadRepository>(commit: Oid, repo: &R) -> Result<DocAt, DocError> {
-        let blob = Self::blob_at(commit, repo)?;
-        let doc = Doc::from_blob(&blob)?;
-
-        Ok(DocAt {
-            commit,
-            doc,
-            blob: blob.id().into(),
-        })
-    }
-
-    pub fn from_blob(blob: &git2::Blob) -> Result<Self, DocError> {
-        Doc::from_json(blob.content())?.verified()
-    }
-
-    pub fn init<G: crypto::Signer>(
-        &self,
-        repo: &storage::git::Repository,
-        signer: &G,
-    ) -> Result<git::Oid, RepositoryError> {
-        let cob = identity::Identity::initialize(self, repo, signer)?;
-        let id_ref = git::refs::storage::id(signer.public_key());
-        let cob_ref = git::refs::storage::cob(
-            signer.public_key(),
-            &crate::cob::identity::TYPENAME,
-            &cob.id,
-        );
-        // Set `.../refs/rad/id` -> `.../refs/cobs/xyz.radicle.id/<id>`
-        repo.backend.reference_symbolic(
-            id_ref.as_str(),
-            cob_ref.as_str(),
-            false,
-            "Create `rad/id` reference to point to new identity COB",
-        )?;
-
-        Ok(*cob.id)
-    }
-}
-
-impl Doc<Unverified> {
-    pub fn initial(project: Project, delegate: Did, visibility: Visibility) -> Self {
-        Self::new(project, NonEmpty::new(delegate), 1, visibility)
-    }
-
-    pub fn new(
-        project: Project,
-        delegates: NonEmpty<Did>,
-        threshold: usize,
-        visibility: Visibility,
-    ) -> Self {
-        let project =
-            serde_json::to_value(project).expect("Doc::initial: payload must be serializable");
-
-        Self {
-            payload: BTreeMap::from_iter([(PayloadId::project(), Payload::from(project))]),
-            delegates,
-            threshold,
-            visibility,
-            verified: PhantomData,
-        }
-    }
-
-    pub fn from_json(bytes: &[u8]) -> Result<Self, DocError> {
-        serde_json::from_slice(bytes).map_err(DocError::from)
-    }
-
-    pub fn verified(self) -> Result<Doc<Verified>, DocError> {
-        if self.delegates.len() > MAX_DELEGATES {
-            return Err(DocError::Delegates("number of delegates cannot exceed 255"));
-        }
-        if self.delegates.is_empty() {
-            return Err(DocError::Delegates("delegate list cannot be empty"));
-        }
-        if self.threshold > self.delegates.len() {
-            return Err(DocError::Threshold(
-                self.threshold,
-                "threshold cannot exceed number of delegates",
-            ));
-        }
-        if self.threshold == 0 {
-            return Err(DocError::Threshold(
-                self.threshold,
-                "threshold cannot be zero",
-            ));
-        }
-
-        Ok(Doc {
-            payload: self.payload,
-            delegates: self.delegates,
-            threshold: self.threshold,
-            visibility: self.visibility,
-            verified: PhantomData,
-        })
-    }
-}
-
-#[cfg(test)]
-#[allow(clippy::unwrap_used)]
-mod test {
-    use radicle_crypto::test::signer::MockSigner;
-    use radicle_crypto::Signer as _;
-
-    use crate::rad;
-    use crate::storage::git::transport;
-    use crate::storage::git::Storage;
-    use crate::storage::{ReadStorage as _, RemoteId, WriteStorage as _};
-    use crate::test::arbitrary;
-    use crate::test::fixtures;
-
-    use super::*;
-    use qcheck_macros::quickcheck;
-
-    #[test]
-    fn test_canonical_example() {
-        let tempdir = tempfile::tempdir().unwrap();
-        let storage = Storage::open(tempdir.path().join("storage"), fixtures::user()).unwrap();
-
-        transport::local::register(storage.clone());
-
-        let delegate = MockSigner::from_seed([0xff; 32]);
-        let (repo, _) = fixtures::repository(tempdir.path().join("working"));
-        let (id, _, _) = rad::init(
-            &repo,
-            "heartwood".try_into().unwrap(),
-            "Radicle Heartwood Protocol & Stack",
-            git::refname!("master"),
-            Visibility::default(),
-            &delegate,
-            &storage,
-        )
-        .unwrap();
-
-        assert_eq!(
-            delegate.public_key().to_human(),
-            String::from("z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi")
-        );
-        assert_eq!(
-            (*id).to_string(),
-            "d96f425412c9f8ad5d9a9a05c9831d0728e2338d"
-        );
-        assert_eq!(id.urn(), String::from("rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji"));
-    }
-
-    #[test]
-    fn test_not_found() {
-        let tempdir = tempfile::tempdir().unwrap();
-        let storage = Storage::open(tempdir.path().join("storage"), fixtures::user()).unwrap();
-        let remote = arbitrary::gen::<RemoteId>(1);
-        let proj = arbitrary::gen::<RepoId>(1);
-        let repo = storage.create(proj).unwrap();
-        let oid = git2::Oid::from_str("2d52a53ce5e4f141148a5f770cfd3ead2d6a45b8").unwrap();
-
-        let err = repo.identity_head_of(&remote).unwrap_err();
-        matches!(err, git::ext::Error::NotFound(_));
-
-        let err = Doc::<Verified>::load_at(oid.into(), &repo).unwrap_err();
-        assert!(err.is_not_found());
-    }
-
-    #[test]
-    fn test_canonical_doc() {
-        let tempdir = tempfile::tempdir().unwrap();
-        let storage = Storage::open(tempdir.path().join("storage"), fixtures::user()).unwrap();
-        transport::local::register(storage.clone());
-
-        let (working, _) = fixtures::repository(tempdir.path().join("working"));
-
-        let delegate = MockSigner::from_seed([0xff; 32]);
-        let (rid, doc, _) = rad::init(
-            &working,
-            "heartwood".try_into().unwrap(),
-            "Radicle Heartwood Protocol & Stack",
-            git::refname!("master"),
-            Visibility::default(),
-            &delegate,
-            &storage,
-        )
-        .unwrap();
-        let repo = storage.repository(rid).unwrap();
-
-        assert_eq!(doc, repo.identity_doc().unwrap().doc);
-    }
-
-    #[quickcheck]
-    fn prop_encode_decode(doc: Doc<Verified>) {
-        let (_, bytes) = doc.encode().unwrap();
-        assert_eq!(Doc::from_json(&bytes).unwrap().verified().unwrap(), doc);
-    }
-
-    #[test]
-    fn test_visibility_json() {
-        use std::str::FromStr;
-
-        assert_eq!(
-            serde_json::to_value(Visibility::Public).unwrap(),
-            serde_json::json!({ "type": "public" })
-        );
-        assert_eq!(
-            serde_json::to_value(Visibility::private([])).unwrap(),
-            serde_json::json!({ "type": "private" })
-        );
-        assert_eq!(
-            serde_json::to_value(Visibility::private([Did::from_str(
-                "did:key:z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT"
-            )
-            .unwrap()]))
-            .unwrap(),
-            serde_json::json!({ "type": "private", "allow": ["did:key:z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT"] })
-        );
-    }
-}
diff --git a/radicle/src/identity/doc/id.rs b/radicle/src/identity/doc/id.rs
deleted file mode 100644
index c61d2bec0..000000000
--- a/radicle/src/identity/doc/id.rs
+++ /dev/null
@@ -1,148 +0,0 @@
-use std::ops::Deref;
-use std::{ffi::OsString, fmt, str::FromStr};
-
-use git_ext::ref_format::{Component, RefString};
-use thiserror::Error;
-
-use crate::git;
-use crate::serde_ext;
-
-/// Radicle identifier prefix.
-pub const RAD_PREFIX: &str = "rad:";
-
-#[derive(Error, Debug)]
-pub enum IdError {
-    #[error("invalid git object id: {0}")]
-    InvalidOid(#[from] git2::Error),
-    #[error(transparent)]
-    Multibase(#[from] multibase::Error),
-}
-
-/// A repository identifier.
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct RepoId(git::Oid);
-
-impl fmt::Display for RepoId {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str(self.urn().as_str())
-    }
-}
-
-impl fmt::Debug for RepoId {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "RepoId({self})")
-    }
-}
-
-impl RepoId {
-    /// Format the identifier as a human-readable URN.
-    ///
-    /// Eg. `rad:z3XncAdkZjeK9mQS5Sdc4qhw98BUX`.
-    ///
-    pub fn urn(&self) -> String {
-        format!("{RAD_PREFIX}{}", self.canonical())
-    }
-
-    /// Parse an identifier from the human-readable URN format.
-    /// Accepts strings without the radicle prefix as well,
-    /// for convenience.
-    pub fn from_urn(s: &str) -> Result<Self, IdError> {
-        let s = s.strip_prefix(RAD_PREFIX).unwrap_or(s);
-        let id = Self::from_canonical(s)?;
-
-        Ok(id)
-    }
-
-    /// Format the identifier as a multibase string.
-    ///
-    /// Eg. `z3XncAdkZjeK9mQS5Sdc4qhw98BUX`.
-    ///
-    pub fn canonical(&self) -> String {
-        multibase::encode(multibase::Base::Base58Btc, self.0.as_bytes())
-    }
-
-    pub fn from_canonical(input: &str) -> Result<Self, IdError> {
-        let (_, bytes) = multibase::decode(input)?;
-        let array: git::Oid = bytes.as_slice().try_into()?;
-
-        Ok(Self(array))
-    }
-}
-
-impl FromStr for RepoId {
-    type Err = IdError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Self::from_urn(s)
-    }
-}
-
-impl TryFrom<OsString> for RepoId {
-    type Error = IdError;
-
-    fn try_from(value: OsString) -> Result<Self, Self::Error> {
-        let string = value.to_string_lossy();
-        Self::from_canonical(&string)
-    }
-}
-
-impl From<git::Oid> for RepoId {
-    fn from(oid: git::Oid) -> Self {
-        Self(oid)
-    }
-}
-
-impl From<git2::Oid> for RepoId {
-    fn from(oid: git2::Oid) -> Self {
-        Self(oid.into())
-    }
-}
-
-impl Deref for RepoId {
-    type Target = git::Oid;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl serde::Serialize for RepoId {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        serde_ext::string::serialize(&self.urn(), serializer)
-    }
-}
-
-impl<'de> serde::Deserialize<'de> for RepoId {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        serde_ext::string::deserialize(deserializer)
-    }
-}
-
-impl From<&RepoId> for Component<'_> {
-    fn from(id: &RepoId) -> Self {
-        let refstr =
-            RefString::try_from(id.0.to_string()).expect("repository id's are valid ref strings");
-        Component::from_refstr(refstr).expect("repository id's are valid refname components")
-    }
-}
-
-#[cfg(test)]
-#[allow(clippy::unwrap_used)]
-mod test {
-    use super::*;
-    use qcheck_macros::quickcheck;
-
-    #[quickcheck]
-    fn prop_from_str(input: RepoId) {
-        let encoded = input.to_string();
-        let decoded = RepoId::from_str(&encoded).unwrap();
-
-        assert_eq!(input, decoded);
-    }
-}
diff --git a/radicle/src/identity/project.rs b/radicle/src/identity/project.rs
deleted file mode 100644
index 3ff9412b4..000000000
--- a/radicle/src/identity/project.rs
+++ /dev/null
@@ -1,284 +0,0 @@
-use std::{fmt, str::FromStr};
-
-use serde::{
-    de::{self, MapAccess, Visitor},
-    Deserialize, Serialize,
-};
-use thiserror::Error;
-
-use crate::crypto;
-use crate::identity::doc;
-use crate::identity::doc::Payload;
-use crate::storage::BranchName;
-
-pub use crypto::PublicKey;
-
-/// A project-related error.
-#[derive(Debug, Error)]
-pub enum ProjectError {
-    #[error("invalid name: {0}")]
-    Name(&'static str),
-    #[error("invalid description: {0}")]
-    Description(&'static str),
-    #[error("invalid default branch: {0}")]
-    DefaultBranch(&'static str),
-}
-
-/// A valid project name.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(try_from = "String", into = "String")]
-pub struct ProjectName(String);
-
-impl From<ProjectName> for String {
-    fn from(value: ProjectName) -> Self {
-        value.0
-    }
-}
-
-impl ProjectName {
-    /// List of allowed special characters.
-    pub const ALLOWED_CHARS: &'static [char] = &['-', '_', '.'];
-
-    /// Return a string reference to the name.
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
-}
-
-impl TryFrom<&str> for ProjectName {
-    type Error = ProjectError;
-
-    fn try_from(s: &str) -> Result<Self, Self::Error> {
-        ProjectName::from_str(s)
-    }
-}
-
-impl TryFrom<String> for ProjectName {
-    type Error = ProjectError;
-
-    fn try_from(s: String) -> Result<Self, Self::Error> {
-        if s.is_empty() {
-            return Err(ProjectError::Name("name cannot be empty"));
-        } else if s.len() > doc::MAX_STRING_LENGTH {
-            return Err(ProjectError::Name("name cannot exceed 255 bytes"));
-        }
-        // Nb. We avoid characters that need to be quoted by shells, such as `$`,
-        // `!` etc., since repository names are used for naming folders during clone.
-        if !s
-            .chars()
-            .all(|c| c.is_alphanumeric() || Self::ALLOWED_CHARS.contains(&c))
-        {
-            return Err(ProjectError::Name(
-                "invalid repository name, only alphanumeric characters, '-', '_' and '.' are allowed",
-            ));
-        }
-        Ok(Self(s))
-    }
-}
-
-impl FromStr for ProjectName {
-    type Err = ProjectError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Self::try_from(s.to_owned())
-    }
-}
-
-/// A "project" payload in an identity document.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Project {
-    /// Project name.
-    name: ProjectName,
-    /// Project description.
-    description: String,
-    /// Project default branch.
-    default_branch: BranchName,
-}
-
-impl<'de> Deserialize<'de> for Project {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        #[derive(Deserialize)]
-        #[serde(field_identifier, rename_all = "camelCase")]
-        enum Field {
-            Name,
-            Description,
-            DefaultBranch,
-            /// A catch-all variant to allow for unknown fields
-            Unknown(#[allow(dead_code)] String),
-        }
-
-        struct ProjectVisitor;
-
-        impl<'de> Visitor<'de> for ProjectVisitor {
-            type Value = Project;
-
-            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-                formatter.write_str("xyz.radicle.project")
-            }
-
-            fn visit_map<V>(self, mut map: V) -> Result<Self::Value, V::Error>
-            where
-                V: MapAccess<'de>,
-            {
-                let mut name = None;
-                let mut description = None;
-                let mut default_branch = None;
-
-                while let Some(key) = map.next_key()? {
-                    match key {
-                        Field::Name => {
-                            if name.is_some() {
-                                return Err(de::Error::duplicate_field("name"));
-                            }
-                            name = Some(map.next_value()?);
-                        }
-                        Field::Description => {
-                            if description.is_some() {
-                                return Err(de::Error::duplicate_field("description"));
-                            }
-                            description = Some(map.next_value()?);
-                        }
-                        Field::DefaultBranch => {
-                            if default_branch.is_some() {
-                                return Err(de::Error::duplicate_field("defaultBranch"));
-                            }
-                            default_branch = Some(map.next_value()?);
-                        }
-                        Field::Unknown(_) => continue,
-                    }
-                }
-                let name = name.ok_or_else(|| de::Error::missing_field("name"))?;
-                let description =
-                    description.ok_or_else(|| de::Error::missing_field("description"))?;
-                let default_branch =
-                    default_branch.ok_or_else(|| de::Error::missing_field("defaultBranch"))?;
-                Project::new(name, description, default_branch).map_err(|errs| {
-                    de::Error::custom(
-                        errs.into_iter()
-                            .map(|err| err.to_string())
-                            .collect::<Vec<_>>()
-                            .join(", "),
-                    )
-                })
-            }
-        }
-        const FIELDS: &[&str] = &["name", "descrption", "defaultBranch"];
-        deserializer.deserialize_struct("Project", FIELDS, ProjectVisitor)
-    }
-}
-
-impl Project {
-    /// Create a new `Project` payload with the given values.
-    ///
-    /// These values are subject to validation and any errors are returned in a vector.
-    ///
-    /// # Validation Rules
-    ///
-    ///   * `name`'s length must not be empty and must not exceed 255.
-    ///   * `description`'s length must not exceed 255.
-    ///   * `default_branch`'s length must not be empty and must not exceed 255.
-    pub fn new(
-        name: ProjectName,
-        description: String,
-        default_branch: BranchName,
-    ) -> Result<Self, Vec<ProjectError>> {
-        let mut errs = Vec::new();
-
-        if description.len() > doc::MAX_STRING_LENGTH {
-            errs.push(ProjectError::Description(
-                "description cannot exceed 255 bytes",
-            ));
-        }
-
-        if default_branch.is_empty() {
-            errs.push(ProjectError::DefaultBranch(
-                "default branch cannot be empty",
-            ))
-        } else if default_branch.len() > doc::MAX_STRING_LENGTH {
-            errs.push(ProjectError::DefaultBranch(
-                "default branch cannot exceed 255 bytes",
-            ))
-        }
-
-        if errs.is_empty() {
-            Ok(Self {
-                name,
-                description,
-                default_branch,
-            })
-        } else {
-            Err(errs)
-        }
-    }
-
-    /// Update the `Project` payload with new values, if provided.
-    ///
-    /// When any of the values are set to `None` then the original
-    /// value will be used, and so the value will pass validation.
-    ///
-    /// Otherwise, the new value is used and will be subject to the
-    /// original validation rules (see [`Project::new`]).
-    pub fn update(
-        self,
-        name: impl Into<Option<ProjectName>>,
-        description: impl Into<Option<String>>,
-        default_branch: impl Into<Option<BranchName>>,
-    ) -> Result<Self, Vec<ProjectError>> {
-        let name = name.into().unwrap_or(self.name);
-        let description = description.into().unwrap_or(self.description);
-        let default_branch = default_branch.into().unwrap_or(self.default_branch);
-        Self::new(name, description, default_branch)
-    }
-
-    #[inline]
-    pub fn name(&self) -> &str {
-        self.name.as_str()
-    }
-
-    #[inline]
-    pub fn description(&self) -> &str {
-        &self.description
-    }
-
-    #[inline]
-    pub fn default_branch(&self) -> &BranchName {
-        &self.default_branch
-    }
-}
-
-impl From<Project> for Payload {
-    fn from(proj: Project) -> Self {
-        let value = serde_json::to_value(proj)
-            .expect("Payload::from: could not convert project into value");
-
-        Self::from(value)
-    }
-}
-
-#[cfg(test)]
-#[allow(clippy::unwrap_used)]
-mod test {
-    use super::*;
-    use crate::assert_matches;
-
-    #[test]
-    fn test_project_name() {
-        assert_matches!(serde_json::from_str::<ProjectName>("\"\""), Err(_));
-        assert_matches!(
-            serde_json::from_str::<ProjectName>("\"invalid name\""),
-            Err(_)
-        );
-        assert_matches!(
-            serde_json::from_str::<ProjectName>("\"invalid%name\""),
-            Err(_)
-        );
-        assert_eq!(
-            serde_json::from_str::<ProjectName>("\"valid-name\"").unwrap(),
-            ProjectName("valid-name".to_owned())
-        );
-    }
-}
diff --git a/radicle/src/io.rs b/radicle/src/io.rs
deleted file mode 100644
index 8af88728d..000000000
--- a/radicle/src/io.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use std::fmt;
-use std::io;
-
-use libc::{getrlimit, rlimit, setrlimit, RLIMIT_NOFILE};
-
-#[cfg(not(target_os = "freebsd"))]
-type Int = u64;
-#[cfg(target_os = "freebsd")]
-type Int = i64;
-
-/// Sets the open file limit to the given value, or the maximum allowed value.
-pub fn set_file_limit<N>(n: N) -> io::Result<Int>
-where
-    N: Copy + fmt::Display,
-    Int: TryFrom<N>,
-{
-    let Ok(n) = Int::try_from(n) else {
-        return Err(io::Error::new(
-            io::ErrorKind::InvalidInput,
-            format!("invalid file limit '{n}'"),
-        ));
-    };
-    let mut rlim = rlimit {
-        rlim_cur: 0, // Initial soft limit value
-        rlim_max: 0, // Initial hard limit value
-    };
-    // Get the current limits.
-    unsafe {
-        if getrlimit(RLIMIT_NOFILE, &mut rlim) != 0 {
-            return Err(io::Error::last_os_error());
-        }
-    }
-    if rlim.rlim_cur >= n {
-        return Ok(rlim.rlim_cur);
-    }
-    // Set the soft limit to the given value, up to the hard limit.
-    rlim.rlim_cur = n.min(rlim.rlim_max);
-    unsafe {
-        if setrlimit(RLIMIT_NOFILE, &rlim as *const rlimit) != 0 {
-            return Err(io::Error::last_os_error());
-        }
-    }
-    Ok(rlim.rlim_cur)
-}
diff --git a/radicle/src/lib.rs b/radicle/src/lib.rs
deleted file mode 100644
index 993cfed76..000000000
--- a/radicle/src/lib.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-#![allow(clippy::match_like_matches_macro)]
-#![allow(clippy::too_many_arguments)]
-#![allow(clippy::iter_nth_zero)]
-
-pub extern crate radicle_crypto as crypto;
-
-#[macro_use]
-extern crate amplify;
-extern crate radicle_git_ext as git_ext;
-
-mod canonical;
-
-pub mod cli;
-pub mod cob;
-pub mod collections;
-pub mod explorer;
-pub mod git;
-pub mod identity;
-pub mod io;
-#[cfg(feature = "logger")]
-pub mod logger;
-pub mod node;
-pub mod profile;
-pub mod rad;
-pub mod serde_ext;
-pub mod sql;
-pub mod storage;
-#[cfg(any(test, feature = "test"))]
-pub mod test;
-pub mod version;
-pub mod web;
-
-pub use cob::{issue, patch};
-pub use node::Node;
-pub use profile::Profile;
-pub use storage::git::Storage;
-
-pub mod prelude {
-    use super::*;
-
-    pub use crypto::{PublicKey, Signer, Verified};
-    pub use identity::{project::Project, Did, Doc, RepoId};
-    pub use node::{Alias, NodeId, Timestamp};
-    pub use profile::Profile;
-    pub use storage::{
-        BranchName, ReadRepository, ReadStorage, SignRepository, WriteRepository, WriteStorage,
-    };
-}
diff --git a/radicle/src/logger.rs b/radicle/src/logger.rs
deleted file mode 100644
index 2b38ac84e..000000000
--- a/radicle/src/logger.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-//! Logging module.
-//!
-//! For test logging see [`mod@test`].
-
-#[cfg(feature = "test")]
-pub mod test;
-
-use std::io;
-use std::io::Write;
-
-use chrono::prelude::*;
-use colored::*;
-use log::{Level, Log, Metadata, Record, SetLoggerError};
-
-/// A logger that logs to `stdout`.
-pub struct Logger {
-    level: Level,
-}
-
-impl Log for Logger {
-    fn enabled(&self, metadata: &Metadata) -> bool {
-        metadata.level() <= self.level
-    }
-
-    fn log(&self, record: &Record) {
-        if self.enabled(record.metadata()) {
-            let target = record.target();
-
-            let message = format!(
-                "{:<5} {:<8} {}",
-                record.level(),
-                target.cyan(),
-                record.args()
-            );
-
-            let message = format!(
-                "{} {}",
-                Local::now().to_rfc3339_opts(SecondsFormat::Millis, true),
-                message,
-            );
-
-            let message = match record.level() {
-                Level::Error => message.red(),
-                Level::Warn => message.yellow(),
-                Level::Info => message.normal(),
-                Level::Debug => message.dimmed(),
-                Level::Trace => message.white().dimmed(),
-            };
-            writeln!(&mut io::stdout(), "{message}").expect("write shouldn't fail");
-        }
-    }
-
-    fn flush(&self) {}
-}
-
-/// A logger that logs to `stderr`.
-pub struct StderrLogger {
-    level: Level,
-}
-
-impl StderrLogger {
-    pub fn new(level: Level) -> Self {
-        Self { level }
-    }
-}
-
-impl Log for StderrLogger {
-    fn enabled(&self, metadata: &Metadata) -> bool {
-        metadata.level() <= self.level
-    }
-
-    fn log(&self, record: &Record) {
-        if self.enabled(record.metadata()) {
-            let message = format!(
-                "{:<5} {:<8} {}",
-                record.level(),
-                record.target(),
-                record.args()
-            );
-            writeln!(&mut io::stderr(), "{message}").expect("write shouldn't fail");
-        }
-    }
-
-    fn flush(&self) {}
-}
-
-/// Initialize a new logger.
-pub fn init(level: Level) -> Result<(), SetLoggerError> {
-    set(Logger { level }, level)
-}
-
-/// Set a logger.
-pub fn set(logger: impl Log + 'static, level: Level) -> Result<(), SetLoggerError> {
-    log::set_boxed_logger(Box::new(logger))?;
-    log::set_max_level(level.to_level_filter());
-
-    Ok(())
-}
-
-/// Get the level set by the environment variable `RUST_LOG`, if
-/// present.
-pub fn env_level() -> Option<Level> {
-    let level = std::env::var("RUST_LOG").ok()?;
-    level.parse().ok()
-}
diff --git a/radicle/src/logger/test.rs b/radicle/src/logger/test.rs
deleted file mode 100644
index ae2fc666d..000000000
--- a/radicle/src/logger/test.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-use localtime::LocalTime;
-use log::*;
-
-struct Logger {
-    level: Level,
-}
-
-impl Log for Logger {
-    fn enabled(&self, metadata: &Metadata) -> bool {
-        metadata.level() <= self.level
-    }
-
-    fn log(&self, record: &Record) {
-        use colored::Colorize;
-        let time = LocalTime::now().as_secs();
-
-        match record.target() {
-            "test" => {
-                println!(
-                    "{time} {} {}",
-                    "test:".cyan(),
-                    record.args().to_string().cyan()
-                )
-            }
-            "sim" => {
-                println!(
-                    "{time} {}  {}",
-                    "sim:".bold(),
-                    record.args().to_string().bold()
-                )
-            }
-            target => {
-                if self.enabled(record.metadata()) {
-                    let current = std::thread::current();
-                    let msg = format!("{:>10} {}", format!("{target}:"), record.args());
-                    let time = LocalTime::now().as_secs();
-                    let s = if let Some(name) = current.name() {
-                        format!("{time} {name:<16} {msg}")
-                    } else {
-                        format!("{time} {msg}")
-                    };
-                    match record.level() {
-                        log::Level::Warn => {
-                            println!("{}", s.yellow());
-                        }
-                        log::Level::Error => {
-                            println!("{}", s.red());
-                        }
-                        _ => {
-                            println!("{}", s.dimmed());
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    fn flush(&self) {}
-}
-
-#[allow(dead_code)]
-pub fn init(level: Level) {
-    let logger = Logger { level };
-
-    log::set_boxed_logger(Box::new(logger)).ok();
-    log::set_max_level(level.to_level_filter());
-}
diff --git a/radicle/src/node.rs b/radicle/src/node.rs
deleted file mode 100644
index b8ee19643..000000000
--- a/radicle/src/node.rs
+++ /dev/null
@@ -1,1453 +0,0 @@
-#![allow(clippy::type_complexity)]
-#![allow(clippy::collapsible_if)]
-mod features;
-
-pub mod address;
-pub mod config;
-pub mod db;
-pub mod events;
-pub mod notifications;
-pub mod policy;
-pub mod refs;
-pub mod routing;
-pub mod seed;
-pub mod timestamp;
-
-use std::collections::{BTreeSet, HashMap, HashSet, VecDeque};
-use std::io::{BufRead, BufReader};
-use std::marker::PhantomData;
-use std::ops::{ControlFlow, Deref};
-use std::os::unix::net::UnixStream;
-use std::path::{Path, PathBuf};
-use std::str::FromStr;
-use std::{fmt, io, net, thread, time};
-
-use amplify::WrapperMut;
-use cyphernet::addr::NetAddr;
-use localtime::{LocalDuration, LocalTime};
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
-use serde_json as json;
-
-use crate::crypto::PublicKey;
-use crate::git;
-use crate::identity::RepoId;
-use crate::profile;
-use crate::storage::refs::RefsAt;
-use crate::storage::RefUpdate;
-
-pub use address::KnownAddress;
-pub use config::Config;
-pub use cyphernet::addr::{HostName, PeerAddr};
-pub use db::Database;
-pub use events::{Event, Events};
-pub use features::Features;
-pub use seed::SyncedAt;
-pub use timestamp::Timestamp;
-
-/// Peer-to-peer protocol version.
-pub const PROTOCOL_VERSION: u8 = 1;
-/// Default name for control socket file.
-pub const DEFAULT_SOCKET_NAME: &str = "control.sock";
-/// Default radicle protocol port.
-pub const DEFAULT_PORT: u16 = 8776;
-/// Default timeout when waiting for the node to respond with data.
-pub const DEFAULT_TIMEOUT: time::Duration = time::Duration::from_secs(30);
-/// Default timeout when waiting for an event to be received on the
-/// [`Handle::subscribe`] channel.
-pub const DEFAULT_SUBSCRIBE_TIMEOUT: time::Duration = time::Duration::from_secs(5);
-/// Maximum length in bytes of a node alias.
-pub const MAX_ALIAS_LENGTH: usize = 32;
-/// Penalty threshold at which point we avoid connecting to this node.
-pub const PENALTY_CONNECT_THRESHOLD: u8 = 32;
-/// Penalty threshold at which point we ban this node.
-pub const PENALTY_BAN_THRESHOLD: u8 = 64;
-/// Filename of node database under the node directory.
-pub const NODE_DB_FILE: &str = "node.db";
-/// Filename of policies database under the node directory.
-pub const POLICIES_DB_FILE: &str = "policies.db";
-/// Filename of notifications database under the node directory.
-pub const NOTIFICATIONS_DB_FILE: &str = "notifications.db";
-/// Filename of last node announcement, when running in debug mode.
-#[cfg(debug_assertions)]
-pub const NODE_ANNOUNCEMENT_FILE: &str = "announcement.wire.debug";
-/// Filename of last node announcement.
-#[cfg(not(debug_assertions))]
-pub const NODE_ANNOUNCEMENT_FILE: &str = "announcement.wire";
-
-#[derive(Debug, Copy, Clone, Default, PartialEq, Eq)]
-pub enum PingState {
-    #[default]
-    /// The peer has not been sent a ping.
-    None,
-    /// A ping has been sent and is waiting on the peer's response.
-    AwaitingResponse {
-        /// Length of pong payload expected.
-        len: u16,
-        /// Since when are we waiting.
-        since: LocalTime,
-    },
-    /// The peer was successfully pinged.
-    Ok,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[allow(clippy::large_enum_variant)]
-#[serde(rename_all = "camelCase")]
-pub enum State {
-    /// Initial state for outgoing connections.
-    Initial,
-    /// Connection attempted successfully.
-    Attempted,
-    /// Initial state after handshake protocol hand-off.
-    #[serde(rename_all = "camelCase")]
-    Connected {
-        /// Connected since this time.
-        #[serde(with = "crate::serde_ext::localtime::time")]
-        since: LocalTime,
-        /// Ping state.
-        #[serde(skip)]
-        ping: PingState,
-        /// Ongoing fetches.
-        fetching: HashSet<RepoId>,
-        /// Measured latencies for this peer.
-        #[serde(skip)]
-        latencies: VecDeque<LocalDuration>,
-        /// Whether the connection is stable.
-        #[serde(skip)]
-        stable: bool,
-    },
-    /// When a peer is disconnected.
-    #[serde(rename_all = "camelCase")]
-    Disconnected {
-        /// Since when has this peer been disconnected.
-        #[serde(with = "crate::serde_ext::localtime::time")]
-        since: LocalTime,
-        /// When to retry the connection.
-        #[serde(with = "crate::serde_ext::localtime::time")]
-        retry_at: LocalTime,
-    },
-}
-
-impl State {
-    /// Check if this is a connected state.
-    pub fn is_connected(&self) -> bool {
-        matches!(self, Self::Connected { .. })
-    }
-}
-
-impl fmt::Display for State {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Initial => {
-                write!(f, "initial")
-            }
-            Self::Attempted { .. } => {
-                write!(f, "attempted")
-            }
-            Self::Connected { .. } => {
-                write!(f, "connected")
-            }
-            Self::Disconnected { .. } => {
-                write!(f, "disconnected")
-            }
-        }
-    }
-}
-
-/// Severity of a peer misbehavior or a connection problem.
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub enum Severity {
-    Low = 0,
-    Medium = 1,
-    High = 8,
-}
-
-/// Node connection penalty. Nodes with a high penalty are deprioritized as peers.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Default, PartialOrd, Ord)]
-pub struct Penalty(u8);
-
-impl Penalty {
-    /// If the penalty threshold is reached, at which point we should just avoid
-    /// connecting to this node.
-    pub fn is_connect_threshold_reached(&self) -> bool {
-        self.0 >= PENALTY_CONNECT_THRESHOLD
-    }
-
-    pub fn is_ban_threshold_reached(&self) -> bool {
-        self.0 >= PENALTY_BAN_THRESHOLD
-    }
-}
-
-/// Repository sync status for our own refs.
-#[derive(Debug, PartialEq, Eq, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(tag = "status")]
-#[serde(rename_all = "camelCase")]
-pub enum SyncStatus {
-    /// We're in sync.
-    #[serde(rename_all = "camelCase")]
-    Synced {
-        /// At what ref was the remote synced at.
-        at: SyncedAt,
-    },
-    /// We're out of sync.
-    #[serde(rename_all = "camelCase")]
-    OutOfSync {
-        /// Local head of our `rad/sigrefs`.
-        local: SyncedAt,
-        /// Remote head of our `rad/sigrefs`.
-        remote: SyncedAt,
-    },
-}
-
-impl Ord for SyncStatus {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        match (self, other) {
-            (Self::Synced { at: left }, Self::Synced { at: right }) => left.cmp(right),
-            (Self::Synced { at }, Self::OutOfSync { remote, .. }) => at.cmp(remote),
-            (Self::OutOfSync { remote, .. }, Self::Synced { at }) => remote.cmp(at),
-            (Self::OutOfSync { remote: left, .. }, Self::OutOfSync { remote: right, .. }) => {
-                left.cmp(right)
-            }
-        }
-    }
-}
-
-impl PartialOrd for SyncStatus {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-/// Node user agent.
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, serde::Serialize, serde::Deserialize)]
-pub struct UserAgent(String);
-
-impl UserAgent {
-    /// Return a reference to the user agent string.
-    pub fn as_str(&self) -> &str {
-        self.0.as_str()
-    }
-}
-
-impl Default for UserAgent {
-    fn default() -> Self {
-        UserAgent(String::from("/radicle/"))
-    }
-}
-
-impl std::fmt::Display for UserAgent {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-impl FromStr for UserAgent {
-    type Err = String;
-
-    fn from_str(input: &str) -> Result<Self, Self::Err> {
-        let reserved = ['/', ':'];
-
-        if input.len() > 64 {
-            return Err(input.to_owned());
-        }
-        let Some(s) = input.strip_prefix('/') else {
-            return Err(input.to_owned());
-        };
-        let Some(s) = s.strip_suffix('/') else {
-            return Err(input.to_owned());
-        };
-        if s.is_empty() {
-            return Err(input.to_owned());
-        }
-        if s.split('/').all(|segment| {
-            if let Some((client, version)) = segment.split_once(':') {
-                if client.is_empty() || version.is_empty() {
-                    false
-                } else {
-                    let client = client
-                        .chars()
-                        .all(|c| c.is_ascii_graphic() && !reserved.contains(&c));
-                    let version = version
-                        .chars()
-                        .all(|c| c.is_ascii_graphic() || !reserved.contains(&c));
-                    client && version
-                }
-            } else {
-                true
-            }
-        }) {
-            Ok(Self(input.to_owned()))
-        } else {
-            Err(input.to_owned())
-        }
-    }
-}
-
-impl AsRef<str> for UserAgent {
-    fn as_ref(&self) -> &str {
-        self.0.as_str()
-    }
-}
-
-/// Node alias.
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(try_from = "String", into = "String")]
-pub struct Alias(String);
-
-impl Alias {
-    /// Create a new alias from a string. Panics if the string is not a valid alias.
-    pub fn new(alias: impl ToString) -> Self {
-        let alias = alias.to_string();
-
-        match Self::from_str(&alias) {
-            Ok(a) => a,
-            Err(e) => panic!("Alias::new: {e}"),
-        }
-    }
-
-    /// Return a reference to the alias string.
-    pub fn as_str(&self) -> &str {
-        self.0.as_str()
-    }
-}
-
-impl From<Alias> for String {
-    fn from(value: Alias) -> Self {
-        value.0
-    }
-}
-
-impl From<&NodeId> for Alias {
-    fn from(nid: &NodeId) -> Self {
-        Alias(nid.to_string())
-    }
-}
-
-impl fmt::Display for Alias {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-impl Deref for Alias {
-    type Target = str;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl AsRef<str> for Alias {
-    fn as_ref(&self) -> &str {
-        self.0.as_str()
-    }
-}
-
-impl From<&Alias> for [u8; 32] {
-    fn from(input: &Alias) -> [u8; 32] {
-        let mut alias = [0u8; 32];
-
-        alias[..input.len()].copy_from_slice(input.as_bytes());
-        alias
-    }
-}
-
-#[derive(thiserror::Error, Debug)]
-pub enum AliasError {
-    #[error("alias cannot be empty")]
-    Empty,
-    #[error("alias cannot be greater than {MAX_ALIAS_LENGTH} bytes")]
-    MaxBytesExceeded,
-    #[error("alias cannot contain whitespace or control characters")]
-    InvalidCharacter,
-}
-
-impl FromStr for Alias {
-    type Err = AliasError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        if s.is_empty() {
-            return Err(AliasError::Empty);
-        }
-        if s.chars().any(|c| c.is_control() || c.is_whitespace()) {
-            return Err(AliasError::InvalidCharacter);
-        }
-        if s.len() > MAX_ALIAS_LENGTH {
-            return Err(AliasError::MaxBytesExceeded);
-        }
-        Ok(Self(s.to_owned()))
-    }
-}
-
-impl TryFrom<String> for Alias {
-    type Error = AliasError;
-
-    fn try_from(value: String) -> Result<Self, Self::Error> {
-        Alias::from_str(&value)
-    }
-}
-
-/// Options passed to the "connect" node command.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct ConnectOptions {
-    /// Establish a persistent connection.
-    pub persistent: bool,
-    /// How long to wait for the connection to be established.
-    pub timeout: time::Duration,
-}
-
-impl Default for ConnectOptions {
-    fn default() -> Self {
-        Self {
-            persistent: false,
-            timeout: DEFAULT_TIMEOUT,
-        }
-    }
-}
-
-/// Result of a command, on the node control socket.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum CommandResult<T> {
-    /// Response on node socket indicating that a command was carried out successfully.
-    Okay(T),
-    /// Response on node socket indicating that an error occured.
-    Error {
-        /// The reason for the error.
-        #[serde(rename = "error")]
-        reason: String,
-    },
-}
-
-impl<T, E> From<Result<T, E>> for CommandResult<T>
-where
-    E: std::error::Error,
-{
-    fn from(result: Result<T, E>) -> Self {
-        match result {
-            Ok(t) => Self::Okay(t),
-            Err(e) => Self::Error {
-                reason: e.to_string(),
-            },
-        }
-    }
-}
-
-impl From<Event> for CommandResult<Event> {
-    fn from(event: Event) -> Self {
-        Self::Okay(event)
-    }
-}
-
-/// A success response.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub struct Success {
-    /// Whether something was updated.
-    #[serde(default, skip_serializing_if = "crate::serde_ext::is_default")]
-    updated: bool,
-}
-
-impl CommandResult<Success> {
-    /// Create an "updated" response.
-    pub fn updated(updated: bool) -> Self {
-        Self::Okay(Success { updated })
-    }
-
-    /// Create an "ok" response.
-    pub fn ok() -> Self {
-        Self::Okay(Success { updated: false })
-    }
-}
-
-impl CommandResult<()> {
-    /// Create an error result.
-    pub fn error(err: impl std::error::Error) -> Self {
-        Self::Error {
-            reason: err.to_string(),
-        }
-    }
-}
-
-impl<T: Serialize> CommandResult<T> {
-    /// Write this command result to a stream, including a terminating LF character.
-    pub fn to_writer(&self, mut w: impl io::Write) -> io::Result<()> {
-        json::to_writer(&mut w, self).map_err(|_| io::ErrorKind::InvalidInput)?;
-        w.write_all(b"\n")
-    }
-}
-
-/// Peer public protocol address.
-#[derive(Wrapper, WrapperMut, Clone, Eq, PartialEq, Debug, Hash, From, Serialize, Deserialize)]
-#[wrapper(Deref, Display, FromStr)]
-#[wrapper_mut(DerefMut)]
-pub struct Address(#[serde(with = "crate::serde_ext::string")] NetAddr<HostName>);
-
-impl Address {
-    /// Check whether this address is from the local network.
-    pub fn is_local(&self) -> bool {
-        match self.0.host {
-            HostName::Ip(ip) => address::is_local(&ip),
-            _ => false,
-        }
-    }
-
-    /// Check whether this address is globally routable.
-    pub fn is_routable(&self) -> bool {
-        match self.0.host {
-            HostName::Ip(ip) => address::is_routable(&ip),
-            _ => true,
-        }
-    }
-}
-
-impl cyphernet::addr::Host for Address {
-    fn requires_proxy(&self) -> bool {
-        self.0.requires_proxy()
-    }
-}
-
-impl cyphernet::addr::Addr for Address {
-    fn port(&self) -> u16 {
-        self.0.port()
-    }
-}
-
-impl From<net::SocketAddr> for Address {
-    fn from(addr: net::SocketAddr) -> Self {
-        Address(NetAddr {
-            host: HostName::Ip(addr.ip()),
-            port: addr.port(),
-        })
-    }
-}
-
-impl From<Address> for HostName {
-    fn from(addr: Address) -> Self {
-        addr.0.host
-    }
-}
-
-/// Command name.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", tag = "command")]
-pub enum Command {
-    /// Announce repository references for given repository to peers.
-    #[serde(rename_all = "camelCase")]
-    AnnounceRefs { rid: RepoId },
-
-    /// Announce local repositories to peers.
-    #[serde(rename_all = "camelCase")]
-    AnnounceInventory,
-
-    /// Update node's inventory.
-    AddInventory { rid: RepoId },
-
-    /// Get the current node condiguration.
-    Config,
-
-    /// Get the node's listen addresses.
-    ListenAddrs,
-
-    /// Connect to node with the given address.
-    #[serde(rename_all = "camelCase")]
-    Connect {
-        addr: config::ConnectAddress,
-        opts: ConnectOptions,
-    },
-
-    /// Disconnect from a node.
-    #[serde(rename_all = "camelCase")]
-    Disconnect { nid: NodeId },
-
-    /// Lookup seeds for the given repository in the routing table.
-    #[serde(rename_all = "camelCase")]
-    Seeds { rid: RepoId },
-
-    /// Get the current peer sessions.
-    Sessions,
-
-    /// Fetch the given repository from the network.
-    #[serde(rename_all = "camelCase")]
-    Fetch {
-        rid: RepoId,
-        nid: NodeId,
-        timeout: time::Duration,
-    },
-
-    /// Seed the given repository.
-    #[serde(rename_all = "camelCase")]
-    Seed { rid: RepoId, scope: policy::Scope },
-
-    /// Unseed the given repository.
-    #[serde(rename_all = "camelCase")]
-    Unseed { rid: RepoId },
-
-    /// Follow the given node.
-    #[serde(rename_all = "camelCase")]
-    Follow { nid: NodeId, alias: Option<Alias> },
-
-    /// Unfollow the given node.
-    #[serde(rename_all = "camelCase")]
-    Unfollow { nid: NodeId },
-
-    /// Get the node's status.
-    Status,
-
-    /// Get node debug information.
-    Debug,
-
-    /// Get the node's NID.
-    NodeId,
-
-    /// Shutdown the node.
-    Shutdown,
-
-    /// Subscribe to events.
-    Subscribe,
-}
-
-impl Command {
-    /// Write this command to a stream, including a terminating LF character.
-    pub fn to_writer(&self, mut w: impl io::Write) -> io::Result<()> {
-        json::to_writer(&mut w, self).map_err(|_| io::ErrorKind::InvalidInput)?;
-        w.write_all(b"\n")
-    }
-}
-
-/// Connection link direction.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Link {
-    /// Outgoing connection.
-    Outbound,
-    /// Incoming connection.
-    Inbound,
-}
-
-/// An established network connection with a peer.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct Session {
-    pub nid: NodeId,
-    pub link: Link,
-    pub addr: Address,
-    pub state: State,
-}
-
-impl Session {
-    /// Calls [`State::is_connected`] on the session state.
-    pub fn is_connected(&self) -> bool {
-        self.state.is_connected()
-    }
-}
-
-/// A seed for some repository, with metadata about its status.
-#[derive(Clone, Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Seed {
-    /// The Node ID.
-    pub nid: NodeId,
-    /// Known addresses for this seed.
-    pub addrs: Vec<KnownAddress>,
-    /// The seed's session state, if any.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub state: Option<State>,
-    /// The seed's sync status, if any.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub sync: Option<SyncStatus>,
-}
-
-impl Seed {
-    /// Check if this is a "connected" seed.
-    pub fn is_connected(&self) -> bool {
-        matches!(self.state, Some(State::Connected { .. }))
-    }
-
-    /// Check if this seed is in sync with us.
-    pub fn is_synced(&self) -> bool {
-        matches!(self.sync, Some(SyncStatus::Synced { .. }))
-    }
-
-    pub fn new(
-        nid: NodeId,
-        addrs: Vec<KnownAddress>,
-        state: Option<State>,
-        sync: Option<SyncStatus>,
-    ) -> Self {
-        Self {
-            nid,
-            addrs,
-            state,
-            sync,
-        }
-    }
-}
-
-#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
-/// Represents a set of seeds with associated metadata. Uses an RNG
-/// underneath, so every iteration returns a different ordering.
-#[serde(into = "Vec<Seed>", from = "Vec<Seed>")]
-pub struct Seeds(address::AddressBook<NodeId, Seed>);
-
-impl Seeds {
-    /// Create a new seeds list from an RNG.
-    pub fn new(rng: fastrand::Rng) -> Self {
-        Self(address::AddressBook::new(rng))
-    }
-
-    /// Insert a seed.
-    pub fn insert(&mut self, seed: Seed) {
-        self.0.insert(seed.nid, seed);
-    }
-
-    /// Check membership.
-    pub fn contains(&self, nid: &NodeId) -> bool {
-        self.0.contains_key(nid)
-    }
-
-    /// Number of seeds.
-    pub fn len(&self) -> usize {
-        self.0.len()
-    }
-
-    /// Check if there are any seeds.
-    pub fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-
-    /// Partitions the list of seeds into connected and disconnected seeds.
-    /// Note that the disconnected seeds may be in a "connecting" state.
-    pub fn partition(&self) -> (Vec<Seed>, Vec<Seed>) {
-        self.iter().cloned().partition(|s| s.is_connected())
-    }
-
-    /// Return connected seeds.
-    pub fn connected(&self) -> impl Iterator<Item = &Seed> {
-        self.iter().filter(|s| s.is_connected())
-    }
-
-    /// Return all seeds.
-    pub fn iter(&self) -> impl Iterator<Item = &Seed> {
-        self.0.shuffled().map(|(_, v)| v)
-    }
-
-    /// Check if a seed is connected.
-    pub fn is_connected(&self, nid: &NodeId) -> bool {
-        self.0.get(nid).map_or(false, |s| s.is_connected())
-    }
-
-    /// Return a new seeds object with the given RNG.
-    pub fn with(self, rng: fastrand::Rng) -> Self {
-        Self(self.0.with(rng))
-    }
-}
-
-impl From<Seeds> for Vec<Seed> {
-    fn from(seeds: Seeds) -> Vec<Seed> {
-        seeds.0.into_shuffled().map(|(_, v)| v).collect()
-    }
-}
-
-impl From<Vec<Seed>> for Seeds {
-    fn from(other: Vec<Seed>) -> Seeds {
-        Seeds(address::AddressBook::from_iter(
-            other.into_iter().map(|s| (s.nid, s)),
-        ))
-    }
-}
-
-/// Announcement result returned by [`Node::announce`].
-#[derive(Debug, Default)]
-pub struct AnnounceResult {
-    /// Nodes that timed out.
-    pub timed_out: Vec<NodeId>,
-    /// Nodes that synced.
-    pub synced: Vec<(NodeId, time::Duration)>,
-}
-
-impl AnnounceResult {
-    /// Check if a node synced successfully.
-    pub fn synced(&self, nid: &NodeId) -> Option<time::Duration> {
-        self.synced
-            .iter()
-            .find(|(id, _)| id == nid)
-            .map(|(_, time)| *time)
-    }
-}
-
-/// A sync event, emitted by [`Node::announce`].
-#[derive(Debug)]
-pub enum AnnounceEvent {
-    /// Refs were synced with the given node.
-    RefsSynced {
-        remote: NodeId,
-        time: time::Duration,
-    },
-    /// Refs were announced to all given nodes.
-    Announced,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[serde(tag = "status", rename_all = "camelCase")]
-pub enum FetchResult {
-    Success {
-        updated: Vec<RefUpdate>,
-        namespaces: HashSet<NodeId>,
-        clone: bool,
-    },
-    // TODO: Create enum for reason.
-    Failed {
-        reason: String,
-    },
-}
-
-impl FetchResult {
-    pub fn is_success(&self) -> bool {
-        matches!(self, FetchResult::Success { .. })
-    }
-
-    pub fn success(self) -> Option<(Vec<RefUpdate>, HashSet<NodeId>)> {
-        match self {
-            Self::Success {
-                updated,
-                namespaces,
-                ..
-            } => Some((updated, namespaces)),
-            _ => None,
-        }
-    }
-
-    pub fn find_updated(&self, name: &git::RefStr) -> Option<RefUpdate> {
-        let updated = match self {
-            Self::Success { updated, .. } => Some(updated),
-            _ => None,
-        }?;
-        updated.iter().find(|up| up.name() == name).cloned()
-    }
-}
-
-impl<S: ToString> From<Result<(Vec<RefUpdate>, HashSet<NodeId>, bool), S>> for FetchResult {
-    fn from(value: Result<(Vec<RefUpdate>, HashSet<NodeId>, bool), S>) -> Self {
-        match value {
-            Ok((updated, namespaces, clone)) => Self::Success {
-                updated,
-                namespaces,
-                clone,
-            },
-            Err(err) => Self::Failed {
-                reason: err.to_string(),
-            },
-        }
-    }
-}
-
-/// Holds multiple fetch results.
-#[derive(Debug, Default)]
-pub struct FetchResults(Vec<(NodeId, FetchResult)>);
-
-impl FetchResults {
-    /// Push a fetch result.
-    pub fn push(&mut self, nid: NodeId, result: FetchResult) {
-        self.0.push((nid, result));
-    }
-
-    /// Check if the results contains the given NID.
-    pub fn contains(&self, nid: &NodeId) -> bool {
-        self.0.iter().any(|(n, _)| n == nid)
-    }
-
-    /// Get a node's result.
-    pub fn get(&self, nid: &NodeId) -> Option<&FetchResult> {
-        self.0.iter().find(|(n, _)| n == nid).map(|(_, r)| r)
-    }
-
-    /// Iterate over all fetch results.
-    pub fn iter(&self) -> impl Iterator<Item = (&NodeId, &FetchResult)> {
-        self.0.iter().map(|(nid, r)| (nid, r))
-    }
-
-    /// Iterate over successful fetches.
-    pub fn success(&self) -> impl Iterator<Item = (&NodeId, &[RefUpdate], HashSet<NodeId>)> {
-        self.0.iter().filter_map(|(nid, r)| {
-            if let FetchResult::Success {
-                updated,
-                namespaces,
-                ..
-            } = r
-            {
-                Some((nid, updated.as_slice(), namespaces.clone()))
-            } else {
-                None
-            }
-        })
-    }
-
-    /// Iterate over failed fetches.
-    pub fn failed(&self) -> impl Iterator<Item = (&NodeId, &str)> {
-        self.0.iter().filter_map(|(nid, r)| {
-            if let FetchResult::Failed { reason } = r {
-                Some((nid, reason.as_str()))
-            } else {
-                None
-            }
-        })
-    }
-}
-
-impl From<Vec<(NodeId, FetchResult)>> for FetchResults {
-    fn from(value: Vec<(NodeId, FetchResult)>) -> Self {
-        Self(value)
-    }
-}
-
-impl Deref for FetchResults {
-    type Target = [(NodeId, FetchResult)];
-
-    fn deref(&self) -> &Self::Target {
-        self.0.as_slice()
-    }
-}
-
-impl IntoIterator for FetchResults {
-    type Item = (NodeId, FetchResult);
-    type IntoIter = std::vec::IntoIter<(NodeId, FetchResult)>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.0.into_iter()
-    }
-}
-
-/// Error returned by [`Handle`] functions.
-#[derive(thiserror::Error, Debug)]
-pub enum Error {
-    #[error("i/o: {0}")]
-    Io(#[from] io::Error),
-    #[error("node: {0}")]
-    Node(String),
-    #[error("timed out reading from control socket")]
-    TimedOut,
-    #[error("failed to open node control socket {0:?} ({1})")]
-    Connect(PathBuf, io::ErrorKind),
-    #[error("command error: {reason}")]
-    Command { reason: String },
-    #[error("received invalid json `{response}` in response to command: {error}")]
-    InvalidJson {
-        response: String,
-        error: json::Error,
-    },
-    #[error("received empty response for command")]
-    EmptyResponse,
-}
-
-impl Error {
-    /// Check if the error is due to the not being able to connect to the local node.
-    pub fn is_connection_err(&self) -> bool {
-        matches!(self, Self::Connect { .. })
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase", tag = "status")]
-pub enum ConnectResult {
-    Connected,
-    Disconnected { reason: String },
-}
-
-/// A handle to send commands to the node or request information.
-pub trait Handle: Clone + Sync + Send {
-    /// The peer sessions type.
-    type Sessions;
-    type Events: IntoIterator<Item = Self::Event>;
-    type Event;
-    /// The error returned by all methods.
-    type Error: std::error::Error + Send + Sync + 'static;
-
-    /// Get the local Node ID.
-    fn nid(&self) -> Result<NodeId, Self::Error>;
-    /// Check if the node is running.
-    fn is_running(&self) -> bool;
-    /// Get the node's bound listen addresses.
-    fn listen_addrs(&self) -> Result<Vec<net::SocketAddr>, Self::Error>;
-    /// Get the current node configuration.
-    fn config(&self) -> Result<config::Config, Self::Error>;
-    /// Connect to a peer.
-    fn connect(
-        &mut self,
-        node: NodeId,
-        addr: Address,
-        opts: ConnectOptions,
-    ) -> Result<ConnectResult, Self::Error>;
-    /// Disconnect from a peer.
-    fn disconnect(&mut self, node: NodeId) -> Result<(), Self::Error>;
-    /// Lookup the seeds of a given repository in the routing table.
-    fn seeds(&mut self, id: RepoId) -> Result<Seeds, Self::Error>;
-    /// Fetch a repository from the network.
-    fn fetch(
-        &mut self,
-        id: RepoId,
-        from: NodeId,
-        timeout: time::Duration,
-    ) -> Result<FetchResult, Self::Error>;
-    /// Start seeding the given repo. May update the scope. Does nothing if the
-    /// repo is already seeded.
-    fn seed(&mut self, id: RepoId, scope: policy::Scope) -> Result<bool, Self::Error>;
-    /// Start following the given peer.
-    fn follow(&mut self, id: NodeId, alias: Option<Alias>) -> Result<bool, Self::Error>;
-    /// Un-seed the given repo and delete it from storage.
-    fn unseed(&mut self, id: RepoId) -> Result<bool, Self::Error>;
-    /// Unfollow the given peer.
-    fn unfollow(&mut self, id: NodeId) -> Result<bool, Self::Error>;
-    /// Notify the service that a project has been updated, and announce local refs.
-    fn announce_refs(&mut self, id: RepoId) -> Result<RefsAt, Self::Error>;
-    /// Announce local inventory.
-    fn announce_inventory(&mut self) -> Result<(), Self::Error>;
-    /// Notify the service that our inventory was updated with the given repository.
-    fn add_inventory(&mut self, rid: RepoId) -> Result<bool, Self::Error>;
-    /// Ask the service to shutdown.
-    fn shutdown(self) -> Result<(), Self::Error>;
-    /// Query the peer session state.
-    fn sessions(&self) -> Result<Self::Sessions, Self::Error>;
-    /// Subscribe to node events.
-    fn subscribe(&self, timeout: time::Duration) -> Result<Self::Events, Self::Error>;
-    /// Return debug information as a JSON value.
-    fn debug(&self) -> Result<json::Value, Self::Error>;
-}
-
-/// Iterator of results `T` when passing a [`Command`] to [`Node::call`].
-///
-/// The iterator blocks for a `timeout` duration, returning [`Error::TimedOut`]
-/// if the duration is reached.
-pub struct LineIter<T> {
-    stream: BufReader<UnixStream>,
-    timeout: time::Duration,
-    witness: PhantomData<T>,
-}
-
-impl<T: DeserializeOwned> Iterator for LineIter<T> {
-    type Item = Result<T, Error>;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let mut l = String::new();
-
-        self.stream
-            .get_ref()
-            .set_read_timeout(Some(self.timeout))
-            .ok();
-
-        match self.stream.read_line(&mut l) {
-            Ok(0) => None,
-            Ok(_) => {
-                let result: CommandResult<T> = match json::from_str(&l) {
-                    Err(e) => {
-                        return Some(Err(Error::InvalidJson {
-                            response: l.clone(),
-                            error: e,
-                        }))
-                    }
-                    Ok(result) => result,
-                };
-                match result {
-                    CommandResult::Okay(result) => Some(Ok(result)),
-                    CommandResult::Error { reason } => Some(Err(Error::Command { reason })),
-                }
-            }
-            Err(e) => match e.kind() {
-                io::ErrorKind::WouldBlock | io::ErrorKind::TimedOut => Some(Err(Error::TimedOut)),
-                _ => Some(Err(Error::Io(e))),
-            },
-        }
-    }
-}
-
-/// Public node & device identifier.
-pub type NodeId = PublicKey;
-
-/// Node controller.
-#[derive(Debug, Clone)]
-pub struct Node {
-    socket: PathBuf,
-}
-
-impl Node {
-    /// Connect to the node, via the socket at the given path.
-    pub fn new<P: AsRef<Path>>(path: P) -> Self {
-        Self {
-            socket: path.as_ref().to_path_buf(),
-        }
-    }
-
-    /// Call a command on the node.
-    pub fn call<T: DeserializeOwned + Send + 'static>(
-        &self,
-        cmd: Command,
-        timeout: time::Duration,
-    ) -> Result<LineIter<T>, Error> {
-        let stream = UnixStream::connect(&self.socket)
-            .map_err(|e| Error::Connect(self.socket.clone(), e.kind()))?;
-        cmd.to_writer(&stream)?;
-        Ok(LineIter {
-            stream: BufReader::new(stream),
-            timeout,
-            witness: PhantomData,
-        })
-    }
-
-    /// Announce refs of the given `rid` to the given seeds.
-    /// Waits for the seeds to acknowledge the refs or times out if no acknowledgments are received
-    /// within the given time.
-    pub fn announce(
-        &mut self,
-        rid: RepoId,
-        seeds: impl IntoIterator<Item = NodeId>,
-        timeout: time::Duration,
-        mut callback: impl FnMut(AnnounceEvent, &HashMap<PublicKey, time::Duration>) -> ControlFlow<()>,
-    ) -> Result<AnnounceResult, Error> {
-        let events = self.subscribe(timeout)?;
-        let refs = self.announce_refs(rid)?;
-
-        let mut unsynced = seeds.into_iter().collect::<BTreeSet<_>>();
-        let mut synced = HashMap::new();
-        let mut timed_out: Vec<NodeId> = Vec::new();
-        let started = time::Instant::now();
-
-        callback(AnnounceEvent::Announced, &synced);
-
-        for e in events {
-            let elapsed = started.elapsed();
-            if elapsed >= timeout {
-                timed_out.extend(unsynced.iter());
-                break;
-            }
-            match e {
-                Ok(Event::RefsSynced {
-                    remote,
-                    rid: rid_,
-                    at,
-                }) if rid == rid_ && refs.at == at => {
-                    log::debug!(target: "radicle", "Received {e:?}");
-
-                    unsynced.remove(&remote);
-                    // We can receive synced events from nodes we didn't directly announce to,
-                    // and it's possible to receive duplicates as well.
-                    if synced.insert(remote, elapsed).is_none() {
-                        let event = AnnounceEvent::RefsSynced {
-                            remote,
-                            time: elapsed,
-                        };
-                        if callback(event, &synced).is_break() {
-                            break;
-                        }
-                    }
-                }
-                Ok(_) => {}
-
-                Err(Error::TimedOut) => {
-                    timed_out.extend(unsynced.iter());
-                    break;
-                }
-                Err(e) => return Err(e),
-            }
-            if unsynced.is_empty() {
-                break;
-            }
-        }
-
-        Ok(AnnounceResult {
-            timed_out,
-            synced: synced.into_iter().collect(),
-        })
-    }
-}
-
-// TODO(finto): repo_policies, node_policies, and routing should all
-// attempt to return iterators instead of allocating vecs.
-impl Handle for Node {
-    type Sessions = Vec<Session>;
-    type Events = LineIter<Event>;
-    type Event = Result<Event, Error>;
-    type Error = Error;
-
-    fn nid(&self) -> Result<NodeId, Error> {
-        self.call::<NodeId>(Command::NodeId, DEFAULT_TIMEOUT)?
-            .next()
-            .ok_or(Error::EmptyResponse)?
-            .map_err(Error::from)
-    }
-
-    fn listen_addrs(&self) -> Result<Vec<net::SocketAddr>, Error> {
-        self.call::<Vec<net::SocketAddr>>(Command::ListenAddrs, DEFAULT_TIMEOUT)?
-            .next()
-            .ok_or(Error::EmptyResponse)?
-            .map_err(Error::from)
-    }
-
-    fn is_running(&self) -> bool {
-        let Ok(mut lines) = self.call::<Success>(Command::Status, DEFAULT_TIMEOUT) else {
-            return false;
-        };
-
-        let Some(Ok(_)) = lines.next() else {
-            return false;
-        };
-        true
-    }
-
-    fn config(&self) -> Result<config::Config, Error> {
-        self.call::<config::Config>(Command::Config, DEFAULT_TIMEOUT)?
-            .next()
-            .ok_or(Error::EmptyResponse)?
-            .map_err(Error::from)
-    }
-
-    fn connect(
-        &mut self,
-        nid: NodeId,
-        addr: Address,
-        opts: ConnectOptions,
-    ) -> Result<ConnectResult, Error> {
-        let timeout = opts.timeout;
-        let result = self
-            .call::<ConnectResult>(
-                Command::Connect {
-                    addr: (nid, addr).into(),
-                    opts,
-                },
-                timeout,
-            )?
-            .next()
-            .ok_or(Error::EmptyResponse)??;
-
-        Ok(result)
-    }
-
-    fn disconnect(&mut self, nid: NodeId) -> Result<(), Self::Error> {
-        self.call::<ConnectResult>(Command::Disconnect { nid }, DEFAULT_TIMEOUT)?
-            .next()
-            .ok_or(Error::EmptyResponse)??;
-
-        Ok(())
-    }
-
-    fn seeds(&mut self, rid: RepoId) -> Result<Seeds, Error> {
-        let seeds = self
-            .call::<Seeds>(Command::Seeds { rid }, DEFAULT_TIMEOUT)?
-            .next()
-            .ok_or(Error::EmptyResponse)??;
-
-        Ok(seeds.with(profile::env::rng()))
-    }
-
-    fn fetch(
-        &mut self,
-        rid: RepoId,
-        from: NodeId,
-        timeout: time::Duration,
-    ) -> Result<FetchResult, Error> {
-        let result = self
-            .call(
-                Command::Fetch {
-                    rid,
-                    nid: from,
-                    timeout,
-                },
-                DEFAULT_TIMEOUT.max(timeout),
-            )?
-            .next()
-            .ok_or(Error::EmptyResponse)??;
-
-        Ok(result)
-    }
-
-    fn follow(&mut self, nid: NodeId, alias: Option<Alias>) -> Result<bool, Error> {
-        let mut lines = self.call::<Success>(Command::Follow { nid, alias }, DEFAULT_TIMEOUT)?;
-        let response = lines.next().ok_or(Error::EmptyResponse)??;
-
-        Ok(response.updated)
-    }
-
-    fn seed(&mut self, rid: RepoId, scope: policy::Scope) -> Result<bool, Error> {
-        let mut lines = self.call::<Success>(Command::Seed { rid, scope }, DEFAULT_TIMEOUT)?;
-        let response = lines.next().ok_or(Error::EmptyResponse)??;
-
-        Ok(response.updated)
-    }
-
-    fn unfollow(&mut self, nid: NodeId) -> Result<bool, Error> {
-        let mut lines = self.call::<Success>(Command::Unfollow { nid }, DEFAULT_TIMEOUT)?;
-        let response = lines.next().ok_or(Error::EmptyResponse)??;
-
-        Ok(response.updated)
-    }
-
-    fn unseed(&mut self, rid: RepoId) -> Result<bool, Error> {
-        let mut lines = self.call::<Success>(Command::Unseed { rid }, DEFAULT_TIMEOUT)?;
-        let response = lines.next().ok_or(Error::EmptyResponse)??;
-
-        Ok(response.updated)
-    }
-
-    fn announce_refs(&mut self, rid: RepoId) -> Result<RefsAt, Error> {
-        let refs: RefsAt = self
-            .call(Command::AnnounceRefs { rid }, DEFAULT_TIMEOUT)?
-            .next()
-            .ok_or(Error::EmptyResponse)??;
-
-        Ok(refs)
-    }
-
-    fn announce_inventory(&mut self) -> Result<(), Error> {
-        for line in self.call::<Success>(Command::AnnounceInventory, DEFAULT_TIMEOUT)? {
-            line?;
-        }
-        Ok(())
-    }
-
-    fn add_inventory(&mut self, rid: RepoId) -> Result<bool, Error> {
-        let mut lines = self.call::<Success>(Command::AddInventory { rid }, DEFAULT_TIMEOUT)?;
-        let response = lines.next().ok_or(Error::EmptyResponse)??;
-
-        Ok(response.updated)
-    }
-
-    fn subscribe(&self, timeout: time::Duration) -> Result<LineIter<Event>, Error> {
-        self.call(Command::Subscribe, timeout)
-    }
-
-    fn sessions(&self) -> Result<Self::Sessions, Error> {
-        let sessions = self
-            .call::<Vec<Session>>(Command::Sessions, DEFAULT_TIMEOUT)?
-            .next()
-            .ok_or(Error::EmptyResponse)??;
-
-        Ok(sessions)
-    }
-
-    fn debug(&self) -> Result<json::Value, Self::Error> {
-        let debug = self
-            .call::<json::Value>(Command::Debug, DEFAULT_TIMEOUT)?
-            .next()
-            .ok_or(Error::EmptyResponse {})??;
-
-        Ok(debug)
-    }
-
-    fn shutdown(self) -> Result<(), Error> {
-        for line in self.call::<Success>(Command::Shutdown, DEFAULT_TIMEOUT)? {
-            line?;
-        }
-        // Wait until the shutdown has completed.
-        while self.is_running() {
-            thread::sleep(time::Duration::from_secs(1));
-        }
-        Ok(())
-    }
-}
-
-/// A trait for different sources which can potentially return an alias.
-pub trait AliasStore {
-    /// Returns alias of a `NodeId`.
-    fn alias(&self, nid: &NodeId) -> Option<Alias>;
-}
-
-impl AliasStore for HashMap<NodeId, Alias> {
-    fn alias(&self, nid: &NodeId) -> Option<Alias> {
-        self.get(nid).map(ToOwned::to_owned)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::assert_matches;
-
-    #[test]
-    fn test_user_agent() {
-        assert!(UserAgent::from_str("/radicle:1.0.0/").is_ok());
-        assert!(UserAgent::from_str("/radicle:1.0.0/heartwood:0.9/").is_ok());
-        assert!(UserAgent::from_str("/radicle:1.0.0/heartwood:0.9/rust:1.77/").is_ok());
-        assert!(UserAgent::from_str("/radicle:1.0.0-rc.1/").is_ok());
-        assert!(UserAgent::from_str("/radicle:1.0.0-rc.1/").is_ok());
-        assert!(UserAgent::from_str("/radicle:@a.b.c/").is_ok());
-        assert!(UserAgent::from_str("/radicle/").is_ok());
-        assert!(UserAgent::from_str("/rad/icle/").is_ok());
-        assert!(UserAgent::from_str("/rad:ic/le/").is_ok());
-
-        assert!(UserAgent::from_str("/:/").is_err());
-        assert!(UserAgent::from_str("//").is_err());
-        assert!(UserAgent::from_str("").is_err());
-        assert!(UserAgent::from_str("radicle:1.0.0/").is_err());
-        assert!(UserAgent::from_str("/radicle:1.0.0").is_err());
-        assert!(UserAgent::from_str("/radi cle:1.0/").is_err());
-        assert!(UserAgent::from_str("/radi\ncle:1.0/").is_err());
-    }
-
-    #[test]
-    fn test_alias() {
-        assert!(Alias::from_str("cloudhead").is_ok());
-        assert!(Alias::from_str("cloud-head").is_ok());
-        assert!(Alias::from_str("cl0ud.h3ad$__").is_ok());
-        assert!(Alias::from_str("©loudhèâd").is_ok());
-
-        assert!(Alias::from_str("").is_err());
-        assert!(Alias::from_str(" ").is_err());
-        assert!(Alias::from_str("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa").is_err());
-        assert!(Alias::from_str("cloud\0head").is_err());
-        assert!(Alias::from_str("cloud head").is_err());
-        assert!(Alias::from_str("cloudhead\n").is_err());
-    }
-
-    #[test]
-    fn test_command_result() {
-        #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
-        struct Test {
-            value: u32,
-        }
-
-        assert_eq!(json::to_string(&CommandResult::Okay(true)).unwrap(), "true");
-        assert_eq!(
-            json::to_string(&CommandResult::Okay(Test { value: 42 })).unwrap(),
-            "{\"value\":42}"
-        );
-        assert_eq!(
-            json::from_str::<CommandResult<Test>>("{\"value\":42}").unwrap(),
-            CommandResult::Okay(Test { value: 42 })
-        );
-        assert_eq!(json::to_string(&CommandResult::ok()).unwrap(), "{}");
-        assert_eq!(
-            json::to_string(&CommandResult::updated(true)).unwrap(),
-            "{\"updated\":true}"
-        );
-        assert_eq!(
-            json::to_string(&CommandResult::error(io::Error::from(
-                io::ErrorKind::NotFound
-            )))
-            .unwrap(),
-            "{\"error\":\"entity not found\"}"
-        );
-
-        json::from_str::<CommandResult<State>>(
-            &serde_json::to_string(&CommandResult::Okay(State::Connected {
-                since: LocalTime::now(),
-                ping: Default::default(),
-                fetching: Default::default(),
-                latencies: VecDeque::default(),
-                stable: false,
-            }))
-            .unwrap(),
-        )
-        .unwrap();
-
-        assert_matches!(
-            json::from_str::<CommandResult<State>>(
-                r#"{"connected":{"since":1699636852107,"fetching":[]}}"#
-            ),
-            Ok(CommandResult::Okay(_))
-        );
-        assert_matches!(
-            json::from_str::<CommandResult<Seeds>>(
-                r#"[{"nid":"z6MksmpU5b1dS7oaqF2bHXhQi1DWy2hB7Mh9CuN7y1DN6QSz","addrs":[{"addr":"seed.radicle.xyz:8776","source":"peer","lastSuccess":1699983994234,"lastAttempt":1699983994000,"banned":false}],"state":{"connected":{"since":1699983994,"fetching":[]}}}]"#
-            ),
-            Ok(CommandResult::Okay(_))
-        );
-    }
-}
diff --git a/radicle/src/node/address.rs b/radicle/src/node/address.rs
deleted file mode 100644
index dac9ac43d..000000000
--- a/radicle/src/node/address.rs
+++ /dev/null
@@ -1,281 +0,0 @@
-pub mod store;
-pub use store::{Error, Store};
-
-use std::cell::RefCell;
-use std::ops::{Deref, DerefMut};
-use std::{hash, net};
-
-use cyphernet::addr::HostName;
-use localtime::LocalTime;
-use nonempty::NonEmpty;
-
-use crate::collections::RandomMap;
-use crate::node::{Address, Alias, Penalty, UserAgent};
-use crate::prelude::Timestamp;
-use crate::{node, profile};
-
-/// A map with the ability to randomly select values.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(transparent)]
-pub struct AddressBook<K: hash::Hash + Eq, V> {
-    inner: RandomMap<K, V>,
-    #[serde(skip)]
-    rng: RefCell<fastrand::Rng>,
-}
-
-impl<K: hash::Hash + Eq, V> AddressBook<K, V> {
-    /// Create a new address book.
-    pub fn new(rng: fastrand::Rng) -> Self {
-        Self {
-            inner: RandomMap::with_hasher(rng.clone().into()),
-            rng: RefCell::new(rng),
-        }
-    }
-
-    /// Pick a random value in the book.
-    pub fn sample(&self) -> Option<(&K, &V)> {
-        self.sample_with(|_, _| true)
-    }
-
-    /// Pick a random value in the book matching a predicate.
-    pub fn sample_with(&self, mut predicate: impl FnMut(&K, &V) -> bool) -> Option<(&K, &V)> {
-        if let Some(pairs) = NonEmpty::from_vec(
-            self.inner
-                .iter()
-                .filter(|(k, v)| predicate(*k, *v))
-                .collect(),
-        ) {
-            let ix = self.rng.borrow_mut().usize(..pairs.len());
-            let pair = pairs[ix]; // Can't fail.
-
-            Some(pair)
-        } else {
-            None
-        }
-    }
-
-    /// Return a new address book with the given RNG.
-    pub fn with(self, rng: fastrand::Rng) -> Self {
-        Self {
-            inner: self.inner,
-            rng: RefCell::new(rng),
-        }
-    }
-}
-
-impl<K: hash::Hash + Eq + Ord + Copy, V> AddressBook<K, V> {
-    /// Return a shuffled iterator.
-    pub fn shuffled(&self) -> std::vec::IntoIter<(&K, &V)> {
-        let mut items = self.inner.iter().collect::<Vec<_>>();
-        items.sort_by_key(|(k, _)| *k);
-        self.rng.borrow_mut().shuffle(&mut items);
-
-        items.into_iter()
-    }
-
-    /// Turn this object into a shuffled iterator.
-    pub fn into_shuffled(self) -> impl Iterator<Item = (K, V)> {
-        let mut items = self.inner.into_iter().collect::<Vec<_>>();
-        items.sort_by_key(|(k, _)| *k);
-        self.rng.borrow_mut().shuffle(&mut items);
-
-        items.into_iter()
-    }
-
-    /// Cycle through the keys at random. The random cycle repeats ad-infintum.
-    pub fn cycle(&self) -> impl Iterator<Item = &K> {
-        self.shuffled().map(|(k, _)| k).cycle()
-    }
-}
-
-impl<K: hash::Hash + Eq, V> FromIterator<(K, V)> for AddressBook<K, V> {
-    fn from_iter<T: IntoIterator<Item = (K, V)>>(iter: T) -> Self {
-        let rng = profile::env::rng();
-        let mut inner = RandomMap::with_hasher(rng.clone().into());
-
-        for (k, v) in iter {
-            inner.insert(k, v);
-        }
-        Self {
-            inner,
-            rng: RefCell::new(rng),
-        }
-    }
-}
-
-impl<K: hash::Hash + Eq, V> Deref for AddressBook<K, V> {
-    type Target = RandomMap<K, V>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.inner
-    }
-}
-
-impl<K: hash::Hash + Eq, V> DerefMut for AddressBook<K, V> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.inner
-    }
-}
-
-/// Node public data.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Node {
-    /// Protocol version.
-    pub version: u8,
-    /// Advertized alias.
-    pub alias: Alias,
-    /// Advertized features.
-    pub features: node::Features,
-    /// Advertized addresses
-    pub addrs: Vec<KnownAddress>,
-    /// Proof-of-work included in node announcement.
-    pub pow: u32,
-    /// When this data was published.
-    pub timestamp: Timestamp,
-    /// User agent string.
-    pub agent: UserAgent,
-    /// Node connection penalty.
-    pub penalty: Penalty,
-    /// Whether the node is banned.
-    pub banned: bool,
-}
-
-/// A known address.
-#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct KnownAddress {
-    /// Network address.
-    pub addr: Address,
-    /// Address of the peer who sent us this address.
-    pub source: Source,
-    /// Last time this address was used to successfully connect to a peer.
-    #[serde(with = "crate::serde_ext::localtime::option::time")]
-    pub last_success: Option<LocalTime>,
-    /// Last time this address was tried.
-    #[serde(with = "crate::serde_ext::localtime::option::time")]
-    pub last_attempt: Option<LocalTime>,
-    /// Whether this address has been banned.
-    pub banned: bool,
-}
-
-impl KnownAddress {
-    /// Create a new known address.
-    pub fn new(addr: Address, source: Source) -> Self {
-        Self {
-            addr,
-            source,
-            last_success: None,
-            last_attempt: None,
-            banned: false,
-        }
-    }
-}
-
-/// Address source. Specifies where an address originated from.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Source {
-    /// An address that was shared by another peer.
-    Peer,
-    /// A bootstrap node address.
-    Bootstrap,
-    /// An address that came from some source external to the system, eg.
-    /// specified by the user or added directly to the address manager.
-    Imported,
-}
-
-impl std::fmt::Display for Source {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Peer => write!(f, "Peer"),
-            Self::Bootstrap => write!(f, "Bootstrap"),
-            Self::Imported => write!(f, "Imported"),
-        }
-    }
-}
-
-/// Address type.
-#[repr(u8)]
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum AddressType {
-    Ipv4 = 1,
-    Ipv6 = 2,
-    Dns = 3,
-    Onion = 4,
-}
-
-impl From<AddressType> for u8 {
-    fn from(other: AddressType) -> Self {
-        other as u8
-    }
-}
-
-impl From<&Address> for AddressType {
-    fn from(a: &Address) -> Self {
-        match a.host {
-            HostName::Ip(net::IpAddr::V4(_)) => AddressType::Ipv4,
-            HostName::Ip(net::IpAddr::V6(_)) => AddressType::Ipv6,
-            HostName::Dns(_) => AddressType::Dns,
-            HostName::Tor(_) => AddressType::Onion,
-            _ => todo!(), // FIXME(cloudhead): Maxim will remove `non-exhaustive`
-        }
-    }
-}
-
-impl TryFrom<u8> for AddressType {
-    type Error = u8;
-
-    fn try_from(other: u8) -> Result<Self, Self::Error> {
-        match other {
-            1 => Ok(AddressType::Ipv4),
-            2 => Ok(AddressType::Ipv6),
-            3 => Ok(AddressType::Dns),
-            4 => Ok(AddressType::Onion),
-            _ => Err(other),
-        }
-    }
-}
-/// Check whether an IP address is globally routable.
-pub fn is_routable(addr: &net::IpAddr) -> bool {
-    match addr {
-        net::IpAddr::V4(addr) => ipv4_is_routable(addr),
-        net::IpAddr::V6(addr) => ipv6_is_routable(addr),
-    }
-}
-
-/// Check whether an IP address is locally routable.
-pub fn is_local(addr: &net::IpAddr) -> bool {
-    match addr {
-        net::IpAddr::V4(addr) => {
-            addr.is_private() || addr.is_loopback() || addr.is_link_local() || addr.is_unspecified()
-        }
-        net::IpAddr::V6(_) => false,
-    }
-}
-
-/// Check whether an IPv4 address is globally routable.
-///
-/// This code is adapted from the Rust standard library's `net::Ipv4Addr::is_global`. It can be
-/// replaced once that function is stabilized.
-fn ipv4_is_routable(addr: &net::Ipv4Addr) -> bool {
-    // Check if this address is 192.0.0.9 or 192.0.0.10. These addresses are the only two
-    // globally routable addresses in the 192.0.0.0/24 range.
-    if u32::from(*addr) == 0xc0000009 || u32::from(*addr) == 0xc000000a {
-        return true;
-    }
-    !addr.is_private()
-        && !addr.is_loopback()
-        && !addr.is_link_local()
-        && !addr.is_broadcast()
-        && !addr.is_documentation()
-        // Make sure the address is not in 0.0.0.0/8.
-        && addr.octets()[0] != 0
-}
-
-/// Check whether an IPv6 address is globally routable.
-///
-/// For now, this always returns `true`, as IPv6 addresses
-/// are not fully supported.
-fn ipv6_is_routable(_addr: &net::Ipv6Addr) -> bool {
-    true
-}
diff --git a/radicle/src/node/address/store.rs b/radicle/src/node/address/store.rs
deleted file mode 100644
index c17dbcf68..000000000
--- a/radicle/src/node/address/store.rs
+++ /dev/null
@@ -1,906 +0,0 @@
-use std::net::IpAddr;
-use std::num::TryFromIntError;
-use std::str::FromStr;
-
-use localtime::LocalTime;
-use sqlite as sql;
-use thiserror::Error;
-
-use crate::node;
-use crate::node::address::{AddressType, KnownAddress, Node, Source};
-use crate::node::UserAgent;
-use crate::node::{Address, Alias, AliasError, AliasStore, Database, NodeId, Penalty, Severity};
-use crate::prelude::Timestamp;
-use crate::sql::transaction;
-
-#[derive(Error, Debug)]
-pub enum Error {
-    /// An Internal error.
-    #[error("internal error: {0}")]
-    Internal(#[from] sql::Error),
-    #[error("alias error: {0}")]
-    InvalidAlias(#[from] AliasError),
-    #[error("integer conversion error: {0}")]
-    TryFromInt(#[from] TryFromIntError),
-    /// No rows returned in query result.
-    #[error("no rows returned")]
-    NoRows,
-}
-
-/// An entry returned by the store.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct AddressEntry {
-    /// Node ID.
-    pub node: NodeId,
-    /// Node protocol version.
-    pub version: u8,
-    /// Node penalty.
-    pub penalty: Penalty,
-    /// Node address.
-    pub address: KnownAddress,
-}
-
-/// Address store.
-///
-/// Used to store node addresses and metadata.
-pub trait Store {
-    /// Get the information we have about a node.
-    fn get(&self, id: &NodeId) -> Result<Option<Node>, Error>;
-    /// Get the addresses of a node.
-    fn addresses_of(&self, node: &NodeId) -> Result<Vec<KnownAddress>, Error>;
-    /// Insert a node with associated addresses into the store.
-    ///
-    /// Returns `true` if the node or addresses were updated, and `false` otherwise.
-    fn insert(
-        &mut self,
-        node: &NodeId,
-        version: u8,
-        features: node::Features,
-        alias: &Alias,
-        pow: u32,
-        agent: &UserAgent,
-        timestamp: Timestamp,
-        addrs: impl IntoIterator<Item = KnownAddress>,
-    ) -> Result<bool, Error>;
-    /// Remove a node from the store.
-    fn remove(&mut self, id: &NodeId) -> Result<bool, Error>;
-    /// Returns the number of addresses.
-    fn len(&self) -> Result<usize, Error>;
-    /// Return the number of nodes.
-    fn nodes(&self) -> Result<usize, Error>;
-    /// Returns true if there are no addresses.
-    fn is_empty(&self) -> Result<bool, Error> {
-        self.len().map(|l| l == 0)
-    }
-    /// Check if an address is banned. Also returns `true` if the node this address belongs
-    /// to is banned.
-    fn is_addr_banned(&self, addr: &Address) -> Result<bool, Error>;
-    /// Check if an IP is banned.
-    fn is_ip_banned(&self, ip: IpAddr) -> Result<bool, Error>;
-    /// Get the address entries in the store.
-    fn entries(&self) -> Result<Box<dyn Iterator<Item = AddressEntry>>, Error>;
-    /// Mark a node as attempted at a certain time.
-    fn attempted(&self, nid: &NodeId, addr: &Address, time: Timestamp) -> Result<(), Error>;
-    /// Mark a node as successfully connected at a certain time.
-    fn connected(&self, nid: &NodeId, addr: &Address, time: Timestamp) -> Result<(), Error>;
-    /// Record a node IP address and connection time.
-    fn record_ip(&self, nid: &NodeId, ip: IpAddr, time: Timestamp) -> Result<(), Error>;
-    /// Mark a node as disconnected.
-    fn disconnected(
-        &mut self,
-        nid: &NodeId,
-        addr: &Address,
-        severity: Severity,
-    ) -> Result<(), Error>;
-}
-
-impl Store for Database {
-    fn get(&self, node: &NodeId) -> Result<Option<Node>, Error> {
-        let mut stmt = self.db.prepare(
-            "SELECT version, features, alias, pow, penalty, banned, agent, timestamp
-             FROM nodes
-             WHERE id = ?",
-        )?;
-        stmt.bind((1, node))?;
-
-        if let Some(Ok(row)) = stmt.into_iter().next() {
-            let version = row.read::<i64, _>("version").try_into()?;
-            let features = row.read::<node::Features, _>("features");
-            let alias = Alias::from_str(row.read::<&str, _>("alias"))?;
-            let timestamp = row.read::<Timestamp, _>("timestamp");
-            let pow = row.read::<i64, _>("pow") as u32;
-            let agent = row.read::<UserAgent, _>("agent");
-            let penalty = row.read::<i64, _>("penalty").min(u8::MAX as i64);
-            let penalty = Penalty(penalty as u8);
-            let banned = row.read::<i64, _>("banned").is_positive();
-            let addrs = self.addresses_of(node)?;
-
-            Ok(Some(Node {
-                version,
-                features,
-                alias,
-                pow,
-                agent,
-                timestamp,
-                penalty,
-                addrs,
-                banned,
-            }))
-        } else {
-            Ok(None)
-        }
-    }
-
-    fn is_addr_banned(&self, addr: &Address) -> Result<bool, Error> {
-        let mut stmt = self.db.prepare(
-            "SELECT a.banned, n.banned
-             FROM addresses AS a
-             JOIN nodes AS n ON a.node = n.id
-             WHERE value = ?1 AND type = ?2",
-        )?;
-        stmt.bind((1, addr))?;
-        stmt.bind((2, AddressType::from(addr)))?;
-
-        if let Some(row) = stmt.into_iter().next() {
-            let row = row?;
-            let addr_banned = row.read::<i64, _>(0).is_positive();
-            let node_banned = row.read::<i64, _>(1).is_positive();
-
-            Ok(node_banned || addr_banned)
-        } else {
-            Ok(false)
-        }
-    }
-
-    fn is_ip_banned(&self, ip: IpAddr) -> Result<bool, Error> {
-        let mut stmt = self.db.prepare(
-            "SELECT banned
-             FROM ips
-             WHERE ip = ?1 AND banned > 0",
-        )?;
-        stmt.bind((1, ip.to_string().as_str()))?;
-
-        Ok(stmt.into_iter().next().is_some())
-    }
-
-    fn addresses_of(&self, node: &NodeId) -> Result<Vec<KnownAddress>, Error> {
-        let mut addrs = Vec::new();
-        let mut stmt = self.db.prepare(
-            "SELECT type, value, source, last_attempt, last_success, banned FROM addresses WHERE node = ?",
-        )?;
-        stmt.bind((1, node))?;
-
-        for row in stmt.into_iter() {
-            let row = row?;
-            let _typ = row.read::<AddressType, _>("type");
-            let addr = row.read::<Address, _>("value");
-            let source = row.read::<Source, _>("source");
-            let last_attempt = row
-                .read::<Option<i64>, _>("last_attempt")
-                .map(|t| LocalTime::from_millis(t as u128));
-            let last_success = row
-                .read::<Option<i64>, _>("last_success")
-                .map(|t| LocalTime::from_millis(t as u128));
-            let banned = row.read::<i64, _>("banned").is_positive();
-
-            addrs.push(KnownAddress {
-                addr,
-                source,
-                last_success,
-                last_attempt,
-                banned,
-            });
-        }
-        Ok(addrs)
-    }
-
-    fn len(&self) -> Result<usize, Error> {
-        let row = self
-            .db
-            .prepare("SELECT COUNT(*) FROM addresses")?
-            .into_iter()
-            .next()
-            .ok_or(Error::NoRows)??;
-        let count = row.read::<i64, _>(0) as usize;
-
-        Ok(count)
-    }
-
-    fn nodes(&self) -> Result<usize, Error> {
-        let row = self
-            .db
-            .prepare("SELECT COUNT(*) FROM nodes")?
-            .into_iter()
-            .next()
-            .ok_or(Error::NoRows)??;
-        let count = row.read::<i64, _>(0) as usize;
-
-        Ok(count)
-    }
-
-    fn insert(
-        &mut self,
-        node: &NodeId,
-        version: u8,
-        features: node::Features,
-        alias: &Alias,
-        pow: u32,
-        agent: &UserAgent,
-        timestamp: Timestamp,
-        addrs: impl IntoIterator<Item = KnownAddress>,
-    ) -> Result<bool, Error> {
-        transaction(&self.db, move |db| {
-            let mut stmt = db.prepare(
-                "INSERT INTO nodes (id, version, features, alias, pow, agent, timestamp)
-                 VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7)
-                 ON CONFLICT DO UPDATE
-                 SET version = ?2, features = ?3, alias = ?4, pow = ?5, agent = ?6, timestamp = ?7
-                 WHERE timestamp < ?7",
-            )?;
-
-            stmt.bind((1, node))?;
-            stmt.bind((2, version as i64))?;
-            stmt.bind((3, features))?;
-            stmt.bind((4, alias.as_str()))?;
-            stmt.bind((5, pow as i64))?;
-            stmt.bind((6, agent.as_str()))?;
-            stmt.bind((7, &timestamp))?;
-            stmt.next()?;
-
-            for addr in addrs {
-                let mut stmt = db.prepare(
-                    "INSERT INTO addresses (node, type, value, source, timestamp)
-                     VALUES (?1, ?2, ?3, ?4, ?5)
-                     ON CONFLICT DO UPDATE
-                     SET timestamp = ?5
-                     WHERE timestamp < ?5",
-                )?;
-                stmt.bind((1, node))?;
-                stmt.bind((2, AddressType::from(&addr.addr)))?;
-                stmt.bind((3, &addr.addr))?;
-                stmt.bind((4, addr.source))?;
-                stmt.bind((5, &timestamp))?;
-                stmt.next()?;
-            }
-            Ok::<_, Error>(db.change_count() > 0)
-        })
-    }
-
-    fn remove(&mut self, node: &NodeId) -> Result<bool, Error> {
-        let mut stmt = self.db.prepare("DELETE FROM nodes WHERE id = ?1")?;
-
-        stmt.bind((1, node))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count() > 0)
-    }
-
-    fn entries(&self) -> Result<Box<dyn Iterator<Item = AddressEntry>>, Error> {
-        let mut stmt = self
-            .db
-            .prepare(
-                "SELECT a.node, a.type, a.value, a.source, a.last_success, a.last_attempt, a.banned, n.version, n.penalty
-                 FROM addresses AS a
-                 JOIN nodes AS n ON a.node = n.id
-                 ORDER BY n.penalty ASC, n.id ASC",
-            )?
-            .into_iter();
-        let mut entries = Vec::new();
-
-        while let Some(Ok(row)) = stmt.next() {
-            let node = row.read::<NodeId, _>("node");
-            let _typ = row.read::<AddressType, _>("type");
-            let addr = row.read::<Address, _>("value");
-            let source = row.read::<Source, _>("source");
-            let last_success = row.read::<Option<i64>, _>("last_success");
-            let last_attempt = row.read::<Option<i64>, _>("last_attempt");
-            let last_success = last_success.map(|t| LocalTime::from_millis(t as u128));
-            let last_attempt = last_attempt.map(|t| LocalTime::from_millis(t as u128));
-            let version = row.read::<i64, _>("version").try_into()?;
-            let banned = row.read::<i64, _>("banned").is_positive();
-            let penalty = row.read::<i64, _>("penalty");
-            let penalty = Penalty(penalty as u8); // Clamped at `u8::MAX`.
-
-            entries.push(AddressEntry {
-                node,
-                version,
-                penalty,
-                address: KnownAddress {
-                    addr,
-                    source,
-                    last_success,
-                    last_attempt,
-                    banned,
-                },
-            });
-        }
-        Ok(Box::new(entries.into_iter()))
-    }
-
-    fn attempted(&self, nid: &NodeId, addr: &Address, time: Timestamp) -> Result<(), Error> {
-        let mut stmt = self.db.prepare(
-            "UPDATE `addresses`
-             SET last_attempt = ?1
-             WHERE node = ?2
-             AND type = ?3
-             AND value = ?4",
-        )?;
-
-        stmt.bind((1, &time))?;
-        stmt.bind((2, nid))?;
-        stmt.bind((3, AddressType::from(addr)))?;
-        stmt.bind((4, addr))?;
-        stmt.next()?;
-
-        Ok(())
-    }
-
-    fn connected(&self, nid: &NodeId, addr: &Address, time: Timestamp) -> Result<(), Error> {
-        transaction(&self.db, |db| {
-            let mut stmt = db.prepare(
-                "UPDATE `addresses`
-                 SET last_success = ?1
-                 WHERE node = ?2
-                 AND type = ?3
-                 AND value = ?4",
-            )?;
-
-            stmt.bind((1, &time))?;
-            stmt.bind((2, nid))?;
-            stmt.bind((3, AddressType::from(addr)))?;
-            stmt.bind((4, addr))?;
-            stmt.next()?;
-
-            // Reduce penalty by half on successful connect.
-            let mut stmt = db.prepare("UPDATE `nodes` SET penalty = penalty / 2 WHERE id = ?1")?;
-
-            stmt.bind((1, nid))?;
-            stmt.next()?;
-
-            Ok(())
-        })
-    }
-
-    fn record_ip(&self, nid: &NodeId, ip: IpAddr, time: Timestamp) -> Result<(), Error> {
-        let mut stmt = self.db.prepare(
-            "INSERT INTO ips (ip, node, last_attempt)
-             VALUES (?1, ?2, ?3)
-             ON CONFLICT DO UPDATE
-             SET last_attempt = ?3
-             WHERE last_attempt < ?3",
-        )?;
-        stmt.bind((1, ip.to_string().as_str()))?;
-        stmt.bind((2, nid))?;
-        stmt.bind((3, &time))?;
-        stmt.next()?;
-
-        Ok(())
-    }
-
-    fn disconnected(
-        &mut self,
-        nid: &NodeId,
-        addr: &Address,
-        severity: Severity,
-    ) -> Result<(), Error> {
-        transaction(&self.db, |db| {
-            let mut stmt = self.db.prepare(
-                "UPDATE `nodes`
-                 SET penalty = penalty + ?2
-                 WHERE id = ?1",
-            )?;
-            stmt.bind((1, nid))?;
-            stmt.bind((2, severity as i64))?;
-            stmt.next()?;
-
-            // If the ban threshold is reached, we ban the node and its addresses.
-            let node = self.get(nid)?.ok_or(Error::NoRows)?;
-            if node.penalty.is_ban_threshold_reached() {
-                let mut stmt = db.prepare("UPDATE `nodes` SET banned = 1 WHERE id = ?1")?;
-                stmt.bind((1, nid))?;
-                stmt.next()?;
-
-                let mut stmt = db.prepare("UPDATE `addresses` SET banned = 1 WHERE value = ?1")?;
-                stmt.bind((1, addr))?;
-                stmt.next()?;
-
-                let mut stmt = db.prepare("UPDATE `ips` SET banned = 1 WHERE node = ?1")?;
-                stmt.bind((1, nid))?;
-                stmt.next()?;
-            }
-            Ok(())
-        })
-    }
-}
-
-impl<T> AliasStore for T
-where
-    T: Store,
-{
-    /// Retrieve `alias` of given node.
-    /// Calls `Self::get` under the hood.
-    fn alias(&self, nid: &NodeId) -> Option<Alias> {
-        self.get(nid)
-            .map(|node| node.map(|n| n.alias))
-            .unwrap_or(None)
-    }
-}
-
-impl TryFrom<&sql::Value> for Source {
-    type Error = sql::Error;
-
-    fn try_from(value: &sql::Value) -> Result<Self, Self::Error> {
-        let err = sql::Error {
-            code: None,
-            message: Some("sql: invalid source".to_owned()),
-        };
-        match value {
-            sql::Value::String(s) => match s.as_str() {
-                "bootstrap" => Ok(Source::Bootstrap),
-                "peer" => Ok(Source::Peer),
-                "imported" => Ok(Source::Imported),
-                _ => Err(err),
-            },
-            _ => Err(err),
-        }
-    }
-}
-
-impl sql::BindableWithIndex for Source {
-    fn bind<I: sql::ParameterIndex>(self, stmt: &mut sql::Statement<'_>, i: I) -> sql::Result<()> {
-        match self {
-            Self::Bootstrap => "bootstrap".bind(stmt, i),
-            Self::Peer => "peer".bind(stmt, i),
-            Self::Imported => "imported".bind(stmt, i),
-        }
-    }
-}
-
-impl TryFrom<&sql::Value> for AddressType {
-    type Error = sql::Error;
-
-    fn try_from(value: &sql::Value) -> Result<Self, Self::Error> {
-        let err = sql::Error {
-            code: None,
-            message: Some("sql: invalid address type".to_owned()),
-        };
-        match value {
-            sql::Value::String(s) => match s.as_str() {
-                "ipv4" => Ok(AddressType::Ipv4),
-                "ipv6" => Ok(AddressType::Ipv6),
-                "dns" => Ok(AddressType::Dns),
-                "onion" => Ok(AddressType::Onion),
-                _ => Err(err),
-            },
-            _ => Err(err),
-        }
-    }
-}
-
-impl sql::BindableWithIndex for AddressType {
-    fn bind<I: sql::ParameterIndex>(self, stmt: &mut sql::Statement<'_>, i: I) -> sql::Result<()> {
-        match self {
-            Self::Ipv4 => "ipv4".bind(stmt, i),
-            Self::Ipv6 => "ipv6".bind(stmt, i),
-            Self::Dns => "dns".bind(stmt, i),
-            Self::Onion => "onion".bind(stmt, i),
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use std::net;
-
-    use super::*;
-    use crate::test::arbitrary;
-    use cyphernet::addr::NetAddr;
-    use localtime::LocalTime;
-
-    #[test]
-    fn test_empty() {
-        let tmp = tempfile::tempdir().unwrap();
-        let path = tmp.path().join("cache");
-        let cache = Database::open(path).unwrap();
-
-        assert!(cache.is_empty().unwrap());
-    }
-
-    #[test]
-    fn test_get_none() {
-        let alice = arbitrary::gen::<NodeId>(1);
-        let cache = Database::memory().unwrap();
-        let result = cache.get(&alice).unwrap();
-
-        assert!(result.is_none());
-    }
-
-    #[test]
-    fn test_remove_nothing() {
-        let alice = arbitrary::gen::<NodeId>(1);
-        let mut cache = Database::memory().unwrap();
-        let removed = cache.remove(&alice).unwrap();
-
-        assert!(!removed);
-    }
-
-    #[test]
-    fn test_alias() {
-        let alice = arbitrary::gen::<NodeId>(1);
-        let mut cache = Database::memory().unwrap();
-        let features = node::Features::SEED;
-        let timestamp = Timestamp::from(LocalTime::now());
-        let ua = UserAgent::default();
-
-        cache
-            .insert(
-                &alice,
-                1,
-                features,
-                &Alias::new("alice"),
-                16,
-                &ua,
-                timestamp,
-                [],
-            )
-            .unwrap();
-        let node = cache.get(&alice).unwrap().unwrap();
-        assert_eq!(node.alias.as_ref(), "alice");
-
-        cache
-            .insert(
-                &alice,
-                1,
-                features,
-                &Alias::new("bob"),
-                16,
-                &ua,
-                timestamp + 1,
-                [],
-            )
-            .unwrap();
-        let node = cache.get(&alice).unwrap().unwrap();
-        assert_eq!(node.alias.as_ref(), "bob");
-    }
-
-    #[test]
-    fn test_insert_and_get() {
-        let alice = arbitrary::gen::<NodeId>(1);
-        let mut cache = Database::memory().unwrap();
-        let version = 2;
-        let features = node::Features::SEED;
-        let timestamp = LocalTime::now().into();
-        let ua = UserAgent::default();
-
-        let ka = KnownAddress {
-            addr: net::SocketAddr::from(([4, 4, 4, 4], 8776)).into(),
-            source: Source::Peer,
-            last_success: None,
-            last_attempt: None,
-            banned: false,
-        };
-        let inserted = cache
-            .insert(
-                &alice,
-                version,
-                features,
-                &Alias::new("alice"),
-                16,
-                &ua,
-                timestamp,
-                [ka.clone()],
-            )
-            .unwrap();
-        assert!(inserted);
-
-        let node = cache.get(&alice).unwrap().unwrap();
-
-        assert_eq!(node.version, version);
-        assert_eq!(node.features, features);
-        assert_eq!(node.pow, 16);
-        assert_eq!(node.timestamp, timestamp);
-        assert_eq!(node.alias.as_ref(), "alice");
-        assert_eq!(node.addrs, vec![ka]);
-    }
-
-    #[test]
-    fn test_insert_duplicate() {
-        let alice = arbitrary::gen::<NodeId>(1);
-        let mut cache = Database::memory().unwrap();
-        let features = node::Features::SEED;
-        let timestamp = LocalTime::now().into();
-        let alias = Alias::new("alice");
-        let ua = UserAgent::default();
-
-        let ka = KnownAddress {
-            addr: net::SocketAddr::from(([4, 4, 4, 4], 8776)).into(),
-            source: Source::Peer,
-            last_success: None,
-            last_attempt: None,
-            banned: false,
-        };
-        let inserted = cache
-            .insert(&alice, 1, features, &alias, 0, &ua, timestamp, [ka.clone()])
-            .unwrap();
-        assert!(inserted);
-
-        let inserted = cache
-            .insert(&alice, 1, features, &alias, 0, &ua, timestamp, [ka])
-            .unwrap();
-        assert!(!inserted);
-
-        assert_eq!(cache.len().unwrap(), 1);
-    }
-
-    #[test]
-    fn test_insert_and_update() {
-        let alice = arbitrary::gen::<NodeId>(1);
-        let mut cache = Database::memory().unwrap();
-        let timestamp = LocalTime::now().into();
-        let features = node::Features::SEED;
-        let ua1 = UserAgent::default();
-        let ua2 = UserAgent::default();
-        let alias1 = Alias::new("alice");
-        let alias2 = Alias::new("~alice~");
-        let ka = KnownAddress {
-            addr: net::SocketAddr::from(([4, 4, 4, 4], 8776)).into(),
-            source: Source::Peer,
-            last_success: None,
-            last_attempt: None,
-            banned: false,
-        };
-
-        let updated = cache
-            .insert(
-                &alice,
-                1,
-                features,
-                &alias1,
-                0,
-                &ua1,
-                timestamp,
-                [ka.clone()],
-            )
-            .unwrap();
-        assert!(updated);
-
-        let updated = cache
-            .insert(&alice, 1, features, &alias2, 0, &ua1, timestamp, [])
-            .unwrap();
-        assert!(!updated, "Can't update using the same timestamp");
-
-        let updated = cache
-            .insert(&alice, 1, features, &alias2, 0, &ua1, timestamp - 1, [])
-            .unwrap();
-        assert!(!updated, "Can't update using a smaller timestamp");
-
-        let node = cache.get(&alice).unwrap().unwrap();
-        assert_eq!(node.alias.as_ref(), "alice");
-        assert_eq!(node.timestamp, timestamp);
-        assert_eq!(node.pow, 0);
-
-        let updated = cache
-            .insert(&alice, 1, features, &alias2, 0, &ua2, timestamp + 1, [])
-            .unwrap();
-        assert!(updated, "Can update with a larger timestamp");
-
-        let updated = cache
-            .insert(
-                &alice,
-                1,
-                node::Features::NONE,
-                &alias2,
-                1,
-                &ua2,
-                timestamp + 2,
-                [],
-            )
-            .unwrap();
-        assert!(updated);
-
-        let node = cache.get(&alice).unwrap().unwrap();
-        assert_eq!(node.features, node::Features::NONE);
-        assert_eq!(node.alias.as_ref(), "~alice~");
-        assert_eq!(node.timestamp, timestamp + 2);
-        assert_eq!(node.pow, 1);
-        assert_eq!(node.addrs, vec![ka]);
-        assert_eq!(node.agent, ua2);
-    }
-
-    #[test]
-    fn test_insert_and_remove() {
-        let alice = arbitrary::gen::<NodeId>(1);
-        let bob = arbitrary::gen::<NodeId>(1);
-        let mut cache = Database::memory().unwrap();
-        let timestamp = LocalTime::now().into();
-        let ua = UserAgent::default();
-        let features = node::Features::SEED;
-        let alice_alias = Alias::new("alice");
-        let bob_alias = Alias::new("bob");
-
-        for addr in [
-            ([4, 4, 4, 4], 8776),
-            ([7, 7, 7, 7], 8776),
-            ([9, 9, 9, 9], 8776),
-        ] {
-            let ka = KnownAddress {
-                addr: net::SocketAddr::from(addr).into(),
-                source: Source::Peer,
-                last_success: None,
-                last_attempt: None,
-                banned: false,
-            };
-            cache
-                .insert(
-                    &alice,
-                    1,
-                    features,
-                    &alice_alias,
-                    0,
-                    &ua,
-                    timestamp,
-                    [ka.clone()],
-                )
-                .unwrap();
-            cache
-                .insert(&bob, 1, features, &bob_alias, 0, &ua, timestamp, [ka])
-                .unwrap();
-        }
-        assert_eq!(cache.len().unwrap(), 6);
-
-        let removed = cache.remove(&alice).unwrap();
-        assert!(removed);
-        assert_eq!(cache.len().unwrap(), 3);
-
-        let removed = cache.remove(&bob).unwrap();
-        assert!(removed);
-        assert_eq!(cache.len().unwrap(), 0);
-    }
-
-    #[test]
-    fn test_entries() {
-        let ids = arbitrary::vec::<NodeId>(16);
-        let mut rng = fastrand::Rng::new();
-        let mut cache = Database::memory().unwrap();
-        let mut expected = Vec::new();
-        let timestamp = LocalTime::now().into();
-        let ua = UserAgent::default();
-        let features = node::Features::SEED;
-        let alias = Alias::new("alice");
-
-        for id in ids {
-            let ip = rng.u32(..);
-            let addr = net::SocketAddr::from((net::Ipv4Addr::from(ip), rng.u16(..)));
-            let ka = KnownAddress {
-                addr: addr.into(),
-                source: Source::Bootstrap,
-                // TODO: Test times as well.
-                last_success: None,
-                last_attempt: None,
-                banned: false,
-            };
-            expected.push(AddressEntry {
-                node: id,
-                version: 3,
-                penalty: Penalty::default(),
-                address: ka.clone(),
-            });
-            cache
-                .insert(&id, 3, features, &alias, 0, &ua, timestamp, [ka])
-                .unwrap();
-        }
-
-        let mut actual = cache.entries().unwrap().collect::<Vec<_>>();
-
-        actual.sort_by_key(|ae| ae.node);
-        expected.sort_by_key(|ae| ae.node);
-
-        assert_eq!(cache.len().unwrap(), actual.len());
-        assert_eq!(actual, expected);
-    }
-
-    #[test]
-    fn test_disconnected() {
-        let alice = arbitrary::gen::<NodeId>(1);
-        let addr = arbitrary::gen::<Address>(1);
-        let mut cache = Database::memory().unwrap();
-        let features = node::Features::SEED;
-        let timestamp = Timestamp::from(LocalTime::now());
-        let ua = UserAgent::default();
-
-        cache
-            .insert(
-                &alice,
-                1,
-                features,
-                &Alias::new("alice"),
-                16,
-                &ua,
-                timestamp,
-                [],
-            )
-            .unwrap();
-        let node = cache.get(&alice).unwrap().unwrap();
-        assert_eq!(node.penalty, Penalty::default());
-
-        cache.disconnected(&alice, &addr, Severity::Low).unwrap();
-        let node = cache.get(&alice).unwrap().unwrap();
-        assert_eq!(node.penalty, Penalty::default());
-
-        cache.disconnected(&alice, &addr, Severity::Medium).unwrap();
-        let node = cache.get(&alice).unwrap().unwrap();
-        assert_eq!(node.penalty, Penalty(1));
-
-        cache.disconnected(&alice, &addr, Severity::High).unwrap();
-        let node = cache.get(&alice).unwrap().unwrap();
-        assert_eq!(node.penalty, Penalty(9));
-
-        cache.connected(&alice, &addr, timestamp + 1).unwrap();
-        let node = cache.get(&alice).unwrap().unwrap();
-        assert_eq!(node.penalty, Penalty(4));
-    }
-
-    #[test]
-    fn test_disconnected_ban() {
-        let alice = arbitrary::gen::<NodeId>(1);
-        let ua = UserAgent::default();
-        let ip1: net::Ipv4Addr = [8, 8, 8, 8].into();
-        let ip2: net::Ipv4Addr = [9, 9, 9, 9].into();
-        let ka1 = arbitrary::gen::<KnownAddress>(1);
-        let ka1 = KnownAddress {
-            addr: Address::from(NetAddr::new(ip1.into(), 8776)),
-            ..ka1
-        };
-        let ka2 = arbitrary::gen::<KnownAddress>(1);
-        let ka2 = KnownAddress {
-            addr: Address::from(NetAddr::new(ip2.into(), 8776)),
-            ..ka2
-        };
-        let mut db = Database::memory().unwrap();
-        let features = node::Features::SEED;
-        let timestamp = Timestamp::from(LocalTime::now());
-
-        db.insert(
-            &alice,
-            1,
-            features,
-            &Alias::new("alice"),
-            16,
-            &ua,
-            timestamp,
-            [ka1.clone(), ka2.clone()],
-        )
-        .unwrap();
-        db.record_ip(&alice, ip1.into(), timestamp).unwrap();
-        db.record_ip(&alice, ip2.into(), timestamp).unwrap();
-
-        let node = db.get(&alice).unwrap().unwrap();
-        assert_eq!(node.penalty, Penalty::default());
-
-        for _ in 0..7 {
-            db.disconnected(&alice, &ka1.addr, Severity::High).unwrap();
-            let node = db.get(&alice).unwrap().unwrap();
-
-            assert!(!node.penalty.is_ban_threshold_reached());
-            assert!(!node.banned);
-        }
-
-        db.disconnected(&alice, &ka1.addr, Severity::High).unwrap();
-        let node = db.get(&alice).unwrap().unwrap();
-
-        assert!(node.penalty.is_ban_threshold_reached());
-        assert!(node.banned);
-
-        for addr in node.addrs {
-            if addr.addr == ka1.addr {
-                assert!(addr.banned);
-            } else {
-                assert!(!addr.banned);
-            }
-        }
-        assert!(db.is_addr_banned(&ka1.addr).unwrap());
-        assert!(db.is_addr_banned(&ka2.addr).unwrap()); // Banned because node is banned.
-        assert!(db.is_ip_banned(ip1.into()).unwrap());
-        assert!(db.is_ip_banned(ip2.into()).unwrap());
-    }
-}
diff --git a/radicle/src/node/config.rs b/radicle/src/node/config.rs
deleted file mode 100644
index fdbe4476a..000000000
--- a/radicle/src/node/config.rs
+++ /dev/null
@@ -1,417 +0,0 @@
-use std::collections::HashSet;
-use std::net;
-use std::ops::Deref;
-
-use cyphernet::addr::PeerAddr;
-use localtime::LocalDuration;
-use serde_json as json;
-
-use crate::node;
-use crate::node::policy::{Scope, SeedingPolicy};
-use crate::node::{Address, Alias, NodeId};
-
-/// Peer-to-peer protocol version.
-pub type ProtocolVersion = u8;
-
-/// Default number of workers to spawn.
-pub const DEFAULT_WORKERS: usize = 8;
-
-/// Configured public seeds.
-pub mod seeds {
-    use std::str::FromStr;
-
-    use super::{ConnectAddress, PeerAddr};
-    use once_cell::sync::Lazy;
-
-    /// The radicle public community seed node.
-    pub static RADICLE_COMMUNITY_NODE: Lazy<ConnectAddress> = Lazy::new(|| {
-        // SAFETY: `ConnectAddress` is known at compile time.
-        #[allow(clippy::unwrap_used)]
-        PeerAddr::from_str(
-            "z6MkrLMMsiPWUcNPHcRajuMi9mDfYckSoJyPwwnknocNYPm7@seed.radicle.garden:8776",
-        )
-        .unwrap()
-        .into()
-    });
-
-    /// The radicle public `ash` seed node.
-    pub static RADICLE_ASH_NODE: Lazy<ConnectAddress> = Lazy::new(|| {
-        // SAFETY: `ConnectAddress` is known at compile time.
-        #[allow(clippy::unwrap_used)]
-        PeerAddr::from_str(
-            "z6Mkmqogy2qEM2ummccUthFEaaHvyYmYBYh3dbe9W4ebScxo@ash.radicle.garden:8776",
-        )
-        .unwrap()
-        .into()
-    });
-
-    /// The radicle team node.
-    pub static RADICLE_TEAM_NODE: Lazy<ConnectAddress> = Lazy::new(|| {
-        // SAFETY: `ConnectAddress` is known at compile time.
-        #[allow(clippy::unwrap_used)]
-        PeerAddr::from_str("z6MksmpU5b1dS7oaqF2bHXhQi1DWy2hB7Mh9CuN7y1DN6QSz@seed.radicle.xyz:8776")
-            .unwrap()
-            .into()
-    });
-}
-
-/// Peer-to-peer network.
-#[derive(Default, Debug, Copy, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Network {
-    #[default]
-    Main,
-    Test,
-}
-
-impl Network {
-    /// Bootstrap nodes for this network.
-    pub fn bootstrap(&self) -> Vec<(Alias, ProtocolVersion, ConnectAddress)> {
-        match self {
-            Self::Main => [
-                ("seed.radicle.garden", seeds::RADICLE_COMMUNITY_NODE.clone()),
-                ("seed.radicle.xyz", seeds::RADICLE_TEAM_NODE.clone()),
-            ]
-            .into_iter()
-            .map(|(a, s)| (Alias::new(a), 1, s))
-            .collect(),
-
-            Self::Test => vec![],
-        }
-    }
-
-    /// Public seeds for this network.
-    pub fn public_seeds(&self) -> Vec<ConnectAddress> {
-        match self {
-            Self::Main => vec![
-                seeds::RADICLE_COMMUNITY_NODE.clone(),
-                seeds::RADICLE_ASH_NODE.clone(),
-            ],
-            Self::Test => vec![],
-        }
-    }
-}
-
-/// Configuration parameters defining attributes of minima and maxima.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Limits {
-    /// Number of routing table entries before we start pruning.
-    pub routing_max_size: usize,
-    /// How long to keep a routing table entry before being pruned.
-    #[serde(with = "crate::serde_ext::localtime::duration")]
-    pub routing_max_age: LocalDuration,
-    /// How long to keep a gossip message entry before pruning it.
-    #[serde(with = "crate::serde_ext::localtime::duration")]
-    pub gossip_max_age: LocalDuration,
-    /// Maximum number of concurrent fetches per peer connection.
-    pub fetch_concurrency: usize,
-    /// Maximum number of open files.
-    pub max_open_files: usize,
-    /// Rate limitter settings.
-    #[serde(default)]
-    pub rate: RateLimits,
-    /// Connection limits.
-    #[serde(default)]
-    pub connection: ConnectionLimits,
-}
-
-impl Default for Limits {
-    fn default() -> Self {
-        Self {
-            routing_max_size: 1000,
-            routing_max_age: LocalDuration::from_mins(7 * 24 * 60), // One week
-            gossip_max_age: LocalDuration::from_mins(2 * 7 * 24 * 60), // Two weeks
-            fetch_concurrency: 1,
-            max_open_files: 4096,
-            rate: RateLimits::default(),
-            connection: ConnectionLimits::default(),
-        }
-    }
-}
-
-/// Connection limits.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ConnectionLimits {
-    /// Max inbound connections.
-    pub inbound: usize,
-    /// Max outbound connections. Note that this can be higher than the *target* number.
-    pub outbound: usize,
-}
-
-impl Default for ConnectionLimits {
-    fn default() -> Self {
-        Self {
-            inbound: 128,
-            outbound: 16,
-        }
-    }
-}
-
-/// Rate limts for a single connection.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct RateLimit {
-    pub fill_rate: f64,
-    pub capacity: usize,
-}
-
-/// Rate limits for inbound and outbound connections.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct RateLimits {
-    pub inbound: RateLimit,
-    pub outbound: RateLimit,
-}
-
-impl Default for RateLimits {
-    fn default() -> Self {
-        Self {
-            inbound: RateLimit {
-                fill_rate: 5.0,
-                capacity: 1024,
-            },
-            outbound: RateLimit {
-                fill_rate: 10.0,
-                capacity: 2048,
-            },
-        }
-    }
-}
-
-/// Full address used to connect to a remote node.
-#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize, Hash)]
-#[serde(transparent)]
-pub struct ConnectAddress(#[serde(with = "crate::serde_ext::string")] PeerAddr<NodeId, Address>);
-
-impl From<PeerAddr<NodeId, Address>> for ConnectAddress {
-    fn from(value: PeerAddr<NodeId, Address>) -> Self {
-        Self(value)
-    }
-}
-
-impl From<ConnectAddress> for (NodeId, Address) {
-    fn from(value: ConnectAddress) -> Self {
-        (value.0.id, value.0.addr)
-    }
-}
-
-impl From<(NodeId, Address)> for ConnectAddress {
-    fn from((id, addr): (NodeId, Address)) -> Self {
-        Self(PeerAddr { id, addr })
-    }
-}
-
-impl From<ConnectAddress> for Address {
-    fn from(value: ConnectAddress) -> Self {
-        value.0.addr
-    }
-}
-
-impl Deref for ConnectAddress {
-    type Target = PeerAddr<NodeId, Address>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-/// Peer configuration.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase", tag = "type")]
-pub enum PeerConfig {
-    /// Static peer set. Connect to the configured peers and maintain the connections.
-    Static,
-    /// Dynamic peer set.
-    Dynamic,
-}
-
-impl Default for PeerConfig {
-    fn default() -> Self {
-        Self::Dynamic
-    }
-}
-
-/// Relay configuration.
-#[derive(Debug, Copy, Clone, Default, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Relay {
-    /// Always relay messages.
-    Always,
-    /// Never relay messages.
-    Never,
-    /// Relay messages when applicable.
-    #[default]
-    Auto,
-}
-
-/// Proxy configuration.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase", tag = "mode")]
-pub enum AddressConfig {
-    /// Proxy connections to this address type.
-    Proxy {
-        /// Proxy address.
-        address: net::SocketAddr,
-    },
-    /// Forward address to the next layer. Either this is the global proxy,
-    /// or the operating system, via DNS.
-    Forward,
-}
-
-/// Default seeding policy. Applies when no repository policies for the given repo are found.
-#[derive(Debug, Copy, Clone, Default, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase", tag = "default")]
-pub enum DefaultSeedingPolicy {
-    /// Allow seeding.
-    Allow {
-        /// Seeding scope.
-        #[serde(default)]
-        scope: Scope,
-    },
-    /// Block seeding.
-    #[default]
-    Block,
-}
-
-impl DefaultSeedingPolicy {
-    /// Is this an "allow" policy.
-    pub fn is_allow(&self) -> bool {
-        matches!(self, Self::Allow { .. })
-    }
-
-    /// Seed everything from anyone.
-    pub fn permissive() -> Self {
-        Self::Allow { scope: Scope::All }
-    }
-}
-
-impl From<DefaultSeedingPolicy> for SeedingPolicy {
-    fn from(policy: DefaultSeedingPolicy) -> Self {
-        match policy {
-            DefaultSeedingPolicy::Block => Self::Block,
-            DefaultSeedingPolicy::Allow { scope } => Self::Allow { scope },
-        }
-    }
-}
-
-/// Service configuration.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Config {
-    /// Node alias.
-    pub alias: Alias,
-    /// Address to listen on.
-    #[serde(default)]
-    pub listen: Vec<net::SocketAddr>,
-    /// Peer configuration.
-    #[serde(default)]
-    pub peers: PeerConfig,
-    /// Peers to connect to on startup.
-    /// Connections to these peers will be maintained.
-    #[serde(default)]
-    pub connect: HashSet<ConnectAddress>,
-    /// Specify the node's public addresses
-    #[serde(default)]
-    pub external_addresses: Vec<Address>,
-    /// Global proxy.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub proxy: Option<net::SocketAddr>,
-    /// Onion address config.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub onion: Option<AddressConfig>,
-    /// Peer-to-peer network.
-    #[serde(default)]
-    pub network: Network,
-    /// Log level.
-    #[serde(default = "defaults::log")]
-    #[serde(with = "crate::serde_ext::string")]
-    pub log: log::Level,
-    /// Whether or not our node should relay messages.
-    #[serde(default, deserialize_with = "crate::serde_ext::ok_or_default")]
-    pub relay: Relay,
-    /// Configured service limits.
-    #[serde(default)]
-    pub limits: Limits,
-    /// Number of worker threads to spawn.
-    #[serde(default = "defaults::workers")]
-    pub workers: usize,
-    /// Default seeding policy.
-    #[serde(default)]
-    pub seeding_policy: DefaultSeedingPolicy,
-    /// Extra fields that aren't supported.
-    #[serde(flatten, skip_serializing)]
-    pub extra: json::Map<String, json::Value>,
-}
-
-impl Config {
-    pub fn test(alias: Alias) -> Self {
-        Self {
-            network: Network::Test,
-            ..Self::new(alias)
-        }
-    }
-
-    pub fn new(alias: Alias) -> Self {
-        Self {
-            alias,
-            peers: PeerConfig::default(),
-            listen: vec![],
-            connect: HashSet::default(),
-            external_addresses: vec![],
-            network: Network::default(),
-            proxy: None,
-            onion: None,
-            relay: Relay::default(),
-            limits: Limits::default(),
-            workers: DEFAULT_WORKERS,
-            log: defaults::log(),
-            seeding_policy: DefaultSeedingPolicy::default(),
-            extra: json::Map::default(),
-        }
-    }
-
-    pub fn peer(&self, id: &NodeId) -> Option<&Address> {
-        self.connect
-            .iter()
-            .find(|ca| &ca.id == id)
-            .map(|ca| &ca.addr)
-    }
-
-    pub fn peers(&self) -> impl Iterator<Item = NodeId> + '_ {
-        self.connect.iter().cloned().map(|p| p.id)
-    }
-
-    pub fn is_persistent(&self, id: &NodeId) -> bool {
-        self.peer(id).is_some()
-    }
-
-    /// Are we a relay node? This determines what we do with gossip messages from other peers.
-    pub fn is_relay(&self) -> bool {
-        match self.relay {
-            // In "auto" mode, we only relay if we're a public seed node.
-            // This reduces traffic for private nodes, as well as message redundancy.
-            Relay::Auto => !self.external_addresses.is_empty(),
-            Relay::Never => false,
-            Relay::Always => true,
-        }
-    }
-
-    pub fn features(&self) -> node::Features {
-        node::Features::SEED
-    }
-}
-
-/// Defaults as functions, for serde.
-mod defaults {
-    /// Worker count.
-    pub fn workers() -> usize {
-        super::DEFAULT_WORKERS
-    }
-
-    /// Log level.
-    pub fn log() -> log::Level {
-        log::Level::Info
-    }
-}
diff --git a/radicle/src/node/db.rs b/radicle/src/node/db.rs
deleted file mode 100644
index 2a01c6875..000000000
--- a/radicle/src/node/db.rs
+++ /dev/null
@@ -1,234 +0,0 @@
-//! # Note on database migrations
-//!
-//! The `user_version` field in the database SQLite header is used to keep track of the database
-//! version. It starts with `0`, which means no tables exist yet, and is incremented everytime a
-//! migration is applied. In turn, migrations are named after their version numbers, so the first
-//! migration is `1.sql`, the second one is `2.sql` and so on.
-//!
-//! The database schema is contained within the first migration. See [`version`], [`bump`] and
-//! [`migrate`] for how this works.
-use std::ops::Deref;
-use std::path::Path;
-use std::sync::Arc;
-use std::{fmt, time};
-
-use sqlite as sql;
-use thiserror::Error;
-
-use crate::node::{
-    address, Address, Alias, Features, KnownAddress, NodeId, Timestamp, UserAgent, PROTOCOL_VERSION,
-};
-use crate::sql::transaction;
-
-/// How long to wait for the database lock to be released before failing a read.
-const DB_READ_TIMEOUT: time::Duration = time::Duration::from_secs(3);
-/// How long to wait for the database lock to be released before failing a write.
-const DB_WRITE_TIMEOUT: time::Duration = time::Duration::from_secs(6);
-
-/// Database migrations.
-/// The first migration is the creation of the initial tables.
-const MIGRATIONS: &[&str] = &[
-    include_str!("db/migrations/1.sql"),
-    include_str!("db/migrations/2.sql"),
-    include_str!("db/migrations/3.sql"),
-    include_str!("db/migrations/4.sql"),
-    include_str!("db/migrations/5.sql"),
-    include_str!("db/migrations/6.sql"),
-];
-
-#[derive(Error, Debug)]
-pub enum Error {
-    /// Initialization error.
-    #[error("error initializing the database: {0}")]
-    Init(#[from] address::store::Error),
-    /// An Internal error.
-    #[error("internal error: {0}")]
-    Internal(#[from] sql::Error),
-    /// No rows returned in query result.
-    #[error("no rows returned")]
-    NoRows,
-}
-
-/// Database journal mode.
-#[derive(Debug, Default, Copy, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum JournalMode {
-    /// "WAL" mode. Good for concurrent reads & writes, but keeps some extra files around.
-    #[serde(rename = "wal")]
-    #[default]
-    WriteAheadLog,
-    /// Default "rollback" mode. Certain writes may block reads.
-    #[serde(alias = "rollback")]
-    Rollback,
-}
-
-/// A file-backed database storing information about the network.
-#[derive(Clone)]
-pub struct Database {
-    pub db: Arc<sql::ConnectionThreadSafe>,
-}
-
-impl Deref for Database {
-    type Target = sql::ConnectionThreadSafe;
-
-    fn deref(&self) -> &Self::Target {
-        &self.db
-    }
-}
-
-impl fmt::Debug for Database {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Database").finish()
-    }
-}
-
-impl From<sql::ConnectionThreadSafe> for Database {
-    fn from(db: sql::ConnectionThreadSafe) -> Self {
-        Self { db: Arc::new(db) }
-    }
-}
-
-impl Database {
-    const PRAGMA: &'static str = "PRAGMA foreign_keys = ON";
-
-    /// Open a database at the given path. Creates a new database if it
-    /// doesn't exist.
-    pub fn open<P: AsRef<Path>>(path: P) -> Result<Self, Error> {
-        let mut db = sql::Connection::open_thread_safe(path)?;
-        db.set_busy_timeout(DB_WRITE_TIMEOUT.as_millis() as usize)?;
-        db.execute(Self::PRAGMA)?;
-        migrate(&db)?;
-
-        Ok(Self { db: Arc::new(db) })
-    }
-
-    /// Same as [`Self::open`], but in read-only mode. This is useful to have multiple
-    /// open databases, as no locking is required.
-    pub fn reader<P: AsRef<Path>>(path: P) -> Result<Self, Error> {
-        let mut db = sql::Connection::open_thread_safe_with_flags(
-            path,
-            sqlite::OpenFlags::new().with_read_only(),
-        )?;
-        db.set_busy_timeout(DB_READ_TIMEOUT.as_millis() as usize)?;
-        db.execute(Self::PRAGMA)?;
-
-        Ok(Self { db: Arc::new(db) })
-    }
-
-    /// Set journal mode.
-    pub fn journal_mode(self, mode: JournalMode) -> Result<Self, Error> {
-        match mode {
-            JournalMode::Rollback => {
-                self.db.execute("PRAGMA journal_mode = DELETE;")?;
-            }
-            JournalMode::WriteAheadLog => {
-                self.db.execute("PRAGMA journal_mode = WAL;")?;
-            }
-        }
-        Ok(self)
-    }
-
-    /// Initialize by adding our local node to the database.
-    pub fn init<'a>(
-        mut self,
-        node: &NodeId,
-        features: Features,
-        alias: &Alias,
-        agent: &UserAgent,
-        timestamp: Timestamp,
-        addrs: impl IntoIterator<Item = &'a Address>,
-    ) -> Result<Self, Error> {
-        address::Store::insert(
-            &mut self,
-            node,
-            PROTOCOL_VERSION,
-            features,
-            alias,
-            0,
-            agent,
-            timestamp,
-            addrs
-                .into_iter()
-                .map(|a| KnownAddress::new(a.clone(), address::Source::Imported)),
-        )?;
-
-        Ok(self)
-    }
-
-    /// Create a new in-memory database.
-    pub fn memory() -> Result<Self, Error> {
-        let db = sql::Connection::open_thread_safe(":memory:")?;
-        db.execute(Self::PRAGMA)?;
-        migrate(&db)?;
-
-        Ok(Self { db: Arc::new(db) })
-    }
-
-    /// Get the database version. This is updated on schema changes.
-    pub fn version(&self) -> Result<usize, Error> {
-        version(&self.db)
-    }
-
-    /// Bump the database version.
-    pub fn bump(&self) -> Result<usize, Error> {
-        transaction(&self.db, bump)
-    }
-}
-
-/// Get the `user_version` value from the database header.
-pub fn version(db: &sql::Connection) -> Result<usize, Error> {
-    let version = db
-        .prepare("PRAGMA user_version")?
-        .into_iter()
-        .next()
-        .ok_or(Error::NoRows)??
-        .read::<i64, _>(0);
-
-    Ok(version as usize)
-}
-
-/// Bump the `user_version` value.
-pub fn bump(db: &sql::Connection) -> Result<usize, Error> {
-    let old = version(db)?;
-    let new = old + 1;
-
-    db.execute(format!("PRAGMA user_version = {new}"))?;
-
-    Ok(new as usize)
-}
-
-/// Migrate the database to the latest schema.
-pub fn migrate(db: &sql::Connection) -> Result<usize, Error> {
-    let mut version = version(db)?;
-    for (i, migration) in MIGRATIONS.iter().enumerate() {
-        if i >= version {
-            transaction(db, |db| {
-                db.execute(migration)?;
-                version = bump(db)?;
-
-                Ok::<_, Error>(())
-            })?;
-        }
-    }
-    Ok(version)
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_version() {
-        let n = MIGRATIONS.len();
-        let db = Database::memory().unwrap();
-        assert_eq!(db.version().unwrap(), n);
-
-        let v = db.bump().unwrap();
-        assert_eq!(v, n + 1);
-        assert_eq!(db.version().unwrap(), n + 1);
-
-        let v = db.bump().unwrap();
-        assert_eq!(v, n + 2);
-        assert_eq!(db.version().unwrap(), n + 2);
-    }
-}
diff --git a/radicle/src/node/db/migrations/1.sql b/radicle/src/node/db/migrations/1.sql
deleted file mode 120000
index 1450fbb9d..000000000
--- a/radicle/src/node/db/migrations/1.sql
+++ /dev/null
@@ -1 +0,0 @@
-../schema.sql
\ No newline at end of file
diff --git a/radicle/src/node/db/migrations/2.sql b/radicle/src/node/db/migrations/2.sql
deleted file mode 100644
index 12c08e726..000000000
--- a/radicle/src/node/db/migrations/2.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Add the "penalty" column.
--- Higher numbers reduce the chances that we connect to this node.
-alter table "nodes" add column "penalty" integer not null default 0;
diff --git a/radicle/src/node/db/migrations/3.sql b/radicle/src/node/db/migrations/3.sql
deleted file mode 100644
index f0d304269..000000000
--- a/radicle/src/node/db/migrations/3.sql
+++ /dev/null
@@ -1,19 +0,0 @@
--- Git refs cache.
-create table if not exists "refs" (
-  -- Repository ID.
-  "repo"                 text      not null,
-  -- Ref namespace (NID).
-  --
-  -- Nb. We don't use a foreign key constraint because we can't guarantee
-  -- that we'll have received a node announcement from this node.
-  "namespace"            text      not null,
-  -- Ref name (qualified).
-  "ref"                  text      not null,
-  -- Ref OID.
-  "oid"                  text      not null,
-  -- When this entry was created or updated.
-  "timestamp"            integer   not null,
-  --
-  unique ("repo", "namespace", "ref")
-  --
-) strict;
diff --git a/radicle/src/node/db/migrations/4.sql b/radicle/src/node/db/migrations/4.sql
deleted file mode 100644
index cfc09396e..000000000
--- a/radicle/src/node/db/migrations/4.sql
+++ /dev/null
@@ -1,14 +0,0 @@
--- Peer IP addresses.
-create table if not exists "ips" (
-  -- IP address. This *omits* the port.
-  "ip"            text      primary key not null,
-  -- Node this address belongs to. Can be `null` if the session is not yet
-  -- established.
-  "node"          text      references "nodes" ("id") on delete cascade,
-  -- When this connection was last attempted by the peer.
-  "last_attempt"  integer   not null,
-  -- If this IP is banned. Used as a boolean.
-  "banned"        integer   default false
-  --
-) strict;
-
diff --git a/radicle/src/node/db/migrations/5.sql b/radicle/src/node/db/migrations/5.sql
deleted file mode 100644
index 1b94c5d2e..000000000
--- a/radicle/src/node/db/migrations/5.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- Add the "relay" column.
--- The "relay" column can be set in several different ways:
---
--- * If set to `-1`, it means this announcement should *not* be relayed.
--- * If set to `NULL`, it means it *should* be relayed.
--- * If set to a positive integer, it means it has been relayed at that UNIX timestamp.
-alter table "announcements" add column "relay" integer default -1;
diff --git a/radicle/src/node/db/migrations/6.sql b/radicle/src/node/db/migrations/6.sql
deleted file mode 100644
index 86df381bd..000000000
--- a/radicle/src/node/db/migrations/6.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- Add the version and user-agent columns.
-alter table "nodes" add column "version" integer not null default 1;
-alter table "nodes" add column "agent" text not null default "/radicle/";
--- Delete all cached announcements, since they no longer match our format.
-delete from "announcements";
diff --git a/radicle/src/node/db/schema.sql b/radicle/src/node/db/schema.sql
deleted file mode 100644
index 6e1f8e9a0..000000000
--- a/radicle/src/node/db/schema.sql
+++ /dev/null
@@ -1,98 +0,0 @@
--- Discovered nodes.
-create table if not exists "nodes" (
-  -- Node ID.
-  "id"                 text      primary key not null,
-  -- Node features.
-  "features"           integer   not null,
-  -- Node alias.
-  "alias"              text      not null,
-  --- Node announcement proof-of-work.
-  "pow"                integer   default 0,
-  -- Node announcement timestamp.
-  "timestamp"          integer   not null,
-  -- If this node is banned. Used as a boolean.
-  "banned"             integer   default false
-  --
-) strict;
-
--- Node addresses. These are adresses advertized by a node.
-create table if not exists "addresses" (
-  -- Node ID.
-  "node"               text      not null references "nodes" ("id") on delete cascade,
-  -- Address type.
-  "type"               text      not null,
-  -- Address value, including port.
-  "value"              text      not null,
-  -- Where we got this address from.
-  "source"             text      not null,
-  -- When this address was announced.
-  "timestamp"          integer   not null,
-  -- Local time at which we last attempted to connect to this node.
-  "last_attempt"       integer   default null,
-  -- Local time at which we successfully connected to this node.
-  "last_success"       integer   default null,
-  -- If this address is banned from use. Used as a boolean.
-  "banned"             integer   default false,
-  -- Nb. This constraint allows more than one node to share the same address.
-  -- This is useful in circumstances when a node wants to rotate its key, but
-  -- remain reachable at the same address. The old entry will eventually be
-  -- pruned.
-  unique ("node", "type", "value")
-  --
-) strict;
-
--- Routing table. Tracks inventories.
-create table if not exists "routing" (
-  -- Repository being seeded.
-  "repo"         text      not null,
-  -- Node ID.
-  "node"         text      not null references "nodes" ("id") on delete cascade,
-  -- UNIX time at which this entry was added or refreshed.
-  "timestamp"    integer   not null,
-
-  primary key ("repo", "node")
-);
-
--- Gossip message store.
-create table if not exists "announcements" (
-  -- Node ID.
-  --
-  -- Nb. We don't use a foreign key constraint here, because announcements are
-  -- currently added to the database before nodes.
-  "node"               text      not null,
-  -- Repo ID, if any, for example in ref announcements.
-  -- For other announcement types, this should be an empty string.
-  "repo"               text      not null,
-  -- Announcement type.
-  --
-  -- Valid values are:
-  --
-  -- "refs"
-  -- "node"
-  -- "inventory"
-  "type"               text      not null,
-  -- Announcement message in wire format (binary).
-  "message"            blob      not null,
-  -- Signature over message.
-  "signature"          blob      not null,
-  -- Announcement timestamp.
-  "timestamp"          integer   not null,
-  --
-  unique ("node", "repo", "type")
-  --
-) strict;
-
--- Repository sync status.
-create table if not exists "repo-sync-status" (
-  -- Repository ID.
-  "repo"                 text      not null,
-  -- Node ID.
-  "node"                 text      not null references "nodes" ("id") on delete cascade,
-  -- Head of your `rad/sigrefs` branch that was synced.
-  "head"                 text      not null,
-  -- When this entry was last updated.
-  "timestamp"            integer   not null,
-  --
-  unique ("repo", "node")
-  --
-) strict;
diff --git a/radicle/src/node/events.rs b/radicle/src/node/events.rs
deleted file mode 100644
index 199f80d84..000000000
--- a/radicle/src/node/events.rs
+++ /dev/null
@@ -1,186 +0,0 @@
-//! Events for `upload-pack` processes.
-pub mod upload_pack;
-pub use upload_pack::UploadPack;
-
-use std::ops::Deref;
-use std::sync::Arc;
-use std::sync::Mutex;
-use std::time;
-
-use crossbeam_channel as chan;
-
-use crate::git::Oid;
-use crate::node;
-use crate::prelude::*;
-use crate::storage::{refs, RefUpdate};
-
-/// Maximum unconsumed events allowed per subscription.
-pub const MAX_PENDING_EVENTS: usize = 8192;
-
-/// A service event.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase", tag = "type")]
-pub enum Event {
-    RefsFetched {
-        remote: NodeId,
-        rid: RepoId,
-        updated: Vec<RefUpdate>,
-    },
-    RefsSynced {
-        remote: NodeId,
-        rid: RepoId,
-        at: Oid,
-    },
-    SeedDiscovered {
-        rid: RepoId,
-        nid: NodeId,
-    },
-    SeedDropped {
-        rid: RepoId,
-        nid: NodeId,
-    },
-    PeerConnected {
-        nid: NodeId,
-    },
-    PeerDisconnected {
-        nid: NodeId,
-        reason: String,
-    },
-    LocalRefsAnnounced {
-        rid: RepoId,
-        refs: refs::RefsAt,
-        timestamp: Timestamp,
-    },
-    InventoryAnnounced {
-        nid: NodeId,
-        inventory: Vec<RepoId>,
-        timestamp: Timestamp,
-    },
-    RefsAnnounced {
-        nid: NodeId,
-        rid: RepoId,
-        refs: Vec<refs::RefsAt>,
-        timestamp: Timestamp,
-    },
-    NodeAnnounced {
-        nid: NodeId,
-        alias: Alias,
-        timestamp: Timestamp,
-        features: node::Features,
-        addresses: Vec<node::Address>,
-    },
-    UploadPack(upload_pack::UploadPack),
-}
-
-impl From<upload_pack::UploadPack> for Event {
-    fn from(value: upload_pack::UploadPack) -> Self {
-        Self::UploadPack(value)
-    }
-}
-
-/// Events feed.
-pub struct Events(chan::Receiver<Event>);
-
-impl IntoIterator for Events {
-    type Item = Event;
-    type IntoIter = chan::IntoIter<Event>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.0.into_iter()
-    }
-}
-
-impl From<chan::Receiver<Event>> for Events {
-    fn from(value: chan::Receiver<Event>) -> Self {
-        Self(value)
-    }
-}
-
-impl Deref for Events {
-    type Target = chan::Receiver<Event>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl Events {
-    /// Listen for events, and wait for the given predicate to return something,
-    /// or timeout if the specified amount of time has elapsed.
-    pub fn wait<F, T>(&self, mut f: F, timeout: time::Duration) -> Result<T, chan::RecvTimeoutError>
-    where
-        F: FnMut(&Event) -> Option<T>,
-    {
-        let start = time::Instant::now();
-
-        loop {
-            if let Some(timeout) = timeout.checked_sub(start.elapsed()) {
-                match self.recv_timeout(timeout) {
-                    Ok(event) => {
-                        if let Some(output) = f(&event) {
-                            return Ok(output);
-                        }
-                    }
-                    Err(err @ chan::RecvTimeoutError::Disconnected) => {
-                        return Err(err);
-                    }
-                    Err(chan::RecvTimeoutError::Timeout) => {
-                        // Keep trying until our timeout reaches zero.
-                        continue;
-                    }
-                }
-            } else {
-                return Err(chan::RecvTimeoutError::Timeout);
-            }
-        }
-    }
-}
-
-/// Publishes events to subscribers.
-#[derive(Debug, Clone)]
-pub struct Emitter<T> {
-    subscribers: Arc<Mutex<Vec<chan::Sender<T>>>>,
-}
-
-impl<T> Default for Emitter<T> {
-    fn default() -> Emitter<T> {
-        Emitter {
-            subscribers: Default::default(),
-        }
-    }
-}
-
-impl<T: Clone> Emitter<T> {
-    /// Emit event to subscribers and drop those who can't receive it.
-    /// Nb. subscribers are also dropped if their channel is full.
-    pub fn emit(&self, event: T) {
-        self.subscribers
-            .lock()
-            .unwrap()
-            .retain(|s| s.try_send(event.clone()).is_ok());
-    }
-
-    /// Subscribe to events stream.
-    pub fn subscribe(&self) -> chan::Receiver<T> {
-        let (sender, receiver) = chan::bounded(MAX_PENDING_EVENTS);
-        let mut subs = self.subscribers.lock().unwrap();
-        subs.push(sender);
-
-        receiver
-    }
-
-    /// Number of subscribers.
-    pub fn subscriptions(&self) -> usize {
-        self.subscribers.lock().unwrap().len()
-    }
-
-    /// Number of messages that have not yet been received.
-    pub fn pending(&self) -> usize {
-        self.subscribers
-            .lock()
-            .unwrap()
-            .iter()
-            .map(|ch| ch.len())
-            .sum()
-    }
-}
diff --git a/radicle/src/node/events/upload_pack.rs b/radicle/src/node/events/upload_pack.rs
deleted file mode 100644
index c9d162754..000000000
--- a/radicle/src/node/events/upload_pack.rs
+++ /dev/null
@@ -1,115 +0,0 @@
-use std::fmt;
-use std::io;
-use std::process::ExitStatus;
-
-use crate::node::NodeId;
-use crate::prelude::RepoId;
-
-/// Events that can occur when an upload-pack process is running.
-#[derive(Clone, Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
-pub enum UploadPack {
-    /// The upload-pack process finished with `status`.
-    Done {
-        /// The repository being fetched.
-        rid: RepoId,
-        /// The node being fetched from.
-        remote: NodeId,
-        /// The status code of the upload-pack process.
-        ///
-        /// N.b. `ExitStatus` can not be de/serialized, so the `Display` of the
-        /// status is used instead.
-        status: String,
-    },
-    /// The upload-pack process emitted some [`Progress`] data.
-    Write {
-        /// The repository being fetched.
-        rid: RepoId,
-        /// The node being fetched from.
-        remote: NodeId,
-        /// The progress metadata of the upload-pack.
-        progress: Progress,
-    },
-    /// An error occurred during the upload-pack process.
-    Error {
-        /// The repository being fetched.
-        rid: RepoId,
-        /// The node being fetched from.
-        remote: NodeId,
-        /// The error that occurred during the upload-pack.
-        err: String,
-    },
-    /// The upload-pack packfile transmission progress.
-    PackProgress {
-        /// The repository being fetched.
-        rid: RepoId,
-        /// The node being fetched from.
-        remote: NodeId,
-        /// The total number of bytes transmitted.
-        transmitted: usize,
-    },
-}
-
-impl UploadPack {
-    /// Construct a `UploadPack::PackProgress` event.
-    pub fn pack_progress(rid: RepoId, remote: NodeId, transmitted: usize) -> Self {
-        Self::PackProgress {
-            rid,
-            remote,
-            transmitted,
-        }
-    }
-
-    /// Construct a `UploadPack::Write` event.
-    pub fn write(rid: RepoId, remote: NodeId, progress: Progress) -> Self {
-        Self::Write {
-            rid,
-            remote,
-            progress,
-        }
-    }
-
-    /// Construct a `UploadPack::Done` event.
-    ///
-    /// If `error` is `None` the process finished successfully, otherwise it
-    /// finished with an error.
-    pub fn done(rid: RepoId, remote: NodeId, status: ExitStatus) -> Self {
-        Self::Done {
-            rid,
-            remote,
-            status: status.to_string(),
-        }
-    }
-
-    pub fn error(rid: RepoId, remote: NodeId, err: io::Error) -> Self {
-        Self::Error {
-            rid,
-            remote,
-            err: err.to_string(),
-        }
-    }
-}
-
-/// Progress updates emitted from the `git-upload-pack` process.
-#[derive(Clone, Debug, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Progress {
-    Enumerating { total: usize },
-    Counting { processed: usize, total: usize },
-    Compressing { processed: usize, total: usize },
-}
-
-impl fmt::Display for Progress {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Progress::Enumerating { total } => write!(f, "Enumerating objects: {total}"),
-            Progress::Counting { processed, total } => {
-                let percent = (processed / total) * 100;
-                write!(f, "Counting objects: {percent}% ({processed}/{total})")
-            }
-            Progress::Compressing { processed, total } => {
-                let percent = (processed / total) * 100;
-                write!(f, "Compressing objects: {percent}% ({processed}/{total})")
-            }
-        }
-    }
-}
diff --git a/radicle/src/node/features.rs b/radicle/src/node/features.rs
deleted file mode 100644
index aa0e43ad4..000000000
--- a/radicle/src/node/features.rs
+++ /dev/null
@@ -1,132 +0,0 @@
-//! Node features advertized on the network.
-use serde::{Deserialize, Serialize};
-use std::{fmt, ops};
-
-/// Advertized node features. Signals what services the node supports.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-#[serde(transparent)]
-pub struct Features(u64);
-
-impl Features {
-    /// `NONE` means no features are supported.
-    pub const NONE: Features = Features(0b00000000);
-
-    /// `SEED` is the base feature set all seed nodes must support.
-    pub const SEED: Features = Features(0b00000001);
-
-    /// Returns [`Features`] with the other features added.
-    #[must_use]
-    pub fn with(self, other: Features) -> Features {
-        Self(self.0 | other.0)
-    }
-
-    /// Returns [`Features`] without the other features.
-    #[must_use]
-    pub fn without(self, other: Features) -> Features {
-        Self(self.0 ^ other.0)
-    }
-
-    /// Check whether [`Features`] are included.
-    pub fn has(self, flags: Features) -> bool {
-        (self.0 | flags.0) == self.0
-    }
-}
-
-impl Default for Features {
-    fn default() -> Self {
-        Self::NONE
-    }
-}
-
-impl ops::Deref for Features {
-    type Target = u64;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl fmt::LowerHex for Features {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        fmt::LowerHex::fmt(&self.0, f)
-    }
-}
-
-impl fmt::UpperHex for Features {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        fmt::UpperHex::fmt(&self.0, f)
-    }
-}
-
-impl fmt::Display for Features {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        if *self == Features::NONE {
-            write!(f, "Features(NONE)")
-        } else {
-            write!(f, "Features(0x{:x})", self.0)
-        }
-    }
-}
-
-impl From<u64> for Features {
-    fn from(f: u64) -> Self {
-        Features(f)
-    }
-}
-
-impl From<Features> for u64 {
-    fn from(flags: Features) -> Self {
-        flags.0
-    }
-}
-
-impl ops::BitOr for Features {
-    type Output = Self;
-
-    fn bitor(self, rhs: Self) -> Self {
-        self.with(rhs)
-    }
-}
-
-impl ops::BitOrAssign for Features {
-    fn bitor_assign(&mut self, rhs: Self) {
-        *self = self.with(rhs);
-    }
-}
-
-impl ops::BitXor for Features {
-    type Output = Self;
-
-    fn bitxor(self, rhs: Self) -> Self {
-        self.without(rhs)
-    }
-}
-
-impl ops::BitXorAssign for Features {
-    fn bitxor_assign(&mut self, rhs: Self) {
-        *self = self.without(rhs);
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_operations() {
-        assert_eq!(Features::NONE.with(Features::SEED), Features::SEED);
-
-        assert!(!Features::from(u64::MAX)
-            .without(Features::SEED)
-            .has(Features::SEED));
-
-        assert!(Features::from(u64::MIN)
-            .with(Features::SEED)
-            .has(Features::SEED));
-
-        assert_eq!(
-            Features::NONE.with(Features::SEED).without(Features::SEED),
-            Features::NONE
-        );
-    }
-}
diff --git a/radicle/src/node/notifications.rs b/radicle/src/node/notifications.rs
deleted file mode 100644
index cbea534a4..000000000
--- a/radicle/src/node/notifications.rs
+++ /dev/null
@@ -1,129 +0,0 @@
-pub mod store;
-
-use localtime::LocalTime;
-use serde::Serialize;
-use sqlite as sql;
-use thiserror::Error;
-
-use crate::cob;
-use crate::cob::TypedId;
-use crate::git::{BranchName, Qualified};
-use crate::prelude::RepoId;
-use crate::storage::{RefUpdate, RemoteId};
-
-pub use store::{Error, Store};
-/// Read and write to the store.
-pub type StoreWriter = Store<store::Write>;
-/// Write to the store.
-pub type StoreReader = Store<store::Read>;
-
-/// Unique identifier for a notification.
-pub type NotificationId = u32;
-
-#[derive(Debug, PartialEq, Eq, Clone, Serialize)]
-pub enum NotificationStatus {
-    ReadAt(LocalTime),
-    Unread,
-}
-
-impl NotificationStatus {
-    pub fn is_read(&self) -> bool {
-        matches!(self, Self::ReadAt(_))
-    }
-}
-
-/// A notification for an updated ref.
-#[derive(Debug, PartialEq, Eq, Clone, Serialize)]
-pub struct Notification {
-    /// Unique notification ID.
-    pub id: NotificationId,
-    /// Source repository for this notification.
-    pub repo: RepoId,
-    /// Remote, if any.
-    pub remote: Option<RemoteId>,
-    /// Qualified ref name that was updated.
-    pub qualified: Qualified<'static>,
-    /// The underlying ref update.
-    pub update: RefUpdate,
-    /// Notification kind.
-    pub kind: NotificationKind,
-    /// Read status.
-    pub status: NotificationStatus,
-    /// Timestamp of the update.
-    pub timestamp: LocalTime,
-}
-
-/// Type of notification.
-#[derive(Debug, PartialEq, Eq, Clone, Serialize)]
-pub enum NotificationKind {
-    /// A COB changed.
-    Cob {
-        #[serde(flatten)]
-        typed_id: TypedId,
-    },
-    /// A source branch changed.
-    Branch { name: BranchName },
-    /// Unknown reference.
-    Unknown { refname: Qualified<'static> },
-}
-
-#[derive(Error, Debug)]
-pub enum NotificationKindError {
-    #[error("invalid cob identifier: {0}")]
-    TypedId(#[from] cob::ParseIdentifierError),
-    /// Invalid Git ref format.
-    #[error("invalid ref format: {0}")]
-    RefFormat(#[from] radicle_git_ext::ref_format::Error),
-}
-
-impl<'a> TryFrom<Qualified<'a>> for NotificationKind {
-    type Error = NotificationKindError;
-
-    fn try_from(value: Qualified) -> Result<Self, Self::Error> {
-        let kind = match TypedId::from_qualified(&value)? {
-            Some(typed_id) => Self::Cob { typed_id },
-            None => match value.non_empty_iter() {
-                ("refs", "heads", head, rest) => Self::Branch {
-                    name: [head]
-                        .into_iter()
-                        .chain(rest)
-                        .collect::<Vec<_>>()
-                        .join("/")
-                        .try_into()?,
-                },
-                _ => Self::Unknown {
-                    refname: value.to_owned(),
-                },
-            },
-        };
-        Ok(kind)
-    }
-}
-
-impl TryFrom<&sql::Value> for NotificationStatus {
-    type Error = sql::Error;
-
-    fn try_from(value: &sql::Value) -> Result<Self, Self::Error> {
-        match value {
-            sql::Value::Null => Ok(NotificationStatus::Unread),
-            sql::Value::Integer(i) => Ok(NotificationStatus::ReadAt(LocalTime::from_millis(
-                *i as u128,
-            ))),
-            _ => Err(sql::Error {
-                code: None,
-                message: Some("sql: invalid type for notification status".to_owned()),
-            }),
-        }
-    }
-}
-
-impl sql::BindableWithIndex for &NotificationStatus {
-    fn bind<I: sql::ParameterIndex>(self, stmt: &mut sql::Statement<'_>, i: I) -> sql::Result<()> {
-        match self {
-            NotificationStatus::Unread => sql::Value::Null.bind(stmt, i),
-            NotificationStatus::ReadAt(t) => {
-                sql::Value::Integer(t.as_millis() as i64).bind(stmt, i)
-            }
-        }
-    }
-}
diff --git a/radicle/src/node/notifications/schema.sql b/radicle/src/node/notifications/schema.sql
deleted file mode 100644
index 2883f8075..000000000
--- a/radicle/src/node/notifications/schema.sql
+++ /dev/null
@@ -1,38 +0,0 @@
--- Repository updates.
-create table if not exists "repository-notifications" (
-  -- Repository ID.
-  "repo"               text      not null,
-  -- Git reference name related to this update.
-  "ref"                text      not null,
-  -- Notification read status. Null if unread, otherwise the time it was read.
-  "status"             integer   default null,
-  -- Old head of the branch before update (OID or `null`).
-  "old"                text,
-  -- New head of the branch after update (OID or `null`).
-  "new"                text,
-  -- Update commit timestamp.
-  "timestamp"          integer   not null,
-  -- We only allow one notification per ref in a given repo. Newer
-  -- notifications should replace older ones.
-  unique ("repo", "ref")
-) strict;
-
--- What updates are we subscribed to.
-create table if not exists "repository-notification-interests" (
-  -- Repository ID.
-  "repo"               text      not null,
-  -- Git reference glob to set interest on.
-  -- To set interest on issues for eg., use "refs/cobs/xyz.radicle.issue/*"
-  -- To set interest on all refs, use "refs/*"
-  -- This can also be used to set interest on a specific COB or branch.
-  "glob"               text      not null,
-  -- Notification interest.
-  --
-  -- "all" - get all updates
-  -- "none" - get no updates
-  -- "relevant" - get updates if relevant to you
-  "interest"           text      not null,
-  --
-  unique ("repo", "glob", "interest")
-  --
-) strict;
diff --git a/radicle/src/node/notifications/store.rs b/radicle/src/node/notifications/store.rs
deleted file mode 100644
index ac7c37500..000000000
--- a/radicle/src/node/notifications/store.rs
+++ /dev/null
@@ -1,639 +0,0 @@
-#![allow(clippy::type_complexity)]
-use std::marker::PhantomData;
-use std::num::TryFromIntError;
-use std::path::Path;
-use std::sync::Arc;
-use std::{fmt, io, str::FromStr, time};
-
-use localtime::LocalTime;
-use sqlite as sql;
-use thiserror::Error;
-
-use crate::git;
-use crate::git::{Oid, RefError, RefString};
-use crate::prelude::RepoId;
-use crate::sql::transaction;
-use crate::storage::RefUpdate;
-
-use super::{
-    Notification, NotificationId, NotificationKind, NotificationKindError, NotificationStatus,
-};
-
-/// How long to wait for the database lock to be released before failing a read.
-const DB_READ_TIMEOUT: time::Duration = time::Duration::from_secs(3);
-/// How long to wait for the database lock to be released before failing a write.
-const DB_WRITE_TIMEOUT: time::Duration = time::Duration::from_secs(6);
-
-#[derive(Error, Debug)]
-pub enum Error {
-    /// I/O error.
-    #[error("i/o error: {0}")]
-    Io(#[from] io::Error),
-    /// An Internal error.
-    #[error("internal error: {0}")]
-    Internal(#[from] sql::Error),
-    /// Timestamp error.
-    #[error("invalid timestamp: {0}")]
-    Timestamp(#[from] TryFromIntError),
-    /// Invalid Git ref name.
-    #[error("invalid ref name: {0}")]
-    RefName(#[from] RefError),
-    /// Invalid Git ref format.
-    #[error("invalid ref format: {0}")]
-    RefFormat(#[from] git_ext::ref_format::Error),
-    /// Invalid notification kind.
-    #[error("invalid notification kind: {0}")]
-    NotificationKind(#[from] NotificationKindError),
-    /// Not found.
-    #[error("notification {0} not found")]
-    NotificationNotFound(NotificationId),
-    /// Internal unit overflow.
-    #[error("the unit overflowed")]
-    UnitOverflow,
-}
-
-/// Read-only type witness.
-#[derive(Clone)]
-pub struct Read;
-/// Read-write type witness.
-#[derive(Clone)]
-pub struct Write;
-
-/// Notifications store.
-#[derive(Clone)]
-pub struct Store<T> {
-    db: Arc<sql::ConnectionThreadSafe>,
-    marker: PhantomData<T>,
-}
-
-impl<T> fmt::Debug for Store<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "Store(..)")
-    }
-}
-
-impl Store<Read> {
-    const SCHEMA: &'static str = include_str!("schema.sql");
-
-    /// Same as [`Self::open`], but in read-only mode. This is useful to have multiple
-    /// open databases, as no locking is required.
-    pub fn reader<P: AsRef<Path>>(path: P) -> Result<Self, Error> {
-        let mut db = sql::Connection::open_thread_safe_with_flags(
-            path,
-            sqlite::OpenFlags::new().with_read_only(),
-        )?;
-        db.set_busy_timeout(DB_READ_TIMEOUT.as_millis() as usize)?;
-        db.execute(Self::SCHEMA)?;
-
-        Ok(Self {
-            db: Arc::new(db),
-            marker: PhantomData,
-        })
-    }
-
-    /// Create a new in-memory address book.
-    pub fn memory() -> Result<Self, Error> {
-        let db = sql::Connection::open_thread_safe_with_flags(
-            ":memory:",
-            sqlite::OpenFlags::new().with_read_only(),
-        )?;
-        db.execute(Self::SCHEMA)?;
-
-        Ok(Self {
-            db: Arc::new(db),
-            marker: PhantomData,
-        })
-    }
-}
-
-impl Store<Write> {
-    const SCHEMA: &'static str = include_str!("schema.sql");
-
-    /// Open a policy store at the given path. Creates a new store if it
-    /// doesn't exist.
-    pub fn open<P: AsRef<Path>>(path: P) -> Result<Self, Error> {
-        let mut db = sql::Connection::open_thread_safe(path)?;
-        db.set_busy_timeout(DB_WRITE_TIMEOUT.as_millis() as usize)?;
-        db.execute(Self::SCHEMA)?;
-
-        Ok(Self {
-            db: Arc::new(db),
-            marker: PhantomData,
-        })
-    }
-
-    /// Create a new in-memory address book.
-    pub fn memory() -> Result<Self, Error> {
-        let db = sql::Connection::open_thread_safe(":memory:")?;
-        db.execute(Self::SCHEMA)?;
-
-        Ok(Self {
-            db: Arc::new(db),
-            marker: PhantomData,
-        })
-    }
-
-    /// Get a read-only version of this store.
-    pub fn read_only(self) -> Store<Read> {
-        Store {
-            db: self.db,
-            marker: PhantomData,
-        }
-    }
-
-    /// Set notification read status for the given notifications.
-    pub fn set_status(
-        &mut self,
-        status: NotificationStatus,
-        ids: &[NotificationId],
-    ) -> Result<bool, Error> {
-        transaction(&self.db, |_| {
-            let mut stmt = self.db.prepare(
-                "UPDATE `repository-notifications`
-                 SET status = ?1
-                 WHERE rowid = ?2",
-            )?;
-            for id in ids {
-                stmt.bind((1, &status))?;
-                stmt.bind((2, *id as i64))?;
-                stmt.next()?;
-                stmt.reset()?;
-            }
-            Ok(self.db.change_count() > 0)
-        })
-    }
-
-    /// Insert a notification. Resets the status to *unread* if it already exists.
-    pub fn insert(
-        &mut self,
-        repo: &RepoId,
-        update: &RefUpdate,
-        timestamp: LocalTime,
-    ) -> Result<bool, Error> {
-        let mut stmt = self.db.prepare(
-            "INSERT INTO `repository-notifications` (repo, ref, old, new, timestamp)
-             VALUES (?1, ?2, ?3, ?4, ?5)
-             ON CONFLICT DO UPDATE
-             SET old = ?3, new = ?4, timestamp = ?5, status = null",
-        )?;
-        let old = update.old().map(|o| o.to_string());
-        let new = update.new().map(|o| o.to_string());
-
-        stmt.bind((1, repo))?;
-        stmt.bind((2, update.name().as_str()))?;
-        stmt.bind((3, old.as_deref()))?;
-        stmt.bind((4, new.as_deref()))?;
-        stmt.bind((5, i64::try_from(timestamp.as_millis())?))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count() > 0)
-    }
-
-    /// Delete the given notifications.
-    pub fn clear(&mut self, ids: &[NotificationId]) -> Result<usize, Error> {
-        transaction(&self.db, |_| {
-            let mut stmt = self
-                .db
-                .prepare("DELETE FROM `repository-notifications` WHERE rowid = ?")?;
-
-            // N.b. we need to keep the count manually since the change count
-            // will always be `1` because of each reset.
-            let mut count = 0;
-            for id in ids {
-                stmt.bind((1, *id as i64))?;
-                stmt.next()?;
-                stmt.reset()?;
-                count += self.db.change_count();
-            }
-            Ok(count)
-        })
-    }
-
-    /// Delete all notifications of a repo.
-    pub fn clear_by_repo(&mut self, repo: &RepoId) -> Result<usize, Error> {
-        let mut stmt = self
-            .db
-            .prepare("DELETE FROM `repository-notifications` WHERE repo = ?")?;
-
-        stmt.bind((1, repo))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count())
-    }
-
-    /// Delete all notifications from all repos.
-    pub fn clear_all(&mut self) -> Result<usize, Error> {
-        self.db
-            .prepare("DELETE FROM `repository-notifications`")?
-            .next()?;
-
-        Ok(self.db.change_count())
-    }
-}
-
-/// `Read` methods for `Store`. This implies that a
-/// `Store<Write>` can access these functions as well.
-impl<T> Store<T> {
-    /// Get a specific notification.
-    pub fn get(&self, id: NotificationId) -> Result<Notification, Error> {
-        let mut stmt = self.db.prepare(
-            "SELECT rowid, repo, ref, old, new, status, timestamp
-             FROM `repository-notifications`
-             WHERE rowid = ?",
-        )?;
-        stmt.bind((1, id as i64))?;
-
-        if let Some(Ok(row)) = stmt.into_iter().next() {
-            return parse::notification(row);
-        }
-        Err(Error::NotificationNotFound(id))
-    }
-
-    /// Get all notifications.
-    pub fn all(&self) -> Result<impl Iterator<Item = Result<Notification, Error>> + '_, Error> {
-        let stmt = self.db.prepare(
-            "SELECT rowid, repo, ref, old, new, status, timestamp
-             FROM `repository-notifications`
-             ORDER BY timestamp DESC",
-        )?;
-
-        Ok(stmt.into_iter().map(move |row| {
-            let row = row?;
-            parse::notification(row)
-        }))
-    }
-
-    // Get notifications that were created between the given times: `since <= t < until`.
-    pub fn by_timestamp(
-        &self,
-        since: LocalTime,
-        until: LocalTime,
-    ) -> Result<impl Iterator<Item = Result<Notification, Error>> + '_, Error> {
-        let mut stmt = self.db.prepare(
-            "SELECT rowid, repo, ref, old, new, status, timestamp
-             FROM `repository-notifications`
-             WHERE timestamp >= ?1 AND timestamp < ?2
-             ORDER BY timestamp",
-        )?;
-        let since = i64::try_from(since.as_millis())?;
-        let until = i64::try_from(until.as_millis())?;
-
-        stmt.bind((1, since))?;
-        stmt.bind((2, until))?;
-
-        Ok(stmt.into_iter().map(move |row| {
-            let row = row?;
-            parse::notification(row)
-        }))
-    }
-
-    /// Get notifications by repo.
-    pub fn by_repo(
-        &self,
-        repo: &RepoId,
-        order_by: &str,
-    ) -> Result<impl Iterator<Item = Result<Notification, Error>> + '_, Error> {
-        let mut stmt = self.db.prepare(format!(
-            "SELECT rowid, repo, ref, old, new, status, timestamp
-             FROM `repository-notifications`
-             WHERE repo = ?
-             ORDER BY {order_by} DESC",
-        ))?;
-        stmt.bind((1, repo))?;
-
-        Ok(stmt.into_iter().map(move |row| {
-            let row = row?;
-            parse::notification(row)
-        }))
-    }
-
-    /// Get the total notification count.
-    pub fn count(&self) -> Result<usize, Error> {
-        let stmt = self
-            .db
-            .prepare("SELECT COUNT(*) FROM `repository-notifications`")?;
-
-        let count: i64 = stmt
-            .into_iter()
-            .next()
-            .expect("COUNT will always return a single row")?
-            .read(0);
-        let count: usize = count.try_into().map_err(|_| Error::UnitOverflow)?;
-
-        Ok(count)
-    }
-
-    /// Get the notification for the given repo.
-    pub fn count_by_repo(&self, repo: &RepoId) -> Result<usize, Error> {
-        let mut stmt = self
-            .db
-            .prepare("SELECT COUNT(*) FROM `repository-notifications` WHERE repo = ?")?;
-
-        stmt.bind((1, repo))?;
-
-        let count: i64 = stmt
-            .into_iter()
-            .next()
-            .expect("COUNT will always return a single row")?
-            .read(0);
-        let count: usize = count.try_into().map_err(|_| Error::UnitOverflow)?;
-
-        Ok(count)
-    }
-}
-
-mod parse {
-    use super::*;
-
-    pub fn notification(row: sql::Row) -> Result<Notification, Error> {
-        let id = row.try_read::<i64, _>("rowid")? as NotificationId;
-        let repo = row.try_read::<RepoId, _>("repo")?;
-        let refstr = row.try_read::<&str, _>("ref")?;
-        let status = row.try_read::<NotificationStatus, _>("status")?;
-        let old = row
-            .try_read::<Option<&str>, _>("old")?
-            .map(|oid| {
-                Oid::from_str(oid).map_err(|e| {
-                    Error::Internal(sql::Error {
-                        code: None,
-                        message: Some(format!("sql: invalid oid in `old` column: {oid:?}: {e}")),
-                    })
-                })
-            })
-            .unwrap_or(Ok(git::raw::Oid::zero().into()))?;
-        let new = row
-            .try_read::<Option<&str>, _>("new")?
-            .map(|oid| {
-                Oid::from_str(oid).map_err(|e| {
-                    Error::Internal(sql::Error {
-                        code: None,
-                        message: Some(format!("sql: invalid oid in `new` column: {oid:?}: {e}")),
-                    })
-                })
-            })
-            .unwrap_or(Ok(git::raw::Oid::zero().into()))?;
-        let update = RefUpdate::from(RefString::try_from(refstr)?, old, new);
-        let (namespace, qualified) = git::parse_ref(refstr)?;
-        let timestamp = row.try_read::<i64, _>("timestamp")?;
-        let timestamp = LocalTime::from_millis(timestamp as u128);
-        let qualified = qualified.to_owned();
-        let kind = NotificationKind::try_from(qualified.clone())?;
-
-        Ok(Notification {
-            id,
-            repo,
-            update,
-            remote: namespace,
-            qualified,
-            status,
-            kind,
-            timestamp,
-        })
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use radicle_git_ext::ref_format::{qualified, refname};
-
-    use super::*;
-    use crate::{cob, node::NodeId, test::arbitrary};
-
-    #[test]
-    fn test_clear() {
-        let mut db = Store::open(":memory:").unwrap();
-        let repo = arbitrary::gen::<RepoId>(1);
-        let old = arbitrary::oid();
-        let time = LocalTime::from_millis(32188142);
-        let master = arbitrary::oid();
-
-        for i in 0..3 {
-            let update = RefUpdate::Updated {
-                name: format!("refs/heads/feature/{i}").try_into().unwrap(),
-                old,
-                new: master,
-            };
-            assert!(db.insert(&repo, &update, time).unwrap());
-        }
-        assert_eq!(db.count().unwrap(), 3);
-        assert_eq!(db.count_by_repo(&repo).unwrap(), 3);
-        db.clear_by_repo(&repo).unwrap();
-        assert_eq!(db.count().unwrap(), 0);
-        assert_eq!(db.count_by_repo(&repo).unwrap(), 0);
-    }
-
-    #[test]
-    fn test_branch_notifications() {
-        let repo = arbitrary::gen::<RepoId>(1);
-        let old = arbitrary::oid();
-        let master = arbitrary::oid();
-        let other = arbitrary::oid();
-        let time1 = LocalTime::from_millis(32188142);
-        let time2 = LocalTime::from_millis(32189874);
-        let time3 = LocalTime::from_millis(32189879);
-        let mut db = Store::open(":memory:").unwrap();
-
-        let update1 = RefUpdate::Updated {
-            name: refname!("refs/heads/master"),
-            old,
-            new: master,
-        };
-        let update2 = RefUpdate::Created {
-            name: refname!("refs/heads/other"),
-            oid: other,
-        };
-        let update3 = RefUpdate::Deleted {
-            name: refname!("refs/heads/dev"),
-            oid: other,
-        };
-        assert!(db.insert(&repo, &update1, time1).unwrap());
-        assert!(db.insert(&repo, &update2, time2).unwrap());
-        assert!(db.insert(&repo, &update3, time3).unwrap());
-
-        let mut notifs = db.by_repo(&repo, "timestamp").unwrap();
-
-        assert_eq!(
-            notifs.next().unwrap().unwrap(),
-            Notification {
-                id: 3,
-                repo,
-                remote: None,
-                qualified: qualified!("refs/heads/dev"),
-                update: update3,
-                kind: NotificationKind::Branch {
-                    name: refname!("dev")
-                },
-                status: NotificationStatus::Unread,
-                timestamp: time3,
-            }
-        );
-        assert_eq!(
-            notifs.next().unwrap().unwrap(),
-            Notification {
-                id: 2,
-                repo,
-                remote: None,
-                qualified: qualified!("refs/heads/other"),
-                update: update2,
-                kind: NotificationKind::Branch {
-                    name: refname!("other")
-                },
-                status: NotificationStatus::Unread,
-                timestamp: time2,
-            }
-        );
-        assert_eq!(
-            notifs.next().unwrap().unwrap(),
-            Notification {
-                id: 1,
-                repo,
-                remote: None,
-                qualified: qualified!("refs/heads/master"),
-                update: update1,
-                kind: NotificationKind::Branch {
-                    name: refname!("master")
-                },
-                status: NotificationStatus::Unread,
-                timestamp: time1,
-            }
-        );
-        assert!(notifs.next().is_none());
-    }
-
-    #[test]
-    fn test_notification_status() {
-        let repo = arbitrary::gen::<RepoId>(1);
-        let oid = arbitrary::oid();
-        let time = LocalTime::from_millis(32188142);
-        let mut db = Store::open(":memory:").unwrap();
-
-        let update1 = RefUpdate::Created {
-            name: refname!("refs/heads/feature/1"),
-            oid,
-        };
-        let update2 = RefUpdate::Created {
-            name: refname!("refs/heads/feature/2"),
-            oid,
-        };
-        let update3 = RefUpdate::Created {
-            name: refname!("refs/heads/feature/3"),
-            oid,
-        };
-        assert!(db.insert(&repo, &update1, time).unwrap());
-        assert!(db.insert(&repo, &update2, time).unwrap());
-        assert!(db.insert(&repo, &update3, time).unwrap());
-        assert!(db
-            .set_status(NotificationStatus::ReadAt(time), &[1, 2, 3])
-            .unwrap());
-
-        let mut notifs = db.by_repo(&repo, "timestamp").unwrap();
-
-        assert_eq!(
-            notifs.next().unwrap().unwrap().status,
-            NotificationStatus::ReadAt(time),
-        );
-        assert_eq!(
-            notifs.next().unwrap().unwrap().status,
-            NotificationStatus::ReadAt(time),
-        );
-        assert_eq!(
-            notifs.next().unwrap().unwrap().status,
-            NotificationStatus::ReadAt(time),
-        );
-    }
-
-    #[test]
-    fn test_duplicate_notifications() {
-        let repo = arbitrary::gen::<RepoId>(1);
-        let old = arbitrary::oid();
-        let master1 = arbitrary::oid();
-        let master2 = arbitrary::oid();
-        let time1 = LocalTime::from_millis(32188142);
-        let time2 = LocalTime::from_millis(32189874);
-        let mut db = Store::open(":memory:").unwrap();
-
-        let update1 = RefUpdate::Updated {
-            name: refname!("refs/heads/master"),
-            old,
-            new: master1,
-        };
-        let update2 = RefUpdate::Updated {
-            name: refname!("refs/heads/master"),
-            old: master1,
-            new: master2,
-        };
-        assert!(db.insert(&repo, &update1, time1).unwrap());
-        assert!(db
-            .set_status(NotificationStatus::ReadAt(time1), &[1])
-            .unwrap());
-        assert!(db.insert(&repo, &update2, time2).unwrap());
-
-        let mut notifs = db.by_repo(&repo, "timestamp").unwrap();
-
-        assert_eq!(
-            notifs.next().unwrap().unwrap(),
-            Notification {
-                id: 1,
-                repo,
-                remote: None,
-                qualified: qualified!("refs/heads/master"),
-                update: update2,
-                kind: NotificationKind::Branch {
-                    name: refname!("master")
-                },
-                // Status is reset to "unread".
-                status: NotificationStatus::Unread,
-                timestamp: time2,
-            }
-        );
-        assert!(notifs.next().is_none());
-    }
-
-    #[test]
-    fn test_cob_notifications() {
-        let repo = arbitrary::gen::<RepoId>(1);
-        let old = arbitrary::oid();
-        let new = arbitrary::oid();
-        let timestamp = LocalTime::from_millis(32189874);
-        let nid: NodeId = "z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
-            .parse()
-            .unwrap();
-        let mut db = Store::open(":memory:").unwrap();
-        let qualified =
-            qualified!("refs/cobs/xyz.radicle.issue/d87dcfe8c2b3200e78b128d9b959cfdf7063fefe");
-        let namespaced = qualified.with_namespace((&nid).into());
-        let update = RefUpdate::Updated {
-            name: namespaced.to_ref_string(),
-            old,
-            new,
-        };
-
-        assert!(db.insert(&repo, &update, timestamp).unwrap());
-
-        let mut notifs = db.by_repo(&repo, "timestamp").unwrap();
-
-        assert_eq!(
-            notifs.next().unwrap().unwrap(),
-            Notification {
-                id: 1,
-                repo,
-                remote: Some(
-                    "z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
-                        .parse()
-                        .unwrap()
-                ),
-                qualified,
-                update,
-                kind: NotificationKind::Cob {
-                    typed_id: cob::TypedId {
-                        type_name: cob::issue::TYPENAME.clone(),
-                        id: "d87dcfe8c2b3200e78b128d9b959cfdf7063fefe".parse().unwrap(),
-                    },
-                },
-                status: NotificationStatus::Unread,
-                timestamp,
-            }
-        );
-        assert!(notifs.next().is_none());
-    }
-}
diff --git a/radicle/src/node/policy.rs b/radicle/src/node/policy.rs
deleted file mode 100644
index 8a1288167..000000000
--- a/radicle/src/node/policy.rs
+++ /dev/null
@@ -1,226 +0,0 @@
-pub mod config;
-pub mod store;
-
-use std::fmt;
-use std::str::FromStr;
-
-use serde::{Deserialize, Serialize};
-use thiserror::Error;
-
-use crate::prelude::RepoId;
-
-pub use super::{Alias, NodeId};
-
-/// Repository seeding policy.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct SeedPolicy {
-    pub rid: RepoId,
-    pub policy: SeedingPolicy,
-}
-
-impl std::ops::Deref for SeedPolicy {
-    type Target = SeedingPolicy;
-
-    fn deref(&self) -> &Self::Target {
-        &self.policy
-    }
-}
-
-/// Node following policy.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-pub struct FollowPolicy {
-    pub nid: NodeId,
-    pub alias: Option<Alias>,
-    pub policy: Policy,
-}
-
-/// Seeding policy of a node or repo.
-#[derive(Debug, Copy, Clone, Default, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase", tag = "policy")]
-pub enum SeedingPolicy {
-    /// Allow seeding.
-    Allow {
-        /// Seeding scope.
-        #[serde(default)]
-        scope: Scope,
-    },
-    /// Block seeding.
-    #[default]
-    Block,
-}
-
-impl SeedingPolicy {
-    /// Is this an "allow" policy.
-    pub fn is_allow(&self) -> bool {
-        matches!(self, Self::Allow { .. })
-    }
-
-    /// Is this a "block" policy.
-    pub fn is_block(&self) -> bool {
-        !self.is_allow()
-    }
-
-    /// Scope, if any.
-    pub fn scope(&self) -> Option<Scope> {
-        match self {
-            Self::Allow { scope } => Some(*scope),
-            Self::Block => None,
-        }
-    }
-}
-
-impl From<SeedingPolicy> for Policy {
-    fn from(p: SeedingPolicy) -> Self {
-        match p {
-            SeedingPolicy::Block => Policy::Block,
-            SeedingPolicy::Allow { .. } => Policy::Allow,
-        }
-    }
-}
-
-impl std::fmt::Display for SeedingPolicy {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "{} ({})",
-            Policy::from(*self),
-            self.scope().unwrap_or_default()
-        )
-    }
-}
-
-/// Resource policy.
-#[derive(Default, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Policy {
-    /// The resource is allowed.
-    Allow,
-    /// The resource is blocked.
-    #[default]
-    Block,
-}
-
-impl fmt::Display for Policy {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Allow => write!(f, "allow"),
-            Self::Block => write!(f, "block"),
-        }
-    }
-}
-
-impl FromStr for Policy {
-    type Err = String;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
-            "allow" => Ok(Self::Allow),
-            "block" => Ok(Self::Block),
-            _ => Err(s.to_owned()),
-        }
-    }
-}
-
-impl sqlite::BindableWithIndex for Policy {
-    fn bind<I: sqlite::ParameterIndex>(
-        self,
-        stmt: &mut sqlite::Statement<'_>,
-        i: I,
-    ) -> sqlite::Result<()> {
-        match self {
-            Self::Allow => "allow",
-            Self::Block => "block",
-        }
-        .bind(stmt, i)
-    }
-}
-
-impl TryFrom<&sqlite::Value> for Policy {
-    type Error = sqlite::Error;
-
-    fn try_from(value: &sqlite::Value) -> Result<Self, Self::Error> {
-        let message = Some("sql: invalid policy value".to_owned());
-
-        match value {
-            sqlite::Value::String(s) if s == "allow" => Ok(Policy::Allow),
-            sqlite::Value::String(s) if s == "block" => Ok(Policy::Block),
-            sqlite::Value::String(s) => Err(sqlite::Error {
-                code: None,
-                message: Some(format!("sql: invalid policy '{s}'")),
-            }),
-            _ => Err(sqlite::Error {
-                code: None,
-                message,
-            }),
-        }
-    }
-}
-
-/// Follow scope of a seeded repository.
-#[derive(Default, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Scope {
-    /// Seed remotes that are explicitly followed.
-    Followed,
-    /// Seed all remotes.
-    #[default]
-    All,
-}
-
-impl fmt::Display for Scope {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Scope::Followed => f.write_str("followed"),
-            Scope::All => f.write_str("all"),
-        }
-    }
-}
-
-#[derive(Debug, Error)]
-#[error("invalid seeding scope: {0:?}")]
-pub struct ParseScopeError(String);
-
-impl FromStr for Scope {
-    type Err = ParseScopeError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s {
-            "followed" => Ok(Self::Followed),
-            "all" => Ok(Self::All),
-            _ => Err(ParseScopeError(s.to_string())),
-        }
-    }
-}
-
-impl sqlite::BindableWithIndex for Scope {
-    fn bind<I: sqlite::ParameterIndex>(
-        self,
-        stmt: &mut sqlite::Statement<'_>,
-        i: I,
-    ) -> sqlite::Result<()> {
-        let s = match self {
-            Self::Followed => "followed",
-            Self::All => "all",
-        };
-        s.bind(stmt, i)
-    }
-}
-
-impl TryFrom<&sqlite::Value> for Scope {
-    type Error = sqlite::Error;
-
-    fn try_from(value: &sqlite::Value) -> Result<Self, Self::Error> {
-        let message = Some("invalid remote scope".to_owned());
-
-        match value {
-            sqlite::Value::String(scope) => Scope::from_str(scope).map_err(|_| sqlite::Error {
-                code: None,
-                message,
-            }),
-            _ => Err(sqlite::Error {
-                code: None,
-                message,
-            }),
-        }
-    }
-}
diff --git a/radicle/src/node/policy/config.rs b/radicle/src/node/policy/config.rs
deleted file mode 100644
index 7a34a90e6..000000000
--- a/radicle/src/node/policy/config.rs
+++ /dev/null
@@ -1,145 +0,0 @@
-use core::fmt;
-use std::collections::HashSet;
-use std::ops;
-
-use log::error;
-use thiserror::Error;
-
-use crate::crypto::PublicKey;
-use crate::prelude::RepoId;
-use crate::storage::{Namespaces, ReadRepository as _, ReadStorage, RepositoryError};
-
-pub use crate::node::policy::store;
-pub use crate::node::policy::store::Error;
-pub use crate::node::policy::store::Store;
-pub use crate::node::policy::{Alias, FollowPolicy, Policy, Scope, SeedPolicy, SeedingPolicy};
-
-#[derive(Debug, Error)]
-pub enum NamespacesError {
-    #[error("failed to find policy for {rid}")]
-    FailedPolicy {
-        rid: RepoId,
-        #[source]
-        err: Error,
-    },
-    #[error("cannot fetch {rid} as it is not seeded")]
-    BlockedPolicy { rid: RepoId },
-    #[error("failed to get node policies for {rid}")]
-    FailedNodes {
-        rid: RepoId,
-        #[source]
-        err: Error,
-    },
-    #[error("failed to get delegates for {rid}")]
-    FailedDelegates {
-        rid: RepoId,
-        #[source]
-        err: RepositoryError,
-    },
-    #[error(transparent)]
-    Git(#[from] crate::git::raw::Error),
-    #[error("could not find any followed nodes for {rid}")]
-    NoFollowed { rid: RepoId },
-}
-
-/// Policies configuration.
-pub struct Config<T> {
-    /// Default policy, if a policy for a specific node or repository was not found.
-    policy: SeedingPolicy,
-    /// Underlying configuration store.
-    store: Store<T>,
-}
-
-// N.b. deriving `Debug` will require `T: Debug` so we manually
-// implement it here.
-impl<T> fmt::Debug for Config<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Config")
-            .field("policy", &self.policy)
-            .field("store", &self.store)
-            .finish()
-    }
-}
-
-impl<T> Config<T> {
-    /// Create a new policy configuration.
-    pub fn new(policy: SeedingPolicy, store: Store<T>) -> Self {
-        Self { policy, store }
-    }
-
-    /// Check if a repository is seeded.
-    pub fn is_seeding(&self, rid: &RepoId) -> Result<bool, Error> {
-        self.seed_policy(rid).map(|entry| entry.policy.is_allow())
-    }
-
-    /// Get a repository's seeding information.
-    /// Returns the default policy if the repo isn't found.
-    pub fn seed_policy(&self, rid: &RepoId) -> Result<SeedPolicy, Error> {
-        Ok(self.store.seed_policy(rid)?.unwrap_or(SeedPolicy {
-            rid: *rid,
-            policy: self.policy,
-        }))
-    }
-
-    pub fn namespaces_for<S>(
-        &self,
-        storage: &S,
-        rid: &RepoId,
-    ) -> Result<Namespaces, NamespacesError>
-    where
-        S: ReadStorage,
-    {
-        use NamespacesError::*;
-
-        let entry = self
-            .seed_policy(rid)
-            .map_err(|err| FailedPolicy { rid: *rid, err })?;
-        match entry.policy {
-            SeedingPolicy::Block => {
-                error!(target: "service", "Attempted to fetch untracked repo {rid}");
-                Err(NamespacesError::BlockedPolicy { rid: *rid })
-            }
-            SeedingPolicy::Allow { scope: Scope::All } => Ok(Namespaces::All),
-            SeedingPolicy::Allow {
-                scope: Scope::Followed,
-            } => {
-                let nodes = self
-                    .follow_policies()
-                    .map_err(|err| FailedNodes { rid: *rid, err })?;
-                let mut followed: HashSet<_> = nodes
-                    .filter_map(|node| (node.policy == Policy::Allow).then_some(node.nid))
-                    .collect();
-
-                if let Ok(repo) = storage.repository(*rid) {
-                    let delegates = repo
-                        .delegates()
-                        .map_err(|err| FailedDelegates { rid: *rid, err })?
-                        .map(PublicKey::from);
-                    followed.extend(delegates);
-                };
-                if followed.is_empty() {
-                    // Nb. returning All here because the
-                    // fetching logic will correctly determine
-                    // followed and delegate remotes.
-                    Ok(Namespaces::All)
-                } else {
-                    Ok(Namespaces::Followed(followed))
-                }
-            }
-        }
-    }
-}
-
-impl<T> ops::Deref for Config<T> {
-    type Target = Store<T>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.store
-    }
-}
-
-impl<T> ops::DerefMut for Config<T> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.store
-    }
-}
diff --git a/radicle/src/node/policy/schema.sql b/radicle/src/node/policy/schema.sql
deleted file mode 100644
index 72d5ed04c..000000000
--- a/radicle/src/node/policy/schema.sql
+++ /dev/null
@@ -1,31 +0,0 @@
---
--- Node policy database.
---
-
--- Node follow policies.
-create table if not exists "following" (
-  -- Node ID.
-  "id"                 text      primary key not null,
-  -- Node alias. May override the alias announced by the node.
-  "alias"              text      default '',
-  -- Tracking policy for this node.
-  "policy"             text      default 'allow'
-  --
-) strict;
-
--- Repository seeding policies.
-create table if not exists "seeding" (
-  -- Repository ID.
-  "id"                 text      primary key not null,
-  -- Tracking scope for this repository.
-  --
-  -- Valid values are:
-  --
-  -- "followed"        seed repository delegates and remotes in the `following` table.
-  -- "all"             seed all remotes.
-  --
-  "scope"              text      default 'followed',
-  -- Tracking policy for this repository.
-  "policy"             text      default 'allow'
-  --
-) strict;
diff --git a/radicle/src/node/policy/store.rs b/radicle/src/node/policy/store.rs
deleted file mode 100644
index 4ef9f78e3..000000000
--- a/radicle/src/node/policy/store.rs
+++ /dev/null
@@ -1,480 +0,0 @@
-#![allow(clippy::type_complexity)]
-use std::marker::PhantomData;
-use std::path::Path;
-use std::{fmt, io, ops::Not as _, str::FromStr, time};
-
-use sqlite as sql;
-use thiserror::Error;
-
-use crate::node::{Alias, AliasStore};
-use crate::prelude::{NodeId, RepoId};
-
-use super::{FollowPolicy, Policy, Scope, SeedPolicy, SeedingPolicy};
-
-/// How long to wait for the database lock to be released before failing a read.
-const DB_READ_TIMEOUT: time::Duration = time::Duration::from_secs(3);
-/// How long to wait for the database lock to be released before failing a write.
-const DB_WRITE_TIMEOUT: time::Duration = time::Duration::from_secs(6);
-
-#[derive(Error, Debug)]
-pub enum Error {
-    /// I/O error.
-    #[error("i/o error: {0}")]
-    Io(#[from] io::Error),
-    /// An Internal error.
-    #[error("internal error: {0}")]
-    Internal(#[from] sql::Error),
-}
-
-/// Read-only type witness.
-pub struct Read;
-/// Read-write type witness.
-pub struct Write;
-
-/// Read only config.
-pub type StoreReader = Store<Read>;
-/// Read-write config.
-pub type StoreWriter = Store<Write>;
-
-/// Policy configuration.
-pub struct Store<T> {
-    db: sql::Connection,
-    _marker: PhantomData<T>,
-}
-
-impl<T> fmt::Debug for Store<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "Store(..)")
-    }
-}
-
-impl Store<Read> {
-    const SCHEMA: &'static str = include_str!("schema.sql");
-
-    /// Same as [`Self::open`], but in read-only mode. This is useful to have multiple
-    /// open databases, as no locking is required.
-    pub fn reader<P: AsRef<Path>>(path: P) -> Result<Self, Error> {
-        let mut db =
-            sql::Connection::open_with_flags(path, sqlite::OpenFlags::new().with_read_only())?;
-        db.set_busy_timeout(DB_READ_TIMEOUT.as_millis() as usize)?;
-        db.execute(Self::SCHEMA)?;
-
-        Ok(Self {
-            db,
-            _marker: PhantomData,
-        })
-    }
-
-    /// Create a new in-memory address book.
-    pub fn memory() -> Result<Self, Error> {
-        let db = sql::Connection::open_with_flags(
-            ":memory:",
-            sqlite::OpenFlags::new().with_read_only(),
-        )?;
-        db.execute(Self::SCHEMA)?;
-
-        Ok(Self {
-            db,
-            _marker: PhantomData,
-        })
-    }
-}
-
-impl Store<Write> {
-    const SCHEMA: &'static str = include_str!("schema.sql");
-
-    /// Open a policy store at the given path. Creates a new store if it
-    /// doesn't exist.
-    pub fn open<P: AsRef<Path>>(path: P) -> Result<Self, Error> {
-        let mut db = sql::Connection::open(path)?;
-        db.set_busy_timeout(DB_WRITE_TIMEOUT.as_millis() as usize)?;
-        db.execute(Self::SCHEMA)?;
-
-        Ok(Self {
-            db,
-            _marker: PhantomData,
-        })
-    }
-
-    /// Create a new in-memory address book.
-    pub fn memory() -> Result<Self, Error> {
-        let db = sql::Connection::open(":memory:")?;
-        db.execute(Self::SCHEMA)?;
-
-        Ok(Self {
-            db,
-            _marker: PhantomData,
-        })
-    }
-
-    /// Get a read-only version of this store.
-    pub fn read_only(self) -> StoreReader {
-        Store {
-            db: self.db,
-            _marker: PhantomData,
-        }
-    }
-
-    /// Follow a node.
-    pub fn follow(&mut self, id: &NodeId, alias: Option<&str>) -> Result<bool, Error> {
-        let mut stmt = self.db.prepare(
-            "INSERT INTO `following` (id, alias)
-             VALUES (?1, ?2)
-             ON CONFLICT DO UPDATE
-             SET alias = ?2 WHERE alias != ?2",
-        )?;
-
-        stmt.bind((1, id))?;
-        stmt.bind((2, alias.unwrap_or_default()))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count() > 0)
-    }
-
-    /// Seed a repository.
-    pub fn seed(&mut self, id: &RepoId, scope: Scope) -> Result<bool, Error> {
-        let mut stmt = self.db.prepare(
-            "INSERT INTO `seeding` (id, scope)
-             VALUES (?1, ?2)
-             ON CONFLICT DO UPDATE
-             SET scope = ?2 WHERE scope != ?2",
-        )?;
-
-        stmt.bind((1, id))?;
-        stmt.bind((2, scope))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count() > 0)
-    }
-
-    /// Set a node's follow policy.
-    pub fn set_follow_policy(&mut self, id: &NodeId, policy: Policy) -> Result<bool, Error> {
-        let mut stmt = self.db.prepare(
-            "INSERT INTO `following` (id, policy)
-             VALUES (?1, ?2)
-             ON CONFLICT DO UPDATE
-             SET policy = ?2 WHERE policy != ?2",
-        )?;
-
-        stmt.bind((1, id))?;
-        stmt.bind((2, policy))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count() > 0)
-    }
-
-    /// Set a repository's seeding policy.
-    pub fn set_seed_policy(&mut self, id: &RepoId, policy: Policy) -> Result<bool, Error> {
-        let mut stmt = self.db.prepare(
-            "INSERT INTO `seeding` (id, policy)
-             VALUES (?1, ?2)
-             ON CONFLICT DO UPDATE
-             SET policy = ?2 WHERE policy != ?2",
-        )?;
-
-        stmt.bind((1, id))?;
-        stmt.bind((2, policy))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count() > 0)
-    }
-
-    /// Unfollow a node.
-    pub fn unfollow(&mut self, id: &NodeId) -> Result<bool, Error> {
-        let mut stmt = self.db.prepare("DELETE FROM `following` WHERE id = ?")?;
-
-        stmt.bind((1, id))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count() > 0)
-    }
-
-    /// Unseed a repository.
-    pub fn unseed(&mut self, id: &RepoId) -> Result<bool, Error> {
-        let mut stmt = self.db.prepare("DELETE FROM `seeding` WHERE id = ?")?;
-
-        stmt.bind((1, id))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count() > 0)
-    }
-
-    /// Unblock a repository.
-    pub fn unblock_rid(&mut self, id: &RepoId) -> Result<bool, Error> {
-        let mut stmt = self
-            .db
-            .prepare("DELETE FROM `seeding` WHERE id = ? AND policy = 'block'")?;
-
-        stmt.bind((1, id))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count() > 0)
-    }
-
-    /// Unblock a remote.
-    pub fn unblock_nid(&mut self, id: &NodeId) -> Result<bool, Error> {
-        let mut stmt = self
-            .db
-            .prepare("DELETE FROM `following` WHERE id = ? AND policy = 'block'")?;
-
-        stmt.bind((1, id))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count() > 0)
-    }
-}
-
-/// `Read` methods for `Config`. This implies that a
-/// `Config<Write>` can access these functions as well.
-impl<T> Store<T> {
-    /// Check if a node is followed.
-    pub fn is_following(&self, id: &NodeId) -> Result<bool, Error> {
-        Ok(matches!(
-            self.follow_policy(id)?,
-            Some(FollowPolicy {
-                policy: Policy::Allow,
-                ..
-            })
-        ))
-    }
-
-    /// Check if a repository is seeded.
-    pub fn is_seeding(&self, id: &RepoId) -> Result<bool, Error> {
-        Ok(matches!(
-            self.seed_policy(id)?,
-            Some(SeedPolicy { policy, .. })
-            if policy.is_allow()
-        ))
-    }
-
-    /// Get a node's follow policy.
-    pub fn follow_policy(&self, id: &NodeId) -> Result<Option<FollowPolicy>, Error> {
-        let mut stmt = self
-            .db
-            .prepare("SELECT alias, policy FROM `following` WHERE id = ?")?;
-
-        stmt.bind((1, id))?;
-
-        if let Some(Ok(row)) = stmt.into_iter().next() {
-            let alias = row.read::<&str, _>("alias");
-            let alias = alias
-                .is_empty()
-                .not()
-                .then_some(alias.to_owned())
-                .and_then(|s| Alias::from_str(&s).ok());
-            let policy = row.read::<Policy, _>("policy");
-
-            return Ok(Some(FollowPolicy {
-                nid: *id,
-                alias,
-                policy,
-            }));
-        }
-        Ok(None)
-    }
-
-    /// Get a repository's seeding policy.
-    pub fn seed_policy(&self, id: &RepoId) -> Result<Option<SeedPolicy>, Error> {
-        let mut stmt = self
-            .db
-            .prepare("SELECT scope, policy FROM `seeding` WHERE id = ?")?;
-
-        stmt.bind((1, id))?;
-
-        if let Some(Ok(row)) = stmt.into_iter().next() {
-            let policy = match row.read::<Policy, _>("policy") {
-                Policy::Allow => SeedingPolicy::Allow {
-                    scope: row.read::<Scope, _>("scope"),
-                },
-                Policy::Block => SeedingPolicy::Block,
-            };
-            return Ok(Some(SeedPolicy { rid: *id, policy }));
-        }
-        Ok(None)
-    }
-
-    /// Get node follow policies.
-    pub fn follow_policies(&self) -> Result<Box<dyn Iterator<Item = FollowPolicy>>, Error> {
-        let mut stmt = self
-            .db
-            .prepare("SELECT id, alias, policy FROM `following`")?
-            .into_iter();
-        let mut entries = Vec::new();
-
-        while let Some(Ok(row)) = stmt.next() {
-            let id = row.read("id");
-            let alias = row.read::<&str, _>("alias").to_owned();
-            let alias = alias
-                .is_empty()
-                .not()
-                .then_some(alias.to_owned())
-                .and_then(|s| Alias::from_str(&s).ok());
-            let policy = row.read::<Policy, _>("policy");
-
-            entries.push(FollowPolicy {
-                nid: id,
-                alias,
-                policy,
-            });
-        }
-        Ok(Box::new(entries.into_iter()))
-    }
-
-    // TODO: see if sql can return iterator directly
-    /// Get repository seed policies.
-    pub fn seed_policies(&self) -> Result<Box<dyn Iterator<Item = SeedPolicy>>, Error> {
-        let mut stmt = self
-            .db
-            .prepare("SELECT id, scope, policy FROM `seeding`")?
-            .into_iter();
-        let mut entries = Vec::new();
-
-        while let Some(Ok(row)) = stmt.next() {
-            let id = row.read("id");
-            let policy = match row.read::<Policy, _>("policy") {
-                Policy::Allow => SeedingPolicy::Allow {
-                    scope: row.read::<Scope, _>("scope"),
-                },
-                Policy::Block => SeedingPolicy::Block,
-            };
-            entries.push(SeedPolicy { rid: id, policy });
-        }
-        Ok(Box::new(entries.into_iter()))
-    }
-}
-
-impl<T> AliasStore for Store<T> {
-    /// Retrieve `alias` of given node.
-    /// Calls `Self::node_policy` under the hood.
-    fn alias(&self, nid: &NodeId) -> Option<Alias> {
-        self.follow_policy(nid)
-            .map(|node| node.and_then(|n| n.alias))
-            .unwrap_or(None)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::assert_matches;
-
-    use super::*;
-    use crate::test::arbitrary;
-
-    #[test]
-    fn test_follow_and_unfollow_node() {
-        let id = arbitrary::gen::<NodeId>(1);
-        let mut db = Store::open(":memory:").unwrap();
-
-        assert!(db.follow(&id, Some("eve")).unwrap());
-        assert!(db.is_following(&id).unwrap());
-        assert!(!db.follow(&id, Some("eve")).unwrap());
-        assert!(db.unfollow(&id).unwrap());
-        assert!(!db.is_following(&id).unwrap());
-    }
-
-    #[test]
-    fn test_seed_and_unseed_repo() {
-        let id = arbitrary::gen::<RepoId>(1);
-        let mut db = Store::open(":memory:").unwrap();
-
-        assert!(db.seed(&id, Scope::All).unwrap());
-        assert!(db.is_seeding(&id).unwrap());
-        assert!(!db.seed(&id, Scope::All).unwrap());
-        assert!(db.unseed(&id).unwrap());
-        assert!(!db.is_seeding(&id).unwrap());
-    }
-
-    #[test]
-    fn test_node_policies() {
-        let ids = arbitrary::vec::<NodeId>(3);
-        let mut db = Store::open(":memory:").unwrap();
-
-        for id in &ids {
-            assert!(db.follow(id, None).unwrap());
-        }
-        let mut entries = db.follow_policies().unwrap();
-        assert_matches!(entries.next(), Some(FollowPolicy { nid, .. }) if nid == ids[0]);
-        assert_matches!(entries.next(), Some(FollowPolicy { nid, .. }) if nid == ids[1]);
-        assert_matches!(entries.next(), Some(FollowPolicy { nid, .. }) if nid == ids[2]);
-    }
-
-    #[test]
-    fn test_repo_policies() {
-        let ids = arbitrary::vec::<RepoId>(3);
-        let mut db = Store::open(":memory:").unwrap();
-
-        for id in &ids {
-            assert!(db.seed(id, Scope::All).unwrap());
-        }
-        let mut entries = db.seed_policies().unwrap();
-        assert_matches!(entries.next(), Some(SeedPolicy { rid, .. }) if rid == ids[0]);
-        assert_matches!(entries.next(), Some(SeedPolicy { rid, .. }) if rid == ids[1]);
-        assert_matches!(entries.next(), Some(SeedPolicy { rid, .. }) if rid == ids[2]);
-    }
-
-    #[test]
-    fn test_update_alias() {
-        let id = arbitrary::gen::<NodeId>(1);
-        let mut db = Store::open(":memory:").unwrap();
-
-        assert!(db.follow(&id, Some("eve")).unwrap());
-        assert_eq!(
-            db.follow_policy(&id).unwrap().unwrap().alias,
-            Some(Alias::from_str("eve").unwrap())
-        );
-        assert!(db.follow(&id, None).unwrap());
-        assert_eq!(db.follow_policy(&id).unwrap().unwrap().alias, None);
-        assert!(!db.follow(&id, None).unwrap());
-        assert!(db.follow(&id, Some("alice")).unwrap());
-        assert_eq!(
-            db.follow_policy(&id).unwrap().unwrap().alias,
-            Some(Alias::new("alice"))
-        );
-    }
-
-    #[test]
-    fn test_update_scope() {
-        let id = arbitrary::gen::<RepoId>(1);
-        let mut db = Store::open(":memory:").unwrap();
-
-        assert!(db.seed(&id, Scope::All).unwrap());
-        assert_eq!(
-            db.seed_policy(&id).unwrap().unwrap().scope(),
-            Some(Scope::All)
-        );
-        assert!(db.seed(&id, Scope::Followed).unwrap());
-        assert_eq!(
-            db.seed_policy(&id).unwrap().unwrap().scope(),
-            Some(Scope::Followed)
-        );
-    }
-
-    #[test]
-    fn test_repo_policy() {
-        let id = arbitrary::gen::<RepoId>(1);
-        let mut db = Store::open(":memory:").unwrap();
-
-        assert!(db.seed(&id, Scope::All).unwrap());
-        assert!(db.seed_policy(&id).unwrap().unwrap().is_allow());
-        assert!(db.set_seed_policy(&id, Policy::Block).unwrap());
-        assert!(!db.seed_policy(&id).unwrap().unwrap().is_allow());
-        assert_eq!(db.seed_policy(&id).unwrap().unwrap().scope(), None);
-    }
-
-    #[test]
-    fn test_node_policy() {
-        let id = arbitrary::gen::<NodeId>(1);
-        let mut db = Store::open(":memory:").unwrap();
-
-        assert!(db.follow(&id, None).unwrap());
-        assert_eq!(
-            db.follow_policy(&id).unwrap().unwrap().policy,
-            Policy::Allow
-        );
-        assert!(db.set_follow_policy(&id, Policy::Block).unwrap());
-        assert_eq!(
-            db.follow_policy(&id).unwrap().unwrap().policy,
-            Policy::Block
-        );
-    }
-}
diff --git a/radicle/src/node/refs.rs b/radicle/src/node/refs.rs
deleted file mode 100644
index 9e1bf6603..000000000
--- a/radicle/src/node/refs.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod store;
-pub use store::{Error, Store};
diff --git a/radicle/src/node/refs/store.rs b/radicle/src/node/refs/store.rs
deleted file mode 100644
index fde561c6e..000000000
--- a/radicle/src/node/refs/store.rs
+++ /dev/null
@@ -1,259 +0,0 @@
-#![allow(clippy::type_complexity)]
-use std::num::TryFromIntError;
-use std::str::FromStr;
-
-use localtime::LocalTime;
-use sqlite as sql;
-use thiserror::Error;
-
-use crate::git::{Oid, Qualified};
-use crate::node::Database;
-use crate::node::NodeId;
-use crate::prelude::RepoId;
-use crate::storage;
-use crate::storage::{ReadRepository, ReadStorage, RemoteRepository, RepositoryError};
-
-#[derive(Error, Debug)]
-pub enum Error {
-    /// An Internal error.
-    #[error("internal error: {0}")]
-    Internal(#[from] sql::Error),
-    /// Timestamp error.
-    #[error("invalid timestamp: {0}")]
-    Timestamp(#[from] TryFromIntError),
-    /// Repository error.
-    #[error("repository error: {0}")]
-    Repository(#[from] RepositoryError),
-    /// Storage error.
-    #[error("storage error: {0}")]
-    Storage(#[from] storage::Error),
-    /// Storage refs error.
-    #[error("storage refs error: {0}")]
-    Refs(#[from] storage::refs::Error),
-    /// No rows returned in query result.
-    #[error("no rows returned")]
-    NoRows,
-}
-
-/// Refs store.
-///
-/// Used to cache git references.
-pub trait Store {
-    /// Set a reference under a remote namespace to the given [`Oid`].
-    fn set(
-        &mut self,
-        repo: &RepoId,
-        namespace: &NodeId,
-        refname: &Qualified,
-        oid: Oid,
-        timestamp: LocalTime,
-    ) -> Result<bool, Error>;
-    /// Get a reference's [`Oid`] and timestamp.
-    fn get(
-        &self,
-        repo: &RepoId,
-        namespace: &NodeId,
-        refname: &Qualified,
-    ) -> Result<Option<(Oid, LocalTime)>, Error>;
-    /// Delete a reference.
-    fn delete(
-        &mut self,
-        repo: &RepoId,
-        namespace: &NodeId,
-        refname: &Qualified,
-    ) -> Result<bool, Error>;
-    /// Populate the database from storage.
-    fn populate<S: ReadStorage>(&mut self, storage: &S) -> Result<(), Error>;
-    /// Return the number of references.
-    fn count(&self) -> Result<usize, Error>;
-    /// Check if there are any references.
-    fn is_empty(&self) -> Result<bool, Error> {
-        self.count().map(|l| l == 0)
-    }
-}
-
-impl Store for Database {
-    fn set(
-        &mut self,
-        repo: &RepoId,
-        namespace: &NodeId,
-        refname: &Qualified,
-        oid: Oid,
-        timestamp: LocalTime,
-    ) -> Result<bool, Error> {
-        let mut stmt = self.db.prepare(
-            "INSERT INTO `refs` (repo, namespace, ref, oid, timestamp)
-             VALUES (?1, ?2, ?3, ?4, ?5)
-             ON CONFLICT DO UPDATE
-             SET oid = ?4, timestamp = ?5
-             WHERE timestamp < ?5 AND oid <> ?4",
-        )?;
-        stmt.bind((1, repo))?;
-        stmt.bind((2, namespace))?;
-        stmt.bind((3, refname.to_string().as_str()))?;
-        stmt.bind((4, oid.to_string().as_str()))?;
-        stmt.bind((5, i64::try_from(timestamp.as_millis())?))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count() > 0)
-    }
-
-    fn get(
-        &self,
-        repo: &RepoId,
-        namespace: &NodeId,
-        refname: &Qualified,
-    ) -> Result<Option<(Oid, LocalTime)>, Error> {
-        let mut stmt = self.db.prepare(
-            "SELECT oid, timestamp FROM refs WHERE repo = ?1 AND namespace = ?2 AND ref = ?3",
-        )?;
-
-        stmt.bind((1, repo))?;
-        stmt.bind((2, namespace))?;
-        stmt.bind((3, refname.to_string().as_str()))?;
-
-        if let Some(Ok(row)) = stmt.into_iter().next() {
-            let oid = row.try_read::<&str, _>("oid")?;
-            let oid = Oid::from_str(oid).map_err(|e| {
-                Error::Internal(sql::Error {
-                    code: None,
-                    message: Some(format!("sql: invalid oid '{oid}': {e}")),
-                })
-            })?;
-            let timestamp = row.try_read::<i64, _>("timestamp")?;
-            let timestamp = LocalTime::from_millis(timestamp as u128);
-
-            Ok(Some((oid, timestamp)))
-        } else {
-            Ok(None)
-        }
-    }
-
-    fn delete(
-        &mut self,
-        repo: &RepoId,
-        namespace: &NodeId,
-        refname: &Qualified,
-    ) -> Result<bool, Error> {
-        let mut stmt = self
-            .db
-            .prepare("DELETE FROM refs WHERE repo = ?1 AND namespace = ?2 AND ref = ?3")?;
-
-        stmt.bind((1, repo))?;
-        stmt.bind((2, namespace))?;
-        stmt.bind((3, refname.to_string().as_str()))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count() > 0)
-    }
-
-    fn count(&self) -> Result<usize, Error> {
-        let row = self
-            .db
-            .prepare("SELECT COUNT(*) FROM refs")?
-            .into_iter()
-            .next()
-            .ok_or(Error::NoRows)??;
-        let count = row.read::<i64, _>(0) as usize;
-
-        Ok(count)
-    }
-
-    fn populate<S: ReadStorage>(&mut self, storage: &S) -> Result<(), Error> {
-        let now = LocalTime::now();
-
-        for info in storage.repositories()? {
-            let repo = storage.repository(info.rid)?;
-            for refs_at in repo.remote_refs_at()? {
-                self.set(&repo.id(), &refs_at.remote, refs_at.path(), refs_at.at, now)?;
-            }
-        }
-        Ok(())
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-    use crate::git::qualified;
-    use crate::test::arbitrary;
-    use localtime::{LocalDuration, LocalTime};
-
-    #[test]
-    fn test_count() {
-        let mut db = Database::memory().unwrap();
-        let oid = arbitrary::oid();
-
-        let repo = arbitrary::gen::<RepoId>(1);
-        let namespace = arbitrary::gen::<NodeId>(1);
-        let refname1 = qualified!("refs/heads/master");
-        let refname2 = qualified!("refs/heads/main");
-        let timestamp = LocalTime::now();
-
-        assert!(db.is_empty().unwrap());
-        assert_eq!(db.count().unwrap(), 0);
-
-        assert!(db
-            .set(&repo, &namespace, &refname1, oid, timestamp)
-            .unwrap());
-        assert!(!db.is_empty().unwrap());
-        assert_eq!(db.count().unwrap(), 1);
-
-        assert!(db
-            .set(&repo, &namespace, &refname2, oid, timestamp)
-            .unwrap());
-        assert_eq!(db.count().unwrap(), 2);
-    }
-
-    #[test]
-    fn test_set_and_delete() {
-        let mut db = Database::memory().unwrap();
-        let oid = arbitrary::oid();
-
-        let repo = arbitrary::gen::<RepoId>(1);
-        let namespace = arbitrary::gen::<NodeId>(1);
-        let refname = qualified!("refs/heads/master");
-        let timestamp = LocalTime::now();
-
-        assert!(db.set(&repo, &namespace, &refname, oid, timestamp).unwrap());
-        assert!(db.get(&repo, &namespace, &refname).unwrap().is_some());
-        assert!(db.delete(&repo, &namespace, &refname).unwrap());
-        assert!(db.get(&repo, &namespace, &refname).unwrap().is_none());
-        assert!(!db.delete(&repo, &namespace, &refname).unwrap());
-    }
-
-    #[test]
-    fn test_set_and_get() {
-        let mut db = Database::memory().unwrap();
-        let oid1 = arbitrary::oid();
-        let oid2 = arbitrary::oid();
-
-        assert_ne!(oid1, oid2);
-
-        let repo = arbitrary::gen::<RepoId>(1);
-        let namespace = arbitrary::gen::<NodeId>(1);
-        let refname = qualified!("refs/heads/master");
-        let mut timestamp = LocalTime::now();
-
-        assert_eq!(db.get(&repo, &namespace, &refname).unwrap(), None);
-        assert!(db
-            .set(&repo, &namespace, &refname, oid1, timestamp)
-            .unwrap());
-        assert_eq!(
-            db.get(&repo, &namespace, &refname).unwrap(),
-            Some((oid1, timestamp))
-        );
-        assert!(!db
-            .set(&repo, &namespace, &refname, oid1, timestamp)
-            .unwrap());
-        timestamp.elapse(LocalDuration::from_millis(1));
-
-        assert!(db
-            .set(&repo, &namespace, &refname, oid2, timestamp)
-            .unwrap());
-        assert_eq!(
-            db.get(&repo, &namespace, &refname).unwrap(),
-            Some((oid2, timestamp))
-        );
-    }
-}
diff --git a/radicle/src/node/routing.rs b/radicle/src/node/routing.rs
deleted file mode 100644
index 9973d6a89..000000000
--- a/radicle/src/node/routing.rs
+++ /dev/null
@@ -1,516 +0,0 @@
-use std::collections::HashSet;
-
-use sqlite as sql;
-use thiserror::Error;
-
-use crate::node::Database;
-use crate::{
-    prelude::Timestamp,
-    prelude::{NodeId, RepoId},
-    sql::transaction,
-};
-
-/// Result of inserting into the routing table.
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub enum InsertResult {
-    /// Nothing was updated.
-    NotUpdated,
-    /// The entry's timestamp was updated.
-    TimeUpdated,
-    /// A new entry was inserted.
-    SeedAdded,
-}
-
-/// An error occuring in peer-to-peer networking code.
-#[derive(Error, Debug)]
-pub enum Error {
-    /// An Internal error.
-    #[error("internal error: {0}")]
-    Internal(#[from] sql::Error),
-    /// Internal unit overflow.
-    #[error("the unit overflowed")]
-    UnitOverflow,
-}
-
-/// Backing store for a routing table.
-pub trait Store {
-    /// Get the nodes seeding the given id.
-    fn get(&self, id: &RepoId) -> Result<HashSet<NodeId>, Error>;
-    /// Get the inventory seeded by the given node.
-    fn get_inventory(&self, node_id: &NodeId) -> Result<HashSet<RepoId>, Error>;
-    /// Get a specific entry.
-    fn entry(&self, id: &RepoId, node: &NodeId) -> Result<Option<Timestamp>, Error>;
-    /// Checks if any entries are available.
-    fn is_empty(&self) -> Result<bool, Error> {
-        Ok(self.len()? == 0)
-    }
-    /// Add a new node seeding the given id.
-    fn add_inventory<'a>(
-        &mut self,
-        ids: impl IntoIterator<Item = &'a RepoId>,
-        node: NodeId,
-        time: Timestamp,
-    ) -> Result<Vec<(RepoId, InsertResult)>, Error>;
-    /// Remove an inventory from the given node.
-    fn remove_inventory(&mut self, id: &RepoId, node: &NodeId) -> Result<bool, Error>;
-    /// Remove multiple inventories from the given node.
-    fn remove_inventories<'a>(
-        &mut self,
-        ids: impl IntoIterator<Item = &'a RepoId>,
-        node: &NodeId,
-    ) -> Result<(), Error>;
-    /// Iterate over all entries in the routing table.
-    fn entries(&self) -> Result<Box<dyn Iterator<Item = (RepoId, NodeId)>>, Error>;
-    /// Get the total number of routing entries.
-    fn len(&self) -> Result<usize, Error>;
-    /// Prune entries older than the given timestamp.
-    fn prune(
-        &mut self,
-        oldest: Timestamp,
-        limit: Option<usize>,
-        ignore: &NodeId,
-    ) -> Result<usize, Error>;
-    /// Count the number of routes for a specific repo RID.
-    fn count(&self, id: &RepoId) -> Result<usize, Error>;
-}
-
-impl Store for Database {
-    fn get(&self, id: &RepoId) -> Result<HashSet<NodeId>, Error> {
-        let mut stmt = self
-            .db
-            .prepare("SELECT (node) FROM routing WHERE repo = ?")?;
-        stmt.bind((1, id))?;
-
-        let mut nodes = HashSet::new();
-        for row in stmt.into_iter() {
-            nodes.insert(row?.read::<NodeId, _>("node"));
-        }
-        Ok(nodes)
-    }
-
-    fn get_inventory(&self, node: &NodeId) -> Result<HashSet<RepoId>, Error> {
-        let mut stmt = self.db.prepare("SELECT repo FROM routing WHERE node = ?")?;
-        stmt.bind((1, node))?;
-
-        let mut inventory = HashSet::new();
-        for row in stmt.into_iter() {
-            inventory.insert(row?.read::<RepoId, _>("repo"));
-        }
-        Ok(inventory)
-    }
-
-    fn entry(&self, id: &RepoId, node: &NodeId) -> Result<Option<Timestamp>, Error> {
-        let mut stmt = self
-            .db
-            .prepare("SELECT (timestamp) FROM routing WHERE repo = ? AND node = ?")?;
-
-        stmt.bind((1, id))?;
-        stmt.bind((2, node))?;
-
-        if let Some(Ok(row)) = stmt.into_iter().next() {
-            return Ok(Some(row.read::<Timestamp, _>("timestamp")));
-        }
-        Ok(None)
-    }
-
-    fn add_inventory<'a>(
-        &mut self,
-        ids: impl IntoIterator<Item = &'a RepoId>,
-        node: NodeId,
-        time: Timestamp,
-    ) -> Result<Vec<(RepoId, InsertResult)>, Error> {
-        let mut results = Vec::new();
-        let mut select_stmt = self
-            .db
-            .prepare("SELECT (timestamp) FROM routing WHERE repo = ? AND node = ?")?;
-        let mut insert_stmt = self.db.prepare(
-            "INSERT INTO routing (repo, node, timestamp)
-             VALUES (?, ?, ?)
-             ON CONFLICT DO UPDATE
-             SET timestamp = ?3
-             WHERE timestamp < ?3",
-        )?;
-        transaction(&self.db, |_| {
-            for id in ids.into_iter() {
-                select_stmt.bind((1, id))?;
-                select_stmt.bind((2, &node))?;
-
-                let existed = select_stmt.iter().next().is_some();
-                select_stmt.reset()?;
-
-                insert_stmt.bind((1, id))?;
-                insert_stmt.bind((2, &node))?;
-                insert_stmt.bind((3, &time))?;
-                insert_stmt.next()?;
-                insert_stmt.reset()?;
-
-                let result = match (self.db.change_count() > 0, existed) {
-                    (true, true) => InsertResult::TimeUpdated,
-                    (true, false) => InsertResult::SeedAdded,
-                    (false, _) => InsertResult::NotUpdated,
-                };
-                results.push((*id, result));
-            }
-            Ok::<_, Error>(results)
-        })
-    }
-
-    fn entries(&self) -> Result<Box<dyn Iterator<Item = (RepoId, NodeId)>>, Error> {
-        let mut stmt = self
-            .db
-            .prepare("SELECT repo, node FROM routing ORDER BY repo")?
-            .into_iter();
-        let mut entries = Vec::new();
-
-        while let Some(Ok(row)) = stmt.next() {
-            let id = row.read("repo");
-            let node = row.read("node");
-
-            entries.push((id, node));
-        }
-        Ok(Box::new(entries.into_iter()))
-    }
-
-    fn remove_inventory(&mut self, id: &RepoId, node: &NodeId) -> Result<bool, Error> {
-        let mut stmt = self
-            .db
-            .prepare("DELETE FROM routing WHERE repo = ? AND node = ?")?;
-
-        stmt.bind((1, id))?;
-        stmt.bind((2, node))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count() > 0)
-    }
-
-    fn remove_inventories<'a>(
-        &mut self,
-        rids: impl IntoIterator<Item = &'a RepoId>,
-        nid: &NodeId,
-    ) -> Result<(), Error> {
-        let mut stmt = self
-            .db
-            .prepare("DELETE FROM routing WHERE repo = ? AND node = ?")?;
-
-        transaction(&self.db, |_| {
-            for rid in rids.into_iter() {
-                stmt.bind((1, rid))?;
-                stmt.bind((2, nid))?;
-
-                stmt.iter().next();
-                stmt.reset()?;
-            }
-            Ok::<_, Error>(())
-        })
-    }
-
-    fn len(&self) -> Result<usize, Error> {
-        let stmt = self.db.prepare("SELECT COUNT(1) FROM routing")?;
-        let count: i64 = stmt
-            .into_iter()
-            .next()
-            .expect("COUNT will always return a single row")?
-            .read(0);
-        let count: usize = count.try_into().map_err(|_| Error::UnitOverflow)?;
-        Ok(count)
-    }
-
-    fn prune(
-        &mut self,
-        oldest: Timestamp,
-        limit: Option<usize>,
-        ignore: &NodeId,
-    ) -> Result<usize, Error> {
-        let limit: i64 = limit
-            .unwrap_or(i64::MAX as usize)
-            .try_into()
-            .map_err(|_| Error::UnitOverflow)?;
-
-        let mut stmt = self.db.prepare(
-            "DELETE FROM routing
-             WHERE node <> ?1 AND rowid IN
-             (SELECT rowid FROM routing WHERE timestamp < ?2 ORDER BY timestamp LIMIT ?3)",
-        )?;
-        stmt.bind((1, ignore))?;
-        stmt.bind((2, &oldest))?;
-        stmt.bind((3, limit))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count())
-    }
-
-    fn count(&self, id: &RepoId) -> Result<usize, Error> {
-        let mut stmt = self
-            .db
-            .prepare("SELECT COUNT(*) FROM routing WHERE repo = ?")?;
-
-        stmt.bind((1, id))?;
-
-        let count: i64 = stmt
-            .into_iter()
-            .next()
-            .expect("COUNT will always return a single row")?
-            .read(0);
-
-        let count: usize = count.try_into().map_err(|_| Error::UnitOverflow)?;
-
-        Ok(count)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use localtime::LocalTime;
-
-    use super::*;
-    use crate::test::arbitrary;
-
-    fn database(path: &str) -> Database {
-        let db = Database::open(path).unwrap();
-
-        // We don't want to test foreign key constraints here.
-        db.db.execute("PRAGMA foreign_keys = OFF").unwrap();
-        db
-    }
-
-    #[test]
-    fn test_insert_and_get() {
-        let ids = arbitrary::set::<RepoId>(5..10);
-        let nodes = arbitrary::set::<NodeId>(5..10);
-        let mut db = database(":memory:");
-
-        for node in &nodes {
-            assert_eq!(
-                db.add_inventory(&ids, *node, Timestamp::EPOCH).unwrap(),
-                ids.iter()
-                    .map(|id| (*id, InsertResult::SeedAdded))
-                    .collect::<Vec<_>>()
-            );
-        }
-
-        for id in &ids {
-            let seeds = db.get(id).unwrap();
-            for node in &nodes {
-                assert!(seeds.contains(node));
-            }
-        }
-    }
-
-    #[test]
-    fn test_insert_and_get_resources() {
-        let ids = arbitrary::set::<RepoId>(5..10);
-        let nodes = arbitrary::set::<NodeId>(5..10);
-        let mut db = database(":memory:");
-
-        for node in &nodes {
-            db.add_inventory(&ids, *node, Timestamp::EPOCH).unwrap();
-        }
-
-        for node in &nodes {
-            let projects = db.get_inventory(node).unwrap();
-            for id in &ids {
-                assert!(projects.contains(id));
-            }
-        }
-    }
-
-    #[test]
-    fn test_entries() {
-        let ids = arbitrary::set::<RepoId>(6..9);
-        let nodes = arbitrary::set::<NodeId>(6..9);
-        let mut db = database(":memory:");
-
-        for node in &nodes {
-            assert!(db
-                .add_inventory(&ids, *node, Timestamp::EPOCH)
-                .unwrap()
-                .iter()
-                .all(|(_, r)| *r == InsertResult::SeedAdded));
-        }
-
-        let results = db.entries().unwrap().collect::<Vec<_>>();
-        assert_eq!(results.len(), ids.len() * nodes.len());
-
-        let mut results_ids = results.iter().map(|(id, _)| *id).collect::<Vec<_>>();
-        results_ids.dedup();
-
-        assert_eq!(results_ids.len(), ids.len(), "Entries are grouped by id");
-    }
-
-    #[test]
-    fn test_insert_and_remove() {
-        let ids = arbitrary::set::<RepoId>(5..10);
-        let nodes = arbitrary::set::<NodeId>(5..10);
-        let mut db = database(":memory:");
-
-        for node in &nodes {
-            db.add_inventory(&ids, *node, Timestamp::EPOCH).unwrap();
-        }
-        for id in &ids {
-            for node in &nodes {
-                assert!(db.remove_inventory(id, node).unwrap());
-            }
-        }
-        for id in &ids {
-            assert!(db.get(id).unwrap().is_empty());
-        }
-    }
-
-    #[test]
-    fn test_insert_duplicate() {
-        let id = arbitrary::gen::<RepoId>(1);
-        let node = arbitrary::gen::<NodeId>(1);
-        let mut db = database(":memory:");
-
-        assert_eq!(
-            db.add_inventory([&id], node, Timestamp::EPOCH).unwrap(),
-            vec![(id, InsertResult::SeedAdded)]
-        );
-        assert_eq!(
-            db.add_inventory([&id], node, Timestamp::EPOCH).unwrap(),
-            vec![(id, InsertResult::NotUpdated)]
-        );
-        assert_eq!(
-            db.add_inventory([&id], node, Timestamp::EPOCH).unwrap(),
-            vec![(id, InsertResult::NotUpdated)]
-        );
-    }
-
-    #[test]
-    fn test_insert_existing_updated_time() {
-        let id = arbitrary::gen::<RepoId>(1);
-        let node = arbitrary::gen::<NodeId>(1);
-        let mut db = database(":memory:");
-
-        assert_eq!(
-            db.add_inventory([&id], node, Timestamp::EPOCH).unwrap(),
-            vec![(id, InsertResult::SeedAdded)]
-        );
-        assert_eq!(
-            db.add_inventory([&id], node, Timestamp::try_from(1u64).unwrap())
-                .unwrap(),
-            vec![(id, InsertResult::TimeUpdated)]
-        );
-        assert_eq!(
-            db.entry(&id, &node).unwrap(),
-            Some(Timestamp::try_from(1u64).unwrap())
-        );
-    }
-
-    #[test]
-    fn test_update_existing_multi() {
-        let id1 = arbitrary::gen::<RepoId>(1);
-        let id2 = arbitrary::gen::<RepoId>(1);
-        let node = arbitrary::gen::<NodeId>(1);
-        let mut db = database(":memory:");
-
-        assert_eq!(
-            db.add_inventory([&id1], node, Timestamp::EPOCH).unwrap(),
-            vec![(id1, InsertResult::SeedAdded)]
-        );
-        assert_eq!(
-            db.add_inventory([&id1, &id2], node, Timestamp::EPOCH)
-                .unwrap(),
-            vec![
-                (id1, InsertResult::NotUpdated),
-                (id2, InsertResult::SeedAdded)
-            ]
-        );
-        assert_eq!(
-            db.add_inventory([&id1, &id2], node, Timestamp::try_from(1u64).unwrap())
-                .unwrap(),
-            vec![
-                (id1, InsertResult::TimeUpdated),
-                (id2, InsertResult::TimeUpdated)
-            ]
-        );
-    }
-
-    #[test]
-    fn test_remove_redundant() {
-        let id = arbitrary::gen::<RepoId>(1);
-        let node = arbitrary::gen::<NodeId>(1);
-        let mut db = database(":memory:");
-
-        assert_eq!(
-            db.add_inventory([&id], node, Timestamp::EPOCH).unwrap(),
-            vec![(id, InsertResult::SeedAdded)]
-        );
-        assert!(db.remove_inventory(&id, &node).unwrap());
-        assert!(!db.remove_inventory(&id, &node).unwrap());
-    }
-
-    #[test]
-    fn test_remove_many() {
-        let id1 = arbitrary::gen::<RepoId>(1);
-        let id2 = arbitrary::gen::<RepoId>(1);
-        let id3 = arbitrary::gen::<RepoId>(1);
-        let node = arbitrary::gen::<NodeId>(1);
-        let mut db = database(":memory:");
-
-        db.add_inventory([&id1, &id2, &id3], node, Timestamp::EPOCH)
-            .unwrap();
-        assert_eq!(db.len().unwrap(), 3);
-
-        db.remove_inventories([&id1, &id3], &node).unwrap();
-        assert_eq!(db.len().unwrap(), 1);
-    }
-
-    #[test]
-    fn test_len() {
-        let mut db = database(":memory:");
-        let ids = arbitrary::vec::<RepoId>(10);
-        let node = arbitrary::gen(1);
-
-        db.add_inventory(&ids, node, LocalTime::now().into())
-            .unwrap();
-
-        assert_eq!(10, db.len().unwrap(), "correct number of rows in table");
-    }
-
-    #[test]
-    fn test_prune() {
-        let mut rng = fastrand::Rng::new();
-        let now = LocalTime::now();
-        let ids = arbitrary::vec::<RepoId>(10);
-        let nodes = arbitrary::vec::<NodeId>(10);
-        let mut db = database(":memory:");
-
-        for node in &nodes {
-            let time = rng.u64(..now.as_millis());
-            db.add_inventory(&ids, *node, Timestamp::try_from(time).unwrap())
-                .unwrap();
-        }
-
-        let ids = arbitrary::vec::<RepoId>(10);
-        let nodes = arbitrary::vec::<NodeId>(10);
-
-        for node in &nodes {
-            let time = rng.u64(now.as_millis()..i64::MAX as u64);
-            db.add_inventory(&ids, *node, Timestamp::try_from(time).unwrap())
-                .unwrap();
-        }
-
-        let pruned = db.prune(now.into(), None, &arbitrary::gen(1)).unwrap();
-        assert_eq!(pruned, ids.len() * nodes.len());
-
-        for id in &ids {
-            for node in &nodes {
-                let t = db.entry(id, node).unwrap().unwrap();
-                assert!(*t >= *Timestamp::from(now));
-            }
-        }
-    }
-
-    #[test]
-    fn test_count() {
-        let id = arbitrary::gen::<RepoId>(1);
-        let nodes = arbitrary::set::<NodeId>(5..10);
-        let mut db = database(":memory:");
-
-        for node in &nodes {
-            db.add_inventory([&id], *node, Timestamp::EPOCH).unwrap();
-        }
-        assert_eq!(db.count(&id).unwrap(), nodes.len());
-    }
-}
diff --git a/radicle/src/node/seed.rs b/radicle/src/node/seed.rs
deleted file mode 100644
index 3408e1967..000000000
--- a/radicle/src/node/seed.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-pub mod store;
-pub use store::{Error, Store};
-
-use localtime::LocalTime;
-
-use crate::git;
-use crate::node::KnownAddress;
-use crate::prelude::NodeId;
-use crate::storage::{refs::RefsAt, ReadRepository, RemoteId};
-
-/// Holds an oid and timestamp.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SyncedAt {
-    /// Head of `rad/sigrefs`.
-    pub oid: git_ext::Oid,
-    /// When these refs were synced.
-    #[serde(with = "crate::serde_ext::localtime::time")]
-    pub timestamp: LocalTime,
-}
-
-impl SyncedAt {
-    /// Load a new [`SyncedAt`] for the given remote.
-    pub fn load<S: ReadRepository>(repo: &S, remote: RemoteId) -> Result<Self, git::ext::Error> {
-        let refs = RefsAt::new(repo, remote)?;
-        let oid = refs.at;
-
-        Self::new(oid, repo)
-    }
-
-    /// Create a new [`SyncedAt`] given an OID, by looking up the timestamp in the repo.
-    pub fn new<S: ReadRepository>(oid: git::ext::Oid, repo: &S) -> Result<Self, git::ext::Error> {
-        let timestamp = repo.commit(oid)?.time();
-        let timestamp = LocalTime::from_secs(timestamp.seconds() as u64);
-
-        Ok(Self { oid, timestamp })
-    }
-}
-
-impl Ord for SyncedAt {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        self.timestamp.cmp(&other.timestamp)
-    }
-}
-
-impl PartialOrd for SyncedAt {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-/// Seed of a specific repository that has been synced at least once.
-#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SyncedSeed {
-    /// The Node ID.
-    pub nid: NodeId,
-    /// Known addresses for this node.
-    pub addresses: Vec<KnownAddress>,
-    /// Sync information for a given repo.
-    pub synced_at: SyncedAt,
-}
diff --git a/radicle/src/node/seed/store.rs b/radicle/src/node/seed/store.rs
deleted file mode 100644
index 66ecf1b55..000000000
--- a/radicle/src/node/seed/store.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-#![allow(clippy::type_complexity)]
-use std::str::FromStr;
-
-use localtime::LocalTime;
-use sqlite as sql;
-use thiserror::Error;
-
-use crate::git::Oid;
-use crate::node::address;
-use crate::node::address::Store as _;
-use crate::node::NodeId;
-use crate::node::{seed::SyncedSeed, Database, SyncedAt};
-use crate::prelude::{RepoId, Timestamp};
-
-#[derive(Error, Debug)]
-pub enum Error {
-    /// An Internal error.
-    #[error("internal error: {0}")]
-    Internal(#[from] sql::Error),
-    /// An address store error.
-    #[error("address store error: {0}")]
-    Addresses(#[from] address::Error),
-}
-
-/// Seed store.
-///
-/// Used to store seed sync statuses.
-pub trait Store: address::Store {
-    /// Mark a repo as synced on the given node.
-    fn synced(
-        &mut self,
-        rid: &RepoId,
-        nid: &NodeId,
-        at: Oid,
-        timestamp: Timestamp,
-    ) -> Result<bool, Error>;
-    /// Get the repos seeded by the given node.
-    fn seeded_by(
-        &self,
-        nid: &NodeId,
-    ) -> Result<Box<dyn Iterator<Item = Result<(RepoId, SyncedAt), Error>> + '_>, Error>;
-    /// Get nodes that have synced the given repo.
-    fn seeds_for(
-        &self,
-        rid: &RepoId,
-    ) -> Result<Box<dyn Iterator<Item = Result<SyncedSeed, Error>> + '_>, Error>;
-}
-
-impl Store for Database {
-    fn synced(
-        &mut self,
-        rid: &RepoId,
-        nid: &NodeId,
-        at: Oid,
-        timestamp: Timestamp,
-    ) -> Result<bool, Error> {
-        let mut stmt = self.db.prepare(
-            "INSERT INTO `repo-sync-status` (repo, node, head, timestamp)
-             VALUES (?1, ?2, ?3, ?4)
-             ON CONFLICT DO UPDATE
-             SET head = ?3, timestamp = ?4
-             WHERE timestamp < ?4 AND head <> ?3",
-        )?;
-        stmt.bind((1, rid))?;
-        stmt.bind((2, nid))?;
-        stmt.bind((3, at.to_string().as_str()))?;
-        stmt.bind((4, &timestamp))?;
-        stmt.next()?;
-
-        Ok(self.db.change_count() > 0)
-    }
-
-    fn seeds_for(
-        &self,
-        rid: &RepoId,
-    ) -> Result<Box<dyn Iterator<Item = Result<SyncedSeed, Error>> + '_>, Error> {
-        let mut stmt = self.db.prepare(
-            "SELECT node, head, timestamp
-             FROM `repo-sync-status`
-             WHERE repo = ?",
-        )?;
-        stmt.bind((1, rid))?;
-
-        Ok(Box::new(stmt.into_iter().map(|row| {
-            let row = row?;
-            let nid = row.try_read::<NodeId, _>("node")?;
-            let oid = row.try_read::<&str, _>("head")?;
-            let oid = Oid::from_str(oid).map_err(|e| {
-                Error::Internal(sql::Error {
-                    code: None,
-                    message: Some(format!("sql: invalid oid '{oid}': {e}")),
-                })
-            })?;
-            let timestamp = row.try_read::<i64, _>("timestamp")?;
-            let timestamp = LocalTime::from_millis(timestamp as u128);
-            let addresses = self.addresses_of(&nid)?;
-
-            Ok(SyncedSeed {
-                nid,
-                addresses,
-                synced_at: SyncedAt { oid, timestamp },
-            })
-        })))
-    }
-
-    fn seeded_by(
-        &self,
-        nid: &NodeId,
-    ) -> Result<Box<dyn Iterator<Item = Result<(RepoId, SyncedAt), Error>> + '_>, Error> {
-        let mut stmt = self.db.prepare(
-            "SELECT repo, head, timestamp
-             FROM `repo-sync-status`
-             WHERE node = ?",
-        )?;
-        stmt.bind((1, nid))?;
-
-        Ok(Box::new(stmt.into_iter().map(|row| {
-            let row = row?;
-            let rid = row.try_read::<RepoId, _>("repo")?;
-            let oid = row.try_read::<&str, _>("head")?;
-            let oid = Oid::from_str(oid).map_err(|e| {
-                Error::Internal(sql::Error {
-                    code: None,
-                    message: Some(format!("sql: invalid oid '{oid}': {e}")),
-                })
-            })?;
-            let timestamp = row.try_read::<i64, _>("timestamp")?;
-            let timestamp = LocalTime::from_millis(timestamp as u128);
-
-            Ok((rid, SyncedAt { oid, timestamp }))
-        })))
-    }
-}
diff --git a/radicle/src/node/timestamp.rs b/radicle/src/node/timestamp.rs
deleted file mode 100644
index 9dd1689d1..000000000
--- a/radicle/src/node/timestamp.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-use std::{
-    fmt,
-    num::TryFromIntError,
-    ops::{Add, Deref, Sub},
-};
-
-use localtime::LocalTime;
-use sqlite as sql;
-
-/// Milliseconds since epoch.
-#[derive(
-    Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize,
-)]
-#[serde(transparent)]
-pub struct Timestamp(u64);
-
-impl Add<u64> for Timestamp {
-    type Output = Timestamp;
-
-    fn add(self, millis: u64) -> Self::Output {
-        Self(self.0.saturating_add(millis))
-    }
-}
-
-impl Sub<u64> for Timestamp {
-    type Output = Timestamp;
-
-    fn sub(self, millis: u64) -> Self::Output {
-        Self(self.0.saturating_sub(millis))
-    }
-}
-
-impl Timestamp {
-    /// UNIX epoch.
-    pub const EPOCH: Self = Self(0);
-    /// Minimum value.
-    pub const MIN: Self = Self(0);
-    /// Maximum value.
-    // Nb. This is the maximum value that can fit in a signed 64-bit integer (`i64`).
-    // This makes it possible to store timestamps in sqlite.
-    pub const MAX: Self = Self(9223372036854775807);
-
-    /// Convert to local time.
-    pub fn to_local_time(&self) -> LocalTime {
-        (*self).into()
-    }
-}
-
-impl fmt::Display for Timestamp {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.0.fmt(f)
-    }
-}
-
-impl Deref for Timestamp {
-    type Target = u64;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl From<LocalTime> for Timestamp {
-    fn from(t: LocalTime) -> Self {
-        Self(t.as_millis())
-    }
-}
-
-impl From<Timestamp> for LocalTime {
-    fn from(t: Timestamp) -> Self {
-        LocalTime::from_millis(t.0 as u128)
-    }
-}
-
-impl TryFrom<u64> for Timestamp {
-    type Error = u64;
-
-    fn try_from(u: u64) -> Result<Self, u64> {
-        if u <= *Self::MAX {
-            Ok(Self(u))
-        } else {
-            Err(u)
-        }
-    }
-}
-
-impl TryFrom<i64> for Timestamp {
-    type Error = TryFromIntError;
-
-    fn try_from(i: i64) -> Result<Self, Self::Error> {
-        i.try_into().map(Self)
-    }
-}
-
-impl TryFrom<&sql::Value> for Timestamp {
-    type Error = sql::Error;
-
-    fn try_from(value: &sql::Value) -> Result<Self, Self::Error> {
-        match value {
-            sql::Value::Integer(i) => match (*i).try_into() {
-                Ok(u) => Ok(Timestamp(u)),
-                Err(e) => Err(sql::Error {
-                    code: None,
-                    message: Some(format!("sql: invalid integer `{i}` for timestamp: {e}")),
-                }),
-            },
-            _ => Err(sql::Error {
-                code: None,
-                message: Some("sql: invalid type for timestamp".to_owned()),
-            }),
-        }
-    }
-}
-
-impl sql::BindableWithIndex for &Timestamp {
-    fn bind<I: sql::ParameterIndex>(self, stmt: &mut sql::Statement<'_>, i: I) -> sql::Result<()> {
-        match i64::try_from(*self.deref()) {
-            Ok(integer) => integer.bind(stmt, i),
-            Err(e) => Err(sql::Error {
-                code: None,
-                message: Some(format!("sql: invalid timestamp `{self}`: {e}")),
-            }),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_timestamp_max() {
-        assert_eq!(i64::try_from(*Timestamp::MAX), Ok(i64::MAX));
-    }
-}
diff --git a/radicle/src/profile.rs b/radicle/src/profile.rs
deleted file mode 100644
index df16a7697..000000000
--- a/radicle/src/profile.rs
+++ /dev/null
@@ -1,814 +0,0 @@
-//! Radicle node profile.
-//!
-//!   $RAD_HOME/                                 # Radicle home
-//!     storage/                                 # Storage root
-//!       zEQNunJUqkNahQ8VvQYuWZZV7EJB/          # Project git repository
-//!       ...                                    # More projects...
-//!     keys/
-//!       radicle                                # Secret key (PKCS 8)
-//!       radicle.pub                            # Public key (PKCS 8)
-//!     node/
-//!       control.sock                           # Node control socket
-//!
-use std::io::Write;
-use std::path::{Path, PathBuf};
-use std::{fs, io};
-
-use localtime::LocalTime;
-use serde::Serialize;
-use serde_json as json;
-use thiserror::Error;
-
-use crate::crypto::ssh::agent::Agent;
-use crate::crypto::ssh::{keystore, Keystore, Passphrase};
-use crate::crypto::{PublicKey, Signer};
-use crate::explorer::Explorer;
-use crate::node::config::DefaultSeedingPolicy;
-use crate::node::policy::config::store::Read;
-use crate::node::{
-    notifications, policy,
-    policy::{Policy, Scope},
-    Alias, AliasStore, Handle as _, Node, UserAgent,
-};
-use crate::prelude::{Did, NodeId, RepoId};
-use crate::storage::git::transport;
-use crate::storage::git::Storage;
-use crate::storage::ReadRepository;
-use crate::{cli, cob, git, node, storage, web};
-
-/// Environment variables used by radicle.
-pub mod env {
-    pub use std::env::*;
-
-    /// Path to the radicle home folder.
-    pub const RAD_HOME: &str = "RAD_HOME";
-    /// Path to the radicle node socket file.
-    pub const RAD_SOCKET: &str = "RAD_SOCKET";
-    /// Passphrase for the encrypted radicle secret key.
-    pub const RAD_PASSPHRASE: &str = "RAD_PASSPHRASE";
-    /// RNG seed. Must be convertible to a `u64`.
-    pub const RAD_RNG_SEED: &str = "RAD_RNG_SEED";
-    /// Private key seed. Used for generating deterministic keypairs.
-    pub const RAD_KEYGEN_SEED: &str = "RAD_KEYGEN_SEED";
-    /// Show radicle hints.
-    pub const RAD_HINT: &str = "RAD_HINT";
-    /// Environment variable to set to overwrite the commit date for both
-    /// the author and the committer.
-    ///
-    /// The format must be a unix timestamp.
-    pub const RAD_COMMIT_TIME: &str = "RAD_COMMIT_TIME";
-    /// Override the device's local time.
-    /// The format must be a unix timestamp.
-    pub const RAD_LOCAL_TIME: &str = "RAD_LOCAL_TIME";
-    // Turn debug mode on.
-    pub const RAD_DEBUG: &str = "RAD_DEBUG";
-    // Used to set the Git committer timestamp. Can be overridden
-    // to generate deterministic COB IDs.
-    pub const GIT_COMMITTER_DATE: &str = "GIT_COMMITTER_DATE";
-
-    /// Commit timestamp to use. Can be overriden by [`RAD_COMMIT_TIME`].
-    pub fn commit_time() -> localtime::LocalTime {
-        time(RAD_COMMIT_TIME).unwrap_or_else(local_time)
-    }
-
-    /// Local time. Can be overriden by [`RAD_LOCAL_TIME`].
-    pub fn local_time() -> localtime::LocalTime {
-        time(RAD_LOCAL_TIME).unwrap_or_else(localtime::LocalTime::now)
-    }
-
-    /// Whether debug mode is on.
-    pub fn debug() -> bool {
-        var(RAD_DEBUG).is_ok()
-    }
-
-    /// Whether or not to show hints.
-    pub fn hints() -> bool {
-        var(RAD_HINT).is_ok()
-    }
-
-    /// Get the configured pager program from the environment.
-    pub fn pager() -> Option<String> {
-        if let Ok(cfg) = git2::Config::open_default() {
-            if let Ok(pager) = cfg.get_string("core.pager") {
-                return Some(pager);
-            }
-        }
-        if let Ok(pager) = var("PAGER") {
-            return Some(pager);
-        }
-        None
-    }
-
-    /// Get the radicle passphrase from the environment.
-    pub fn passphrase() -> Option<super::Passphrase> {
-        let Ok(passphrase) = var(RAD_PASSPHRASE) else {
-            return None;
-        };
-        if passphrase.is_empty() {
-            // `ssh-keygen` treats the empty string as no passphrase,
-            // so we do the same.
-            log::trace!(target: "radicle", "Treating empty passphrase as no passphrase.");
-            return None;
-        }
-        Some(super::Passphrase::from(passphrase))
-    }
-
-    /// Get a random number generator from the environment.
-    pub fn rng() -> fastrand::Rng {
-        if let Ok(seed) = var(RAD_RNG_SEED) {
-            let Ok(seed) = seed.parse() else {
-                panic!("env::rng: invalid seed specified in `{RAD_RNG_SEED}`");
-            };
-            fastrand::Rng::with_seed(seed)
-        } else {
-            fastrand::Rng::new()
-        }
-    }
-
-    /// Return the seed stored in the [`RAD_KEYGEN_SEED`] environment variable,
-    /// or generate a random one.
-    pub fn seed() -> crypto::Seed {
-        if let Ok(seed) = var(RAD_KEYGEN_SEED) {
-            let Ok(seed) = (0..seed.len())
-                .step_by(2)
-                .map(|i| u8::from_str_radix(&seed[i..i + 2], 16))
-                .collect::<Result<Vec<u8>, _>>()
-            else {
-                panic!("env::seed: invalid hexadecimal value set in `{RAD_KEYGEN_SEED}`");
-            };
-            let Ok(seed): Result<[u8; 32], _> = seed.try_into() else {
-                panic!("env::seed: invalid seed length set in `{RAD_KEYGEN_SEED}`");
-            };
-            crypto::Seed::new(seed)
-        } else {
-            crypto::Seed::generate()
-        }
-    }
-
-    fn time(key: &str) -> Option<localtime::LocalTime> {
-        if let Ok(s) = var(key) {
-            match s.trim().parse::<u64>() {
-                Ok(t) => return Some(localtime::LocalTime::from_secs(t)),
-                Err(e) => {
-                    panic!("env::time: invalid value {s:?} for `{key}` environment variable: {e}");
-                }
-            }
-        }
-        None
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum Error {
-    #[error(transparent)]
-    Io(#[from] io::Error),
-    #[error(transparent)]
-    Config(#[from] ConfigError),
-    #[error(transparent)]
-    Node(#[from] node::Error),
-    #[error(transparent)]
-    Routing(#[from] node::routing::Error),
-    #[error(transparent)]
-    Keystore(#[from] keystore::Error),
-    #[error(transparent)]
-    MemorySigner(#[from] keystore::MemorySignerError),
-    #[error("no radicle profile found at path '{0}'")]
-    NotFound(PathBuf),
-    #[error("error connecting to ssh-agent: {0}")]
-    Agent(#[from] crate::crypto::ssh::agent::Error),
-    #[error("radicle key `{0}` is not registered; run `rad auth` to register it with ssh-agent")]
-    KeyNotRegistered(PublicKey),
-    #[error(transparent)]
-    PolicyStore(#[from] node::policy::store::Error),
-    #[error(transparent)]
-    NotificationsStore(#[from] node::notifications::store::Error),
-    #[error(transparent)]
-    DatabaseStore(#[from] node::db::Error),
-    #[error(transparent)]
-    Repository(#[from] storage::RepositoryError),
-    #[error(transparent)]
-    CobsCache(#[from] cob::cache::Error),
-    #[error(transparent)]
-    Storage(#[from] storage::Error),
-}
-
-#[derive(Debug, Error)]
-pub enum ConfigError {
-    #[error("failed to load configuration from {0}: {1}")]
-    Io(PathBuf, io::Error),
-    #[error("failed to load configuration from {0}: {1}")]
-    Load(PathBuf, serde_json::Error),
-}
-
-/// Local radicle configuration.
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Config {
-    /// Public explorer. This is used for generating links.
-    #[serde(default)]
-    pub public_explorer: Explorer,
-    /// Preferred seeds. These seeds will be used for explorer links
-    /// and in other situations when a seed needs to be chosen.
-    #[serde(default)]
-    pub preferred_seeds: Vec<node::config::ConnectAddress>,
-    /// Web configuration.
-    #[serde(default)]
-    pub web: web::Config,
-    /// CLI configuration.
-    #[serde(default)]
-    pub cli: cli::Config,
-    /// Node configuration.
-    pub node: node::Config,
-}
-
-impl Config {
-    /// Create a new, default configuration.
-    pub fn new(alias: Alias) -> Self {
-        let node = node::Config::new(alias);
-
-        Self {
-            public_explorer: Explorer::default(),
-            preferred_seeds: node.network.public_seeds(),
-            web: web::Config::default(),
-            cli: cli::Config::default(),
-            node,
-        }
-    }
-
-    /// Initialize a new configuration. Fails if the path already exists.
-    pub fn init(alias: Alias, path: &Path) -> io::Result<Self> {
-        let cfg = Config::new(alias);
-        cfg.write(path)?;
-
-        Ok(cfg)
-    }
-
-    /// Load a configuration from the given path.
-    pub fn load(path: &Path) -> Result<Self, ConfigError> {
-        let mut cfg: Self = match fs::File::open(path) {
-            Ok(cfg) => {
-                json::from_reader(cfg).map_err(|e| ConfigError::Load(path.to_path_buf(), e))?
-            }
-            Err(e) => return Err(ConfigError::Io(path.to_path_buf(), e)),
-        };
-
-        // Handle deprecated policy configuration.
-        // Nb. This will override "seedingPolicy" if set! This code should be removed after 1.0.
-        if let (Some(p), Some(s)) = (cfg.node.extra.get("policy"), cfg.node.extra.get("scope")) {
-            if let (Ok(policy), Ok(scope)) = (
-                json::from_value::<Policy>(p.clone()),
-                json::from_value::<Scope>(s.clone()),
-            ) {
-                log::warn!(target: "radicle", "Overwriting `seedingPolicy` configuration");
-                cfg.node.seeding_policy = match policy {
-                    Policy::Allow => DefaultSeedingPolicy::Allow { scope },
-                    Policy::Block => DefaultSeedingPolicy::Block,
-                }
-            }
-        }
-        Ok(cfg)
-    }
-
-    /// Write configuration to disk.
-    pub fn write(&self, path: &Path) -> Result<(), io::Error> {
-        let mut file = fs::OpenOptions::new()
-            .create_new(true)
-            .write(true)
-            .open(path)?;
-        let formatter = json::ser::PrettyFormatter::with_indent(b"  ");
-        let mut serializer = json::Serializer::with_formatter(&file, formatter);
-
-        self.serialize(&mut serializer)?;
-        file.write_all(b"\n")?;
-        file.sync_all()?;
-
-        Ok(())
-    }
-
-    /// Get the user alias.
-    pub fn alias(&self) -> &Alias {
-        &self.node.alias
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct Profile {
-    pub home: Home,
-    pub storage: Storage,
-    pub keystore: Keystore,
-    pub public_key: PublicKey,
-    pub config: Config,
-}
-
-impl Profile {
-    pub fn init(
-        home: Home,
-        alias: Alias,
-        passphrase: Option<Passphrase>,
-        seed: crypto::Seed,
-    ) -> Result<Self, Error> {
-        let keystore = Keystore::new(&home.keys());
-        let public_key = keystore.init("radicle", passphrase, seed)?;
-        let config = Config::init(alias.clone(), home.config().as_path())?;
-        let storage = Storage::open(
-            home.storage(),
-            git::UserInfo {
-                alias,
-                key: public_key,
-            },
-        )?;
-        // Create DBs.
-        home.policies_mut()?;
-        home.notifications_mut()?;
-        home.database_mut()?
-            .journal_mode(node::db::JournalMode::default())?
-            .init(
-                &public_key,
-                config.node.features(),
-                &config.node.alias,
-                &UserAgent::default(),
-                LocalTime::now().into(),
-                config.node.external_addresses.iter(),
-            )?;
-
-        transport::local::register(storage.clone());
-
-        Ok(Profile {
-            home,
-            storage,
-            keystore,
-            public_key,
-            config,
-        })
-    }
-
-    pub fn load() -> Result<Self, Error> {
-        let home = self::home()?;
-        let keystore = Keystore::new(&home.keys());
-        let public_key = keystore
-            .public_key()?
-            .ok_or_else(|| Error::NotFound(home.path().to_path_buf()))?;
-        let config = Config::load(home.config().as_path())?;
-        let storage = Storage::open(
-            home.storage(),
-            git::UserInfo {
-                alias: config.alias().clone(),
-                key: public_key,
-            },
-        )?;
-        transport::local::register(storage.clone());
-
-        Ok(Profile {
-            home,
-            storage,
-            keystore,
-            public_key,
-            config,
-        })
-    }
-
-    pub fn id(&self) -> &PublicKey {
-        &self.public_key
-    }
-
-    pub fn info(&self) -> git::UserInfo {
-        git::UserInfo {
-            alias: self.config.alias().clone(),
-            key: *self.id(),
-        }
-    }
-
-    pub fn hints(&self) -> bool {
-        if env::hints() {
-            return true;
-        }
-        self.config.cli.hints
-    }
-
-    pub fn did(&self) -> Did {
-        Did::from(self.public_key)
-    }
-
-    pub fn signer(&self) -> Result<Box<dyn Signer>, Error> {
-        if !self.keystore.is_encrypted()? {
-            let signer = keystore::MemorySigner::load(&self.keystore, None)?;
-            return Ok(signer.boxed());
-        }
-
-        if let Some(passphrase) = env::passphrase() {
-            let signer = keystore::MemorySigner::load(&self.keystore, Some(passphrase))?;
-            return Ok(signer.boxed());
-        }
-
-        match Agent::connect() {
-            Ok(agent) => {
-                let signer = agent.signer(self.public_key);
-                if signer.is_ready()? {
-                    Ok(signer.boxed())
-                } else {
-                    Err(Error::KeyNotRegistered(self.public_key))
-                }
-            }
-            Err(err) => Err(err.into()),
-        }
-    }
-
-    /// Get radicle home.
-    pub fn home(&self) -> &Home {
-        &self.home
-    }
-
-    /// Return a read-only handle to the policies of the node.
-    pub fn policies(&self) -> Result<policy::config::Config<Read>, policy::store::Error> {
-        let path = self.node().join(node::POLICIES_DB_FILE);
-        let config = policy::config::Config::new(
-            self.config.node.seeding_policy.into(),
-            policy::store::Store::reader(path)?,
-        );
-        Ok(config)
-    }
-
-    /// Return a multi-source store for aliases.
-    pub fn aliases(&self) -> Aliases {
-        let policies = self.home.policies().ok();
-        let db = self.home.database().ok();
-
-        Aliases { policies, db }
-    }
-
-    /// Add the repo to our inventory.
-    /// If the node is offline, adds it directly to the database.
-    pub fn add_inventory(&self, rid: RepoId, node: &mut Node) -> Result<bool, Error> {
-        match node.add_inventory(rid) {
-            Ok(updated) => Ok(updated),
-            Err(e) if e.is_connection_err() => {
-                let now = LocalTime::now();
-                let mut db = self.database_mut()?;
-                let updates =
-                    node::routing::Store::add_inventory(&mut db, [&rid], *self.id(), now.into())?;
-
-                Ok(!updates.is_empty())
-            }
-            Err(e) => Err(e.into()),
-        }
-    }
-
-    /// Seed a repository by first trying to seed through the node, and if the node isn't running,
-    /// by updating the policy database directly. If the repo is available locally, we also add it
-    /// to our inventory.
-    pub fn seed(&self, rid: RepoId, scope: Scope, node: &mut Node) -> Result<bool, Error> {
-        match node.seed(rid, scope) {
-            Ok(updated) => Ok(updated),
-            Err(e) if e.is_connection_err() => {
-                let mut config = self.policies_mut()?;
-                let updated = config.seed(&rid, scope)?;
-
-                Ok(updated)
-            }
-            Err(e) => Err(e.into()),
-        }
-    }
-
-    /// Unseed a repository by first trying to unseed through the node, and if the node isn't
-    /// running, by updating the policy database directly.
-    pub fn unseed(&self, rid: RepoId, node: &mut Node) -> Result<bool, Error> {
-        match node.unseed(rid) {
-            Ok(updated) => Ok(updated),
-            Err(e) if e.is_connection_err() => {
-                let mut config = self.policies_mut()?;
-                let result = config.unseed(&rid)?;
-
-                let mut db = self.database_mut()?;
-                node::routing::Store::remove_inventory(&mut db, &rid, self.id())?;
-
-                Ok(result)
-            }
-            Err(e) => Err(e.into()),
-        }
-    }
-}
-
-impl std::ops::Deref for Profile {
-    type Target = Home;
-
-    fn deref(&self) -> &Self::Target {
-        &self.home
-    }
-}
-
-impl std::ops::DerefMut for Profile {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.home
-    }
-}
-
-impl AliasStore for Profile {
-    fn alias(&self, nid: &NodeId) -> Option<Alias> {
-        self.aliases().alias(nid)
-    }
-}
-
-/// Holds multiple alias stores, and will try
-/// them one by one when asking for an alias.
-pub struct Aliases {
-    policies: Option<policy::store::StoreReader>,
-    db: Option<node::Database>,
-}
-
-impl AliasStore for Aliases {
-    /// Retrieve `alias` of given node.
-    /// First looks in `policies.db` and then `addresses.db`.
-    fn alias(&self, nid: &NodeId) -> Option<Alias> {
-        self.policies
-            .as_ref()
-            .and_then(|db| db.alias(nid))
-            .or_else(|| self.db.as_ref().and_then(|db| db.alias(nid)))
-    }
-}
-
-/// Get the path to the radicle home folder.
-pub fn home() -> Result<Home, io::Error> {
-    if let Some(home) = env::var_os(env::RAD_HOME) {
-        Ok(Home::new(PathBuf::from(home))?)
-    } else if let Some(home) = env::var_os("HOME") {
-        Ok(Home::new(PathBuf::from(home).join(".radicle"))?)
-    } else {
-        Err(io::Error::new(
-            io::ErrorKind::NotFound,
-            "Neither `RAD_HOME` nor `HOME` are set",
-        ))
-    }
-}
-
-/// Radicle home.
-#[derive(Debug, Clone)]
-pub struct Home {
-    path: PathBuf,
-}
-
-impl TryFrom<PathBuf> for Home {
-    type Error = io::Error;
-
-    fn try_from(home: PathBuf) -> Result<Self, Self::Error> {
-        Self::new(home)
-    }
-}
-
-impl Home {
-    /// Creates the Radicle Home directories.
-    ///
-    /// The `home` path is used as the base directory for all
-    /// necessary subdirectories.
-    ///
-    /// If `home` does not already exist then it and any
-    /// subdirectories are created using [`fs::create_dir_all`].
-    ///
-    /// The `home` path is also canonicalized using [`fs::canonicalize`].
-    ///
-    /// All necessary subdirectories are also created.
-    pub fn new(home: impl Into<PathBuf>) -> Result<Self, io::Error> {
-        let path = home.into();
-        if !path.exists() {
-            fs::create_dir_all(path.clone())?;
-        }
-        let home = Self {
-            path: path.canonicalize()?,
-        };
-
-        for dir in &[home.storage(), home.keys(), home.node(), home.cobs()] {
-            if !dir.exists() {
-                fs::create_dir_all(dir)?;
-            }
-        }
-
-        Ok(home)
-    }
-
-    pub fn path(&self) -> &Path {
-        self.path.as_path()
-    }
-
-    pub fn storage(&self) -> PathBuf {
-        self.path.join("storage")
-    }
-
-    pub fn config(&self) -> PathBuf {
-        self.path.join("config.json")
-    }
-
-    pub fn keys(&self) -> PathBuf {
-        self.path.join("keys")
-    }
-
-    pub fn node(&self) -> PathBuf {
-        self.path.join("node")
-    }
-
-    pub fn cobs(&self) -> PathBuf {
-        self.path.join("cobs")
-    }
-
-    pub fn socket(&self) -> PathBuf {
-        env::var_os(env::RAD_SOCKET)
-            .map(PathBuf::from)
-            .unwrap_or_else(|| self.node().join(node::DEFAULT_SOCKET_NAME))
-    }
-
-    /// Return a read-write handle to the notifications database.
-    pub fn notifications_mut(
-        &self,
-    ) -> Result<notifications::StoreWriter, notifications::store::Error> {
-        let path = self.node().join(node::NOTIFICATIONS_DB_FILE);
-        let db = notifications::Store::open(path)?;
-
-        Ok(db)
-    }
-
-    /// Return a read-write handle to the policies store of the node.
-    pub fn policies_mut(&self) -> Result<policy::store::StoreWriter, policy::store::Error> {
-        let path = self.node().join(node::POLICIES_DB_FILE);
-        let config = policy::store::Store::open(path)?;
-
-        Ok(config)
-    }
-
-    /// Return a handle to a read-only database of the node.
-    pub fn database(&self) -> Result<node::Database, node::db::Error> {
-        let path = self.node().join(node::NODE_DB_FILE);
-        let db = node::Database::reader(path)?;
-
-        Ok(db)
-    }
-
-    /// Return a handle to the database of the node.
-    pub fn database_mut(&self) -> Result<node::Database, node::db::Error> {
-        let path = self.node().join(node::NODE_DB_FILE);
-        let db = node::Database::open(path)?;
-
-        Ok(db)
-    }
-
-    /// Returns the address store.
-    pub fn addresses(&self) -> Result<impl node::address::Store, node::db::Error> {
-        self.database_mut()
-    }
-
-    /// Returns the routing store.
-    pub fn routing(&self) -> Result<impl node::routing::Store, node::db::Error> {
-        self.database()
-    }
-
-    /// Returns the routing store, mutably.
-    pub fn routing_mut(&self) -> Result<impl node::routing::Store, node::db::Error> {
-        self.database_mut()
-    }
-
-    /// Return a read-only handle for the issues cache.
-    pub fn issues<'a, R>(
-        &self,
-        repository: &'a R,
-    ) -> Result<cob::issue::Cache<cob::issue::Issues<'a, R>, cob::cache::StoreReader>, Error>
-    where
-        R: ReadRepository + cob::Store,
-    {
-        let path = self.cobs().join(cob::cache::COBS_DB_FILE);
-        let db = cob::cache::Store::reader(path)?;
-        let store = cob::issue::Issues::open(repository)?;
-        Ok(cob::issue::Cache::reader(store, db))
-    }
-
-    /// Return a read-write handle for the issues cache.
-    pub fn issues_mut<'a, R>(
-        &self,
-        repository: &'a R,
-    ) -> Result<cob::issue::Cache<cob::issue::Issues<'a, R>, cob::cache::StoreWriter>, Error>
-    where
-        R: ReadRepository + cob::Store,
-    {
-        let path = self.cobs().join(cob::cache::COBS_DB_FILE);
-        let db = cob::cache::Store::open(path)?;
-        let store = cob::issue::Issues::open(repository)?;
-        Ok(cob::issue::Cache::open(store, db))
-    }
-
-    /// Return a read-only handle for the patches cache.
-    pub fn patches<'a, R>(
-        &self,
-        repository: &'a R,
-    ) -> Result<cob::patch::Cache<cob::patch::Patches<'a, R>, cob::cache::StoreReader>, Error>
-    where
-        R: ReadRepository + cob::Store,
-    {
-        let path = self.cobs().join(cob::cache::COBS_DB_FILE);
-        let db = cob::cache::Store::reader(path)?;
-        let store = cob::patch::Patches::open(repository)?;
-        Ok(cob::patch::Cache::reader(store, db))
-    }
-
-    /// Return a read-write handle for the patches cache.
-    pub fn patches_mut<'a, R>(
-        &self,
-        repository: &'a R,
-    ) -> Result<cob::patch::Cache<cob::patch::Patches<'a, R>, cob::cache::StoreWriter>, Error>
-    where
-        R: ReadRepository + cob::Store,
-    {
-        let path = self.cobs().join(cob::cache::COBS_DB_FILE);
-        let db = cob::cache::Store::open(path)?;
-        let store = cob::patch::Patches::open(repository)?;
-        Ok(cob::patch::Cache::open(store, db))
-    }
-}
-
-// Private methods.
-impl Home {
-    /// Return a read-only handle to the policies store of the node.
-    fn policies(&self) -> Result<policy::store::StoreReader, policy::store::Error> {
-        let path = self.node().join(node::POLICIES_DB_FILE);
-        let config = policy::store::Store::reader(path)?;
-
-        Ok(config)
-    }
-}
-
-#[cfg(test)]
-#[cfg(not(target_os = "macos"))]
-mod test {
-    use super::*;
-    use std::fs;
-
-    // Checks that if we have:
-    // '/run/user/1000/.tmpqfK6ih/../.tmpqfK6ih/Radicle/Home'
-    //
-    // that it gets normalized to:
-    // '/run/user/1000/.tmpqfK6ih/Radicle/Home'
-    #[test]
-    fn canonicalize_home() {
-        let tmp = tempfile::tempdir().unwrap();
-        let path = tmp.path().join("Home").join("Radicle");
-        fs::create_dir_all(path.clone()).unwrap();
-
-        let last = tmp.path().components().last().unwrap();
-        let home = Home::new(
-            tmp.path()
-                .join("..")
-                .join(last)
-                .join("Home")
-                .join("Radicle"),
-        )
-        .unwrap();
-
-        assert_eq!(home.path, path);
-    }
-
-    #[test]
-    fn test_config() {
-        let cfg = json::from_value::<Config>(json::json!({
-          "publicExplorer": "https://app.radicle.xyz/nodes/$host/$rid$path",
-          "preferredSeeds": [],
-          "web": {
-            "pinned": {
-              "repositories": [
-                "rad:z3TajuiHXifEDEX4qbJxe8nXr9ufi",
-                "rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5"
-              ]
-            }
-          },
-          "cli": { "hints": true },
-          "node": {
-            "alias": "seed.radicle.xyz",
-            "listen": [],
-            "peers": { "type": "dynamic", "target": 8 },
-            "connect": [
-              "z6Mkmqogy2qEM2ummccUthFEaaHvyYmYBYh3dbe9W4ebScxo@ash.radicle.garden:8776",
-              "z6MkrLMMsiPWUcNPHcRajuMi9mDfYckSoJyPwwnknocNYPm7@seed.radicle.garden:8776"
-            ],
-            "externalAddresses": [ "seed.radicle.xyz:8776" ],
-            "db": { "journalMode": "wal" },
-            "network": "main",
-            "log": "INFO",
-            "relay": "always",
-            "limits": {
-              "routingMaxSize": 1000,
-              "routingMaxAge": 604800,
-              "gossipMaxAge": 604800,
-              "fetchConcurrency": 1,
-              "maxOpenFiles": 4096,
-              "rate": {
-                "inbound": { "fillRate": 10.0, "capacity": 2048 },
-                "outbound": { "fillRate": 10.0, "capacity": 2048 }
-              },
-              "connection": { "inbound": 128, "outbound": 16 }
-            },
-            "workers": 32,
-            "policy": "allow",
-            "scope": "all"
-          }
-        }))
-        .unwrap();
-
-        assert!(cfg.node.extra.contains_key("db"));
-        assert!(cfg.node.extra.contains_key("policy"));
-        assert!(cfg.node.extra.contains_key("scope"));
-    }
-}
diff --git a/radicle/src/rad.rs b/radicle/src/rad.rs
deleted file mode 100644
index 07917a74e..000000000
--- a/radicle/src/rad.rs
+++ /dev/null
@@ -1,545 +0,0 @@
-#![allow(clippy::let_unit_value)]
-use std::io;
-use std::path::Path;
-use std::str::FromStr;
-
-use once_cell::sync::Lazy;
-use thiserror::Error;
-
-use crate::cob::ObjectId;
-use crate::crypto::{Signer, Verified};
-use crate::git;
-use crate::identity::doc;
-use crate::identity::doc::{DocError, RepoId, Visibility};
-use crate::identity::project::{Project, ProjectName};
-use crate::storage::git::transport;
-use crate::storage::git::Repository;
-use crate::storage::refs::SignedRefs;
-use crate::storage::RepositoryError;
-use crate::storage::{BranchName, ReadRepository as _, RemoteId, SignRepository as _};
-use crate::storage::{WriteRepository, WriteStorage};
-use crate::{identity, storage};
-
-/// Name of the radicle storage remote.
-pub static REMOTE_NAME: Lazy<git::RefString> = Lazy::new(|| git::refname!("rad"));
-/// Name of the radicle storage remote.
-pub static REMOTE_COMPONENT: Lazy<git::Component> = Lazy::new(|| git::fmt::name::component!("rad"));
-/// Refname used for pushing patches.
-pub static PATCHES_REFNAME: Lazy<git::RefString> = Lazy::new(|| git::refname!("refs/patches"));
-
-#[derive(Error, Debug)]
-pub enum InitError {
-    #[error("doc: {0}")]
-    Doc(#[from] DocError),
-    #[error("repository: {0}")]
-    Repository(#[from] RepositoryError),
-    #[error("project payload: {0}")]
-    ProjectPayload(String),
-    #[error("git: {0}")]
-    Git(#[from] git2::Error),
-    #[error("i/o: {0}")]
-    Io(#[from] io::Error),
-    #[error("storage: {0}")]
-    Storage(#[from] storage::Error),
-}
-
-/// Initialize a new radicle project from a git repository.
-pub fn init<G: Signer, S: WriteStorage>(
-    repo: &git2::Repository,
-    name: ProjectName,
-    description: &str,
-    default_branch: BranchName,
-    visibility: Visibility,
-    signer: &G,
-    storage: S,
-) -> Result<(RepoId, identity::Doc<Verified>, SignedRefs<Verified>), InitError> {
-    // TODO: Better error when project id already exists in storage, but remote doesn't.
-    let pk = signer.public_key();
-    let delegate = identity::Did::from(*pk);
-    let proj = Project::new(
-        name.to_owned(),
-        description.to_owned(),
-        default_branch.clone(),
-    )
-    .map_err(|errs| {
-        InitError::ProjectPayload(
-            errs.into_iter()
-                .map(|err| err.to_string())
-                .collect::<Vec<_>>()
-                .join(", "),
-        )
-    })?;
-    let doc = identity::Doc::initial(proj, delegate, visibility).verified()?;
-    let (project, _) = Repository::init(&doc, &storage, signer)?;
-    let url = git::Url::from(project.id);
-
-    match init_configure(repo, &project, pk, &default_branch, &url, signer) {
-        Ok(signed) => Ok((project.id, doc, signed)),
-        Err(err) => {
-            if let Err(e) = project.remove() {
-                log::warn!(target: "radicle", "Failed to remove project during `rad::init` cleanup: {e}");
-            }
-            if repo.find_remote(&REMOTE_NAME).is_ok() {
-                if let Err(e) = repo.remote_delete(&REMOTE_NAME) {
-                    log::warn!(target: "radicle", "Failed to remove remote during `rad::init` cleanup: {e}");
-                }
-            }
-            Err(err)
-        }
-    }
-}
-
-fn init_configure<G>(
-    repo: &git2::Repository,
-    project: &Repository,
-    pk: &crypto::PublicKey,
-    default_branch: &BranchName,
-    url: &git::Url,
-    signer: &G,
-) -> Result<SignedRefs<Verified>, InitError>
-where
-    G: crypto::Signer,
-{
-    git::configure_repository(repo)?;
-    git::configure_remote(repo, &REMOTE_NAME, url, &url.clone().with_namespace(*pk))?;
-    git::push(
-        repo,
-        &REMOTE_NAME,
-        [(
-            &git::fmt::lit::refs_heads(default_branch).into(),
-            &git::fmt::lit::refs_heads(default_branch).into(),
-        )],
-    )?;
-
-    let signed = project.sign_refs(signer)?;
-    let _head = project.set_identity_head()?;
-    let _head = project.set_head()?;
-
-    Ok(signed)
-}
-
-#[derive(Error, Debug)]
-pub enum ForkError {
-    #[error("git: {0}")]
-    Git(#[from] git2::Error),
-    #[error("storage: {0}")]
-    Storage(#[from] storage::Error),
-    #[error("payload: {0}")]
-    Payload(#[from] doc::PayloadError),
-    #[error("repository `{0}` was not found in storage")]
-    NotFound(RepoId),
-    #[error("repository: {0}")]
-    Repository(#[from] RepositoryError),
-}
-
-/// Create a local tree for an existing project, from an existing remote.
-pub fn fork_remote<G: Signer, S: storage::WriteStorage>(
-    proj: RepoId,
-    remote: &RemoteId,
-    signer: &G,
-    storage: S,
-) -> Result<(), ForkError> {
-    // TODO: Copy tags over?
-
-    // Creates or copies the following references:
-    //
-    // refs/namespaces/<pk>/refs/heads/master
-    // refs/namespaces/<pk>/refs/rad/sigrefs
-    // refs/namespaces/<pk>/refs/tags/*
-
-    let me = signer.public_key();
-    let doc = storage.get(proj)?.ok_or(ForkError::NotFound(proj))?;
-    let project = doc.project()?;
-    let repository = storage.repository_mut(proj)?;
-
-    let raw = repository.raw();
-    let remote_head = raw.refname_to_id(&git::refs::storage::branch_of(
-        remote,
-        project.default_branch(),
-    ))?;
-    raw.reference(
-        &git::refs::storage::branch_of(me, project.default_branch()),
-        remote_head,
-        false,
-        &format!("creating default branch for {me}"),
-    )?;
-    repository.sign_refs(signer)?;
-
-    Ok(())
-}
-
-pub fn fork<G: Signer, S: storage::WriteStorage>(
-    rid: RepoId,
-    signer: &G,
-    storage: &S,
-) -> Result<(), ForkError> {
-    let me = signer.public_key();
-    let repository = storage.repository_mut(rid)?;
-    let (canonical_branch, canonical_head) = repository.head()?;
-    let raw = repository.raw();
-
-    raw.reference(
-        &canonical_branch.with_namespace(me.into()),
-        *canonical_head,
-        true,
-        &format!("creating default branch for {me}"),
-    )?;
-    repository.sign_refs(signer)?;
-
-    Ok(())
-}
-
-#[derive(Error, Debug)]
-pub enum CheckoutError {
-    #[error("failed to fetch to working copy")]
-    Fetch(#[source] git2::Error),
-    #[error("git: {0}")]
-    Git(#[from] git2::Error),
-    #[error("payload: {0}")]
-    Payload(#[from] doc::PayloadError),
-    #[error("repository `{0}` was not found in storage")]
-    NotFound(RepoId),
-    #[error("repository: {0}")]
-    Repository(#[from] RepositoryError),
-}
-
-/// Checkout a project from storage as a working copy.
-/// This effectively does a `git-clone` from storage.
-pub fn checkout<P: AsRef<Path>, S: storage::ReadStorage>(
-    proj: RepoId,
-    remote: &RemoteId,
-    path: P,
-    storage: &S,
-) -> Result<git2::Repository, CheckoutError> {
-    // TODO: Decide on whether we can use `clone_local`
-    // TODO: Look into sharing object databases.
-    let doc = storage.get(proj)?.ok_or(CheckoutError::NotFound(proj))?;
-    let project = doc.project()?;
-
-    let mut opts = git2::RepositoryInitOptions::new();
-    opts.no_reinit(true).description(project.description());
-
-    let repo = git2::Repository::init_opts(path.as_ref(), &opts)?;
-    let url = git::Url::from(proj);
-
-    // Configure repository for radicle.
-    git::configure_repository(&repo)?;
-    // Configure and fetch all refs from remote.
-    git::configure_remote(
-        &repo,
-        &REMOTE_NAME,
-        &url,
-        &url.clone().with_namespace(*remote),
-    )?;
-    git::fetch(&repo, &REMOTE_NAME).map_err(CheckoutError::Fetch)?;
-
-    {
-        // Setup default branch.
-        let remote_head_ref =
-            git::refs::workdir::remote_branch(&REMOTE_NAME, project.default_branch());
-
-        let remote_head_commit = repo.find_reference(&remote_head_ref)?.peel_to_commit()?;
-        let branch = repo
-            .branch(project.default_branch(), &remote_head_commit, true)?
-            .into_reference();
-        let branch_ref = branch
-            .name()
-            .expect("checkout: default branch name is valid UTF-8");
-
-        repo.set_head(branch_ref)?;
-        repo.checkout_head(None)?;
-
-        // Setup remote tracking for default branch.
-        git::set_upstream(&repo, &*REMOTE_NAME, project.default_branch(), branch_ref)?;
-    }
-
-    Ok(repo)
-}
-
-#[derive(Error, Debug)]
-pub enum RemoteError {
-    #[error("git: {0}")]
-    Git(#[from] git2::Error),
-    #[error("invalid remote url: {0}")]
-    Url(#[from] transport::local::UrlError),
-    #[error("invalid utf-8 string")]
-    InvalidUtf8,
-    #[error("remote `{0}` not found")]
-    NotFound(String),
-    #[error("expected remote for {expected} but found {found}")]
-    RidMismatch { found: RepoId, expected: RepoId },
-}
-
-/// Get the radicle ("rad") remote of a repository, and return the associated project id.
-pub fn remote(repo: &git2::Repository) -> Result<(git2::Remote<'_>, RepoId), RemoteError> {
-    let remote = repo.find_remote(&REMOTE_NAME).map_err(|e| {
-        if e.code() == git2::ErrorCode::NotFound {
-            RemoteError::NotFound(REMOTE_NAME.to_string())
-        } else {
-            RemoteError::from(e)
-        }
-    })?;
-    let url = remote.url().ok_or(RemoteError::InvalidUtf8)?;
-    let url = git::Url::from_str(url)?;
-
-    Ok((remote, url.repo))
-}
-
-/// Delete the radicle ("rad") remote of a repository.
-pub fn remove_remote(repo: &git2::Repository) -> Result<(), RemoteError> {
-    repo.remote_delete(&REMOTE_NAME).map_err(|e| {
-        if e.code() == git2::ErrorCode::NotFound {
-            RemoteError::NotFound(REMOTE_NAME.to_string())
-        } else {
-            RemoteError::from(e)
-        }
-    })?;
-    Ok(())
-}
-
-/// Get the RID of the repository in current working directory
-///
-/// It will atempt to search parent directories if `path` did not find
-/// a git repository.
-///
-/// # Safety
-///
-/// This function should only perform read operations since we do not
-/// want to modify the wrong repository in the case that it found a
-/// Git repository that is not a Radicle repository.
-pub fn cwd() -> Result<(git2::Repository, RepoId), RemoteError> {
-    let repo = repo()?;
-    let (_, id) = remote(&repo)?;
-
-    Ok((repo, id))
-}
-
-/// Get the repository of project in specified directory
-pub fn at(path: impl AsRef<Path>) -> Result<(git2::Repository, RepoId), RemoteError> {
-    let repo = git2::Repository::open(path)?;
-    let (_, id) = remote(&repo)?;
-
-    Ok((repo, id))
-}
-
-/// Get the current Git repository.
-pub fn repo() -> Result<git2::Repository, git2::Error> {
-    let mut flags = git2::RepositoryOpenFlags::empty();
-    // Allow to search upwards.
-    flags.set(git2::RepositoryOpenFlags::NO_SEARCH, false);
-    // Allow to use `GIT_DIR` env.
-    flags.set(git2::RepositoryOpenFlags::FROM_ENV, true);
-
-    let ceilings: &[&str] = &[];
-    let repo = git2::Repository::open_ext(Path::new("."), flags, ceilings)?;
-
-    Ok(repo)
-}
-
-/// Setup patch upstream branch such that `git push` updates the patch.
-pub fn setup_patch_upstream<'a>(
-    patch: &ObjectId,
-    patch_head: git::Oid,
-    working: &'a git::raw::Repository,
-    remote: &git::RefString,
-    force: bool,
-) -> Result<Option<git::raw::Branch<'a>>, git::ext::Error> {
-    let head = working.head()?;
-
-    // Don't do anything in case we're not on the patch branch.
-    if head.peel_to_commit()?.id() != *patch_head {
-        return Ok(None);
-    }
-    let Ok(r) = head.resolve() else {
-        return Ok(None);
-    };
-
-    // Can't set an upstream for something that's not a branch
-    if !r.is_branch() {
-        return Ok(None);
-    }
-
-    let branch = git::raw::Branch::wrap(r);
-
-    // Only set the upstream if it's missing or `force` is `true`
-    if branch.upstream().is_ok() && !force {
-        return Ok(None);
-    }
-
-    let name: Option<git::RefString> = branch.name()?.and_then(|b| b.try_into().ok());
-    let remote_branch = git::refs::workdir::patch_upstream(patch);
-    let remote_branch = working.reference(
-        &remote_branch,
-        *patch_head,
-        true,
-        "Create remote tracking branch for patch",
-    )?;
-    assert!(remote_branch.is_remote());
-
-    if let Some(name) = name {
-        if force || branch.upstream().is_err() {
-            git::set_upstream(working, remote, name.as_str(), git::refs::patch(patch))?;
-        }
-    }
-    Ok(Some(git::raw::Branch::wrap(remote_branch)))
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::HashMap;
-
-    use pretty_assertions::assert_eq;
-    use radicle_crypto::test::signer::MockSigner;
-
-    use crate::git::{name::component, qualified};
-    use crate::identity::Did;
-    use crate::storage::git::transport;
-    use crate::storage::git::Storage;
-    use crate::storage::{ReadStorage, RemoteRepository as _};
-    use crate::test::fixtures;
-
-    use super::*;
-
-    #[test]
-    fn test_init() {
-        let tempdir = tempfile::tempdir().unwrap();
-        let signer = MockSigner::default();
-        let public_key = *signer.public_key();
-        let storage = Storage::open(tempdir.path().join("storage"), fixtures::user()).unwrap();
-
-        transport::local::register(storage.clone());
-
-        let (repo, _) = fixtures::repository(tempdir.path().join("working"));
-        let (proj, _, refs) = init(
-            &repo,
-            "acme".try_into().unwrap(),
-            "Acme's repo",
-            git::refname!("master"),
-            Visibility::default(),
-            &signer,
-            &storage,
-        )
-        .unwrap();
-
-        let doc = storage.get(proj).unwrap().unwrap();
-        let project = doc.project().unwrap();
-        let remotes: HashMap<_, _> = storage
-            .repository(proj)
-            .unwrap()
-            .remotes()
-            .unwrap()
-            .collect::<Result<_, _>>()
-            .unwrap();
-
-        let project_repo = storage.repository(proj).unwrap();
-        let (_, head) = project_repo.head().unwrap();
-
-        // Test canonical refs.
-        assert_eq!(refs.head(component!("master")).unwrap(), head);
-        assert_eq!(project_repo.raw().refname_to_id("HEAD").unwrap(), *head);
-        assert_eq!(
-            project_repo
-                .raw()
-                .refname_to_id("refs/heads/master")
-                .unwrap(),
-            *head
-        );
-
-        assert_eq!(remotes[&public_key].refs, refs);
-        assert_eq!(project.name(), "acme");
-        assert_eq!(project.description(), "Acme's repo");
-        assert_eq!(project.default_branch(), &git::refname!("master"));
-        assert_eq!(doc.delegates.first(), &Did::from(public_key));
-    }
-
-    #[test]
-    fn test_fork() {
-        let mut rng = fastrand::Rng::new();
-        let tempdir = tempfile::tempdir().unwrap();
-        let alice = MockSigner::new(&mut rng);
-        let bob = MockSigner::new(&mut rng);
-        let bob_id = bob.public_key();
-        let storage = Storage::open(tempdir.path().join("storage"), fixtures::user()).unwrap();
-
-        transport::local::register(storage.clone());
-
-        // Alice creates a project.
-        let (original, _) = fixtures::repository(tempdir.path().join("original"));
-        let (id, _, alice_refs) = init(
-            &original,
-            "acme".try_into().unwrap(),
-            "Acme's repo",
-            git::refname!("master"),
-            Visibility::default(),
-            &alice,
-            &storage,
-        )
-        .unwrap();
-
-        // Bob forks it and creates a checkout.
-        fork(id, &bob, &storage).unwrap();
-        checkout(id, bob_id, tempdir.path().join("copy"), &storage).unwrap();
-
-        let bob_remote = storage.repository(id).unwrap().remote(bob_id).unwrap();
-
-        assert_eq!(
-            bob_remote
-                .refs
-                .get(&qualified!("refs/heads/master"))
-                .unwrap(),
-            alice_refs.get(&qualified!("refs/heads/master")).unwrap()
-        );
-    }
-
-    #[test]
-    fn test_checkout() {
-        let tempdir = tempfile::tempdir().unwrap();
-        let signer = MockSigner::default();
-        let remote_id = signer.public_key();
-        let storage = Storage::open(tempdir.path().join("storage"), fixtures::user()).unwrap();
-
-        transport::local::register(storage.clone());
-
-        let (original, _) = fixtures::repository(tempdir.path().join("original"));
-        let (id, _, _) = init(
-            &original,
-            "acme".try_into().unwrap(),
-            "Acme's repo",
-            git::refname!("master"),
-            Visibility::default(),
-            &signer,
-            &storage,
-        )
-        .unwrap();
-        git::set_upstream(&original, "rad", "master", "refs/heads/master").unwrap();
-
-        let copy = checkout(id, remote_id, tempdir.path().join("copy"), &storage).unwrap();
-
-        assert_eq!(
-            copy.head().unwrap().target(),
-            original.head().unwrap().target()
-        );
-        assert_eq!(
-            copy.branch_upstream_name("refs/heads/master")
-                .unwrap()
-                .to_vec(),
-            original
-                .branch_upstream_name("refs/heads/master")
-                .unwrap()
-                .to_vec()
-        );
-        assert_eq!(
-            copy.find_remote(&REMOTE_NAME)
-                .unwrap()
-                .refspecs()
-                .map(|r| r.bytes().to_vec())
-                .collect::<Vec<_>>(),
-            original
-                .find_remote(&REMOTE_NAME)
-                .unwrap()
-                .refspecs()
-                .map(|r| r.bytes().to_vec())
-                .collect::<Vec<_>>(),
-        );
-    }
-}
diff --git a/radicle/src/serde_ext.rs b/radicle/src/serde_ext.rs
deleted file mode 100644
index 8e785e53a..000000000
--- a/radicle/src/serde_ext.rs
+++ /dev/null
@@ -1,170 +0,0 @@
-pub mod bool {
-    /// Function that always returns `true`, for use in `serde(default)` attributes.
-    pub fn yes() -> bool {
-        true
-    }
-}
-
-pub mod string {
-    use std::fmt::Display;
-    use std::str::FromStr;
-
-    use serde::{de, Deserialize, Deserializer, Serializer};
-
-    pub fn serialize<T, S>(value: &T, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        T: Display,
-        S: Serializer,
-    {
-        serializer.collect_str(value)
-    }
-
-    pub fn deserialize<'de, T, D>(deserializer: D) -> Result<T, D::Error>
-    where
-        T: FromStr,
-        T::Err: Display,
-        D: Deserializer<'de>,
-    {
-        String::deserialize(deserializer)?
-            .parse()
-            .map_err(de::Error::custom)
-    }
-}
-
-/// Unlike the default `serde` instances from `localtime`, this encodes and decodes using seconds
-/// instead of milliseconds.
-pub mod localtime {
-    pub mod time {
-        use localtime::LocalTime;
-        use serde::{Deserialize, Deserializer, Serializer};
-
-        pub fn serialize<S>(value: &LocalTime, serializer: S) -> Result<S::Ok, S::Error>
-        where
-            S: Serializer,
-        {
-            serializer.serialize_u64(value.as_secs())
-        }
-
-        pub fn deserialize<'de, D>(deserializer: D) -> Result<LocalTime, D::Error>
-        where
-            D: Deserializer<'de>,
-        {
-            let seconds = u64::deserialize(deserializer)?;
-
-            Ok(LocalTime::from_secs(seconds))
-        }
-    }
-
-    pub mod option {
-        pub mod time {
-            use localtime::LocalTime;
-            use serde::{Deserialize, Deserializer, Serializer};
-
-            pub fn serialize<S>(value: &Option<LocalTime>, serializer: S) -> Result<S::Ok, S::Error>
-            where
-                S: Serializer,
-            {
-                match value {
-                    Some(time) => serializer.serialize_some(&time.as_secs()),
-                    None => serializer.serialize_none(),
-                }
-            }
-
-            pub fn deserialize<'de, D>(deserializer: D) -> Result<Option<LocalTime>, D::Error>
-            where
-                D: Deserializer<'de>,
-            {
-                let option = Option::<u64>::deserialize(deserializer)?;
-                match option {
-                    Some(seconds) => Ok(Some(LocalTime::from_secs(seconds))),
-                    None => Ok(None),
-                }
-            }
-        }
-    }
-
-    pub mod duration {
-        use localtime::LocalDuration;
-        use serde::{Deserialize, Deserializer, Serializer};
-
-        pub fn serialize<S>(value: &LocalDuration, serializer: S) -> Result<S::Ok, S::Error>
-        where
-            S: Serializer,
-        {
-            serializer.serialize_u64(value.as_secs())
-        }
-
-        pub fn deserialize<'de, D>(deserializer: D) -> Result<LocalDuration, D::Error>
-        where
-            D: Deserializer<'de>,
-        {
-            let seconds = u64::deserialize(deserializer)?;
-
-            Ok(LocalDuration::from_secs(seconds))
-        }
-    }
-}
-
-/// Return true if the given value is the default for that type.
-pub fn is_default<T: Default + PartialEq>(t: &T) -> bool {
-    t == &T::default()
-}
-
-/// Deserialize a value, but if it fails, return the default value.
-pub fn ok_or_default<'de, T, D>(deserializer: D) -> Result<T, D::Error>
-where
-    T: serde::Deserialize<'de> + Default,
-    D: serde::Deserializer<'de>,
-{
-    let v: serde_json::Value = serde::Deserialize::deserialize(deserializer)?;
-    Ok(T::deserialize(v).unwrap_or_default())
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    use ::localtime::LocalTime;
-
-    #[test]
-    fn test_localtime() {
-        #[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Eq)]
-        struct Test {
-            time: LocalTime,
-        }
-        let value = Test {
-            time: LocalTime::from_millis(1699636852107),
-        };
-
-        assert_eq!(
-            serde_json::from_str::<Test>(r#"{"time":1699636852107}"#).unwrap(),
-            value
-        );
-        assert_eq!(
-            serde_json::from_str::<Test>(serde_json::to_string(&value).unwrap().as_str()).unwrap(),
-            value
-        );
-    }
-
-    #[test]
-    // Tests serialization into seconds instead of milliseconds.
-    fn test_localtime_ext() {
-        #[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Eq)]
-        struct Test {
-            #[serde(with = "localtime::time")]
-            time: LocalTime,
-        }
-        let value = Test {
-            time: LocalTime::from_secs(1699636852107),
-        };
-
-        assert_eq!(
-            serde_json::from_str::<Test>(r#"{"time":1699636852107}"#).unwrap(),
-            value
-        );
-        assert_eq!(
-            serde_json::from_str::<Test>(serde_json::to_string(&value).unwrap().as_str()).unwrap(),
-            value
-        );
-    }
-}
diff --git a/radicle/src/sql.rs b/radicle/src/sql.rs
deleted file mode 100644
index f6dada6c3..000000000
--- a/radicle/src/sql.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-use std::ops::Deref;
-use std::str::FromStr;
-
-use sqlite as sql;
-use sqlite::Value;
-
-use crate::identity::RepoId;
-use crate::node;
-use crate::node::{Address, UserAgent};
-
-/// Run an SQL query inside a transaction.
-/// Commits the transaction on success, and rolls back on error.
-pub fn transaction<T, E: From<sql::Error>>(
-    db: &sql::Connection,
-    query: impl FnOnce(&sql::Connection) -> Result<T, E>,
-) -> Result<T, E> {
-    db.execute("BEGIN")?;
-
-    match query(db) {
-        Ok(result) => {
-            db.execute("COMMIT")?;
-            Ok(result)
-        }
-        Err(err) => {
-            db.execute("ROLLBACK")?;
-            Err(err)
-        }
-    }
-}
-
-impl TryFrom<&Value> for RepoId {
-    type Error = sql::Error;
-
-    fn try_from(value: &Value) -> Result<Self, Self::Error> {
-        match value {
-            Value::String(id) => RepoId::from_urn(id).map_err(|e| sql::Error {
-                code: None,
-                message: Some(e.to_string()),
-            }),
-            _ => Err(sql::Error {
-                code: None,
-                message: Some(format!("sql: invalid type `{:?}` for id", value.kind())),
-            }),
-        }
-    }
-}
-
-impl sqlite::BindableWithIndex for &RepoId {
-    fn bind<I: sql::ParameterIndex>(self, stmt: &mut sql::Statement<'_>, i: I) -> sql::Result<()> {
-        self.urn().as_str().bind(stmt, i)
-    }
-}
-
-impl sql::BindableWithIndex for node::Features {
-    fn bind<I: sql::ParameterIndex>(self, stmt: &mut sql::Statement<'_>, i: I) -> sql::Result<()> {
-        (*self.deref() as i64).bind(stmt, i)
-    }
-}
-
-impl TryFrom<&Value> for node::Features {
-    type Error = sql::Error;
-
-    fn try_from(value: &Value) -> Result<Self, Self::Error> {
-        match value {
-            Value::Integer(bits) => Ok(node::Features::from(*bits as u64)),
-            _ => Err(sql::Error {
-                code: None,
-                message: Some(format!(
-                    "sql: invalid type `{:?}` for node features",
-                    value.kind()
-                )),
-            }),
-        }
-    }
-}
-
-impl TryFrom<&sql::Value> for Address {
-    type Error = sql::Error;
-
-    fn try_from(value: &sql::Value) -> Result<Self, Self::Error> {
-        match value {
-            sql::Value::String(s) => Address::from_str(s.as_str()).map_err(|e| sql::Error {
-                code: None,
-                message: Some(e.to_string()),
-            }),
-            _ => Err(sql::Error {
-                code: None,
-                message: Some(format!(
-                    "sql: invalid type `{:?}` for address",
-                    value.kind()
-                )),
-            }),
-        }
-    }
-}
-
-impl sql::BindableWithIndex for &Address {
-    fn bind<I: sql::ParameterIndex>(self, stmt: &mut sql::Statement<'_>, i: I) -> sql::Result<()> {
-        self.to_string().bind(stmt, i)
-    }
-}
-
-impl TryFrom<&Value> for UserAgent {
-    type Error = sql::Error;
-
-    fn try_from(value: &Value) -> Result<Self, Self::Error> {
-        match value {
-            Value::String(ua) => UserAgent::from_str(ua).map_err(|e| sql::Error {
-                code: None,
-                message: Some(e.to_string()),
-            }),
-            _ => Err(sql::Error {
-                code: None,
-                message: Some(format!(
-                    "sql: invalid type `{:?}` for user-agent",
-                    value.kind()
-                )),
-            }),
-        }
-    }
-}
diff --git a/radicle/src/storage.rs b/radicle/src/storage.rs
deleted file mode 100644
index f3e34f83e..000000000
--- a/radicle/src/storage.rs
+++ /dev/null
@@ -1,710 +0,0 @@
-pub mod git;
-pub mod refs;
-
-use std::collections::{hash_map, HashSet};
-use std::ops::Deref;
-use std::path::{Path, PathBuf};
-use std::{fmt, io};
-
-use nonempty::NonEmpty;
-use serde::{Deserialize, Serialize};
-use thiserror::Error;
-
-use crypto::{PublicKey, Signer, Unverified, Verified};
-pub use git::{Validation, Validations};
-pub use radicle_git_ext::Oid;
-
-use crate::cob;
-use crate::collections::RandomMap;
-use crate::git::{canonical, ext as git_ext};
-use crate::git::{refspec::Refspec, PatternString, Qualified, RefError, RefStr, RefString};
-use crate::identity::{Did, PayloadError};
-use crate::identity::{Doc, DocAt, DocError};
-use crate::identity::{Identity, RepoId};
-use crate::node::SyncedAt;
-use crate::storage::git::NAMESPACES_GLOB;
-use crate::storage::refs::Refs;
-
-use self::git::UserInfo;
-use self::refs::{RefsAt, SignedRefs};
-
-pub type BranchName = git::RefString;
-
-/// Basic repository information.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct RepositoryInfo<V> {
-    /// Repository identifier.
-    pub rid: RepoId,
-    /// Head of default branch.
-    pub head: Oid,
-    /// Identity document.
-    pub doc: Doc<V>,
-    /// Local signed refs, if any.
-    /// Repositories with this set to `None` are ones that are seeded but not forked.
-    pub refs: Option<refs::SignedRefsAt>,
-    /// Sync time of the repository.
-    pub synced_at: Option<SyncedAt>,
-}
-
-/// Describes one or more namespaces.
-#[derive(Default, Debug, Clone, PartialEq, Eq)]
-pub enum Namespaces {
-    /// All namespaces.
-    #[default]
-    All,
-    /// The followed set of namespaces.
-    Followed(HashSet<PublicKey>),
-}
-
-impl Namespaces {
-    pub fn to_refspecs(&self) -> Vec<Refspec<PatternString, PatternString>> {
-        match self {
-            Namespaces::All => vec![Refspec {
-                src: (*NAMESPACES_GLOB).clone(),
-                dst: (*NAMESPACES_GLOB).clone(),
-                force: true,
-            }],
-            Namespaces::Followed(pks) => pks
-                .iter()
-                .map(|pk| {
-                    let ns = pk.to_namespace().with_pattern(git::refspec::STAR);
-                    Refspec {
-                        src: ns.clone(),
-                        dst: ns,
-                        force: true,
-                    }
-                })
-                .collect(),
-        }
-    }
-}
-
-impl FromIterator<PublicKey> for Namespaces {
-    fn from_iter<T: IntoIterator<Item = PublicKey>>(iter: T) -> Self {
-        Self::Followed(iter.into_iter().collect())
-    }
-}
-
-/// Output of [`WriteRepository::set_head`].
-pub struct SetHead {
-    /// Old branch head.
-    pub old: Option<Oid>,
-    /// New branch head.
-    pub new: Oid,
-}
-
-impl SetHead {
-    /// Check if the head was updated.
-    pub fn is_updated(&self) -> bool {
-        self.old != Some(self.new)
-    }
-}
-
-/// Repository error.
-#[derive(Error, Debug)]
-pub enum RepositoryError {
-    #[error(transparent)]
-    Storage(#[from] Error),
-    #[error(transparent)]
-    Store(#[from] cob::store::Error),
-    #[error(transparent)]
-    Doc(#[from] DocError),
-    #[error(transparent)]
-    Payload(#[from] PayloadError),
-    #[error(transparent)]
-    Git(#[from] git::raw::Error),
-    #[error(transparent)]
-    GitExt(#[from] git_ext::Error),
-    #[error(transparent)]
-    Quorum(#[from] canonical::QuorumError),
-    #[error(transparent)]
-    Refs(#[from] refs::Error),
-}
-
-impl RepositoryError {
-    pub fn is_not_found(&self) -> bool {
-        match self {
-            Self::Storage(e) if e.is_not_found() => true,
-            Self::Git(e) if git_ext::is_not_found_err(e) => true,
-            Self::GitExt(git_ext::Error::NotFound(_)) => true,
-            _ => false,
-        }
-    }
-}
-
-/// Storage error.
-#[derive(Error, Debug)]
-pub enum Error {
-    #[error("invalid git reference")]
-    InvalidRef,
-    #[error("identity doc: {0}")]
-    Doc(#[from] DocError),
-    #[error("git reference error: {0}")]
-    Ref(#[from] RefError),
-    #[error(transparent)]
-    Refs(#[from] refs::Error),
-    #[error("git: {0}")]
-    Git(#[from] git2::Error),
-    #[error("git: {0}")]
-    Ext(#[from] git::ext::Error),
-    #[error("invalid repository identifier {0:?}")]
-    InvalidId(std::ffi::OsString),
-    #[error("i/o: {0}")]
-    Io(#[from] io::Error),
-}
-
-impl Error {
-    /// Whether this error is caused by something not being found.
-    pub fn is_not_found(&self) -> bool {
-        match self {
-            Self::Io(e) if e.kind() == io::ErrorKind::NotFound => true,
-            Self::Git(e) if git::ext::is_not_found_err(e) => true,
-            Self::Doc(e) if e.is_not_found() => true,
-            _ => false,
-        }
-    }
-}
-
-/// Fetch error.
-#[derive(Error, Debug)]
-#[allow(clippy::large_enum_variant)]
-pub enum FetchError {
-    #[error("git: {0}")]
-    Git(#[from] git2::Error),
-    #[error("i/o: {0}")]
-    Io(#[from] io::Error),
-    #[error(transparent)]
-    Refs(#[from] refs::Error),
-    #[error(transparent)]
-    Storage(#[from] Error),
-    #[error("failed to validate remote layouts in storage")]
-    Validation { validations: Validations },
-    #[error("repository head: {0}")]
-    SetHead(#[from] DocError),
-    #[error("repository: {0}")]
-    Repository(#[from] RepositoryError),
-}
-
-pub type RemoteId = PublicKey;
-
-/// An update to a reference.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum RefUpdate {
-    Updated { name: RefString, old: Oid, new: Oid },
-    Created { name: RefString, oid: Oid },
-    Deleted { name: RefString, oid: Oid },
-    Skipped { name: RefString, oid: Oid },
-}
-
-impl RefUpdate {
-    pub fn from(name: RefString, old: impl Into<Oid>, new: impl Into<Oid>) -> Self {
-        let old = old.into();
-        let new = new.into();
-
-        if old.is_zero() {
-            Self::Created { name, oid: new }
-        } else if new.is_zero() {
-            Self::Deleted { name, oid: old }
-        } else if old != new {
-            Self::Updated { name, old, new }
-        } else {
-            Self::Skipped { name, oid: old }
-        }
-    }
-
-    /// Get the old OID, if any.
-    pub fn old(&self) -> Option<Oid> {
-        match self {
-            RefUpdate::Updated { old, .. } => Some(*old),
-            RefUpdate::Created { .. } => None,
-            RefUpdate::Deleted { oid, .. } => Some(*oid),
-            RefUpdate::Skipped { oid, .. } => Some(*oid),
-        }
-    }
-
-    /// Get the new OID, if any.
-    #[allow(clippy::new_ret_no_self)]
-    pub fn new(&self) -> Option<Oid> {
-        match self {
-            RefUpdate::Updated { new, .. } => Some(*new),
-            RefUpdate::Created { oid, .. } => Some(*oid),
-            RefUpdate::Deleted { .. } => None,
-            RefUpdate::Skipped { .. } => None,
-        }
-    }
-
-    /// Get the ref name.
-    pub fn name(&self) -> &RefStr {
-        match self {
-            RefUpdate::Updated { name, .. } => name.as_refstr(),
-            RefUpdate::Created { name, .. } => name.as_refstr(),
-            RefUpdate::Deleted { name, .. } => name.as_refstr(),
-            RefUpdate::Skipped { name, .. } => name.as_refstr(),
-        }
-    }
-
-    /// Is it an update.
-    pub fn is_updated(&self) -> bool {
-        matches!(self, RefUpdate::Updated { .. })
-    }
-
-    /// Is it a create.
-    pub fn is_created(&self) -> bool {
-        matches!(self, RefUpdate::Created { .. })
-    }
-
-    /// Is it a skip.
-    pub fn is_skipped(&self) -> bool {
-        matches!(self, RefUpdate::Skipped { .. })
-    }
-}
-
-impl fmt::Display for RefUpdate {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Updated { name, old, new } => {
-                write!(f, "~ {old:.7}..{new:.7} {name}")
-            }
-            Self::Created { name, oid } => {
-                write!(f, "* 0000000..{oid:.7} {name}")
-            }
-            Self::Deleted { name, oid } => {
-                write!(f, "- {oid:.7}..0000000 {name}")
-            }
-            Self::Skipped { name, oid } => {
-                write!(f, "= {oid:.7}..{oid:.7} {name}")
-            }
-        }
-    }
-}
-
-/// Project remotes. Tracks the git state of a project.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Remotes<V>(RandomMap<RemoteId, Remote<V>>);
-
-impl<V> FromIterator<(RemoteId, Remote<V>)> for Remotes<V> {
-    fn from_iter<T: IntoIterator<Item = (RemoteId, Remote<V>)>>(iter: T) -> Self {
-        Self(iter.into_iter().collect())
-    }
-}
-
-impl<V> Deref for Remotes<V> {
-    type Target = RandomMap<RemoteId, Remote<V>>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl<V> Remotes<V> {
-    pub fn new(remotes: RandomMap<RemoteId, Remote<V>>) -> Self {
-        Self(remotes)
-    }
-}
-
-impl Remotes<Verified> {
-    pub fn unverified(self) -> Remotes<Unverified> {
-        Remotes(
-            self.into_iter()
-                .map(|(id, r)| (id, r.unverified()))
-                .collect(),
-        )
-    }
-}
-
-impl<V> Default for Remotes<V> {
-    fn default() -> Self {
-        Self(RandomMap::default())
-    }
-}
-
-impl<V> IntoIterator for Remotes<V> {
-    type Item = (RemoteId, Remote<V>);
-    type IntoIter = hash_map::IntoIter<RemoteId, Remote<V>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.0.into_iter()
-    }
-}
-
-impl<V> From<Remotes<V>> for RandomMap<RemoteId, Refs> {
-    fn from(other: Remotes<V>) -> Self {
-        let mut remotes = RandomMap::with_hasher(fastrand::Rng::new().into());
-
-        for (k, v) in other.into_iter() {
-            remotes.insert(k, v.refs.into());
-        }
-        remotes
-    }
-}
-
-/// A project remote.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
-pub struct Remote<V = Verified> {
-    /// Git references published under this remote, and their hashes.
-    #[serde(flatten)]
-    pub refs: SignedRefs<V>,
-}
-
-impl Remote<Unverified> {
-    /// Create a new unverified remotes object.
-    pub fn new(refs: impl Into<SignedRefs<Unverified>>) -> Self {
-        Self { refs: refs.into() }
-    }
-}
-
-impl Remote<Unverified> {
-    pub fn verified(self) -> Result<Remote<Verified>, crypto::Error> {
-        let refs = self.refs.verified()?;
-
-        Ok(Remote { refs })
-    }
-}
-
-impl Remote<Verified> {
-    /// Create a new unverified remotes object.
-    pub fn new(refs: impl Into<SignedRefs<Verified>>) -> Self {
-        Self { refs: refs.into() }
-    }
-
-    pub fn unverified(self) -> Remote<Unverified> {
-        Remote {
-            refs: self.refs.unverified(),
-        }
-    }
-
-    pub fn to_refspecs(&self) -> Vec<Refspec<PatternString, PatternString>> {
-        let ns = self.id.to_namespace();
-        // Nb. the references in Refs are expected to be Qualified
-        self.refs
-            .iter()
-            .map(|(name, _)| {
-                let name = PatternString::from(ns.join(name));
-                Refspec {
-                    src: name.clone(),
-                    dst: name,
-                    force: true,
-                }
-            })
-            .collect()
-    }
-}
-
-impl<V> Deref for Remote<V> {
-    type Target = SignedRefs<V>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.refs
-    }
-}
-
-/// Read-only operations on a storage instance.
-pub trait ReadStorage {
-    type Repository: ReadRepository;
-
-    /// Get user info for this storage.
-    fn info(&self) -> &UserInfo;
-    /// Get the storage base path.
-    fn path(&self) -> &Path;
-    /// Get a repository's path.
-    fn path_of(&self, rid: &RepoId) -> PathBuf;
-    /// Check whether storage contains a repository.
-    fn contains(&self, rid: &RepoId) -> Result<bool, RepositoryError>;
-    /// Return all repositories (public and private).
-    fn repositories(&self) -> Result<Vec<RepositoryInfo<Verified>>, Error>;
-    /// Open or create a read-only repository.
-    fn repository(&self, rid: RepoId) -> Result<Self::Repository, RepositoryError>;
-    /// Get a repository's identity if it exists.
-    fn get(&self, rid: RepoId) -> Result<Option<Doc<Verified>>, RepositoryError> {
-        match self.repository(rid) {
-            Ok(repo) => Ok(Some(repo.identity_doc()?.into())),
-            Err(e) if e.is_not_found() => Ok(None),
-            Err(e) => Err(e),
-        }
-    }
-}
-
-/// Allows access to individual storage repositories.
-pub trait WriteStorage: ReadStorage {
-    type RepositoryMut: WriteRepository;
-
-    /// Open a read-write repository.
-    fn repository_mut(&self, rid: RepoId) -> Result<Self::RepositoryMut, RepositoryError>;
-    /// Create a read-write repository.
-    fn create(&self, rid: RepoId) -> Result<Self::RepositoryMut, Error>;
-
-    /// Clean the repository found at `rid`.
-    ///
-    /// If the local peer has initialised `rad/sigrefs` by forking or
-    /// creating any COBs, then this will delete all remote namespaces
-    /// that are neither the local's or a delegate's.
-    ///
-    /// If the local peer has no initialised `rad/sigrefs`, then the
-    /// repository will be entirely removed from storage.
-    fn clean(&self, rid: RepoId) -> Result<Vec<RemoteId>, RepositoryError>;
-}
-
-/// Anything can return the [`RepoId`] that it is associated with.
-pub trait HasRepoId {
-    fn rid(&self) -> RepoId;
-}
-
-impl<T: ReadRepository> HasRepoId for T {
-    fn rid(&self) -> RepoId {
-        ReadRepository::id(self)
-    }
-}
-
-/// Allows read-only access to a repository.
-pub trait ReadRepository: Sized + ValidateRepository {
-    /// Return the repository id.
-    fn id(&self) -> RepoId;
-
-    /// Returns `true` if there are no references in the repository.
-    fn is_empty(&self) -> Result<bool, git2::Error>;
-
-    /// The [`Path`] to the git repository.
-    fn path(&self) -> &Path;
-
-    /// Get a blob in this repository at the given commit and path.
-    fn blob_at<P: AsRef<Path>>(&self, commit: Oid, path: P) -> Result<git2::Blob, git_ext::Error>;
-
-    /// Get a blob in this repository, given its id.
-    fn blob(&self, oid: Oid) -> Result<git2::Blob, git_ext::Error>;
-
-    /// Get the head of this repository.
-    ///
-    /// Returns the reference pointed to by `HEAD` if it is set. Otherwise, computes the canonical
-    /// head using [`ReadRepository::canonical_head`].
-    ///
-    /// Returns the [`Oid`] as well as the qualified reference name.
-    fn head(&self) -> Result<(Qualified, Oid), RepositoryError>;
-
-    /// Compute the canonical head of this repository.
-    ///
-    /// Ignores any existing `HEAD` reference.
-    ///
-    /// Returns the [`Oid`] as well as the qualified reference name.
-    fn canonical_head(&self) -> Result<(Qualified, Oid), RepositoryError>;
-
-    /// Get the head of the `rad/id` reference in this repository.
-    ///
-    /// Returns the reference pointed to by `rad/id` if it is set. Otherwise, computes the canonical
-    /// `rad/id` using [`ReadRepository::canonical_identity_head`].
-    fn identity_head(&self) -> Result<Oid, RepositoryError>;
-
-    /// Get the identity head of a specific remote.
-    fn identity_head_of(&self, remote: &RemoteId) -> Result<Oid, git::ext::Error>;
-
-    /// Get the root commit of the canonical identity branch.
-    fn identity_root(&self) -> Result<Oid, RepositoryError>;
-
-    /// Get the root commit of the identity branch of a sepcific remote.
-    fn identity_root_of(&self, remote: &RemoteId) -> Result<Oid, RepositoryError>;
-
-    /// Load the identity history.
-    fn identity(&self) -> Result<Identity, RepositoryError>
-    where
-        Self: cob::Store,
-    {
-        Identity::load(self)
-    }
-
-    /// Compute the canonical `rad/id` of this repository.
-    ///
-    /// Ignores any existing `rad/id` reference.
-    fn canonical_identity_head(&self) -> Result<Oid, RepositoryError>;
-
-    /// Compute the canonical identity document.
-    fn canonical_identity_doc(&self) -> Result<DocAt, RepositoryError> {
-        let head = self.canonical_identity_head()?;
-        let doc = self.identity_doc_at(head)?;
-
-        Ok(doc)
-    }
-
-    /// Get the `reference` for the given `remote`.
-    ///
-    /// Returns `None` is the reference did not exist.
-    fn reference(
-        &self,
-        remote: &RemoteId,
-        reference: &Qualified,
-    ) -> Result<git2::Reference, git_ext::Error>;
-
-    /// Get the [`git2::Commit`] found using its `oid`.
-    ///
-    /// Returns `Err` if the commit did not exist.
-    fn commit(&self, oid: Oid) -> Result<git2::Commit, git::ext::Error>;
-
-    /// Perform a revision walk of a commit history starting from the given head.
-    fn revwalk(&self, head: Oid) -> Result<git2::Revwalk, git2::Error>;
-
-    /// Check if the underlying ODB contains the given `oid`.
-    fn contains(&self, oid: Oid) -> Result<bool, git2::Error>;
-
-    /// Check whether the given commit is an ancestor of another commit.
-    fn is_ancestor_of(&self, ancestor: Oid, head: Oid) -> Result<bool, git::ext::Error>;
-
-    /// Get the object id of a reference under the given remote.
-    fn reference_oid(
-        &self,
-        remote: &RemoteId,
-        reference: &Qualified,
-    ) -> Result<Oid, git::raw::Error>;
-
-    /// Get all references of the given remote.
-    fn references_of(&self, remote: &RemoteId) -> Result<Refs, Error>;
-
-    /// Get all references following a pattern.
-    /// Skips references with names that are not parseable into [`Qualified`].
-    ///
-    /// This function always peels reference to the commit. For tags, this means the [`Oid`] of the
-    /// commit pointed to by the tag is returned, and not the [`Oid`] of the tag itsself.
-    fn references_glob(
-        &self,
-        pattern: &git::PatternStr,
-    ) -> Result<Vec<(Qualified, Oid)>, git::ext::Error>;
-
-    /// Get repository delegates.
-    fn delegates(&self) -> Result<NonEmpty<Did>, RepositoryError> {
-        let doc: Doc<_> = self.identity_doc()?.into();
-
-        Ok(doc.delegates)
-    }
-
-    /// Get the repository's identity document.
-    fn identity_doc(&self) -> Result<DocAt, RepositoryError> {
-        let head = self.identity_head()?;
-        let doc = self.identity_doc_at(head)?;
-
-        Ok(doc)
-    }
-
-    /// Get the repository's identity document at a specific commit.
-    fn identity_doc_at(&self, head: Oid) -> Result<DocAt, DocError>;
-
-    /// Get the merge base of two commits.
-    fn merge_base(&self, left: &Oid, right: &Oid) -> Result<Oid, git::ext::Error>;
-}
-
-/// Access the remotes of a repository.
-pub trait RemoteRepository {
-    /// Get the given remote.
-    fn remote(&self, remote: &RemoteId) -> Result<Remote<Verified>, refs::Error>;
-
-    /// Get all remotes.
-    fn remotes(&self) -> Result<Remotes<Verified>, refs::Error>;
-
-    /// Get [`RefsAt`] of all remotes.
-    fn remote_refs_at(&self) -> Result<Vec<RefsAt>, refs::Error>;
-}
-
-pub trait ValidateRepository
-where
-    Self: RemoteRepository,
-{
-    /// Validate all remotes with [`ValidateRepository::validate_remote`].
-    fn validate(&self) -> Result<Validations, Error> {
-        let mut failures = Validations::default();
-        for (_, remote) in self.remotes()? {
-            failures.append(&mut self.validate_remote(&remote)?);
-        }
-        Ok(failures)
-    }
-
-    /// Validates a remote's signed refs and identity.
-    ///
-    /// Returns any ref found under that remote that isn't signed.
-    /// If a signed ref is missing from the repository, an error is returned.
-    fn validate_remote(&self, remote: &Remote<Verified>) -> Result<Validations, Error>;
-}
-
-/// Allows read-write access to a repository.
-pub trait WriteRepository: ReadRepository + SignRepository {
-    /// Set the repository head to the canonical branch.
-    /// This computes the head based on the delegate set.
-    fn set_head(&self) -> Result<SetHead, RepositoryError>;
-    /// Set the repository 'rad/id' to the canonical commit, agreed by quorum.
-    fn set_identity_head(&self) -> Result<Oid, RepositoryError> {
-        let head = self.canonical_identity_head()?;
-        self.set_identity_head_to(head)?;
-
-        Ok(head)
-    }
-    /// Set the repository 'rad/id' to the given commit.
-    fn set_identity_head_to(&self, commit: Oid) -> Result<(), RepositoryError>;
-    /// Set the user info of the Git repository.
-    fn set_user(&self, info: &UserInfo) -> Result<(), Error>;
-    /// Get the underlying git repository.
-    fn raw(&self) -> &git2::Repository;
-}
-
-/// Allows signing refs.
-pub trait SignRepository {
-    /// Sign the repository's refs under the `refs/rad/sigrefs` branch.
-    fn sign_refs<G: Signer>(&self, signer: &G) -> Result<SignedRefs<Verified>, Error>;
-}
-
-impl<T, S> ReadStorage for T
-where
-    T: Deref<Target = S>,
-    S: ReadStorage + 'static,
-{
-    type Repository = S::Repository;
-
-    fn info(&self) -> &UserInfo {
-        self.deref().info()
-    }
-
-    fn path(&self) -> &Path {
-        self.deref().path()
-    }
-
-    fn path_of(&self, rid: &RepoId) -> PathBuf {
-        self.deref().path_of(rid)
-    }
-
-    fn contains(&self, rid: &RepoId) -> Result<bool, RepositoryError> {
-        self.deref().contains(rid)
-    }
-
-    fn get(&self, rid: RepoId) -> Result<Option<Doc<Verified>>, RepositoryError> {
-        self.deref().get(rid)
-    }
-
-    fn repository(&self, rid: RepoId) -> Result<Self::Repository, RepositoryError> {
-        self.deref().repository(rid)
-    }
-
-    fn repositories(&self) -> Result<Vec<RepositoryInfo<Verified>>, Error> {
-        self.deref().repositories()
-    }
-}
-
-impl<T, S> WriteStorage for T
-where
-    T: Deref<Target = S>,
-    S: WriteStorage + 'static,
-{
-    type RepositoryMut = S::RepositoryMut;
-
-    fn repository_mut(&self, rid: RepoId) -> Result<Self::RepositoryMut, RepositoryError> {
-        self.deref().repository_mut(rid)
-    }
-
-    fn create(&self, rid: RepoId) -> Result<Self::RepositoryMut, Error> {
-        self.deref().create(rid)
-    }
-
-    fn clean(&self, rid: RepoId) -> Result<Vec<RemoteId>, RepositoryError> {
-        self.deref().clean(rid)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn test_storage() {}
-}
diff --git a/radicle/src/storage/git.rs b/radicle/src/storage/git.rs
deleted file mode 100644
index aa7abfa3f..000000000
--- a/radicle/src/storage/git.rs
+++ /dev/null
@@ -1,1038 +0,0 @@
-#![warn(clippy::unwrap_used)]
-pub mod cob;
-pub mod transport;
-
-use std::collections::{BTreeMap, BTreeSet, HashMap};
-use std::ops::{Deref, DerefMut};
-use std::path::{Path, PathBuf};
-use std::{fs, io};
-
-use crypto::{Signer, Verified};
-use once_cell::sync::Lazy;
-use tempfile::TempDir;
-
-use crate::crypto::Unverified;
-use crate::git::canonical::Canonical;
-use crate::identity::doc::DocError;
-use crate::identity::{doc::DocAt, Doc, RepoId};
-use crate::identity::{Identity, Project};
-use crate::node::SyncedAt;
-use crate::storage::refs;
-use crate::storage::refs::{Refs, SignedRefs, SignedRefsAt};
-use crate::storage::{
-    ReadRepository, ReadStorage, Remote, Remotes, RepositoryError, RepositoryInfo, SetHead,
-    SignRepository, WriteRepository, WriteStorage,
-};
-use crate::{git, node};
-
-pub use crate::git::{
-    ext, raw, refname, refspec, Oid, PatternStr, Qualified, RefError, RefString, UserInfo,
-};
-pub use crate::storage::Error;
-
-use super::refs::RefsAt;
-use super::{RemoteId, RemoteRepository, ValidateRepository};
-
-pub static NAMESPACES_GLOB: Lazy<git::refspec::PatternString> =
-    Lazy::new(|| git::refspec::pattern!("refs/namespaces/*"));
-pub static SIGREFS_GLOB: Lazy<refspec::PatternString> =
-    Lazy::new(|| git::refspec::pattern!("refs/namespaces/*/rad/sigrefs"));
-pub static CANONICAL_IDENTITY: Lazy<git::Qualified> = Lazy::new(|| {
-    git::Qualified::from_components(
-        git::name::component!("rad"),
-        git::name::component!("id"),
-        None,
-    )
-});
-
-/// A parsed Git reference.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Ref {
-    pub oid: git::Oid,
-    pub name: RefString,
-    pub namespace: Option<RemoteId>,
-}
-
-impl<'a> TryFrom<git2::Reference<'a>> for Ref {
-    type Error = RefError;
-
-    fn try_from(r: git2::Reference) -> Result<Self, Self::Error> {
-        let name = r.name().ok_or(RefError::InvalidName)?;
-        let (namespace, name) = match git::parse_ref_namespaced::<RemoteId>(name) {
-            Ok((namespace, refname)) => (Some(namespace), refname.to_ref_string()),
-            Err(RefError::MissingNamespace(refname)) => (None, refname),
-            Err(err) => return Err(err),
-        };
-        let oid = r.resolve()?.target().ok_or(RefError::NoTarget)?;
-
-        Ok(Self {
-            namespace,
-            name,
-            oid: oid.into(),
-        })
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct Storage {
-    path: PathBuf,
-    info: UserInfo,
-}
-
-impl ReadStorage for Storage {
-    type Repository = Repository;
-
-    fn info(&self) -> &UserInfo {
-        &self.info
-    }
-
-    fn path(&self) -> &Path {
-        self.path.as_path()
-    }
-
-    fn path_of(&self, rid: &RepoId) -> PathBuf {
-        paths::repository(&self, rid)
-    }
-
-    fn contains(&self, rid: &RepoId) -> Result<bool, RepositoryError> {
-        if paths::repository(&self, rid).exists() {
-            let _ = self.repository(*rid)?.head()?;
-            return Ok(true);
-        }
-        Ok(false)
-    }
-
-    fn repository(&self, rid: RepoId) -> Result<Self::Repository, RepositoryError> {
-        Repository::open(paths::repository(self, &rid), rid)
-    }
-
-    fn repositories(&self) -> Result<Vec<RepositoryInfo<Verified>>, Error> {
-        let mut repos = Vec::new();
-
-        for result in fs::read_dir(&self.path)? {
-            let path = result?;
-
-            // Skip non-directories.
-            if !path.file_type()?.is_dir() {
-                continue;
-            }
-            // Skip hidden files.
-            if path.file_name().to_string_lossy().starts_with('.') {
-                continue;
-            }
-            // Skip lock files.
-            if let Some(ext) = path.path().extension() {
-                if ext == "lock" {
-                    continue;
-                }
-            }
-            let rid = RepoId::try_from(path.file_name())
-                .map_err(|_| Error::InvalidId(path.file_name()))?;
-
-            let repo = match self.repository(rid) {
-                Ok(repo) => repo,
-                Err(e) => {
-                    log::warn!(target: "storage", "Repository {rid} is invalid: {e}");
-                    continue;
-                }
-            };
-            let doc = match repo.identity_doc() {
-                Ok(doc) => doc.into(),
-                Err(e) => {
-                    log::warn!(target: "storage", "Repository {rid} is invalid: looking up doc: {e}");
-                    continue;
-                }
-            };
-
-            // For performance reasons, we don't do a full repository check here.
-            let head = match repo.head() {
-                Ok((_, head)) => head,
-                Err(e) => {
-                    log::warn!(target: "storage", "Repository {rid} is invalid: looking up head: {e}");
-                    continue;
-                }
-            };
-            // Nb. This will be `None` if they were not found.
-            let refs = refs::SignedRefsAt::load(self.info.key, &repo)?;
-            let synced_at = refs
-                .as_ref()
-                .map(|r| node::SyncedAt::new(r.at, &repo))
-                .transpose()?;
-
-            repos.push(RepositoryInfo {
-                rid,
-                head,
-                doc,
-                refs,
-                synced_at,
-            });
-        }
-        Ok(repos)
-    }
-}
-
-impl WriteStorage for Storage {
-    type RepositoryMut = Repository;
-
-    fn repository_mut(&self, rid: RepoId) -> Result<Self::RepositoryMut, RepositoryError> {
-        Repository::open(paths::repository(self, &rid), rid)
-    }
-
-    fn create(&self, rid: RepoId) -> Result<Self::RepositoryMut, Error> {
-        Repository::create(paths::repository(self, &rid), rid, &self.info)
-    }
-
-    fn clean(&self, rid: RepoId) -> Result<Vec<RemoteId>, RepositoryError> {
-        let repo = self.repository(rid)?;
-        // N.b. we remove the repository if the `local` peer has no
-        // `rad/sigrefs`. There's no risk of them corrupting data.
-        let has_sigrefs = SignedRefsAt::load(self.info.key, &repo)?.is_some();
-        if has_sigrefs {
-            repo.clean(&self.info.key)
-        } else {
-            let remotes = repo.remote_ids()?.collect::<Result<_, _>>()?;
-            repo.remove()?;
-            Ok(remotes)
-        }
-    }
-}
-
-impl Storage {
-    /// Open a new storage instance and load its inventory.
-    pub fn open<P: AsRef<Path>>(path: P, info: UserInfo) -> Result<Self, Error> {
-        let path = path.as_ref().to_path_buf();
-
-        match fs::create_dir_all(&path) {
-            Err(err) if err.kind() == io::ErrorKind::AlreadyExists => {}
-            Err(err) => return Err(Error::Io(err)),
-            Ok(()) => {}
-        }
-        Ok(Self { path, info })
-    }
-
-    /// Create a [`Repository`] in a temporary directory.
-    ///
-    /// N.b. it is important to keep the [`TempDir`] in scope while
-    /// using the [`Repository`]. If it is dropped, any action on the
-    /// `Repository` will fail.
-    pub fn lock_repository(&self, rid: RepoId) -> Result<(Repository, TempDir), RepositoryError> {
-        if self.contains(&rid)? {
-            return Err(Error::Io(io::Error::new(
-                io::ErrorKind::AlreadyExists,
-                format!("refusing to create '{}.lock'", rid),
-            ))
-            .into());
-        }
-        let tmp = tempfile::Builder::new()
-            .prefix(&rid.canonical())
-            .suffix(".lock")
-            .tempdir_in(self.path())
-            .map_err(Error::from)?;
-        Ok((Repository::create(tmp.path(), rid, &self.info)?, tmp))
-    }
-
-    pub fn path(&self) -> &Path {
-        self.path.as_path()
-    }
-
-    pub fn repositories_by_id<'a>(
-        &self,
-        mut rids: impl Iterator<Item = &'a RepoId>,
-    ) -> Result<Vec<RepositoryInfo<Verified>>, RepositoryError> {
-        rids.try_fold(Vec::new(), |mut infos, rid| {
-            let repo = self.repository(*rid)?;
-            let (_, head) = repo.head()?;
-            let refs = refs::SignedRefsAt::load(self.info.key, &repo)?;
-            let synced_at = refs
-                .as_ref()
-                .map(|r| SyncedAt::new(r.at, &repo))
-                .transpose()?;
-            let info = RepositoryInfo {
-                rid: *rid,
-                head,
-                doc: repo.identity_doc()?.into(),
-                refs,
-                synced_at,
-            };
-            infos.push(info);
-            Ok(infos)
-        })
-    }
-
-    pub fn inspect(&self) -> Result<(), RepositoryError> {
-        for r in self.repositories()? {
-            let rid = r.rid;
-            let repo = self.repository(rid)?;
-
-            for r in repo.raw().references()? {
-                let r = r?;
-                let name = r.name().ok_or(Error::InvalidRef)?;
-                let oid = r.resolve()?.target().ok_or(Error::InvalidRef)?;
-
-                println!("{} {oid} {name}", rid.urn());
-            }
-        }
-        Ok(())
-    }
-}
-
-/// Git implementation of [`WriteRepository`] using the `git2` crate.
-pub struct Repository {
-    /// The repository identifier (RID).
-    pub id: RepoId,
-    /// The backing Git repository.
-    pub backend: git2::Repository,
-}
-
-/// A set of [`Validation`] errors that a caller **must use**.
-#[must_use]
-#[derive(Debug, Default)]
-pub struct Validations(pub Vec<Validation>);
-
-impl Validations {
-    pub fn append(&mut self, vs: &mut Self) {
-        self.0.append(&mut vs.0)
-    }
-}
-
-impl IntoIterator for Validations {
-    type Item = Validation;
-    type IntoIter = std::vec::IntoIter<Self::Item>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.0.into_iter()
-    }
-}
-
-impl Deref for Validations {
-    type Target = Vec<Validation>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for Validations {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-/// Validation errors that can occur when verifying the layout of the
-/// storage. These errors include checking the validity of the
-/// `rad/sigrefs` contents and the identity of the repository.
-#[derive(Debug, Error)]
-pub enum Validation {
-    #[error("found unsigned ref `{0}`")]
-    UnsignedRef(RefString),
-    #[error("{refname}: expected {expected}, but found {actual}")]
-    MismatchedRef {
-        expected: Oid,
-        actual: Oid,
-        refname: RefString,
-    },
-    #[error("missing `refs/namespaces/{remote}/{refname}`")]
-    MissingRef {
-        remote: RemoteId,
-        refname: RefString,
-    },
-    #[error("missing `refs/namespaces/{0}/refs/rad/sigrefs`")]
-    MissingRadSigRefs(RemoteId),
-}
-
-impl Repository {
-    /// Open an existing repository.
-    pub fn open<P: AsRef<Path>>(path: P, id: RepoId) -> Result<Self, RepositoryError> {
-        let backend = git2::Repository::open_ext(
-            path.as_ref(),
-            git2::RepositoryOpenFlags::empty()
-                | git2::RepositoryOpenFlags::BARE
-                | git2::RepositoryOpenFlags::NO_DOTGIT
-                | git2::RepositoryOpenFlags::NO_SEARCH,
-            &[] as &[&std::ffi::OsStr],
-        )?;
-
-        Ok(Self { id, backend })
-    }
-
-    /// Create a new repository.
-    pub fn create<P: AsRef<Path>>(path: P, id: RepoId, info: &UserInfo) -> Result<Self, Error> {
-        let backend = git2::Repository::init_opts(
-            &path,
-            git2::RepositoryInitOptions::new()
-                .bare(true)
-                .no_reinit(true)
-                .external_template(false),
-        )?;
-        let mut config = backend.config()?;
-
-        config.set_str("user.name", &info.name())?;
-        config.set_str("user.email", &info.email())?;
-
-        Ok(Self { id, backend })
-    }
-
-    /// Remove an existing repository
-    pub fn remove(&self) -> Result<(), Error> {
-        let path = self.backend.path();
-        if path.exists() {
-            fs::remove_dir_all(path)?;
-        }
-        Ok(())
-    }
-
-    /// Remove all the remotes of a repository that are not the
-    /// delegates of the repository or the local peer.
-    ///
-    /// N.b. failure to delete remotes or references will not result
-    /// in an early exit. Instead, this method continues to delete the
-    /// next available remote or reference.
-    pub fn clean(&self, local: &RemoteId) -> Result<Vec<RemoteId>, RepositoryError> {
-        let delegates = self
-            .delegates()?
-            .into_iter()
-            .map(RemoteId::from)
-            .collect::<BTreeSet<_>>();
-        let mut deleted = Vec::new();
-        for id in self.remote_ids()? {
-            let id = match id {
-                Ok(id) => id,
-                Err(e) => {
-                    log::error!(target: "storage", "Failed to clean up remote: {e}");
-                    continue;
-                }
-            };
-
-            // N.b. it is fatal to delete local or delegates
-            if *local == id || delegates.contains(&id) {
-                continue;
-            }
-
-            let glob = git::refname!("refs/namespaces")
-                .join(git::Component::from(&id))
-                .with_pattern(git::refspec::STAR);
-            let refs = match self.references_glob(&glob) {
-                Ok(refs) => refs,
-                Err(e) => {
-                    log::error!(target: "storage", "Failed to clean up remote '{id}': {e}");
-                    continue;
-                }
-            };
-            for (refname, _) in refs {
-                if let Ok(mut r) = self.backend.find_reference(refname.as_str()) {
-                    if let Err(e) = r.delete() {
-                        log::error!(target: "storage", "Failed to clean up reference '{refname}': {e}");
-                    }
-                } else {
-                    log::error!(target: "storage", "Failed to clean up reference '{refname}'");
-                }
-            }
-            deleted.push(id);
-        }
-
-        Ok(deleted)
-    }
-
-    /// Create the repository's identity branch.
-    pub fn init<G: Signer, S: WriteStorage>(
-        doc: &Doc<Verified>,
-        storage: &S,
-        signer: &G,
-    ) -> Result<(Self, git::Oid), RepositoryError> {
-        let (doc_oid, _) = doc.encode()?;
-        let id = RepoId::from(doc_oid);
-        let repo = Self::create(paths::repository(storage, &id), id, storage.info())?;
-        let commit = doc.init(&repo, signer)?;
-
-        Ok((repo, commit))
-    }
-
-    pub fn inspect(&self) -> Result<(), Error> {
-        for r in self.backend.references()? {
-            let r = r?;
-            let name = r.name().ok_or(Error::InvalidRef)?;
-            let oid = r.resolve()?.target().ok_or(Error::InvalidRef)?;
-
-            println!("{oid} {name}");
-        }
-        Ok(())
-    }
-
-    /// Iterate over all references.
-    pub fn references(
-        &self,
-    ) -> Result<impl Iterator<Item = Result<Ref, refs::Error>> + '_, git2::Error> {
-        let refs = self
-            .backend
-            .references()?
-            .map(|reference| {
-                let r = reference?;
-
-                match Ref::try_from(r) {
-                    Err(err) => Err(err.into()),
-                    Ok(r) => Ok(Some(r)),
-                }
-            })
-            .filter_map(Result::transpose);
-
-        Ok(refs)
-    }
-
-    /// Get the canonical project information.
-    pub fn project(&self) -> Result<Project, RepositoryError> {
-        let head = self.identity_head()?;
-        let doc = self.identity_doc_at(head)?;
-        let proj = doc.project()?;
-
-        Ok(proj)
-    }
-
-    pub fn identity_doc_of(&self, remote: &RemoteId) -> Result<Doc<Verified>, DocError> {
-        let oid = self.identity_head_of(remote)?;
-        Doc::load_at(oid, self).map(|d| d.into())
-    }
-
-    pub fn remote_ids(
-        &self,
-    ) -> Result<impl Iterator<Item = Result<RemoteId, refs::Error>> + '_, git2::Error> {
-        let iter = self.backend.references_glob(SIGREFS_GLOB.as_str())?.map(
-            |reference| -> Result<RemoteId, refs::Error> {
-                let r = reference?;
-                let name = r.name().ok_or(refs::Error::InvalidRef)?;
-                let (id, _) = git::parse_ref_namespaced::<RemoteId>(name)?;
-
-                Ok(id)
-            },
-        );
-        Ok(iter)
-    }
-
-    pub fn remotes(
-        &self,
-    ) -> Result<
-        impl Iterator<Item = Result<(RemoteId, Remote<Verified>), refs::Error>> + '_,
-        git2::Error,
-    > {
-        let remotes =
-            self.backend
-                .references_glob(SIGREFS_GLOB.as_str())?
-                .map(|reference| -> Result<_, _> {
-                    let r = reference?;
-                    let name = r.name().ok_or(refs::Error::InvalidRef)?;
-                    let (id, _) = git::parse_ref_namespaced::<RemoteId>(name)?;
-                    let remote = self.remote(&id)?;
-
-                    Ok((id, remote))
-                });
-        Ok(remotes)
-    }
-}
-
-impl RemoteRepository for Repository {
-    fn remotes(&self) -> Result<Remotes<Verified>, refs::Error> {
-        let mut remotes = Vec::new();
-        for remote in Repository::remotes(self)? {
-            remotes.push(remote?);
-        }
-        Ok(Remotes::from_iter(remotes))
-    }
-
-    fn remote(&self, remote: &RemoteId) -> Result<Remote<Verified>, refs::Error> {
-        let refs = SignedRefs::load(*remote, self)?;
-        Ok(Remote::<Verified>::new(refs))
-    }
-
-    fn remote_refs_at(&self) -> Result<Vec<RefsAt>, refs::Error> {
-        let mut all = Vec::new();
-
-        for remote in self.remote_ids()? {
-            let remote = remote?;
-            let refs_at = RefsAt::new(self, remote)?;
-
-            all.push(refs_at);
-        }
-        Ok(all)
-    }
-}
-
-impl ValidateRepository for Repository {
-    fn validate_remote(&self, remote: &Remote<Verified>) -> Result<Validations, Error> {
-        // Contains a copy of the signed refs of this remote.
-        let mut signed = BTreeMap::from((*remote.refs).clone());
-        let mut failures = Validations::default();
-        let mut has_sigrefs = false;
-
-        // Check all repository references, making sure they are present in the signed refs map.
-        for (refname, oid) in self.references_of(&remote.id)? {
-            // Skip validation of the signed refs branch, as it is not part of `Remote`.
-            if refname == refs::SIGREFS_BRANCH.to_ref_string() {
-                has_sigrefs = true;
-                continue;
-            }
-            if let Some(signed_oid) = signed.remove(&refname) {
-                if oid != signed_oid {
-                    failures.push(Validation::MismatchedRef {
-                        refname,
-                        expected: signed_oid,
-                        actual: oid,
-                    });
-                }
-            } else {
-                failures.push(Validation::UnsignedRef(refname));
-            }
-        }
-
-        if !has_sigrefs {
-            failures.push(Validation::MissingRadSigRefs(remote.id));
-        }
-
-        // The refs that are left in the map, are ones that were signed, but are not
-        // in the repository. If any are left, bail.
-        if let Some((name, _)) = signed.into_iter().next() {
-            failures.push(Validation::MissingRef {
-                refname: name,
-                remote: remote.id,
-            });
-        }
-
-        // Nb. As it stands, it doesn't make sense to verify a single remote's identity branch,
-        // since it is a COB.
-
-        Ok(failures)
-    }
-}
-
-impl ReadRepository for Repository {
-    fn id(&self) -> RepoId {
-        self.id
-    }
-
-    fn is_empty(&self) -> Result<bool, git2::Error> {
-        Ok(self.remotes()?.next().is_none())
-    }
-
-    fn path(&self) -> &Path {
-        self.backend.path()
-    }
-
-    fn blob_at<P: AsRef<Path>>(&self, commit: Oid, path: P) -> Result<git2::Blob, git::Error> {
-        let commit = self.backend.find_commit(*commit)?;
-        let tree = commit.tree()?;
-        let entry = tree.get_path(path.as_ref())?;
-        let obj = entry.to_object(&self.backend)?;
-        let blob = obj.into_blob().map_err(|_| {
-            git::Error::NotFound(git::NotFound::NoSuchBlob(
-                path.as_ref().display().to_string(),
-            ))
-        })?;
-
-        Ok(blob)
-    }
-
-    fn blob(&self, oid: Oid) -> Result<git2::Blob, git::Error> {
-        self.backend.find_blob(oid.into()).map_err(git::Error::from)
-    }
-
-    fn reference(
-        &self,
-        remote: &RemoteId,
-        name: &git::Qualified,
-    ) -> Result<git2::Reference, git::Error> {
-        let name = name.with_namespace(remote.into());
-        self.backend.find_reference(&name).map_err(git::Error::from)
-    }
-
-    fn reference_oid(
-        &self,
-        remote: &RemoteId,
-        reference: &git::Qualified,
-    ) -> Result<Oid, git::raw::Error> {
-        let name = reference.with_namespace(remote.into());
-        let oid = self.backend.refname_to_id(&name)?;
-
-        Ok(oid.into())
-    }
-
-    fn commit(&self, oid: Oid) -> Result<git2::Commit, git::Error> {
-        self.backend
-            .find_commit(oid.into())
-            .map_err(git::Error::from)
-    }
-
-    fn revwalk(&self, head: Oid) -> Result<git2::Revwalk, git2::Error> {
-        let mut revwalk = self.backend.revwalk()?;
-        revwalk.push(head.into())?;
-
-        Ok(revwalk)
-    }
-
-    fn contains(&self, oid: Oid) -> Result<bool, raw::Error> {
-        self.backend.odb().map(|odb| odb.exists(oid.into()))
-    }
-
-    fn is_ancestor_of(&self, ancestor: Oid, head: Oid) -> Result<bool, git::Error> {
-        self.backend
-            .graph_descendant_of(head.into(), ancestor.into())
-            .map_err(git::Error::from)
-    }
-
-    fn references_of(&self, remote: &RemoteId) -> Result<Refs, Error> {
-        let entries = self
-            .backend
-            .references_glob(format!("refs/namespaces/{remote}/*").as_str())?;
-        let mut refs = BTreeMap::new();
-
-        for e in entries {
-            let e = e?;
-            let name = e.name().ok_or(Error::InvalidRef)?;
-            let (_, refname) = git::parse_ref::<RemoteId>(name)?;
-            let oid = e.resolve()?.target().ok_or(Error::InvalidRef)?;
-            let (_, category, _, _) = refname.non_empty_components();
-
-            if [
-                git::name::HEADS,
-                git::name::TAGS,
-                git::name::NOTES,
-                &git::name::component!("rad"),
-                &git::name::component!("cobs"),
-            ]
-            .contains(&category.as_ref())
-            {
-                refs.insert(refname.into(), oid.into());
-            }
-        }
-        Ok(refs.into())
-    }
-
-    fn references_glob(
-        &self,
-        pattern: &PatternStr,
-    ) -> Result<Vec<(Qualified, Oid)>, git::ext::Error> {
-        let mut refs = Vec::new();
-
-        for r in self.backend.references_glob(pattern)? {
-            let r = r?;
-            let c = r.peel_to_commit()?;
-
-            if let Some(name) = r
-                .name()
-                .and_then(|n| git::RefStr::try_from_str(n).ok())
-                .and_then(git::Qualified::from_refstr)
-            {
-                refs.push((name.to_owned(), c.id().into()));
-            }
-        }
-        Ok(refs)
-    }
-
-    fn identity_doc_at(&self, head: Oid) -> Result<DocAt, DocError> {
-        Doc::<Verified>::load_at(head, self)
-    }
-
-    fn head(&self) -> Result<(Qualified, Oid), RepositoryError> {
-        // If `HEAD` is already set locally, just return that.
-        if let Ok(head) = self.backend.head() {
-            if let Ok((name, oid)) = git::refs::qualified_from(&head) {
-                return Ok((name.to_owned(), oid));
-            }
-        }
-        self.canonical_head()
-    }
-
-    fn canonical_head(&self) -> Result<(Qualified, Oid), RepositoryError> {
-        let doc = self.identity_doc()?;
-        let project = doc.project()?;
-        let branch_ref = git::refs::branch(project.default_branch());
-        let raw = self.raw();
-        let oid = Canonical::default_branch(self, &project, &doc.delegates)?
-            .quorum(doc.threshold, raw)?;
-        Ok((branch_ref, oid))
-    }
-
-    fn identity_head(&self) -> Result<Oid, RepositoryError> {
-        let result = self
-            .backend
-            .refname_to_id(CANONICAL_IDENTITY.as_str())
-            .map(Oid::from);
-
-        match result {
-            Ok(oid) => Ok(oid),
-            Err(err) if git::ext::is_not_found_err(&err) => self.canonical_identity_head(),
-            Err(err) => Err(err.into()),
-        }
-    }
-
-    fn identity_head_of(&self, remote: &RemoteId) -> Result<Oid, git::ext::Error> {
-        self.reference_oid(remote, &git::refs::storage::IDENTITY_BRANCH)
-            .map_err(git::ext::Error::from)
-    }
-
-    fn identity_root(&self) -> Result<Oid, RepositoryError> {
-        let oid = self.backend.refname_to_id(CANONICAL_IDENTITY.as_str())?;
-        let walk = self.revwalk(oid.into())?.collect::<Vec<_>>();
-        let root = walk
-            .into_iter()
-            .last()
-            .ok_or(RepositoryError::Doc(DocError::Missing))??;
-
-        Ok(root.into())
-    }
-
-    fn identity_root_of(&self, remote: &RemoteId) -> Result<Oid, RepositoryError> {
-        let oid = self.identity_head_of(remote)?;
-        let walk = self.revwalk(oid)?.collect::<Vec<_>>();
-        let root = walk
-            .into_iter()
-            .last()
-            .ok_or(RepositoryError::Doc(DocError::Missing))??;
-
-        Ok(root.into())
-    }
-
-    fn canonical_identity_head(&self) -> Result<Oid, RepositoryError> {
-        for remote in self.remote_ids()? {
-            let remote = remote?;
-            // Nb. A remote may not have an identity document if the user has not contributed
-            // any changes to the identity COB.
-            let Ok(root) = self.identity_root_of(&remote) else {
-                continue;
-            };
-            let blob = Doc::<Unverified>::blob_at(root, self)?;
-
-            // We've got an identity that goes back to the correct root.
-            if blob.id() == **self.id {
-                let identity = Identity::get(&root.into(), self)?;
-
-                return Ok(identity.head());
-            }
-        }
-        Err(DocError::Missing.into())
-    }
-
-    fn merge_base(&self, left: &Oid, right: &Oid) -> Result<Oid, git::ext::Error> {
-        self.backend
-            .merge_base(**left, **right)
-            .map(Oid::from)
-            .map_err(git::ext::Error::from)
-    }
-}
-
-impl WriteRepository for Repository {
-    fn set_head(&self) -> Result<SetHead, RepositoryError> {
-        let head_ref = refname!("HEAD");
-        let old = self
-            .raw()
-            .refname_to_id(&head_ref)
-            .ok()
-            .map(|oid| oid.into());
-
-        let (branch_ref, new) = self.canonical_head()?;
-
-        if old == Some(new) {
-            return Ok(SetHead { old, new });
-        }
-        log::debug!(target: "storage", "Setting ref: {} -> {}", &branch_ref, new);
-        self.raw()
-            .reference(&branch_ref, *new, true, "set-local-branch (radicle)")?;
-
-        log::debug!(target: "storage", "Setting ref: {} -> {}", head_ref, branch_ref);
-        self.raw()
-            .reference_symbolic(&head_ref, &branch_ref, true, "set-head (radicle)")?;
-
-        Ok(SetHead { old, new })
-    }
-
-    fn set_identity_head_to(&self, commit: Oid) -> Result<(), RepositoryError> {
-        log::debug!(target: "storage", "Setting ref: {} -> {}", *CANONICAL_IDENTITY, commit);
-        self.raw().reference(
-            CANONICAL_IDENTITY.as_str(),
-            *commit,
-            true,
-            "set-local-branch (radicle)",
-        )?;
-        Ok(())
-    }
-
-    fn set_user(&self, info: &UserInfo) -> Result<(), Error> {
-        let mut config = self.backend.config()?;
-        config.set_str("user.name", &info.name())?;
-        config.set_str("user.email", &info.email())?;
-        Ok(())
-    }
-
-    fn raw(&self) -> &git2::Repository {
-        &self.backend
-    }
-}
-
-impl SignRepository for Repository {
-    fn sign_refs<G: Signer>(&self, signer: &G) -> Result<SignedRefs<Verified>, Error> {
-        let remote = signer.public_key();
-        let mut refs = self.references_of(remote)?;
-        // Don't sign the `rad/sigrefs` ref itself, and don't sign invalid OIDs.
-        refs.retain(|name, oid| {
-            name.as_refstr() != refs::SIGREFS_BRANCH.as_ref() && !oid.is_zero()
-        });
-        let signed = refs.signed(signer)?;
-
-        signed.save(self)?;
-
-        Ok(signed)
-    }
-}
-pub mod trailers {
-    use std::str::FromStr;
-
-    use thiserror::Error;
-
-    use super::*;
-    use crypto::{PublicKey, PublicKeyError};
-    use crypto::{Signature, SignatureError};
-
-    pub const SIGNATURE_TRAILER: &str = "Rad-Signature";
-
-    #[derive(Error, Debug)]
-    pub enum Error {
-        #[error("invalid format for signature trailer")]
-        SignatureTrailerFormat,
-        #[error("invalid public key in signature trailer")]
-        PublicKey(#[from] PublicKeyError),
-        #[error("invalid signature in trailer")]
-        Signature(#[from] SignatureError),
-    }
-
-    pub fn parse_signatures(msg: &str) -> Result<HashMap<PublicKey, Signature>, Error> {
-        let trailers =
-            git2::message_trailers_strs(msg).map_err(|_| Error::SignatureTrailerFormat)?;
-        let mut signatures = HashMap::with_capacity(trailers.len());
-
-        for (key, val) in trailers.iter() {
-            if key == SIGNATURE_TRAILER {
-                if let Some((pk, sig)) = val.split_once(' ') {
-                    let pk = PublicKey::from_str(pk)?;
-                    let sig = Signature::from_str(sig)?;
-
-                    signatures.insert(pk, sig);
-                } else {
-                    return Err(Error::SignatureTrailerFormat);
-                }
-            }
-        }
-        Ok(signatures)
-    }
-}
-
-pub mod paths {
-    use std::path::PathBuf;
-
-    use super::ReadStorage;
-    use super::RepoId;
-
-    pub fn repository<S: ReadStorage>(storage: &S, proj: &RepoId) -> PathBuf {
-        storage.path().join(proj.canonical())
-    }
-}
-
-#[cfg(test)]
-#[allow(clippy::unwrap_used)]
-mod tests {
-    use crypto::test::signer::MockSigner;
-
-    use super::*;
-    use crate::git;
-    use crate::storage::refs::SIGREFS_BRANCH;
-    use crate::storage::{ReadRepository, ReadStorage};
-    use crate::test::arbitrary;
-    use crate::test::fixtures;
-
-    #[test]
-    fn test_remote_refs() {
-        let dir = tempfile::tempdir().unwrap();
-        let signer = MockSigner::default();
-        let storage = fixtures::storage(dir.path(), &signer).unwrap();
-        let inv = storage.repositories().unwrap();
-        let proj = inv.first().unwrap();
-        let mut refs = git::remote_refs(&git::Url::from(proj.rid)).unwrap();
-
-        let project = storage.repository(proj.rid).unwrap();
-        let remotes = project.remotes().unwrap();
-
-        // Strip the remote refs of sigrefs so we can compare them.
-        for remote in refs.values_mut() {
-            let sigref = (*SIGREFS_BRANCH).to_ref_string();
-            remote.remove(&sigref).unwrap();
-        }
-
-        let remotes = remotes
-            .map(|remote| remote.map(|(id, r): (RemoteId, Remote<Verified>)| (id, r.refs.into())))
-            .collect::<Result<_, _>>()
-            .unwrap();
-
-        assert_eq!(refs, remotes);
-    }
-
-    #[test]
-    fn test_references_of() {
-        let tmp = tempfile::tempdir().unwrap();
-        let signer = MockSigner::default();
-        let storage = Storage::open(tmp.path().join("storage"), fixtures::user()).unwrap();
-
-        transport::local::register(storage.clone());
-
-        let (rid, _, _, _) =
-            fixtures::project(tmp.path().join("project"), &storage, &signer).unwrap();
-        let repo = storage.repository(rid).unwrap();
-        let id = repo.identity().unwrap().head();
-        let cob = format!("refs/cobs/xyz.radicle.id/{id}");
-
-        let mut refs = repo
-            .references_of(signer.public_key())
-            .unwrap()
-            .iter()
-            .map(|(r, _)| r.to_string())
-            .collect::<Vec<_>>();
-        refs.sort();
-
-        assert_eq!(
-            refs,
-            vec![&cob, "refs/heads/master", "refs/rad/id", "refs/rad/sigrefs"]
-        );
-    }
-
-    #[test]
-    fn test_sign_refs() {
-        let tmp = tempfile::tempdir().unwrap();
-        let mut rng = fastrand::Rng::new();
-        let signer = MockSigner::new(&mut rng);
-        let storage = Storage::open(tmp.path(), fixtures::user()).unwrap();
-        let proj_id = arbitrary::gen::<RepoId>(1);
-        let alice = *signer.public_key();
-        let project = storage.create(proj_id).unwrap();
-        let backend = &project.backend;
-        let sig = git2::Signature::now(&alice.to_string(), "anonymous@radicle.xyz").unwrap();
-        let head = git::initial_commit(backend, &sig).unwrap();
-        let tree =
-            git::write_tree(Path::new("README"), "Hello World!\n".as_bytes(), backend).unwrap();
-
-        git::commit(
-            backend,
-            &head,
-            &git::RefString::try_from(format!("refs/remotes/{alice}/heads/master")).unwrap(),
-            "Second commit",
-            &sig,
-            &tree,
-        )
-        .unwrap();
-
-        let signed = project.sign_refs(&signer).unwrap();
-        let remote = project.remote(&alice).unwrap();
-        let mut unsigned = project.references_of(&alice).unwrap();
-
-        // The signed refs doesn't contain the signature ref itself.
-        let sigref = (*SIGREFS_BRANCH).to_ref_string();
-        unsigned.remove(&sigref).unwrap();
-
-        assert_eq!(remote.refs, signed);
-        assert_eq!(*remote.refs, unsigned);
-    }
-}
diff --git a/radicle/src/storage/git/cob.rs b/radicle/src/storage/git/cob.rs
deleted file mode 100644
index e7111b4af..000000000
--- a/radicle/src/storage/git/cob.rs
+++ /dev/null
@@ -1,462 +0,0 @@
-//! COB storage Git backend.
-use std::collections::BTreeMap;
-use std::path::Path;
-
-use cob::object::Objects;
-use radicle_cob as cob;
-use radicle_cob::change;
-use storage::RemoteRepository;
-use storage::RepositoryError;
-use storage::SignRepository;
-use storage::ValidateRepository;
-
-use crate::git::*;
-use crate::storage;
-use crate::storage::Error;
-use crate::storage::{
-    git::{Remote, Remotes, Validations},
-    ReadRepository, Verified,
-};
-use crate::{
-    git, identity,
-    identity::{doc::DocError, PublicKey},
-};
-
-use super::{RemoteId, Repository};
-
-pub use crate::cob::{store, ObjectId};
-
-#[derive(Error, Debug)]
-pub enum ObjectsError {
-    #[error(transparent)]
-    Convert(#[from] cob::object::storage::convert::Error),
-    #[error(transparent)]
-    Git(#[from] git2::Error),
-}
-
-#[derive(Error, Debug)]
-pub enum TypesError {
-    #[error(transparent)]
-    Convert(#[from] cob::object::storage::convert::Error),
-    #[error(transparent)]
-    Git(#[from] git2::Error),
-    #[error(transparent)]
-    ParseKey(#[from] crypto::Error),
-    #[error(transparent)]
-    ParseObjectId(#[from] cob::object::ParseObjectId),
-    #[error(transparent)]
-    RefFormat(#[from] git::fmt::Error),
-}
-
-impl cob::Store for Repository {}
-
-impl change::Storage for Repository {
-    type StoreError = <git2::Repository as change::Storage>::StoreError;
-    type LoadError = <git2::Repository as change::Storage>::LoadError;
-
-    type ObjectId = <git2::Repository as change::Storage>::ObjectId;
-    type Parent = <git2::Repository as change::Storage>::Parent;
-    type Signatures = <git2::Repository as change::Storage>::Signatures;
-
-    fn store<Signer>(
-        &self,
-        authority: Option<Self::Parent>,
-        parents: Vec<Self::Parent>,
-        signer: &Signer,
-        spec: change::Template<Self::ObjectId>,
-    ) -> Result<cob::Entry, Self::StoreError>
-    where
-        Signer: crypto::Signer,
-    {
-        self.backend.store(authority, parents, signer, spec)
-    }
-
-    fn load(&self, id: Self::ObjectId) -> Result<cob::Entry, Self::LoadError> {
-        self.backend.load(id)
-    }
-
-    fn parents_of(&self, id: &Oid) -> Result<Vec<Oid>, Self::LoadError> {
-        self.backend.parents_of(id)
-    }
-}
-
-impl cob::object::Storage for Repository {
-    type ObjectsError = ObjectsError;
-    type TypesError = TypesError;
-    type UpdateError = git2::Error;
-    type RemoveError = git2::Error;
-
-    fn objects(
-        &self,
-        typename: &cob::TypeName,
-        object_id: &cob::ObjectId,
-    ) -> Result<cob::object::Objects, Self::ObjectsError> {
-        let refs = self
-            .backend
-            .references_glob(git::refs::storage::cobs(typename, object_id).as_str())?;
-        let refs = refs
-            .map(|r| {
-                r.map_err(Self::ObjectsError::from).and_then(|r| {
-                    cob::object::Reference::try_from(r).map_err(Self::ObjectsError::from)
-                })
-            })
-            .collect::<Result<Vec<_>, _>>()?;
-        Ok(refs.into())
-    }
-
-    fn types(
-        &self,
-        typename: &cob::TypeName,
-    ) -> Result<BTreeMap<cob::ObjectId, cob::object::Objects>, Self::TypesError> {
-        // TODO: Use glob here.
-        let mut references = self.backend.references()?.filter_map(|reference| {
-            let reference = reference.ok()?;
-            match RefStr::try_from_str(reference.name()?) {
-                Ok(name) => {
-                    let (ty, object_id) = cob::object::parse_refstr(&name)?;
-                    if ty == *typename {
-                        Some(
-                            cob::object::Reference::try_from(reference)
-                                .map_err(Self::TypesError::from)
-                                .map(|reference| (object_id, reference)),
-                        )
-                    } else {
-                        None
-                    }
-                }
-                Err(err) => Some(Err(err.into())),
-            }
-        });
-
-        references.try_fold(BTreeMap::new(), |mut objects, result| {
-            let (oid, reference) = result?;
-            objects
-                .entry(oid)
-                .and_modify(|objs: &mut cob::object::Objects| objs.push(reference.clone()))
-                .or_insert_with(|| cob::object::Objects::new(reference));
-            Ok(objects)
-        })
-    }
-
-    fn update(
-        &self,
-        identifier: &PublicKey,
-        typename: &cob::TypeName,
-        object_id: &cob::ObjectId,
-        entry: &cob::EntryId,
-    ) -> Result<(), Self::UpdateError> {
-        self.backend.reference(
-            git::refs::storage::cob(identifier, typename, object_id).as_str(),
-            (*entry).into(),
-            true,
-            &format!(
-                "Updating collaborative object '{}/{}' with new entry {}",
-                typename, object_id, entry,
-            ),
-        )?;
-
-        Ok(())
-    }
-
-    fn remove(
-        &self,
-        identifier: &PublicKey,
-        typename: &cob::TypeName,
-        object_id: &cob::ObjectId,
-    ) -> Result<(), Self::RemoveError> {
-        let mut reference = self
-            .backend
-            .find_reference(git::refs::storage::cob(identifier, typename, object_id).as_str())?;
-
-        reference.delete().map_err(Self::RemoveError::from)
-    }
-}
-
-/// Stores draft collaborative objects.
-///
-// This storage backend for COBs stores changes in a `draft/cobs/*` namespace,
-// which allows for some of the features needed for code review. For
-// example, users can draft comments and later decide to publish them.
-pub struct DraftStore<'a, R> {
-    remote: RemoteId,
-    repo: &'a R,
-}
-
-impl<'a, R: storage::WriteRepository> DraftStore<'a, R> {
-    /// Create this draft store with an existing COB from storage, so that changes applied
-    /// to this COB can evaluate properly. This creates a symbolic reference to the COB
-    /// pointing to the public COB reference.
-    pub fn with(
-        self,
-        remote: &RemoteId,
-        typename: &cob::TypeName,
-        id: &ObjectId,
-    ) -> Result<Self, git::Error> {
-        let target = git::refs::storage::cob(remote, typename, id);
-        let name = git::refs::storage::draft::cob(remote, typename, id);
-        let repo = self.repo.raw();
-
-        repo.reference_symbolic(
-            name.as_str(),
-            target.as_str(),
-            true, // The reference may already exist, overwrite it if so.
-            format!("Link to COB {id} of type {typename}").as_str(),
-        )?;
-
-        Ok(self)
-    }
-}
-
-impl<'a, R> DraftStore<'a, R> {
-    pub fn new(remote: RemoteId, repo: &'a R) -> Self {
-        Self { remote, repo }
-    }
-}
-
-impl<'a, R: storage::WriteRepository> cob::Store for DraftStore<'a, R> {}
-
-impl<'a, R: storage::WriteRepository> change::Storage for DraftStore<'a, R> {
-    type StoreError = <git2::Repository as change::Storage>::StoreError;
-    type LoadError = <git2::Repository as change::Storage>::LoadError;
-
-    type ObjectId = <git2::Repository as change::Storage>::ObjectId;
-    type Parent = <git2::Repository as change::Storage>::Parent;
-    type Signatures = <git2::Repository as change::Storage>::Signatures;
-
-    fn store<Signer>(
-        &self,
-        authority: Option<Self::Parent>,
-        parents: Vec<Self::Parent>,
-        signer: &Signer,
-        spec: change::Template<Self::ObjectId>,
-    ) -> Result<cob::Entry, Self::StoreError>
-    where
-        Signer: crypto::Signer,
-    {
-        self.repo.raw().store(authority, parents, signer, spec)
-    }
-
-    fn load(&self, id: Self::ObjectId) -> Result<cob::Entry, Self::LoadError> {
-        self.repo.raw().load(id)
-    }
-
-    fn parents_of(&self, id: &Oid) -> Result<Vec<Oid>, Self::LoadError> {
-        self.repo.raw().parents_of(id)
-    }
-}
-
-impl<'a, R: storage::ReadRepository> SignRepository for DraftStore<'a, R> {
-    fn sign_refs<G: crypto::Signer>(
-        &self,
-        signer: &G,
-    ) -> Result<storage::refs::SignedRefs<Verified>, Error> {
-        // Since this is a draft store, we do not actually want to sign the refs.
-        // Instead, we just return the existing signed refs.
-        let remote = self.repo.remote(signer.public_key())?;
-
-        Ok(remote.refs)
-    }
-}
-
-impl<'a, R: storage::RemoteRepository> RemoteRepository for DraftStore<'a, R> {
-    fn remote(&self, id: &RemoteId) -> Result<Remote<Verified>, storage::refs::Error> {
-        self.repo.remote(id)
-    }
-
-    fn remotes(&self) -> Result<Remotes<Verified>, storage::refs::Error> {
-        RemoteRepository::remotes(self.repo)
-    }
-
-    fn remote_refs_at(&self) -> Result<Vec<storage::refs::RefsAt>, storage::refs::Error> {
-        RemoteRepository::remote_refs_at(self.repo)
-    }
-}
-
-impl<'a, R: storage::ValidateRepository> ValidateRepository for DraftStore<'a, R> {
-    fn validate_remote(&self, remote: &Remote<Verified>) -> Result<Validations, Error> {
-        self.repo.validate_remote(remote)
-    }
-}
-
-impl<'a, R: storage::ReadRepository> ReadRepository for DraftStore<'a, R> {
-    fn id(&self) -> identity::RepoId {
-        self.repo.id()
-    }
-
-    fn is_empty(&self) -> Result<bool, git2::Error> {
-        self.repo.is_empty()
-    }
-
-    fn head(&self) -> Result<(Qualified, Oid), RepositoryError> {
-        self.repo.head()
-    }
-
-    fn canonical_head(&self) -> Result<(Qualified, Oid), RepositoryError> {
-        self.repo.canonical_head()
-    }
-
-    fn path(&self) -> &std::path::Path {
-        self.repo.path()
-    }
-
-    fn commit(&self, oid: Oid) -> Result<git2::Commit, git_ext::Error> {
-        self.repo.commit(oid)
-    }
-
-    fn revwalk(&self, head: Oid) -> Result<git2::Revwalk, git2::Error> {
-        self.repo.revwalk(head)
-    }
-
-    fn contains(&self, oid: Oid) -> Result<bool, raw::Error> {
-        self.repo.contains(oid)
-    }
-
-    fn is_ancestor_of(&self, ancestor: Oid, head: Oid) -> Result<bool, git_ext::Error> {
-        self.repo.is_ancestor_of(ancestor, head)
-    }
-
-    fn blob_at<P: AsRef<Path>>(
-        &self,
-        oid: git_ext::Oid,
-        path: P,
-    ) -> Result<git2::Blob, git_ext::Error> {
-        self.repo.blob_at(oid, path)
-    }
-
-    fn blob(&self, oid: git_ext::Oid) -> Result<raw::Blob, ext::Error> {
-        self.repo.blob(oid)
-    }
-
-    fn reference(
-        &self,
-        remote: &RemoteId,
-        reference: &git::Qualified,
-    ) -> Result<git2::Reference, git_ext::Error> {
-        self.repo.reference(remote, reference)
-    }
-
-    fn reference_oid(
-        &self,
-        remote: &RemoteId,
-        reference: &git::Qualified,
-    ) -> Result<git_ext::Oid, git::raw::Error> {
-        self.repo.reference_oid(remote, reference)
-    }
-
-    fn references_of(&self, remote: &RemoteId) -> Result<crate::storage::refs::Refs, Error> {
-        self.repo.references_of(remote)
-    }
-
-    fn references_glob(
-        &self,
-        pattern: &git::PatternStr,
-    ) -> Result<Vec<(fmt::Qualified, Oid)>, git::ext::Error> {
-        self.repo.references_glob(pattern)
-    }
-
-    fn identity_doc(&self) -> Result<crate::identity::DocAt, RepositoryError> {
-        self.repo.identity_doc()
-    }
-
-    fn identity_doc_at(&self, head: Oid) -> Result<crate::identity::DocAt, DocError> {
-        self.repo.identity_doc_at(head)
-    }
-
-    fn identity_head(&self) -> Result<Oid, RepositoryError> {
-        self.repo.identity_head()
-    }
-
-    fn identity_head_of(&self, remote: &RemoteId) -> Result<Oid, super::ext::Error> {
-        self.repo.identity_head_of(remote)
-    }
-
-    fn identity_root(&self) -> Result<Oid, RepositoryError> {
-        self.repo.identity_root()
-    }
-
-    fn identity_root_of(&self, remote: &RemoteId) -> Result<Oid, RepositoryError> {
-        self.repo.identity_root_of(remote)
-    }
-
-    fn canonical_identity_head(&self) -> Result<Oid, RepositoryError> {
-        self.repo.canonical_identity_head()
-    }
-
-    fn merge_base(&self, left: &Oid, right: &Oid) -> Result<Oid, git::ext::Error> {
-        self.repo.merge_base(left, right)
-    }
-}
-
-impl<'a, R: storage::WriteRepository> cob::object::Storage for DraftStore<'a, R> {
-    type ObjectsError = ObjectsError;
-    type TypesError = git::ext::Error;
-    type UpdateError = git2::Error;
-    type RemoveError = git2::Error;
-
-    fn objects(
-        &self,
-        typename: &cob::TypeName,
-        object_id: &cob::ObjectId,
-    ) -> Result<cob::object::Objects, Self::ObjectsError> {
-        // Nb. There can only be one draft per COB, per remote.
-        let Ok(r) = self.repo.raw().find_reference(
-            git::refs::storage::draft::cob(&self.remote, typename, object_id).as_str(),
-        ) else {
-            return Ok(Objects::default());
-        };
-        let r = cob::object::Reference::try_from(r).map_err(Self::ObjectsError::from)?;
-
-        Ok(Objects::new(r))
-    }
-
-    fn types(
-        &self,
-        typename: &cob::TypeName,
-    ) -> Result<BTreeMap<cob::ObjectId, cob::object::Objects>, Self::TypesError> {
-        let glob = git::refs::storage::draft::cobs(&self.remote, typename);
-        let references = self.repo.references_glob(&glob)?;
-        let mut objs = BTreeMap::new();
-
-        for (name, id) in references {
-            let r = cob::object::Reference {
-                name: name.into_refstring(),
-                target: cob::object::Commit { id },
-            };
-            objs.insert(id.into(), Objects::new(r));
-        }
-        Ok(objs)
-    }
-
-    fn update(
-        &self,
-        identifier: &PublicKey,
-        typename: &cob::TypeName,
-        object_id: &cob::ObjectId,
-        entry: &cob::history::EntryId,
-    ) -> Result<(), Self::UpdateError> {
-        self.repo.raw().reference(
-            git::refs::storage::draft::cob(identifier, typename, object_id).as_str(),
-            (*entry).into(),
-            true,
-            &format!(
-                "Updating draft collaborative object '{}/{}' with new entry {}",
-                typename, object_id, entry,
-            ),
-        )?;
-
-        Ok(())
-    }
-
-    fn remove(
-        &self,
-        identifier: &PublicKey,
-        typename: &cob::TypeName,
-        object_id: &cob::ObjectId,
-    ) -> Result<(), Self::RemoveError> {
-        let mut reference = self.repo.raw().find_reference(
-            git::refs::storage::draft::cob(identifier, typename, object_id).as_str(),
-        )?;
-
-        reference.delete()
-    }
-}
diff --git a/radicle/src/storage/git/transport.rs b/radicle/src/storage/git/transport.rs
deleted file mode 100644
index 947054bea..000000000
--- a/radicle/src/storage/git/transport.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-pub mod local;
-pub mod remote;
-
-use std::{io, process};
-
-/// A wrapper around a child process' stdin and stdout,
-/// making it [`io::Read`] and [`io::Write`].
-///
-/// Used for some of the git transports.
-pub(crate) struct ChildStream {
-    pub stdin: process::ChildStdin,
-    pub stdout: process::ChildStdout,
-}
-
-impl io::Read for ChildStream {
-    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
-        self.stdout.read(buf)
-    }
-}
-
-impl io::Write for ChildStream {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.stdin.write(buf)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        self.stdin.flush()
-    }
-}
diff --git a/radicle/src/storage/git/transport/local.rs b/radicle/src/storage/git/transport/local.rs
deleted file mode 100644
index 086229f62..000000000
--- a/radicle/src/storage/git/transport/local.rs
+++ /dev/null
@@ -1,111 +0,0 @@
-//! The local git transport protocol.
-pub mod url;
-pub use url::{Url, UrlError};
-
-use std::cell::RefCell;
-use std::process;
-use std::str::FromStr;
-use std::sync::Once;
-
-use crate::storage;
-use crate::storage::git::Storage;
-
-use super::ChildStream;
-
-thread_local! {
-    /// Stores a storage instance per thread.
-    /// This avoids race conditions when used in a multi-threaded context.
-    static THREAD_STORAGE: RefCell<Option<Storage>> = RefCell::default();
-}
-
-/// Local git transport over the filesystem.
-#[derive(Default)]
-struct Local {
-    /// The child process we spawn.
-    child: RefCell<Option<process::Child>>,
-}
-
-impl git2::transport::SmartSubtransport for Local {
-    fn action(
-        &self,
-        url: &str,
-        service: git2::transport::Service,
-    ) -> Result<Box<dyn git2::transport::SmartSubtransportStream>, git2::Error> {
-        let url = Url::from_str(url).map_err(|e| git2::Error::from_str(e.to_string().as_str()))?;
-        let service: &str = match service {
-            git2::transport::Service::UploadPack | git2::transport::Service::UploadPackLs => {
-                "upload-pack"
-            }
-            git2::transport::Service::ReceivePack | git2::transport::Service::ReceivePackLs => {
-                "receive-pack"
-            }
-        };
-        let git_dir = THREAD_STORAGE
-            .with(|t| {
-                t.borrow()
-                    .as_ref()
-                    .map(|s| storage::git::paths::repository(&s, &url.repo))
-            })
-            .ok_or_else(|| git2::Error::from_str("local transport storage was not registered"))?;
-
-        let mut cmd = process::Command::new("git");
-
-        if let Some(ns) = url.namespace {
-            cmd.env("GIT_NAMESPACE", ns.to_string());
-        }
-
-        let mut child = cmd
-            .arg(service)
-            .arg(&git_dir)
-            .stdin(process::Stdio::piped())
-            .stdout(process::Stdio::piped())
-            .stderr(process::Stdio::inherit())
-            .spawn()
-            .map_err(|e| git2::Error::from_str(e.to_string().as_str()))?;
-
-        let stdin = child.stdin.take().expect("taking stdin is safe");
-        let stdout = child.stdout.take().expect("taking stdout is safe");
-
-        self.child.replace(Some(child));
-
-        Ok(Box::new(ChildStream { stdout, stdin }))
-    }
-
-    fn close(&self) -> Result<(), git2::Error> {
-        if let Some(mut child) = self.child.take() {
-            let result = child
-                .wait()
-                .map_err(|e| git2::Error::from_str(e.to_string().as_str()))?;
-
-            if !result.success() {
-                return if let Some(code) = result.code() {
-                    Err(git2::Error::from_str(
-                        format!("transport: child process exited with error code {code}").as_str(),
-                    ))
-                } else {
-                    Err(git2::Error::from_str(
-                        "transport: child process exited with unknown error",
-                    ))
-                };
-            }
-        }
-        Ok(())
-    }
-}
-
-// TODO: Instead of taking a storage here, we should take something that can return a storage path.
-/// Register a storage with the local transport protocol.
-pub fn register(storage: Storage) {
-    static REGISTER: Once = Once::new();
-
-    THREAD_STORAGE.with(|s| {
-        *s.borrow_mut() = Some(storage);
-    });
-
-    REGISTER.call_once(|| unsafe {
-        git2::transport::register(Url::SCHEME, move |remote| {
-            git2::transport::Transport::smart(remote, false, Local::default())
-        })
-        .expect("local transport registration");
-    });
-}
diff --git a/radicle/src/storage/git/transport/local/url.rs b/radicle/src/storage/git/transport/local/url.rs
deleted file mode 100644
index b434177a5..000000000
--- a/radicle/src/storage/git/transport/local/url.rs
+++ /dev/null
@@ -1,159 +0,0 @@
-//! Git local transport URLs.
-use std::fmt;
-use std::str::FromStr;
-
-use thiserror::Error;
-
-use crate::{
-    crypto,
-    identity::{IdError, RepoId},
-};
-
-/// Repository namespace.
-type Namespace = crypto::PublicKey;
-
-#[derive(Debug, Error)]
-pub enum UrlError {
-    /// Invalid format.
-    #[error("invalid url format: expected `rad://<repo>[/<namespace>]`")]
-    InvalidFormat,
-    /// Unsupported URL scheme.
-    #[error("unsupported scheme: expected `rad://`")]
-    UnsupportedScheme,
-    /// Invalid repository identifier.
-    #[error("repo: {0}")]
-    InvalidRepository(#[source] IdError),
-    /// Invalid namespace.
-    #[error("namespace: {0}")]
-    InvalidNamespace(#[source] crypto::PublicKeyError),
-}
-
-/// A git local transport URL.
-///
-/// * Used to content-address a repository, eg. when sharing projects.
-/// * Used as a remore url in a git working copy.
-///
-/// `rad://<repo>[/<namespace>]`
-///
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
-pub struct Url {
-    /// Repository identifier.
-    pub repo: RepoId,
-    /// Repository sub-tree.
-    pub namespace: Option<Namespace>,
-}
-
-impl Url {
-    /// URL scheme.
-    pub const SCHEME: &'static str = "rad";
-
-    /// Return this URL with the given namespace added.
-    pub fn with_namespace(mut self, namespace: Namespace) -> Self {
-        self.namespace = Some(namespace);
-        self
-    }
-}
-
-impl From<RepoId> for Url {
-    fn from(repo: RepoId) -> Self {
-        Self {
-            repo,
-            namespace: None,
-        }
-    }
-}
-
-impl fmt::Display for Url {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        if let Some(ns) = self.namespace {
-            write!(f, "{}://{}/{}", Self::SCHEME, self.repo.canonical(), ns)
-        } else {
-            write!(f, "{}://{}", Self::SCHEME, self.repo.canonical())
-        }
-    }
-}
-
-impl FromStr for Url {
-    type Err = UrlError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let rest = s
-            .strip_prefix("rad://")
-            .ok_or(UrlError::UnsupportedScheme)?;
-        let components = rest.split('/').collect::<Vec<_>>();
-
-        let (resource, namespace) = match components.as_slice() {
-            [resource] => (resource, None),
-            [resource, namespace] => (resource, Some(namespace)),
-            _ => return Err(UrlError::InvalidFormat),
-        };
-
-        let resource = RepoId::from_canonical(resource).map_err(UrlError::InvalidRepository)?;
-        let namespace = namespace
-            .map(|pk| Namespace::from_str(pk).map_err(UrlError::InvalidNamespace))
-            .transpose()?;
-
-        Ok(Url {
-            repo: resource,
-            namespace,
-        })
-    }
-}
-
-#[cfg(test)]
-#[allow(clippy::unwrap_used)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_url_parse() {
-        let repo = RepoId::from_canonical("z2w8RArM3gaBXZxXhQUswE3hhLcss").unwrap();
-        let namespace =
-            Namespace::from_str("z6Mkifeb5NPS6j7JP72kEQEeuqMTpCAVcHsJi1C86jGTzHRi").unwrap();
-
-        let url = format!("rad://{}", repo.canonical());
-        let url = Url::from_str(&url).unwrap();
-
-        assert_eq!(url.repo, repo);
-        assert_eq!(url.namespace, None);
-
-        let url = format!("rad://{}/{namespace}", repo.canonical());
-        let url = Url::from_str(&url).unwrap();
-
-        assert_eq!(url.repo, repo);
-        assert_eq!(url.namespace, Some(namespace));
-
-        assert!(format!("heartwood://{}", repo.canonical())
-            .parse::<Url>()
-            .is_err());
-        assert!(format!("git://{}", repo.canonical())
-            .parse::<Url>()
-            .is_err());
-        assert!(format!("rad://{namespace}").parse::<Url>().is_err());
-        assert!(format!("rad://{}/{namespace}/fnord", repo.canonical())
-            .parse::<Url>()
-            .is_err());
-    }
-
-    #[test]
-    fn test_url_to_string() {
-        let repo = RepoId::from_canonical("z2w8RArM3gaBXZxXhQUswE3hhLcss").unwrap();
-        let namespace =
-            Namespace::from_str("z6Mkifeb5NPS6j7JP72kEQEeuqMTpCAVcHsJi1C86jGTzHRi").unwrap();
-
-        let url = Url {
-            repo,
-            namespace: None,
-        };
-        assert_eq!(url.to_string(), format!("rad://{}", repo.canonical()));
-
-        let url = Url {
-            repo,
-            namespace: Some(namespace),
-        };
-        assert_eq!(
-            url.to_string(),
-            format!("rad://{}/{namespace}", repo.canonical())
-        );
-    }
-}
diff --git a/radicle/src/storage/git/transport/remote.rs b/radicle/src/storage/git/transport/remote.rs
deleted file mode 100644
index f36ac06a8..000000000
--- a/radicle/src/storage/git/transport/remote.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-//! Git sub-transport used for fetching radicle data.
-pub mod mock;
-pub mod url;
-
-pub use url::{Url, UrlError};
diff --git a/radicle/src/storage/git/transport/remote/mock.rs b/radicle/src/storage/git/transport/remote/mock.rs
deleted file mode 100644
index 851af3e19..000000000
--- a/radicle/src/storage/git/transport/remote/mock.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-//! Mock git transport used for mocking the remote transport in tests.
-use std::collections::HashMap;
-use std::path::{Path, PathBuf};
-use std::str::FromStr;
-use std::sync::{Mutex, Once};
-use std::thread::ThreadId;
-use std::{process, thread};
-
-use once_cell::sync::Lazy;
-
-use super::Url;
-use crate::storage::git::transport::ChildStream;
-use crate::storage::RemoteId;
-
-/// Nodes registered with the mock transport.
-static NODES: Lazy<Mutex<HashMap<(ThreadId, RemoteId), PathBuf>>> =
-    Lazy::new(|| Mutex::new(HashMap::new()));
-
-/// The mock transport.
-#[derive(Default)]
-struct MockTransport;
-
-impl git2::transport::SmartSubtransport for MockTransport {
-    fn action(
-        &self,
-        url: &str,
-        service: git2::transport::Service,
-    ) -> Result<Box<dyn git2::transport::SmartSubtransportStream>, git2::Error> {
-        let url = Url::from_str(url).map_err(|e| git2::Error::from_str(e.to_string().as_str()))?;
-        let id = thread::current().id();
-        let nodes = NODES.lock().expect("lock cannot be poisoned");
-        let storage = if let Some(storage) = nodes.get(&(id, url.node)) {
-            match service {
-                git2::transport::Service::ReceivePack | git2::transport::Service::ReceivePackLs => {
-                    return Err(git2::Error::from_str(
-                        "git-receive-pack is not supported with the mock transport",
-                    ));
-                }
-                _ => {}
-            }
-            storage
-        } else {
-            return Err(git2::Error::from_str(&format!(
-                "node {} was not registered with the mock transport",
-                url.node
-            )));
-        };
-        assert!(
-            storage.exists(),
-            "The storage path {} must exist",
-            storage.display()
-        );
-
-        let git_dir = storage.join(url.repo.canonical());
-        assert!(
-            git_dir.exists(),
-            "The repository {} must exist",
-            git_dir.display()
-        );
-
-        let mut cmd = process::Command::new("git");
-        let mut child = cmd
-            .arg("upload-pack")
-            .arg("--strict")
-            .arg(&git_dir)
-            .stdin(process::Stdio::piped())
-            .stdout(process::Stdio::piped())
-            .stderr(process::Stdio::inherit())
-            .spawn()
-            .expect("the `git` command is available");
-
-        let stdin = child.stdin.take().expect("stdin is safe to take");
-        let stdout = child.stdout.take().expect("stdout is safe to take");
-
-        thread::spawn(move || child.wait());
-
-        Ok(Box::new(ChildStream { stdout, stdin }))
-    }
-
-    fn close(&self) -> Result<(), git2::Error> {
-        Ok(())
-    }
-}
-
-/// Register a new node with the given storage path.
-pub fn register(node: &RemoteId, path: &Path) {
-    static REGISTER: Once = Once::new();
-
-    REGISTER.call_once(|| unsafe {
-        git2::transport::register(Url::SCHEME, move |remote| {
-            git2::transport::Transport::smart(remote, false, MockTransport)
-        })
-        .expect("transport registration is successful");
-    });
-    let id = thread::current().id();
-
-    NODES
-        .lock()
-        .expect("the lock isn't poisoned")
-        .insert((id, *node), path.to_owned());
-}
diff --git a/radicle/src/storage/git/transport/remote/url.rs b/radicle/src/storage/git/transport/remote/url.rs
deleted file mode 100644
index f22eaf9e6..000000000
--- a/radicle/src/storage/git/transport/remote/url.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-//! Git remote transport URLs.
-use std::fmt;
-use std::str::FromStr;
-
-use thiserror::Error;
-
-use crate::{
-    crypto,
-    identity::{IdError, RepoId},
-};
-
-type NodeId = crypto::PublicKey;
-type Namespace = crypto::PublicKey;
-
-#[derive(Debug, Error)]
-pub enum UrlError {
-    /// Invalid format.
-    #[error("invalid url format: expected `heartwood://<node>/<repo>[/<namespace>]`")]
-    InvalidFormat,
-    /// Unsupported URL scheme.
-    #[error("unsupported scheme: expected `heartwood://`")]
-    UnsupportedScheme,
-    /// Invalid node identifier.
-    #[error("invalid node: {0}")]
-    InvalidNode(#[source] crypto::PublicKeyError),
-    /// Invalid repository identifier.
-    #[error("invalid repo: {0}")]
-    InvalidRepository(#[source] IdError),
-    /// Invalid namespace.
-    #[error("invalid namespace: {0}")]
-    InvalidNamespace(#[source] crypto::PublicKeyError),
-}
-
-/// A git remote transport URL.
-///
-/// `heartwood://<node>/<repo>[/<namespace>]`
-///
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
-pub struct Url {
-    /// Node identifier.
-    pub node: NodeId,
-    /// Repository identifier.
-    pub repo: RepoId,
-    /// Repository sub-tree.
-    pub namespace: Option<Namespace>,
-}
-
-impl Url {
-    /// URL scheme.
-    pub const SCHEME: &'static str = "heartwood";
-}
-
-impl fmt::Display for Url {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        if let Some(ns) = self.namespace {
-            write!(
-                f,
-                "{}://{}/{}/{}",
-                Self::SCHEME,
-                self.node,
-                self.repo.canonical(),
-                ns
-            )
-        } else {
-            write!(
-                f,
-                "{}://{}/{}",
-                Self::SCHEME,
-                self.node,
-                self.repo.canonical()
-            )
-        }
-    }
-}
-
-impl FromStr for Url {
-    type Err = UrlError;
-
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let rest = s
-            .strip_prefix("heartwood://")
-            .ok_or(UrlError::UnsupportedScheme)?;
-        let components = rest.split('/').collect::<Vec<_>>();
-
-        let (node, resource, namespace) = match components.as_slice() {
-            [node, resource] => (node, resource, None),
-            [node, resource, namespace] => (node, resource, Some(namespace)),
-            _ => return Err(UrlError::InvalidFormat),
-        };
-
-        let node = NodeId::from_str(node).map_err(UrlError::InvalidNode)?;
-        let resource = RepoId::from_canonical(resource).map_err(UrlError::InvalidRepository)?;
-        let namespace = namespace
-            .map(|pk| Namespace::from_str(pk).map_err(UrlError::InvalidNamespace))
-            .transpose()?;
-
-        Ok(Url {
-            node,
-            repo: resource,
-            namespace,
-        })
-    }
-}
-
-#[cfg(test)]
-#[allow(clippy::unwrap_used)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_url_parse() {
-        let node = NodeId::from_str("z6MkhaXgBZDvotDkL5257faiztiGiC2QtKLGpbnnEGta2doK").unwrap();
-        let repo = RepoId::from_canonical("z2w8RArM3gaBXZxXhQUswE3hhLcss").unwrap();
-        let namespace =
-            Namespace::from_str("z6Mkifeb5NPS6j7JP72kEQEeuqMTpCAVcHsJi1C86jGTzHRi").unwrap();
-
-        let url = format!("heartwood://{node}/{}", repo.canonical());
-        let url = Url::from_str(&url).unwrap();
-
-        assert_eq!(url.node, node);
-        assert_eq!(url.repo, repo);
-        assert_eq!(url.namespace, None);
-
-        let url = format!("heartwood://{node}/{}/{namespace}", repo.canonical());
-        let url = Url::from_str(&url).unwrap();
-
-        assert_eq!(url.node, node);
-        assert_eq!(url.repo, repo);
-        assert_eq!(url.namespace, Some(namespace));
-
-        assert!(format!("heartwood://{node}").parse::<Url>().is_err());
-        assert!(format!("rad://{node}").parse::<Url>().is_err());
-        assert!(format!("heartwood://{node}/{namespace}")
-            .parse::<Url>()
-            .is_err());
-        assert!(
-            format!("heartwood://{node}/{}/{namespace}/fnord", repo.canonical())
-                .parse::<Url>()
-                .is_err()
-        );
-    }
-}
diff --git a/radicle/src/storage/refs.rs b/radicle/src/storage/refs.rs
deleted file mode 100644
index 15b8bdb7e..000000000
--- a/radicle/src/storage/refs.rs
+++ /dev/null
@@ -1,473 +0,0 @@
-use std::collections::BTreeMap;
-use std::fmt::Debug;
-use std::io;
-use std::io::{BufRead, BufReader};
-use std::marker::PhantomData;
-use std::ops::{Deref, DerefMut};
-use std::path::Path;
-use std::str::FromStr;
-
-use crypto::{PublicKey, Signature, Signer, SignerError, Unverified, Verified};
-use serde::{Deserialize, Serialize};
-use thiserror::Error;
-
-use crate::git;
-use crate::git::ext as git_ext;
-use crate::git::Oid;
-use crate::profile::env;
-use crate::storage;
-use crate::storage::{ReadRepository, RemoteId, WriteRepository};
-
-pub use crate::git::refs::storage::*;
-
-/// File in which the signed references are stored, in the `refs/rad/sigrefs` branch.
-pub const REFS_BLOB_PATH: &str = "refs";
-/// File in which the signature over the references is stored in the `refs/rad/sigrefs` branch.
-pub const SIGNATURE_BLOB_PATH: &str = "signature";
-
-#[derive(Debug)]
-pub enum Updated {
-    /// The computed [`Refs`] were stored as a new commit.
-    Updated { oid: Oid },
-    /// The stored [`Refs`] were the same as the computed ones, so no new commit
-    /// was created.
-    Unchanged { oid: Oid },
-}
-
-#[derive(Debug, Error)]
-pub enum Error {
-    #[error("invalid signature: {0}")]
-    InvalidSignature(#[from] crypto::Error),
-    #[error("signer error: {0}")]
-    Signer(#[from] SignerError),
-    #[error("canonical refs: {0}")]
-    Canonical(#[from] canonical::Error),
-    #[error("invalid reference")]
-    InvalidRef,
-    #[error("invalid reference: {0}")]
-    Ref(#[from] git::RefError),
-    #[error(transparent)]
-    Git(#[from] git2::Error),
-    #[error(transparent)]
-    GitExt(#[from] git_ext::Error),
-}
-
-impl Error {
-    /// Whether this error is caused by a reference not being found.
-    pub fn is_not_found(&self) -> bool {
-        match self {
-            Self::GitExt(git::Error::NotFound(_)) => true,
-            Self::GitExt(git::Error::Git(e)) if git::is_not_found_err(e) => true,
-            Self::Git(e) if git::is_not_found_err(e) => true,
-            _ => false,
-        }
-    }
-}
-
-// TODO(finto): we should turn `git::RefString` to `git::Qualified`,
-// since all these refs SHOULD be `Qualified`.
-/// The published state of a local repository.
-#[derive(Default, Clone, Debug, PartialEq, Eq, Serialize)]
-pub struct Refs(BTreeMap<git::RefString, Oid>);
-
-impl Refs {
-    /// Verify the given signature on these refs, and return [`SignedRefs`] on success.
-    pub fn verified(
-        self,
-        signer: PublicKey,
-        signature: Signature,
-    ) -> Result<SignedRefs<Verified>, Error> {
-        let refs = self;
-        let msg = refs.canonical();
-
-        match signer.verify(msg, &signature) {
-            Ok(()) => Ok(SignedRefs {
-                refs,
-                signature,
-                id: signer,
-                _verified: PhantomData,
-            }),
-            Err(e) => Err(e.into()),
-        }
-    }
-
-    /// Sign these refs with the given signer and return [`SignedRefs`].
-    pub fn signed<G>(self, signer: &G) -> Result<SignedRefs<Verified>, Error>
-    where
-        G: Signer,
-    {
-        let refs = self;
-        let msg = refs.canonical();
-        let signature = signer.try_sign(&msg)?;
-
-        Ok(SignedRefs {
-            refs,
-            signature,
-            id: *signer.public_key(),
-            _verified: PhantomData,
-        })
-    }
-
-    /// Get a particular ref.
-    pub fn get(&self, name: &git::Qualified) -> Option<Oid> {
-        self.0.get(name.to_ref_string().as_refstr()).copied()
-    }
-
-    /// Get a particular head ref.
-    pub fn head(&self, name: impl AsRef<git::RefStr>) -> Option<Oid> {
-        let branch = git::refname!("refs/heads").join(name);
-        self.0.get(&branch).copied()
-    }
-
-    /// Create refs from a canonical representation.
-    pub fn from_canonical(bytes: &[u8]) -> Result<Self, canonical::Error> {
-        let reader = BufReader::new(bytes);
-        let mut refs = BTreeMap::new();
-
-        for line in reader.lines() {
-            let line = line?;
-            let (oid, name) = line
-                .split_once(' ')
-                .ok_or(canonical::Error::InvalidFormat)?;
-
-            let name = git::RefString::try_from(name)?;
-            let oid = Oid::from_str(oid)?;
-
-            if oid.is_zero() {
-                continue;
-            }
-            refs.insert(name, oid);
-        }
-        Ok(Self(refs))
-    }
-
-    pub fn canonical(&self) -> Vec<u8> {
-        let mut buf = String::new();
-
-        for (name, oid) in self.iter() {
-            buf.push_str(&oid.to_string());
-            buf.push(' ');
-            buf.push_str(name);
-            buf.push('\n');
-        }
-        buf.into_bytes()
-    }
-}
-
-impl IntoIterator for Refs {
-    type Item = (git::RefString, Oid);
-    type IntoIter = std::collections::btree_map::IntoIter<git::RefString, Oid>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.0.into_iter()
-    }
-}
-
-impl From<Refs> for BTreeMap<git::RefString, Oid> {
-    fn from(refs: Refs) -> Self {
-        refs.0
-    }
-}
-
-impl<V> From<SignedRefs<V>> for Refs {
-    fn from(signed: SignedRefs<V>) -> Self {
-        signed.refs
-    }
-}
-
-impl From<BTreeMap<git::RefString, Oid>> for Refs {
-    fn from(refs: BTreeMap<git::RefString, Oid>) -> Self {
-        Self(refs)
-    }
-}
-
-impl Deref for Refs {
-    type Target = BTreeMap<git::RefString, Oid>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for Refs {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-/// Combination of [`Refs`] and a [`Signature`]. The signature is a cryptographic
-/// signature over the refs. This allows us to easily verify if a set of refs
-/// came from a particular key.
-///
-/// The type parameter keeps track of whether the signature was [`Verified`] or
-/// [`Unverified`].
-#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
-pub struct SignedRefs<V> {
-    /// The signed refs.
-    pub refs: Refs,
-    /// The signature of the signer over the refs.
-    #[serde(skip)]
-    pub signature: Signature,
-    /// This is the remote under which these refs exist, and the public key of the signer.
-    pub id: PublicKey,
-
-    #[serde(skip)]
-    _verified: PhantomData<V>,
-}
-
-impl SignedRefs<Unverified> {
-    pub fn new(refs: Refs, id: PublicKey, signature: Signature) -> Self {
-        Self {
-            refs,
-            signature,
-            id,
-            _verified: PhantomData,
-        }
-    }
-
-    pub fn verified(self) -> Result<SignedRefs<Verified>, crypto::Error> {
-        match self.verify(&self.id) {
-            Ok(()) => Ok(SignedRefs {
-                refs: self.refs,
-                signature: self.signature,
-                id: self.id,
-                _verified: PhantomData,
-            }),
-            Err(e) => Err(e),
-        }
-    }
-
-    pub fn verify(&self, signer: &PublicKey) -> Result<(), crypto::Error> {
-        let canonical = self.refs.canonical();
-
-        match signer.verify(canonical, &self.signature) {
-            Ok(()) => Ok(()),
-            Err(e) => Err(e),
-        }
-    }
-}
-
-impl SignedRefs<Verified> {
-    pub fn load<S>(remote: RemoteId, repo: &S) -> Result<Self, Error>
-    where
-        S: ReadRepository,
-    {
-        let oid = repo.reference_oid(&remote, &SIGREFS_BRANCH)?;
-
-        SignedRefs::load_at(oid, remote, repo)
-    }
-
-    pub fn load_at<S>(oid: Oid, remote: RemoteId, repo: &S) -> Result<Self, Error>
-    where
-        S: storage::ReadRepository,
-    {
-        let refs = repo.blob_at(oid, Path::new(REFS_BLOB_PATH))?;
-        let signature = repo.blob_at(oid, Path::new(SIGNATURE_BLOB_PATH))?;
-        let signature: crypto::Signature = signature.content().try_into()?;
-
-        match remote.verify(refs.content(), &signature) {
-            Ok(()) => {
-                let refs = Refs::from_canonical(refs.content())?;
-
-                Ok(Self {
-                    refs,
-                    signature,
-                    id: remote,
-                    _verified: PhantomData,
-                })
-            }
-            Err(e) => Err(e.into()),
-        }
-    }
-
-    /// Save the signed refs to disk.
-    /// This creates a new commit on the signed refs branch, and updates the branch pointer.
-    pub fn save<S: WriteRepository>(&self, repo: &S) -> Result<Updated, Error> {
-        let sigref = &SIGREFS_BRANCH;
-        let remote = &self.id;
-        let raw = repo.raw();
-
-        // N.b. if the signatures match then there are no updates
-        let parent = match SignedRefsAt::load(*remote, repo)? {
-            Some(SignedRefsAt { sigrefs, at }) if sigrefs.signature == self.signature => {
-                return Ok(Updated::Unchanged { oid: at })
-            }
-            Some(SignedRefsAt { at, .. }) => Some(raw.find_commit(*at)?),
-            None => None,
-        };
-
-        let tree = {
-            let refs_blob_oid = raw.blob(&self.canonical())?;
-            let sig_blob_oid = raw.blob(self.signature.as_ref())?;
-
-            let mut builder = raw.treebuilder(None)?;
-            builder.insert(REFS_BLOB_PATH, refs_blob_oid, 0o100_644)?;
-            builder.insert(SIGNATURE_BLOB_PATH, sig_blob_oid, 0o100_644)?;
-
-            let oid = builder.write()?;
-
-            raw.find_tree(oid)
-        }?;
-
-        let sigref = sigref.with_namespace(remote.into());
-        let author = if let Ok(s) = env::var(env::GIT_COMMITTER_DATE) {
-            let Ok(timestamp) = s.trim().parse::<i64>() else {
-                panic!(
-                    "Invalid timestamp value {s:?} for `{}`",
-                    env::GIT_COMMITTER_DATE
-                );
-            };
-            let time = git2::Time::new(timestamp, 0);
-            git2::Signature::new("radicle", remote.to_string().as_str(), &time)?
-        } else {
-            raw.signature()?
-        };
-
-        let commit = raw.commit(
-            Some(&sigref),
-            &author,
-            &author,
-            "Update signed refs\n",
-            &tree,
-            &parent.iter().collect::<Vec<&git2::Commit>>(),
-        );
-
-        match commit {
-            Ok(oid) => Ok(Updated::Updated { oid: oid.into() }),
-            Err(e) => match (e.class(), e.code()) {
-                (git2::ErrorClass::Object, git2::ErrorCode::Modified) => {
-                    log::warn!("Concurrent modification of refs: {:?}", e);
-
-                    Err(Error::Git(e))
-                }
-                _ => Err(e.into()),
-            },
-        }
-    }
-
-    pub fn unverified(self) -> SignedRefs<Unverified> {
-        SignedRefs {
-            refs: self.refs,
-            signature: self.signature,
-            id: self.id,
-            _verified: PhantomData,
-        }
-    }
-}
-
-impl<V> Deref for SignedRefs<V> {
-    type Target = Refs;
-
-    fn deref(&self) -> &Self::Target {
-        &self.refs
-    }
-}
-
-/// The content-addressable information required to load a remote's
-/// `rad/sigrefs`.
-///
-/// This can be used to [`RefsAt::load`] a [`SignedRefsAt`].
-///
-/// It can also be used for communicating announcements of updates
-/// references to other nodes.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct RefsAt {
-    /// The remote namespace of the `rad/sigrefs`.
-    pub remote: RemoteId,
-    /// The commit SHA that `rad/sigrefs` points to.
-    pub at: Oid,
-}
-
-impl RefsAt {
-    pub fn new<S: ReadRepository>(repo: &S, remote: RemoteId) -> Result<Self, git::raw::Error> {
-        let at = repo.reference_oid(&remote, &storage::refs::SIGREFS_BRANCH)?;
-        Ok(RefsAt { remote, at })
-    }
-
-    pub fn load<S: ReadRepository>(&self, repo: &S) -> Result<SignedRefsAt, Error> {
-        SignedRefsAt::load_at(self.at, self.remote, repo)
-    }
-
-    pub fn path(&self) -> &git::Qualified {
-        &SIGREFS_BRANCH
-    }
-}
-
-/// Verified [`SignedRefs`] that keeps track of their content address
-/// [`Oid`].
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct SignedRefsAt {
-    pub sigrefs: SignedRefs<Verified>,
-    pub at: Oid,
-}
-
-impl SignedRefsAt {
-    /// Load the [`SignedRefs`] found under `remote`'s [`SIGREFS_BRANCH`].
-    ///
-    /// This will return `None` if the branch was not found, all other
-    /// errors are returned.
-    pub fn load<S>(remote: RemoteId, repo: &S) -> Result<Option<Self>, Error>
-    where
-        S: ReadRepository,
-    {
-        let at = match RefsAt::new(repo, remote) {
-            Ok(RefsAt { at, .. }) => at,
-            Err(e) if git::is_not_found_err(&e) => return Ok(None),
-            Err(e) => return Err(e.into()),
-        };
-        Self::load_at(at, remote, repo).map(Some)
-    }
-
-    pub fn load_at<S>(at: Oid, remote: RemoteId, repo: &S) -> Result<Self, Error>
-    where
-        S: storage::ReadRepository,
-    {
-        Ok(Self {
-            sigrefs: SignedRefs::load_at(at, remote, repo)?,
-            at,
-        })
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = (&git::RefString, &Oid)> {
-        self.sigrefs.refs.iter()
-    }
-}
-
-impl Deref for SignedRefsAt {
-    type Target = SignedRefs<Verified>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.sigrefs
-    }
-}
-
-pub mod canonical {
-    use super::*;
-
-    #[derive(Debug, thiserror::Error)]
-    pub enum Error {
-        #[error(transparent)]
-        InvalidRef(#[from] git::fmt::Error),
-        #[error("invalid canonical format")]
-        InvalidFormat,
-        #[error(transparent)]
-        Io(#[from] io::Error),
-        #[error(transparent)]
-        Git(#[from] git2::Error),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use qcheck_macros::quickcheck;
-
-    #[quickcheck]
-    fn prop_canonical_roundtrip(refs: Refs) {
-        let encoded = refs.canonical();
-        let decoded = Refs::from_canonical(&encoded).unwrap();
-
-        assert_eq!(refs, decoded);
-    }
-}
diff --git a/radicle/src/test.rs b/radicle/src/test.rs
deleted file mode 100644
index ed374897d..000000000
--- a/radicle/src/test.rs
+++ /dev/null
@@ -1,324 +0,0 @@
-#![allow(clippy::unwrap_used)]
-pub mod arbitrary;
-pub mod assert;
-pub mod fixtures;
-pub mod storage;
-
-use super::storage::{Namespaces, RefUpdate};
-
-use crate::prelude::NodeId;
-use crate::storage::WriteRepository;
-
-/// Perform a fetch between two local repositories.
-/// This has the same outcome as doing a "real" fetch, but suffices for the simulation, and
-/// doesn't require running nodes.
-pub fn fetch<W: WriteRepository>(
-    repo: &W,
-    node: &NodeId,
-    namespaces: impl Into<Namespaces>,
-) -> Result<Vec<RefUpdate>, crate::storage::FetchError> {
-    let namespace = match namespaces.into() {
-        Namespaces::All => None,
-        Namespaces::Followed(followed) => followed.into_iter().next(),
-    };
-    let mut updates = Vec::new();
-    let mut callbacks = git2::RemoteCallbacks::new();
-    let mut opts = git2::FetchOptions::default();
-    let refspec = if let Some(namespace) = namespace {
-        opts.prune(git2::FetchPrune::On);
-        format!("refs/namespaces/{namespace}/refs/*:refs/namespaces/{namespace}/refs/*")
-    } else {
-        opts.prune(git2::FetchPrune::Off);
-        "refs/namespaces/*:refs/namespaces/*".to_owned()
-    };
-
-    callbacks.update_tips(|name, old, new| {
-        if let Ok(name) = crate::git::RefString::try_from(name) {
-            if name.to_namespaced().is_some() {
-                updates.push(RefUpdate::from(name, old, new));
-                // Returning `true` ensures the process is not aborted.
-                return true;
-            }
-        }
-        false
-    });
-    opts.remote_callbacks(callbacks);
-
-    let mut remote = repo.raw().remote_anonymous(
-        crate::storage::git::transport::remote::Url {
-            node: *node,
-            repo: repo.id(),
-            namespace,
-        }
-        .to_string()
-        .as_str(),
-    )?;
-    remote.fetch(&[refspec], Some(&mut opts), None)?;
-
-    drop(opts);
-
-    repo.set_identity_head()?;
-    repo.set_head()?;
-
-    let validations = repo.validate()?;
-    if !validations.is_empty() {
-        return Err(crate::storage::FetchError::Validation { validations });
-    }
-    Ok(updates)
-}
-
-pub mod setup {
-    use std::path::{Path, PathBuf};
-
-    use tempfile::{tempdir, TempDir};
-
-    use super::storage::{Namespaces, RefUpdate};
-    use crate::crypto::test::signer::MockSigner;
-    use crate::storage::git::transport::remote;
-    use crate::{
-        git,
-        profile::Home,
-        rad::REMOTE_NAME,
-        test::{fixtures, storage::git::Repository},
-        Storage,
-    };
-    use crate::{prelude::*, rad};
-
-    /// A node.
-    ///
-    /// Note that this isn't a real node; only a profile with storage and a signing key.
-    pub struct Node {
-        pub tmp: TempDir,
-        pub root: PathBuf,
-        pub storage: Storage,
-        pub signer: MockSigner,
-    }
-
-    impl Default for Node {
-        fn default() -> Self {
-            let root = tempdir().unwrap();
-
-            Self::new(root, MockSigner::default(), "Radcliff")
-        }
-    }
-
-    impl Node {
-        pub fn new(tmp: TempDir, signer: MockSigner, alias: &str) -> Self {
-            let root = tmp.path().to_path_buf();
-            let home = root.join("home");
-            let paths = Home::new(home.as_path()).unwrap();
-            let storage = Storage::open(
-                paths.storage(),
-                git::UserInfo {
-                    alias: Alias::new(alias),
-                    key: *signer.public_key(),
-                },
-            )
-            .unwrap();
-
-            remote::mock::register(signer.public_key(), storage.path());
-
-            Self {
-                tmp,
-                root,
-                storage,
-                signer,
-            }
-        }
-
-        pub fn clone(&mut self, rid: RepoId, other: &Self) {
-            let repo = self.storage.create(rid).unwrap();
-            super::fetch(&repo, other.signer.public_key(), Namespaces::All).unwrap();
-
-            rad::fork(rid, &self.signer, &self.storage).unwrap();
-        }
-
-        pub fn project(&self) -> NodeRepo {
-            let (id, _, checkout, _) =
-                fixtures::project(self.root.join("working"), &self.storage, &self.signer).unwrap();
-            let repo = self.storage.repository(id).unwrap();
-            let checkout = Some(NodeRepoCheckout { checkout });
-
-            NodeRepo { repo, checkout }
-        }
-    }
-
-    /// A node repository with an optional checkout.
-    pub struct NodeRepo {
-        pub repo: Repository,
-        pub checkout: Option<NodeRepoCheckout>,
-    }
-
-    impl NodeRepo {
-        #[track_caller]
-        pub fn fetch(&self, from: &Node) -> Vec<RefUpdate> {
-            super::fetch(&self.repo, from.signer.public_key(), Namespaces::All).unwrap()
-        }
-
-        #[track_caller]
-        pub fn checkout(&self) -> &NodeRepoCheckout {
-            self.checkout.as_ref().unwrap()
-        }
-    }
-
-    impl std::ops::Deref for NodeRepo {
-        type Target = Repository;
-
-        fn deref(&self) -> &Self::Target {
-            &self.repo
-        }
-    }
-
-    impl std::ops::DerefMut for NodeRepo {
-        fn deref_mut(&mut self) -> &mut Self::Target {
-            &mut self.repo
-        }
-    }
-
-    /// A repository checkout.
-    pub struct NodeRepoCheckout {
-        checkout: git::raw::Repository,
-    }
-
-    impl NodeRepoCheckout {
-        pub fn branch_with<S: AsRef<Path>, T: AsRef<[u8]>>(
-            &self,
-            blobs: impl IntoIterator<Item = (S, T)>,
-        ) -> BranchWith {
-            let refname = git::Qualified::from(git::lit::refs_heads(git::refname!("master")));
-            let base = self.checkout.refname_to_id(refname.as_str()).unwrap();
-            let parent = self.checkout.find_commit(base).unwrap();
-            let oid = commit(&self.checkout, &refname, blobs, &[&parent]);
-
-            git::push(&self.checkout, &REMOTE_NAME, [(&refname, &refname)]).unwrap();
-
-            BranchWith {
-                base: base.into(),
-                oid,
-            }
-        }
-    }
-
-    impl std::ops::Deref for NodeRepoCheckout {
-        type Target = git::raw::Repository;
-
-        fn deref(&self) -> &Self::Target {
-            &self.checkout
-        }
-    }
-
-    /// A node with a repository.
-    pub struct NodeWithRepo {
-        pub node: Node,
-        pub repo: NodeRepo,
-    }
-
-    impl std::ops::Deref for NodeWithRepo {
-        type Target = Node;
-
-        fn deref(&self) -> &Self::Target {
-            &self.node
-        }
-    }
-
-    impl std::ops::DerefMut for NodeWithRepo {
-        fn deref_mut(&mut self) -> &mut Self::Target {
-            &mut self.node
-        }
-    }
-
-    impl Default for NodeWithRepo {
-        fn default() -> Self {
-            let node = Node::default();
-            let repo = node.project();
-
-            Self { node, repo }
-        }
-    }
-
-    /// A network of three nodes.
-    ///
-    /// Note that these are not actually running nodes in the sense of `radicle-node`.
-    /// These are simply profiles with their own storage, and the ability to fetch between
-    /// them.
-    pub struct Network {
-        pub alice: NodeWithRepo,
-        pub bob: NodeWithRepo,
-        pub eve: NodeWithRepo,
-        pub rid: RepoId,
-    }
-
-    impl Default for Network {
-        fn default() -> Self {
-            let alice = Node::new(tempdir().unwrap(), MockSigner::from_seed([!0; 32]), "alice");
-            let mut bob = Node::new(tempdir().unwrap(), MockSigner::from_seed([!1; 32]), "bob");
-            let mut eve = Node::new(tempdir().unwrap(), MockSigner::from_seed([!2; 32]), "eve");
-            let repo = alice.project();
-            let rid = repo.id;
-
-            bob.clone(repo.id, &alice);
-            eve.clone(repo.id, &alice);
-
-            let alice = NodeWithRepo { node: alice, repo };
-            let repo = bob.storage.repository(rid).unwrap();
-            let bob = NodeWithRepo {
-                node: bob,
-                repo: NodeRepo {
-                    repo,
-                    checkout: None,
-                },
-            };
-            let repo = eve.storage.repository(rid).unwrap();
-            let eve = NodeWithRepo {
-                node: eve,
-                repo: NodeRepo {
-                    repo,
-                    checkout: None,
-                },
-            };
-
-            Self {
-                alice,
-                bob,
-                eve,
-                rid,
-            }
-        }
-    }
-
-    #[derive(Debug)]
-    pub struct BranchWith {
-        pub base: git::Oid,
-        pub oid: git::Oid,
-    }
-
-    pub fn commit<S: AsRef<Path>, T: AsRef<[u8]>>(
-        repo: &git2::Repository,
-        refname: &git::Qualified,
-        blobs: impl IntoIterator<Item = (S, T)>,
-        parents: &[&git2::Commit<'_>],
-    ) -> git::Oid {
-        let tree = {
-            let mut tb = repo.treebuilder(None).unwrap();
-            for (name, blob) in blobs.into_iter() {
-                let oid = repo.blob(blob.as_ref()).unwrap();
-                tb.insert(name.as_ref(), oid, git2::FileMode::Blob.into())
-                    .unwrap();
-            }
-            tb.write().unwrap()
-        };
-        let tree = repo.find_tree(tree).unwrap();
-        let author = git2::Signature::now("anonymous", "anonymous@example.com").unwrap();
-
-        repo.commit(
-            Some(refname.as_str()),
-            &author,
-            &author,
-            "Making changes",
-            &tree,
-            parents,
-        )
-        .unwrap()
-        .into()
-    }
-}
diff --git a/radicle/src/test/arbitrary.rs b/radicle/src/test/arbitrary.rs
deleted file mode 100644
index e90f3fa48..000000000
--- a/radicle/src/test/arbitrary.rs
+++ /dev/null
@@ -1,337 +0,0 @@
-use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
-use std::hash::Hash;
-use std::ops::RangeBounds;
-use std::str::FromStr;
-use std::{iter, net};
-
-use crypto::test::signer::MockSigner;
-use crypto::{PublicKey, Unverified, Verified};
-use cyphernet::addr::tor::OnionAddrV3;
-use cyphernet::EcPk;
-use nonempty::NonEmpty;
-use qcheck::Arbitrary;
-
-use crate::collections::RandomMap;
-use crate::identity::doc::Visibility;
-use crate::identity::project::ProjectName;
-use crate::identity::{
-    doc::{Doc, DocAt, RepoId},
-    project::Project,
-    Did,
-};
-use crate::node::address::{AddressType, Source};
-use crate::node::{Address, Alias, KnownAddress, Timestamp, UserAgent};
-use crate::storage;
-use crate::storage::refs::{Refs, RefsAt, SignedRefs};
-use crate::test::storage::{MockRepository, MockStorage};
-use crate::{cob, git};
-
-pub fn oid() -> storage::Oid {
-    let oid_bytes: [u8; 20] = gen(1);
-    storage::Oid::try_from(oid_bytes.as_slice()).unwrap()
-}
-
-pub fn entry_id() -> cob::EntryId {
-    self::oid()
-}
-
-pub fn refstring(len: usize) -> git::RefString {
-    let mut buf = Vec::<u8>::new();
-    for _ in 0..len {
-        buf.push(fastrand::u8(0x61..0x7a));
-    }
-    std::str::from_utf8(&buf)
-        .unwrap()
-        .to_string()
-        .try_into()
-        .unwrap()
-}
-
-pub fn set<T: Eq + Hash + Arbitrary>(range: impl RangeBounds<usize>) -> HashSet<T> {
-    let size = fastrand::usize(range);
-    let mut set = HashSet::with_capacity(size);
-    let mut g = qcheck::Gen::new(size);
-
-    while set.len() < size {
-        set.insert(T::arbitrary(&mut g));
-    }
-    set
-}
-
-pub fn vec<T: Eq + Arbitrary>(size: usize) -> Vec<T> {
-    let mut vec = Vec::with_capacity(size);
-    let mut g = qcheck::Gen::new(size);
-
-    for _ in 0..vec.capacity() {
-        vec.push(T::arbitrary(&mut g));
-    }
-    vec
-}
-
-pub fn nonempty_storage(size: usize) -> MockStorage {
-    let mut storage = gen::<MockStorage>(size);
-    for _ in 0..size {
-        let id = gen::<RepoId>(1);
-        storage.repos.insert(
-            id,
-            MockRepository {
-                id,
-                doc: gen::<DocAt>(1),
-                remotes: HashMap::new(),
-            },
-        );
-    }
-    storage
-}
-
-pub fn gen<T: Arbitrary>(size: usize) -> T {
-    let mut gen = qcheck::Gen::new(size);
-
-    T::arbitrary(&mut gen)
-}
-
-impl Arbitrary for storage::Remotes<crypto::Verified> {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let remotes: RandomMap<storage::RemoteId, storage::Remote<crypto::Verified>> =
-            Arbitrary::arbitrary(g);
-
-        storage::Remotes::new(remotes)
-    }
-}
-
-impl Arbitrary for Did {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        Self::from(PublicKey::arbitrary(g))
-    }
-}
-
-impl Arbitrary for Project {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let mut rng = fastrand::Rng::with_seed(u64::arbitrary(g));
-        let length = rng.usize(1..16);
-        let name: String = iter::repeat_with(|| rng.alphanumeric())
-            .take(length)
-            .collect();
-        let name = ProjectName::from_str(&name).unwrap();
-        let description = iter::repeat_with(|| rng.alphanumeric())
-            .take(length * 2)
-            .collect();
-        let default_branch: git::RefString = iter::repeat_with(|| rng.alphanumeric())
-            .take(length)
-            .collect::<String>()
-            .try_into()
-            .unwrap();
-
-        Project::new(name, description, default_branch).unwrap()
-    }
-}
-
-impl Arbitrary for Visibility {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        if bool::arbitrary(g) {
-            Visibility::Public
-        } else {
-            Visibility::Private {
-                allow: BTreeSet::arbitrary(g),
-            }
-        }
-    }
-}
-
-impl Arbitrary for Doc<Unverified> {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let proj = Project::arbitrary(g);
-        let delegate = Did::arbitrary(g);
-        let visibility = Visibility::arbitrary(g);
-
-        Self::initial(proj, delegate, visibility)
-    }
-}
-
-impl Arbitrary for Doc<Verified> {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let mut rng = fastrand::Rng::with_seed(u64::arbitrary(g));
-        let project = Project::arbitrary(g);
-        let delegates: NonEmpty<_> = iter::repeat_with(|| Did::arbitrary(g))
-            .take(rng.usize(1..6))
-            .collect::<Vec<_>>()
-            .try_into()
-            .unwrap();
-        let threshold = delegates.len() / 2 + 1;
-        let visibility = Visibility::arbitrary(g);
-        let doc: Doc<Unverified> = Doc::new(project, delegates, threshold, visibility);
-
-        doc.verified().unwrap()
-    }
-}
-
-impl Arbitrary for DocAt {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let doc = Doc::<Verified>::arbitrary(g);
-
-        DocAt {
-            commit: self::oid(),
-            blob: self::oid(),
-            doc,
-        }
-    }
-}
-
-impl Arbitrary for SignedRefs<Unverified> {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let bytes: [u8; 64] = Arbitrary::arbitrary(g);
-        let signature = crypto::Signature::from(bytes);
-        let id = PublicKey::arbitrary(g);
-        let refs = Refs::arbitrary(g);
-
-        Self::new(refs, id, signature)
-    }
-}
-
-impl Arbitrary for Refs {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let mut refs: BTreeMap<git::RefString, storage::Oid> = BTreeMap::new();
-        let mut bytes: [u8; 20] = [0; 20];
-        let names = &[
-            "heads/master",
-            "heads/feature/1",
-            "heads/feature/2",
-            "heads/feature/3",
-            "rad/id",
-            "tags/v1.0",
-            "tags/v2.0",
-            "notes/1",
-        ];
-
-        for _ in 0..g.size().min(names.len()) {
-            if let Some(name) = g.choose(names) {
-                for byte in &mut bytes {
-                    *byte = u8::arbitrary(g);
-                }
-                let oid = storage::Oid::try_from(&bytes[..]).unwrap();
-                let name = git::RefString::try_from(*name).unwrap();
-
-                refs.insert(name, oid);
-            }
-        }
-        Self::from(refs)
-    }
-}
-
-impl Arbitrary for RefsAt {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        Self {
-            remote: PublicKey::arbitrary(g),
-            at: oid(),
-        }
-    }
-}
-
-impl Arbitrary for MockStorage {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let inventory = Arbitrary::arbitrary(g);
-        MockStorage::new(inventory)
-    }
-}
-
-impl Arbitrary for MockRepository {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let rid = RepoId::arbitrary(g);
-        let doc = Doc::<Verified>::arbitrary(g);
-
-        Self::new(rid, doc)
-    }
-}
-
-impl Arbitrary for storage::Remote<crypto::Verified> {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let refs = Refs::arbitrary(g);
-        let signer = MockSigner::arbitrary(g);
-        let signed = refs.signed(&signer).unwrap();
-
-        storage::Remote::<crypto::Verified>::new(signed)
-    }
-}
-
-impl Arbitrary for RepoId {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let bytes = <[u8; 20]>::arbitrary(g);
-        let oid = git::Oid::try_from(bytes.as_slice()).unwrap();
-
-        RepoId::from(oid)
-    }
-}
-
-impl Arbitrary for AddressType {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let t = *g.choose(&[1, 2, 3, 4]).unwrap() as u8;
-
-        AddressType::try_from(t).unwrap()
-    }
-}
-
-impl Arbitrary for Address {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let host = match AddressType::arbitrary(g) {
-            AddressType::Ipv4 => cyphernet::addr::HostName::Ip(net::IpAddr::V4(
-                net::Ipv4Addr::from(u32::arbitrary(g)),
-            )),
-            AddressType::Ipv6 => {
-                let octets: [u8; 16] = Arbitrary::arbitrary(g);
-                cyphernet::addr::HostName::Ip(net::IpAddr::V6(net::Ipv6Addr::from(octets)))
-            }
-            AddressType::Dns => cyphernet::addr::HostName::Dns(
-                g.choose(&[
-                    "seed.radicle.xyz",
-                    "seed.radicle.garden",
-                    "seed.radicle.cloudhead.io",
-                ])
-                .unwrap()
-                .to_string(),
-            ),
-            AddressType::Onion => {
-                let pk = PublicKey::arbitrary(g);
-                let addr = OnionAddrV3::from(
-                    cyphernet::ed25519::PublicKey::from_pk_compressed(**pk).unwrap(),
-                );
-                cyphernet::addr::HostName::Tor(addr)
-            }
-        };
-
-        Address::from(cyphernet::addr::NetAddr {
-            host,
-            port: u16::arbitrary(g),
-        })
-    }
-}
-
-impl Arbitrary for KnownAddress {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        KnownAddress::new(Address::arbitrary(g), Source::Peer)
-    }
-}
-
-impl Arbitrary for Alias {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        let s = g
-            .choose(&["cloudhead", "alice", "bob", "john-lu", "f0_"])
-            .unwrap();
-
-        Alias::from_str(s).unwrap()
-    }
-}
-
-impl Arbitrary for Timestamp {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        Self::try_from(u64::arbitrary(g).min(*Self::MAX)).unwrap()
-    }
-}
-
-impl Arbitrary for UserAgent {
-    fn arbitrary(g: &mut qcheck::Gen) -> Self {
-        UserAgent::from_str(
-            format!("/radicle:1.{}.{}/", u8::arbitrary(g), u8::arbitrary(g)).as_str(),
-        )
-        .unwrap()
-    }
-}
diff --git a/radicle/src/test/assert.rs b/radicle/src/test/assert.rs
deleted file mode 100644
index 4f6ed872a..000000000
--- a/radicle/src/test/assert.rs
+++ /dev/null
@@ -1,296 +0,0 @@
-// Copyright (c) 2016 Murarth
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-// and associated documentation files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all copies or
-// substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-// BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-//! Provides a macro, `assert_matches!`, which tests whether a value
-//! matches a given pattern, causing a panic if the match fails.
-//!
-//! See the macro [`assert_matches!`] documentation for more information.
-//!
-//! Also provides a debug-only counterpart, [`debug_assert_matches!`].
-//!
-//! See the macro [`debug_assert_matches!`] documentation for more information
-//! about this macro.
-//!
-//! [`assert_matches!`]: macro.assert_matches.html
-//! [`debug_assert_matches!`]: macro.debug_assert_matches.html
-
-#![deny(missing_docs)]
-
-/// Asserts that an expression matches a given pattern.
-///
-/// A guard expression may be supplied to add further restrictions to the
-/// expected value of the expression.
-///
-/// A `match` arm may be supplied to perform additional assertions or to yield
-/// a value from the macro invocation.
-///
-#[macro_export]
-macro_rules! assert_matches {
-    ( $e:expr , $($pat:pat_param)|+ ) => {
-        match $e {
-            $($pat)|+ => (),
-            ref e => panic!("assertion failed: `{:?}` does not match `{}`",
-                e, stringify!($($pat)|+))
-        }
-    };
-    ( $e:expr , $($pat:pat_param)|+ if $cond:expr ) => {
-        match $e {
-            $($pat)|+ if $cond => (),
-            ref e => panic!("assertion failed: `{:?}` does not match `{}`",
-                e, stringify!($($pat)|+ if $cond))
-        }
-    };
-    ( $e:expr , $($pat:pat_param)|+ => $arm:expr ) => {
-        match $e {
-            $($pat)|+ => $arm,
-            ref e => panic!("assertion failed: `{:?}` does not match `{}`",
-                e, stringify!($($pat)|+))
-        }
-    };
-    ( $e:expr , $($pat:pat_param)|+ if $cond:expr => $arm:expr ) => {
-        match $e {
-            $($pat)|+ if $cond => $arm,
-            ref e => panic!("assertion failed: `{:?}` does not match `{}`",
-                e, stringify!($($pat)|+ if $cond))
-        }
-    };
-    ( $e:expr , $($pat:pat_param)|+ , $($arg:tt)* ) => {
-        match $e {
-            $($pat)|+ => (),
-            ref e => panic!("assertion failed: `{:?}` does not match `{}`: {}",
-                e, stringify!($($pat)|+), format_args!($($arg)*))
-        }
-    };
-    ( $e:expr , $($pat:pat_param)|+ if $cond:expr , $($arg:tt)* ) => {
-        match $e {
-            $($pat)|+ if $cond => (),
-            ref e => panic!("assertion failed: `{:?}` does not match `{}`: {}",
-                e, stringify!($($pat)|+ if $cond), format_args!($($arg)*))
-        }
-    };
-    ( $e:expr , $($pat:pat_param)|+ => $arm:expr , $($arg:tt)* ) => {
-        match $e {
-            $($pat)|+ => $arm,
-            ref e => panic!("assertion failed: `{:?}` does not match `{}`: {}",
-                e, stringify!($($pat)|+), format_args!($($arg)*))
-        }
-    };
-    ( $e:expr , $($pat:pat_param)|+ if $cond:expr => $arm:expr , $($arg:tt)* ) => {
-        match $e {
-            $($pat)|+ if $cond => $arm,
-            ref e => panic!("assertion failed: `{:?}` does not match `{}`: {}",
-                e, stringify!($($pat)|+ if $cond), format_args!($($arg)*))
-        }
-    };
-}
-
-/// Asserts that an expression matches a given pattern.
-///
-/// Unlike [`assert_matches!`], `debug_assert_matches!` statements are only enabled
-/// in non-optimized builds by default. An optimized build will omit all
-/// `debug_assert_matches!` statements unless `-C debug-assertions` is passed
-/// to the compiler.
-///
-/// See the macro [`assert_matches!`] documentation for more information.
-///
-/// [`assert_matches!`]: macro.assert_matches.html
-#[macro_export(local_inner_macros)]
-macro_rules! debug_assert_matches {
-    ( $($tt:tt)* ) => { {
-        if _assert_matches_cfg!(debug_assertions) {
-            assert_matches!($($tt)*);
-        }
-    } }
-}
-
-#[doc(hidden)]
-#[macro_export]
-macro_rules! _assert_matches_cfg {
-    ( $($tt:tt)* ) => { cfg!($($tt)*) }
-}
-
-#[cfg(test)]
-mod test {
-    use std::panic::{catch_unwind, UnwindSafe};
-
-    #[derive(Debug)]
-    enum Foo {
-        A(i32),
-        B(&'static str),
-        C(&'static str),
-    }
-
-    #[test]
-    fn test_assert_succeed() {
-        let a = Foo::A(123);
-
-        assert_matches!(a, Foo::A(_));
-        assert_matches!(a, Foo::A(123));
-        assert_matches!(a, Foo::A(i) if i == 123);
-        assert_matches!(a, Foo::A(42) | Foo::A(123));
-
-        let b = Foo::B("foo");
-
-        assert_matches!(b, Foo::B(_));
-        assert_matches!(b, Foo::B("foo"));
-        assert_matches!(b, Foo::B(s) if s == "foo");
-        assert_matches!(b, Foo::B(s) => assert_eq!(s, "foo"));
-        assert_matches!(b, Foo::B(s) => { assert_eq!(s, "foo") });
-        assert_matches!(b, Foo::B(s) if s == "foo" => assert_eq!(s, "foo"));
-        assert_matches!(b, Foo::B(s) if s == "foo" => { assert_eq!(s, "foo") });
-
-        let c = Foo::C("foo");
-
-        assert_matches!(c, Foo::B(_) | Foo::C(_));
-        assert_matches!(c, Foo::B("foo") | Foo::C("foo"));
-        assert_matches!(c, Foo::B(s) | Foo::C(s) if s == "foo");
-        assert_matches!(c, Foo::B(s) | Foo::C(s) => assert_eq!(s, "foo"));
-        assert_matches!(c, Foo::B(s) | Foo::C(s) => { assert_eq!(s, "foo") });
-        assert_matches!(c, Foo::B(s) | Foo::C(s) if s == "foo" => assert_eq!(s, "foo"));
-        assert_matches!(c, Foo::B(s) | Foo::C(s) if s == "foo" => { assert_eq!(s, "foo") });
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_assert_panic_0() {
-        let a = Foo::A(123);
-
-        assert_matches!(a, Foo::B(_));
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_assert_panic_1() {
-        let b = Foo::B("foo");
-
-        assert_matches!(b, Foo::B("bar"));
-    }
-
-    #[test]
-    #[should_panic]
-    fn test_assert_panic_2() {
-        let b = Foo::B("foo");
-
-        assert_matches!(b, Foo::B(s) if s == "bar");
-    }
-
-    #[test]
-    fn test_assert_no_move() {
-        let b = &mut Foo::A(0);
-        assert_matches!(*b, Foo::A(0));
-    }
-
-    #[test]
-    fn assert_with_message() {
-        let a = Foo::A(0);
-
-        assert_matches!(a, Foo::A(_), "o noes");
-        assert_matches!(a, Foo::A(n) if n == 0, "o noes");
-        assert_matches!(a, Foo::A(n) => assert_eq!(n, 0), "o noes");
-        assert_matches!(a, Foo::A(n) => { assert_eq!(n, 0); assert!(n < 1) }, "o noes");
-        assert_matches!(a, Foo::A(n) if n == 0 => assert_eq!(n, 0), "o noes");
-        assert_matches!(a, Foo::A(n) if n == 0 => { assert_eq!(n, 0); assert!(n < 1) }, "o noes");
-        assert_matches!(a, Foo::A(_), "o noes {:?}", a);
-        assert_matches!(a, Foo::A(n) if n == 0, "o noes {:?}", a);
-        assert_matches!(a, Foo::A(n) => assert_eq!(n, 0), "o noes {:?}", a);
-        assert_matches!(a, Foo::A(n) => { assert_eq!(n, 0); assert!(n < 1) }, "o noes {:?}", a);
-        assert_matches!(a, Foo::A(_), "o noes {value:?}", value = a);
-        assert_matches!(a, Foo::A(n) if n == 0, "o noes {value:?}", value=a);
-        assert_matches!(a, Foo::A(n) => assert_eq!(n, 0), "o noes {value:?}", value=a);
-        assert_matches!(a, Foo::A(n) => { assert_eq!(n, 0); assert!(n < 1) }, "o noes {value:?}", value=a);
-        assert_matches!(a, Foo::A(n) if n == 0 => assert_eq!(n, 0), "o noes {value:?}", value=a);
-    }
-
-    fn panic_message<F>(f: F) -> String
-    where
-        F: FnOnce() + UnwindSafe,
-    {
-        let err = catch_unwind(f).expect_err("function did not panic");
-
-        *err.downcast::<String>()
-            .expect("function panicked with non-String value")
-    }
-
-    #[test]
-    fn test_panic_message() {
-        let a = Foo::A(1);
-
-        // expr, pat
-        assert_eq!(
-            panic_message(|| {
-                assert_matches!(a, Foo::B(_));
-            }),
-            r#"assertion failed: `A(1)` does not match `Foo::B(_)`"#
-        );
-
-        // expr, pat if cond
-        assert_eq!(
-            panic_message(|| {
-                assert_matches!(a, Foo::B(s) if s == "foo");
-            }),
-            r#"assertion failed: `A(1)` does not match `Foo::B(s) if s == "foo"`"#
-        );
-
-        // expr, pat => arm
-        assert_eq!(
-            panic_message(|| {
-                assert_matches!(a, Foo::B(_) => {});
-            }),
-            r#"assertion failed: `A(1)` does not match `Foo::B(_)`"#
-        );
-
-        // expr, pat if cond => arm
-        assert_eq!(
-            panic_message(|| {
-                assert_matches!(a, Foo::B(s) if s == "foo" => {});
-            }),
-            r#"assertion failed: `A(1)` does not match `Foo::B(s) if s == "foo"`"#
-        );
-
-        // expr, pat, args
-        assert_eq!(
-            panic_message(|| {
-                assert_matches!(a, Foo::B(_), "msg");
-            }),
-            r#"assertion failed: `A(1)` does not match `Foo::B(_)`: msg"#
-        );
-
-        // expr, pat if cond, args
-        assert_eq!(
-            panic_message(|| {
-                assert_matches!(a, Foo::B(s) if s == "foo", "msg");
-            }),
-            r#"assertion failed: `A(1)` does not match `Foo::B(s) if s == "foo"`: msg"#
-        );
-
-        // expr, pat => arm, args
-        assert_eq!(
-            panic_message(|| {
-                assert_matches!(a, Foo::B(_) => {}, "msg");
-            }),
-            r#"assertion failed: `A(1)` does not match `Foo::B(_)`: msg"#
-        );
-
-        // expr, pat if cond => arm, args
-        assert_eq!(
-            panic_message(|| {
-                assert_matches!(a, Foo::B(s) if s == "foo" => {}, "msg");
-            }),
-            r#"assertion failed: `A(1)` does not match `Foo::B(s) if s == "foo"`: msg"#
-        );
-    }
-}
diff --git a/radicle/src/test/fixtures.rs b/radicle/src/test/fixtures.rs
deleted file mode 100644
index 7f41f0f3a..000000000
--- a/radicle/src/test/fixtures.rs
+++ /dev/null
@@ -1,222 +0,0 @@
-use std::path::Path;
-use std::str::FromStr;
-
-use crate::crypto::{PublicKey, Signer, Verified};
-use crate::git;
-use crate::identity::doc::Visibility;
-use crate::identity::RepoId;
-use crate::node::Alias;
-use crate::rad;
-use crate::storage::git::transport;
-use crate::storage::git::Storage;
-use crate::storage::refs::SignedRefs;
-
-/// The birth of the radicle project, January 1st, 2018.
-pub const RADICLE_EPOCH: i64 = 1514817556;
-
-/// Create a new user info object.
-pub fn user() -> git::UserInfo {
-    git::UserInfo {
-        alias: Alias::new("Radcliff"),
-        key: PublicKey::from_str("z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi").unwrap(),
-    }
-}
-
-/// Create a new storage with a project.
-pub fn storage<P: AsRef<Path>, G: Signer>(path: P, signer: &G) -> Result<Storage, rad::InitError> {
-    let path = path.as_ref();
-    let storage = Storage::open(
-        path.join("storage"),
-        git::UserInfo {
-            alias: Alias::new("Radcliff"),
-            key: *signer.public_key(),
-        },
-    )?;
-
-    transport::local::register(storage.clone());
-    transport::remote::mock::register(signer.public_key(), storage.path());
-
-    for (name, desc) in [
-        ("acme", "Acme's repository"),
-        ("vim", "A text editor"),
-        ("rx", "A pixel editor"),
-    ] {
-        let (repo, _) = repository(path.join("workdir").join(name));
-        rad::init(
-            &repo,
-            name.try_into().unwrap(),
-            desc,
-            git::refname!("master"),
-            Visibility::default(),
-            signer,
-            &storage,
-        )?;
-    }
-
-    Ok(storage)
-}
-
-/// Create a new repository at the given path, and initialize it into a project.
-pub fn project<P: AsRef<Path>, G: Signer>(
-    path: P,
-    storage: &Storage,
-    signer: &G,
-) -> Result<(RepoId, SignedRefs<Verified>, git2::Repository, git2::Oid), rad::InitError> {
-    transport::local::register(storage.clone());
-
-    let (working, head) = repository(path);
-    let (id, _, refs) = rad::init(
-        &working,
-        "acme".try_into().unwrap(),
-        "Acme's repository",
-        git::refname!("master"),
-        Visibility::default(),
-        signer,
-        storage,
-    )?;
-
-    Ok((id, refs, working, head))
-}
-
-/// Creates a regular repository at the given path with a couple of commits.
-pub fn repository<P: AsRef<Path>>(path: P) -> (git2::Repository, git2::Oid) {
-    let repo = git2::Repository::init(path).unwrap();
-    let sig = git2::Signature::new(
-        "anonymous",
-        "anonymous@radicle.xyz",
-        &git2::Time::new(RADICLE_EPOCH, 0),
-    )
-    .unwrap();
-    let head = git::initial_commit(&repo, &sig).unwrap();
-    let tree = git::write_tree(Path::new("README"), "Hello World!\n".as_bytes(), &repo).unwrap();
-    let oid = {
-        let commit = git::commit(
-            &repo,
-            &head,
-            git::refname!("refs/heads/master").as_refstr(),
-            "Second commit",
-            &sig,
-            &tree,
-        )
-        .unwrap();
-
-        commit.id()
-    };
-    repo.set_head("refs/heads/master").unwrap();
-    repo.checkout_head(None).unwrap();
-
-    drop(tree);
-    drop(head);
-
-    (repo, oid)
-}
-
-/// Create an empty commit on the current branch.
-pub fn commit(msg: &str, parents: &[git2::Oid], repo: &git2::Repository) -> git::Oid {
-    let head = repo.head().unwrap();
-    let sig = git2::Signature::new(
-        "anonymous",
-        "anonymous@radicle.xyz",
-        &git2::Time::new(RADICLE_EPOCH, 0),
-    )
-    .unwrap();
-    let tree = head.peel_to_commit().unwrap().tree().unwrap();
-    let parents = parents
-        .iter()
-        .map(|p| repo.find_commit(*p).unwrap())
-        .collect::<Vec<_>>();
-    let parents = parents.iter().collect::<Vec<_>>(); // Get references.
-
-    repo.commit(None, &sig, &sig, msg, &tree, &parents)
-        .unwrap()
-        .into()
-}
-
-/// Populate a repository with commits, branches and blobs.
-pub fn populate(repo: &git2::Repository, scale: usize) -> Vec<git::Qualified> {
-    assert!(
-        scale <= 8,
-        "Scale parameter must be less than or equal to 8"
-    );
-    if scale == 0 {
-        return vec![];
-    }
-    let head = repo.head().unwrap().peel_to_commit().unwrap();
-    let mut rng = fastrand::Rng::with_seed(42);
-    let mut buffer = vec![0; 1024 * 1024 * scale];
-    let mut refs = Vec::new();
-
-    for _ in 0..scale {
-        let random = std::iter::repeat_with(|| rng.alphanumeric())
-            .take(7)
-            .collect::<String>()
-            .to_lowercase();
-        let name =
-            git::refname!("feature").join(git::RefString::try_from(random.as_str()).unwrap());
-        let signature = git2::Signature::now("Radicle", "radicle@radicle.xyz").unwrap();
-
-        rng.fill(&mut buffer);
-
-        let blob = repo.blob(&buffer).unwrap();
-        let mut builder = repo.treebuilder(None).unwrap();
-        builder.insert("random.txt", blob, 0o100_644).unwrap();
-        let tree_oid = builder.write().unwrap();
-        let tree = repo.find_tree(tree_oid).unwrap();
-        let refstr = git::refs::workdir::branch(&name);
-
-        repo.commit(
-            Some(&refstr),
-            &signature,
-            &signature,
-            &format!("Initialize new branch {name}"),
-            &tree,
-            &[&head],
-        )
-        .unwrap();
-
-        refs.push(git::Qualified::from_refstr(refstr).unwrap());
-    }
-    refs
-}
-
-/// Generate random fixtures.
-pub mod gen {
-    use super::*;
-
-    /// Generate a random string of the given length.
-    pub fn string(length: usize) -> String {
-        std::iter::repeat_with(fastrand::alphabetic)
-            .take(length)
-            .collect::<String>()
-    }
-
-    /// Generate a random email.
-    pub fn email() -> String {
-        format!("{}@{}.xyz", string(6), string(6))
-    }
-
-    /// Creates a regular repository at the given path with a couple of commits.
-    pub fn repository<P: AsRef<Path>>(path: P) -> (git2::Repository, git2::Oid) {
-        let repo = git2::Repository::init(path).unwrap();
-        let sig = git2::Signature::now(string(6).as_str(), email().as_str()).unwrap();
-        let head = git::initial_commit(&repo, &sig).unwrap();
-        let tree =
-            git::write_tree(Path::new("README"), "Hello World!\n".as_bytes(), &repo).unwrap();
-        let oid = git::commit(
-            &repo,
-            &head,
-            git::refname!("refs/heads/master").as_refstr(),
-            string(16).as_str(),
-            &sig,
-            &tree,
-        )
-        .unwrap()
-        .id();
-
-        // Look, I don't really understand why we have to do this, but we do.
-        drop(head);
-        drop(tree);
-
-        (repo, oid)
-    }
-}
diff --git a/radicle/src/test/storage.rs b/radicle/src/test/storage.rs
deleted file mode 100644
index 91d37e621..000000000
--- a/radicle/src/test/storage.rs
+++ /dev/null
@@ -1,432 +0,0 @@
-use std::collections::HashMap;
-use std::convert::Infallible;
-use std::io;
-use std::path::{Path, PathBuf};
-use std::str::FromStr;
-
-use git_ext::ref_format as fmt;
-
-use crate::crypto::{Signer, Verified};
-use crate::identity::doc::{Doc, DocAt, DocError, RepoId};
-use crate::node::NodeId;
-
-pub use crate::storage::*;
-
-use super::{arbitrary, fixtures};
-
-#[derive(Clone, Debug)]
-pub struct MockStorage {
-    pub path: PathBuf,
-    pub info: git::UserInfo,
-
-    /// All refs keyed by RID.
-    /// Each value is a map of refs keyed by node Id (public key).
-    pub repos: HashMap<RepoId, MockRepository>,
-}
-
-impl MockStorage {
-    pub fn new(inventory: Vec<(RepoId, DocAt)>) -> Self {
-        Self {
-            path: PathBuf::default(),
-            info: fixtures::user(),
-            repos: inventory
-                .into_iter()
-                .map(|(id, doc)| {
-                    (
-                        id,
-                        MockRepository {
-                            id,
-                            doc,
-                            remotes: HashMap::new(),
-                        },
-                    )
-                })
-                .collect(),
-        }
-    }
-
-    pub fn repo_mut(&mut self, rid: &RepoId) -> &mut MockRepository {
-        self.repos
-            .get_mut(rid)
-            .expect("MockStorage::repo_mut: repository does not exist")
-    }
-
-    pub fn map(mut self, f: impl Fn(&mut Doc<Verified>)) -> Self {
-        for repo in self.repos.values_mut() {
-            f(&mut repo.doc.doc);
-        }
-        self
-    }
-
-    pub fn empty() -> Self {
-        Self::new(Vec::new())
-    }
-}
-
-impl ReadStorage for MockStorage {
-    type Repository = MockRepository;
-
-    fn info(&self) -> &git::UserInfo {
-        &self.info
-    }
-
-    fn path(&self) -> &Path {
-        self.path.as_path()
-    }
-
-    fn path_of(&self, rid: &RepoId) -> PathBuf {
-        self.path().join(rid.canonical())
-    }
-
-    fn contains(&self, rid: &RepoId) -> Result<bool, RepositoryError> {
-        Ok(self.repos.contains_key(rid))
-    }
-
-    fn repository(&self, rid: RepoId) -> Result<Self::Repository, RepositoryError> {
-        self.repos
-            .get(&rid)
-            .ok_or_else(|| {
-                RepositoryError::Storage(Error::Io(io::Error::from(io::ErrorKind::NotFound)))
-            })
-            .cloned()
-    }
-
-    fn repositories(&self) -> Result<Vec<RepositoryInfo<Verified>>, Error> {
-        Ok(self
-            .repos
-            .iter()
-            .map(|(rid, r)| RepositoryInfo {
-                rid: *rid,
-                head: r.head().unwrap().1,
-                doc: r.doc.clone().into(),
-                refs: None,
-                synced_at: None,
-            })
-            .collect())
-    }
-}
-
-impl WriteStorage for MockStorage {
-    type RepositoryMut = MockRepository;
-
-    fn repository_mut(&self, rid: RepoId) -> Result<Self::RepositoryMut, RepositoryError> {
-        self.repos
-            .get(&rid)
-            .ok_or(RepositoryError::Storage(Error::Io(io::Error::from(
-                io::ErrorKind::NotFound,
-            ))))
-            .cloned()
-    }
-
-    fn create(&self, _rid: RepoId) -> Result<Self::RepositoryMut, Error> {
-        todo!()
-    }
-
-    fn clean(&self, _rid: RepoId) -> Result<Vec<RemoteId>, RepositoryError> {
-        todo!()
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct MockRepository {
-    pub id: RepoId,
-    pub doc: DocAt,
-    pub remotes: HashMap<NodeId, refs::SignedRefsAt>,
-}
-
-impl MockRepository {
-    pub fn new(id: RepoId, doc: Doc<Verified>) -> Self {
-        let (blob, _) = doc.encode().unwrap();
-
-        Self {
-            id,
-            doc: DocAt {
-                commit: Oid::from_str("ffffffffffffffffffffffffffffffffffffffff").unwrap(),
-                blob,
-                doc,
-            },
-            remotes: HashMap::default(),
-        }
-    }
-}
-
-impl RemoteRepository for MockRepository {
-    fn remote(&self, id: &RemoteId) -> Result<Remote<Verified>, refs::Error> {
-        self.remotes
-            .get(id)
-            .map(|refs| Remote {
-                refs: refs.sigrefs.clone(),
-            })
-            .ok_or(refs::Error::InvalidRef)
-    }
-
-    fn remotes(&self) -> Result<Remotes<Verified>, refs::Error> {
-        Ok(self
-            .remotes
-            .iter()
-            .map(|(id, refs)| {
-                (
-                    *id,
-                    Remote {
-                        refs: refs.sigrefs.clone(),
-                    },
-                )
-            })
-            .collect())
-    }
-
-    fn remote_refs_at(&self) -> Result<Vec<refs::RefsAt>, refs::Error> {
-        Ok(self
-            .remotes
-            .values()
-            .map(|s| refs::RefsAt {
-                remote: s.id,
-                at: s.at,
-            })
-            .collect())
-    }
-}
-
-impl ValidateRepository for MockRepository {
-    fn validate_remote(&self, _remote: &Remote<Verified>) -> Result<Validations, Error> {
-        Ok(Validations::default())
-    }
-}
-
-impl ReadRepository for MockRepository {
-    fn id(&self) -> RepoId {
-        self.id
-    }
-
-    fn is_empty(&self) -> Result<bool, git2::Error> {
-        Ok(self.remotes.is_empty())
-    }
-
-    fn head(&self) -> Result<(fmt::Qualified, Oid), RepositoryError> {
-        Ok((fmt::qualified!("refs/heads/master"), arbitrary::oid()))
-    }
-
-    fn canonical_head(&self) -> Result<(fmt::Qualified, Oid), RepositoryError> {
-        todo!()
-    }
-
-    fn path(&self) -> &std::path::Path {
-        todo!()
-    }
-
-    fn commit(&self, oid: Oid) -> Result<git2::Commit, git_ext::Error> {
-        Err(git_ext::Error::NotFound(git_ext::NotFound::NoSuchObject(
-            *oid,
-        )))
-    }
-
-    fn revwalk(&self, _head: Oid) -> Result<git2::Revwalk, git2::Error> {
-        todo!()
-    }
-
-    fn contains(&self, oid: Oid) -> Result<bool, git2::Error> {
-        Ok(self
-            .remotes
-            .values()
-            .any(|sigrefs| sigrefs.at == oid || sigrefs.refs.values().any(|oid_| *oid_ == oid)))
-    }
-
-    fn is_ancestor_of(&self, _ancestor: Oid, _head: Oid) -> Result<bool, git_ext::Error> {
-        Ok(true)
-    }
-
-    fn blob(&self, _oid: Oid) -> Result<git2::Blob, git_ext::Error> {
-        todo!()
-    }
-
-    fn blob_at<P: AsRef<std::path::Path>>(
-        &self,
-        _oid: git_ext::Oid,
-        _path: P,
-    ) -> Result<git2::Blob, git_ext::Error> {
-        todo!()
-    }
-
-    fn reference(
-        &self,
-        _remote: &RemoteId,
-        _reference: &git::Qualified,
-    ) -> Result<git2::Reference, git_ext::Error> {
-        todo!()
-    }
-
-    fn reference_oid(
-        &self,
-        remote: &RemoteId,
-        reference: &git::Qualified,
-    ) -> Result<git_ext::Oid, git::raw::Error> {
-        let not_found = || {
-            git::raw::Error::new(
-                git::raw::ErrorCode::NotFound,
-                git::raw::ErrorClass::Reference,
-                format!("could not find {reference} for {remote}"),
-            )
-        };
-
-        let refs = self.remotes.get(remote).ok_or_else(not_found)?;
-        if reference == &*refs::SIGREFS_BRANCH {
-            Ok(refs.at)
-        } else {
-            refs.sigrefs.get(reference).ok_or_else(not_found)
-        }
-    }
-
-    fn references_of(&self, _remote: &RemoteId) -> Result<crate::storage::refs::Refs, Error> {
-        todo!()
-    }
-
-    fn references_glob(
-        &self,
-        _pattern: &git::PatternStr,
-    ) -> Result<Vec<(fmt::Qualified, Oid)>, git::ext::Error> {
-        todo!()
-    }
-
-    fn identity_doc(&self) -> Result<crate::identity::DocAt, RepositoryError> {
-        Ok(self.doc.clone())
-    }
-
-    fn identity_doc_at(&self, _head: Oid) -> Result<crate::identity::DocAt, DocError> {
-        Ok(self.doc.clone())
-    }
-
-    fn identity_head(&self) -> Result<Oid, RepositoryError> {
-        self.canonical_identity_head()
-    }
-
-    fn identity_head_of(&self, _remote: &RemoteId) -> Result<Oid, git::ext::Error> {
-        todo!()
-    }
-
-    fn identity_root(&self) -> Result<Oid, RepositoryError> {
-        todo!()
-    }
-
-    fn identity_root_of(&self, _remote: &RemoteId) -> Result<Oid, RepositoryError> {
-        todo!()
-    }
-
-    fn canonical_identity_head(&self) -> Result<Oid, RepositoryError> {
-        Ok(Oid::from_str("cccccccccccccccccccccccccccccccccccccccc").unwrap())
-    }
-
-    fn merge_base(&self, _left: &Oid, _right: &Oid) -> Result<Oid, git::ext::Error> {
-        todo!()
-    }
-}
-
-impl WriteRepository for MockRepository {
-    fn raw(&self) -> &git2::Repository {
-        todo!()
-    }
-
-    fn set_head(&self) -> Result<SetHead, RepositoryError> {
-        todo!()
-    }
-
-    fn set_identity_head_to(&self, _commit: Oid) -> Result<(), RepositoryError> {
-        todo!()
-    }
-
-    fn set_user(&self, _info: &git::UserInfo) -> Result<(), Error> {
-        todo!()
-    }
-}
-
-impl SignRepository for MockRepository {
-    fn sign_refs<G: Signer>(
-        &self,
-        _signer: &G,
-    ) -> Result<crate::storage::refs::SignedRefs<Verified>, Error> {
-        todo!()
-    }
-}
-
-impl radicle_cob::Store for MockRepository {}
-
-impl radicle_cob::object::Storage for MockRepository {
-    type ObjectsError = Infallible;
-    type TypesError = Infallible;
-    type UpdateError = Infallible;
-    type RemoveError = Infallible;
-
-    fn objects(
-        &self,
-        _typename: &radicle_cob::TypeName,
-        _object_id: &radicle_cob::ObjectId,
-    ) -> Result<radicle_cob::object::Objects, Self::ObjectsError> {
-        todo!()
-    }
-
-    fn types(
-        &self,
-        _typename: &radicle_cob::TypeName,
-    ) -> Result<
-        std::collections::BTreeMap<radicle_cob::ObjectId, radicle_cob::object::Objects>,
-        Self::TypesError,
-    > {
-        todo!()
-    }
-
-    fn update(
-        &self,
-        _identifier: &radicle_crypto::PublicKey,
-        _typename: &radicle_cob::TypeName,
-        _object_id: &radicle_cob::ObjectId,
-        _entry: &radicle_cob::EntryId,
-    ) -> Result<(), Self::UpdateError> {
-        todo!()
-    }
-
-    fn remove(
-        &self,
-        _identifier: &radicle_crypto::PublicKey,
-        _typename: &radicle_cob::TypeName,
-        _object_id: &radicle_cob::ObjectId,
-    ) -> Result<(), Self::RemoveError> {
-        todo!()
-    }
-}
-
-impl radicle_cob::change::Storage for MockRepository {
-    type StoreError = radicle_cob::git::change::error::Create;
-    type LoadError = radicle_cob::git::change::error::Load;
-    type ObjectId = Oid;
-    type Parent = Oid;
-    type Signatures = radicle_cob::signatures::ExtendedSignature;
-
-    fn store<G>(
-        &self,
-        _resource: Option<Self::Parent>,
-        _related: Vec<Self::Parent>,
-        _signer: &G,
-        _template: radicle_cob::change::Template<Self::ObjectId>,
-    ) -> Result<
-        radicle_cob::change::store::Entry<Self::Parent, Self::ObjectId, Self::Signatures>,
-        Self::StoreError,
-    >
-    where
-        G: radicle_crypto::Signer,
-    {
-        todo!()
-    }
-
-    fn load(
-        &self,
-        _id: Self::ObjectId,
-    ) -> Result<
-        radicle_cob::change::store::Entry<Self::Parent, Self::ObjectId, Self::Signatures>,
-        Self::LoadError,
-    > {
-        todo!()
-    }
-
-    fn parents_of(&self, _id: &Oid) -> Result<Vec<Oid>, Self::LoadError> {
-        todo!()
-    }
-}
diff --git a/radicle/src/version.rs b/radicle/src/version.rs
deleted file mode 100644
index 815343869..000000000
--- a/radicle/src/version.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::io;
-
-/// Program version metadata.
-#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
-pub struct Version<'a> {
-    pub name: &'a str,
-    pub version: &'a str,
-    pub commit: &'a str,
-    pub timestamp: &'a str,
-}
-
-impl<'a> Version<'a> {
-    /// Write program version as string.
-    /// Adjust with caution, third party applications parse the string for version info.
-    pub fn write(&self, mut w: impl std::io::Write) -> Result<(), io::Error> {
-        let Version {
-            name,
-            version,
-            commit,
-            ..
-        } = self;
-
-        writeln!(w, "{name} {version} ({commit})")?;
-
-        Ok(())
-    }
-
-    /// Write the program version metadata as a JSON value.
-    pub fn write_json(&self, w: impl std::io::Write) -> Result<(), serde_json::Error> {
-        serde_json::to_writer(w, self)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_version() {
-        let mut buffer = Vec::new();
-        Version {
-            name: "rad",
-            version: "1.2.3",
-            commit: "28b341d",
-            timestamp: "",
-        }
-        .write(&mut buffer)
-        .unwrap();
-        let res = std::str::from_utf8(&buffer).unwrap();
-        assert_eq!("rad 1.2.3 (28b341d)\n", res);
-    }
-}
diff --git a/radicle/src/web.rs b/radicle/src/web.rs
deleted file mode 100644
index 990cca129..000000000
--- a/radicle/src/web.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use std::collections::HashSet;
-
-use serde::{Deserialize, Serialize};
-
-use crate::prelude::RepoId;
-
-/// Web configuration.
-#[derive(Clone, Debug, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Config {
-    /// Pinned content.
-    pub pinned: Pinned,
-    /// URL pointing to an image used in the header of a node page.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub banner_url: Option<String>,
-    /// URL pointing to an image used as the node avatar.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub avatar_url: Option<String>,
-    /// Node description.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub description: Option<String>,
-}
-
-/// Pinned content. This can be used to pin certain content when
-/// listing, e.g. pin repositories on a web client.
-#[derive(Clone, Debug, Default, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Pinned {
-    /// Pinned repositories.
-    pub repositories: HashSet<RepoId>,
-}
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
deleted file mode 100644
index 96b30271d..000000000
--- a/rust-toolchain.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-[toolchain]
-channel = "1.80"
-profile = "default"
-components = [ "rust-src" ]
diff --git a/scripts/build-man-pages.sh b/scripts/build-man-pages.sh
deleted file mode 100755
index 55bcc0265..000000000
--- a/scripts/build-man-pages.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Attempt to install `asciidoctor` on Debian, Arch Linux and MacOS.
-install() {
-  os="$(uname)"
-
-  case "$os" in
-    Linux)
-      if command -v apt-get >/dev/null 2>&1; then
-        # Debian
-        apt-get update
-        apt-get install -y asciidoctor
-      elif command -v pacman >/dev/null 2>&1; then
-        # Arch Linux
-        pacman -Sy --noconfirm asciidoctor
-      fi ;;
-    Darwin) # MacOS
-      if command -v brew >/dev/null 2>&1; then
-        brew install asciidoctor
-      fi ;;
-    *)
-      echo "fatal: unknown operating system: $os"
-      exit 1 ;;
-  esac
-}
-
-main() {
-  if [ $# -lt 2 ]; then
-    echo "usage: $0 <output-dir> <input-file>..."
-    exit 1
-  fi
-
-  outdir="$1"
-  shift
-
-  if ! command -v asciidoctor >/dev/null 2>&1; then
-    echo "Installing 'asciidoctor'.."
-    install
-  fi
-
-  for input in "$@"; do
-    echo "Building $input.."
-    asciidoctor --doctype manpage --backend manpage --destination-dir "$outdir" "$input"
-  done
-}
-
-main "$@"
diff --git a/scripts/cache-cobs b/scripts/cache-cobs
deleted file mode 100755
index b29013ac0..000000000
--- a/scripts/cache-cobs
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-set -e
-
-DIRECTORY="$(rad path)/storage"
-
-if [ ! -d "$DIRECTORY" ]; then
-  echo "Error: Directory $DIRECTORY does not exist or is not accessible."
-  exit 1
-fi
-
-for repo in "$DIRECTORY"/*; do
-  if [ -d "$repo" ]; then
-    rid=$(basename "$repo")
-    echo "Processing rad:$rid.."
-    rad issue cache --repo "rad:$rid"
-    rad patch cache --repo "rad:$rid"
-    echo
-  fi
-done
diff --git a/scripts/changelog b/scripts/changelog
deleted file mode 100755
index 74f82eca7..000000000
--- a/scripts/changelog
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-set -e
-
-tag=$(git describe)
-version=$(echo $tag | sed 's/^v//')
-
-echo "# 👾 Radicle $version"
-echo
-echo "Radicle $version ($(git rev-parse --short HEAD)) is released."
-echo
-echo "## Installation"
-echo
-echo '```'
-echo "curl -sSf https://radicle.xyz/install | sh -s -- --no-modify-path --version=$version"
-echo '```'
-echo
-echo "## Notes"
-echo
-echo "* This update is recommended for everyone. No manual intervention is required."
-echo
-echo "## Changelog"
-echo
-
-git log --pretty=format:'* `%h` **%s** *<%ae>*' $(git describe --abbrev=0 HEAD^)..HEAD
-
-echo
-echo "## Checksums"
-echo
-
-echo '```'
-build/checksums
-echo '```'
diff --git a/scripts/clear-refs-db.sh b/scripts/clear-refs-db.sh
deleted file mode 100755
index ff70af01b..000000000
--- a/scripts/clear-refs-db.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-set -e
-
-DB="$(rad path)/node/node.db"
-
-if command -v sqlite3 >/dev/null 2>&1; then
-  if [ -f "$DB" ]; then
-    echo -n "Clearing 'refs' table from $DB.. "
-    sqlite3 $DB "DELETE FROM refs;"
-    echo "done."
-  else
-    echo "fatal: database file does not exist"
-    exit 1
-  fi
-else
-  echo "fatal: sqlite3 is not installed"
-  exit 1
-fi
diff --git a/scripts/create-env.sh b/scripts/create-env.sh
deleted file mode 100755
index 79f98c390..000000000
--- a/scripts/create-env.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-set -e
-
-unset SSH_AUTH_SOCK
-unset SSH_AGENT_PID
-
-tmp="$(mktemp -d)"
-
-export RAD_HOME=$tmp/.radicle
-export RAD_PASSPHRASE=
-
-set -x
-mkdir $tmp/acme
-cd $tmp/acme
-echo "ACME" > README
-echo "Copyright (c) 1978-1986 ACME Corp." > COPY
-
-git init
-git add README COPY
-git commit -m "Initial commit" --no-gpg-sign
-
-rad auth --alias alice
-rad init --name "acme" --description "ACME Corp. Warez" --private --no-confirm
-
-exec "$SHELL"
diff --git a/scripts/delete-remote-branches.sh b/scripts/delete-remote-branches.sh
deleted file mode 100755
index d2d9e75ea..000000000
--- a/scripts/delete-remote-branches.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# Delete all remote branches that don't have a local copy.
-
-remote="rad"
-remote_branches="$(git for-each-ref --format='%(refname:short)' refs/remotes/rad)"
-
-# Check that a branch isn't a remote tracking branch.
-is_remote_branch() {
-  for remote_branch in $remote_branches; do
-    # Remove the "rad/" prefix
-    if [ "$1" = "${remote_branch#rad/}" ]; then
-      return 0
-    fi
-  done
-  return 1
-}
-
-# Iterate over all remote branches.
-for branch in $(git branch -r --format "%(refname:short)"); do
-  # Extract the branch name without the "$remote/" prefix.
-  branch=${branch#"$remote/"}
-  # Never delete the master branch.
-  if [ "$branch" == "master" ]; then
-    continue
-  fi
-
-  # Check if the branch doesn't exist locally.
-  if ! git rev-parse --quiet --verify "$branch" >/dev/null; then
-    if ! is_remote_branch "$branch"; then
-      git push -o "no-sync" $remote --delete "$branch"
-      echo "Deleted '$branch'"
-    else
-      echo "Skipping remote branch '$branch'"
-    fi
-  fi
-done
-
-rad sync --announce
diff --git a/scripts/delete-remote-refs.sh b/scripts/delete-remote-refs.sh
deleted file mode 100755
index 9f93c565c..000000000
--- a/scripts/delete-remote-refs.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$#" -lt 2 ]; then
-  printf "usage: %s <rid> <nid>\n" "$(basename "$0")"
-  exit 1
-fi
-
-RAD_HOME=${RAD_HOME:-"$HOME/.radicle"}
-REPO=$(echo "$1" | sed 's/rad://')
-REMOTE=$2
-
-if [ "$REMOTE" = "$(rad self --nid)" ]; then
-  echo "Error: refusing to delete your own remote"
-  exit 1
-fi
-
-cd $RAD_HOME/storage/$REPO
-
-refs=$(git for-each-ref --format="%(refname)")
-pattern="refs/namespaces/$2/refs/*"
-
-for ref in $refs; do
-  case "$ref" in
-    $pattern)
-      git update-ref -d "$ref"
-      printf 'Deleted %s\n' "$ref"
-      ;;
-  esac
-done
-
-git gc
diff --git a/scripts/import-issue.sh b/scripts/import-issue.sh
deleted file mode 100755
index c210d11a2..000000000
--- a/scripts/import-issue.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-#
-# Import a GitHub issue into Radicle.
-#
-set -e
-
-if ! command -v curl > /dev/null; then
-  echo "Error: curl is not installed" ; exit 1
-fi
-
-if ! command -v jq > /dev/null; then
-  echo "Error: jq is not installed" ; exit 1
-fi
-
-if ! command -v rad > /dev/null; then
-  echo "Error: rad is not installed" ; exit 1
-fi
-
-if ! command -v pcregrep > /dev/null; then
-  echo "Error: pcregrep is not installed" ; exit 1
-fi
-
-if ! command -v sed > /dev/null; then
-  echo "Error: sed is not installed" ; exit 1
-fi
-
-function removeImgTags {
-  local html="$(cat)"
-  local imgTags="$(echo "$html" | pcregrep -M '<img [^>]*>')"
-
-  for imgTag in "$imgTags"; do
-    html="$(echo "$html" | sed -z "s@$imgTag@@")"
-  done
-  echo "$html"
-}
-
-# Check if the correct number of arguments is provided
-if [ "$#" -ne 3 ]; then
-  echo "Usage: $0 <org> <repo> <issue>"
-  exit 1
-fi
-
-owner="$1"
-repo="$2"
-issue="$3"
-
-url="https://api.github.com/repos/${owner}/${repo}/issues/${issue}"
-
-# Fetch the issue data using the GitHub API
-response="$(curl -s "$url")"
-
-# Extract the title and body from the JSON response
-title="$(echo "$response" | jq -r '.title')"
-body="$(echo "$response" | jq -r '.body' | removeImgTags)"
-labels="$(echo "$response" | jq -r '.labels | .[].name')"
-
-tags=()
-for label in $labels; do
-  tags+=("--label" "$label")
-done
-
-rad issue open --title "$title" "${tags[@]}" --description "$body" --no-announce
diff --git a/scripts/patch-rebase.sh b/scripts/patch-rebase.sh
deleted file mode 100755
index 0c0ff6a78..000000000
--- a/scripts/patch-rebase.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ "$#" -lt 1 ]; then
-  printf "usage: %s <patch-id>\n" "$(basename "$0")"
-  exit 1
-fi
-
-rad patch checkout $1
-git rebase master --autosquash
-rad patch update $1 --message "Rebased on master"
-git checkout master
diff --git a/scripts/show-sigrefs.sh b/scripts/show-sigrefs.sh
deleted file mode 100755
index 3516dabc0..000000000
--- a/scripts/show-sigrefs.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-set -e
-
-if [ "$#" -lt 2 ]; then
-  printf "usage: %s <rid> <nid>\n" "$(basename "$0")"
-  exit 1
-fi
-
-RAD_HOME=${RAD_HOME:-"$HOME/.radicle"}
-REPO=$(echo "$1" | sed 's/^rad://')
-REMOTE=$2
-
-cd $RAD_HOME/storage/$REPO
-
-sigrefs=$(git rev-parse "refs/namespaces/$REMOTE/refs/rad/sigrefs")
-signed=$(git show "$sigrefs:refs")
-actual=$(git for-each-ref "refs/namespaces/$REMOTE/refs/**" --format="%(objectname) %(refname)")
-
-# Strip namespace prefix.
-actual=$(echo "$actual" | sed "s@refs/namespaces/$REMOTE/@@")
-# Remove `sigrefs` itself.
-actual=$(echo "$actual" | grep -v "refs/rad/sigrefs$")
-
-diff <(echo "$signed") <(echo "$actual") --color=always -y --minimal -W 240
diff --git a/systemd/radicle-node.service b/systemd/radicle-node.service
deleted file mode 100644
index 5ec85d734..000000000
--- a/systemd/radicle-node.service
+++ /dev/null
@@ -1,30 +0,0 @@
-# Example systemd unit file for `radicle-node`.
-#
-# When running radicle-node on a server, it should be run as a separate user.
-#
-# Copy this file into /etc/systemd/system and set the User/Group parameters
-# under [Service] appropriately, as well as the `RAD_HOME` environment variable.
-#
-# If your Radicle key is passphrase-protected, you will have to set the
-# `RAD_PASSPHRASE` environment variable to the passphrase supplied during
-# `rad auth`, eg.
-#
-#   [Service]
-#   Environment=RAD_PASSPHRASE=snickerdoodle
-#
-[Unit]
-Description=Radicle Node
-After=network.target network-online.target
-Requires=network-online.target
-
-[Service]
-User=seed
-Group=seed
-ExecStart=/usr/local/bin/radicle-node --listen 0.0.0.0:8776 --force
-Environment=RAD_HOME=/home/seed/.radicle RUST_BACKTRACE=1 RUST_LOG=info
-KillMode=process
-Restart=always
-RestartSec=3
-
-[Install]
-WantedBy=multi-user.target