diff --git a/crate/pahkat-cli/Cargo.lock b/crate/pahkat-cli/Cargo.lock
index cb2ee32..1abb6be 100644
--- a/crate/pahkat-cli/Cargo.lock
+++ b/crate/pahkat-cli/Cargo.lock
@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "addr2line"
 version = "0.13.0"
@@ -115,17 +117,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "async-trait"
-version = "0.1.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b246867b8b3b6ae56035f1eb1ed557c1d8eae97f0d53696138a50fa0e3a3b8c0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -228,7 +219,6 @@ dependencies = [
  "libc",
  "num-integer",
  "num-traits",
- "serde",
  "time",
  "winapi 0.3.9",
 ]
@@ -316,16 +306,6 @@ dependencies = [
  "lazy_static",
 ]
 
-[[package]]
-name = "ctor"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fbaabec2c953050352311293be5c6aba8e141ba19d6811862b232d6fd020484"
-dependencies = [
- "quote",
- "syn",
-]
-
 [[package]]
 name = "derive_more"
 version = "0.99.11"
@@ -451,7 +431,7 @@ dependencies = [
  "quote",
  "structopt",
  "syn",
- "typed-builder",
+ "typed-builder 0.7.0",
 ]
 
 [[package]]
@@ -484,6 +464,15 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "fruity__bbqsrc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1283d8f04c860649949007b3d0b8e185798209cfbd8cc21ac8f03cfa29e66380"
+dependencies = [
+ "malloced",
+]
+
 [[package]]
 name = "fuchsia-zircon"
 version = "0.3.3"
@@ -675,15 +664,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79296f72d53a89096cbc9a88c9547ee8dfe793388674620e2207593d370550ac"
 
-[[package]]
-name = "home"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654"
-dependencies = [
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "http"
 version = "0.2.1"
@@ -967,10 +947,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "maplit"
-version = "1.0.2"
+name = "malloced"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
+checksum = "d1f1986e0c53fe06cc6ae463b1c2bb325cf13ad4d4aeca9fe567a0dd974e04c9"
 
 [[package]]
 name = "matches"
@@ -1060,9 +1040,9 @@ dependencies = [
 
 [[package]]
 name = "net2"
-version = "0.2.35"
+version = "0.2.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853"
+checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
 dependencies = [
  "cfg-if 0.1.10",
  "libc",
@@ -1142,7 +1122,7 @@ checksum = "2ac6fe3538f701e339953a3ebbe4f39941aababa8a3f6964635b24ab526daeac"
 
 [[package]]
 name = "pahkat-cli"
-version = "0.1.0"
+version = "2.1.1"
 dependencies = [
  "anyhow",
  "directories",
@@ -1152,21 +1132,20 @@ dependencies = [
  "pahkat-client",
  "pahkat-types",
  "structopt",
+ "thiserror",
  "tokio",
 ]
 
 [[package]]
 name = "pahkat-client"
-version = "0.1.0"
+version = "2.1.1"
 dependencies = [
  "android_log",
  "anyhow",
  "async-stream",
- "async-trait",
  "backtrace",
  "chrono",
  "crossbeam-queue",
- "ctor",
  "fbs",
  "fbs-build",
  "futures",
@@ -1174,11 +1153,8 @@ dependencies = [
  "indexmap",
  "iref",
  "is_executable",
- "itertools",
- "lazy_static",
  "libc",
  "log",
- "maplit",
  "once_cell",
  "pahkat-types",
  "pathos",
@@ -1194,7 +1170,6 @@ dependencies = [
  "sha2",
  "stream-cancel",
  "tar",
- "tempfile",
  "thiserror",
  "tokio",
  "toml",
@@ -1207,14 +1182,14 @@ dependencies = [
 
 [[package]]
 name = "pahkat-types"
-version = "1.0.0-alpha.0"
+version = "2.1.1"
 dependencies = [
- "chrono",
- "indexmap",
+ "fbs",
+ "fbs-build",
  "semver",
  "serde",
  "thiserror",
- "typed-builder",
+ "typed-builder 0.9.1",
  "url",
 ]
 
@@ -1246,12 +1221,12 @@ dependencies = [
 
 [[package]]
 name = "pathos"
-version = "0.3.0-pre.1"
+version = "0.3.0-pre.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a622ae1fb6a5ac1fe52cf65d71dc9adb46471a17d2c034b88b7583781089ed4"
+checksum = "dd0754fe2734846847204e57e8a79e4b506bd3155baf5ddb591b7d62b6f21f59"
 dependencies = [
  "eieio",
- "home",
+ "fruity__bbqsrc",
  "iref",
  "libc",
  "log",
@@ -1259,6 +1234,7 @@ dependencies = [
  "os_str_bytes",
  "percent-encoding",
  "thiserror",
+ "windirs",
 ]
 
 [[package]]
@@ -1325,12 +1301,6 @@ dependencies = [
  "xml-rs",
 ]
 
-[[package]]
-name = "ppv-lite86"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20"
-
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -1412,47 +1382,6 @@ dependencies = [
  "rusqlite",
 ]
 
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom",
- "libc",
- "rand_chacha",
- "rand_core",
- "rand_hc",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.1.57"
@@ -1501,15 +1430,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "reqwest"
 version = "0.10.8"
@@ -1829,20 +1749,6 @@ dependencies = [
  "xattr",
 ]
 
-[[package]]
-name = "tempfile"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "rand",
- "redox_syscall",
- "remove_dir_all",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "termcolor"
 version = "1.1.0"
@@ -1873,18 +1779,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.21"
+version = "1.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "318234ffa22e0920fe9a40d7b8369b5f649d490980cf7aadcf1eb91594869b42"
+checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.21"
+version = "1.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab"
+checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2030,6 +1936,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "typed-builder"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a46ee5bd706ff79131be9c94e7edcb82b703c487766a114434e5790361cf08c5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "typenum"
 version = "1.12.0"
@@ -2291,6 +2208,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windirs"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85cba2d95c9364ef67ebf049be2c87e7483c890681ca030a664dab6a537419bc"
+dependencies = [
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "winreg"
 version = "0.7.0"