From 9f2e1d726696c299f26e63074f39f38a768847d2 Mon Sep 17 00:00:00 2001 From: Gabor Koerber Date: Mon, 25 May 2026 01:22:04 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=B0=EF=B8=8F=20export=20from=20upstrea?= =?UTF-8?q?m=20(31619fc)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.lock | 1244 +++++++++++++++++++++++- README.md | 11 +- crates/sandcage/Cargo.toml | 23 + crates/sandcage/src/acp/mod.rs | 229 +++++ crates/sandcage/src/acp/registry.rs | 456 +++++++++ crates/sandcage/src/backend/bollard.rs | 315 ++++++ crates/sandcage/src/backend/compose.rs | 103 ++ crates/sandcage/src/backend/mod.rs | 50 + crates/sandcage/src/docker.rs | 127 +-- crates/sandcage/src/lib.rs | 4 + crates/sandcage/src/main.rs | 31 +- docs/commands.md | 116 +++ 12 files changed, 2641 insertions(+), 68 deletions(-) create mode 100644 crates/sandcage/src/acp/mod.rs create mode 100644 crates/sandcage/src/acp/registry.rs create mode 100644 crates/sandcage/src/backend/bollard.rs create mode 100644 crates/sandcage/src/backend/compose.rs create mode 100644 crates/sandcage/src/backend/mod.rs diff --git a/Cargo.lock b/Cargo.lock index b7e9236..1deda62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -97,6 +97,17 @@ dependencies = [ "wait-timeout", ] +[[package]] +name = "async-trait" +version = "0.1.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "atomic" version = "0.6.1" @@ -106,6 +117,12 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" version = "1.5.1" @@ -136,6 +153,12 @@ dependencies = [ "backtrace", ] +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "bitflags" version = "2.11.1" @@ -151,6 +174,49 @@ dependencies = [ "generic-array", ] +[[package]] +name = "bollard" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9d0a013e3d3ee4edd61e779adf117944c08902d375f18630a0c5b8f95659734" +dependencies = [ + "base64", + "bollard-stubs", + "bytes", + "futures-core", + "futures-util", + "hex", + "http", + "http-body-util", + "hyper", + "hyper-named-pipe", + "hyper-util", + "hyperlocal", + "log", + "pin-project-lite", + "serde", + "serde_derive", + "serde_json", + "serde_urlencoded", + "thiserror 2.0.18", + "tokio", + "tokio-util", + "tower-service", + "url", + "winapi", +] + +[[package]] +name = "bollard-stubs" +version = "1.53.1-rc.29.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce412eb6f7096743011dc3cb5c674caeb24ced61d8c498fe07cf7998a4fea889" +dependencies = [ + "serde", + "serde_json", + "serde_repr", +] + [[package]] name = "bstr" version = "1.12.1" @@ -162,18 +228,46 @@ dependencies = [ "serde", ] +[[package]] +name = "bumpalo" +version = "3.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" + [[package]] name = "bytemuck" version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec" +[[package]] +name = "bytes" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" + +[[package]] +name = "cc" +version = "1.2.62" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98" +dependencies = [ + "find-msvc-tools", + "shlex", +] + [[package]] name = "cfg-if" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "clap" version = "4.6.1" @@ -242,6 +336,15 @@ dependencies = [ "libc", ] +[[package]] +name = "crc32fast" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +dependencies = [ + "cfg-if", +] + [[package]] name = "crypto-common" version = "0.1.7" @@ -302,6 +405,17 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "either" version = "1.16.0" @@ -356,6 +470,32 @@ dependencies = [ "version_check", ] +[[package]] +name = "filetime" +version = "0.2.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c287a33c7f0a620c38e641e7f60827713987b3c0f26e8ddc9462cc69cf75759" +dependencies = [ + "cfg-if", + "libc", +] + +[[package]] +name = "find-msvc-tools" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" + +[[package]] +name = "flate2" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + [[package]] name = "float-cmp" version = "0.10.0" @@ -371,6 +511,66 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +[[package]] +name = "form_urlencoded" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures-channel" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" + +[[package]] +name = "futures-macro" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" + +[[package]] +name = "futures-task" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" + +[[package]] +name = "futures-util" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" +dependencies = [ + "futures-core", + "futures-macro", + "futures-task", + "pin-project-lite", + "slab", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -388,8 +588,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", +] + +[[package]] +name = "getrandom" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "r-efi 5.3.0", + "wasip2", + "wasm-bindgen", ] [[package]] @@ -400,7 +616,7 @@ checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" dependencies = [ "cfg-if", "libc", - "r-efi", + "r-efi 6.0.0", "wasip2", "wasip3", ] @@ -438,12 +654,250 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "http" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +dependencies = [ + "bytes", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca" +dependencies = [ + "atomic-waker", + "bytes", + "futures-channel", + "futures-core", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-named-pipe" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" +dependencies = [ + "hex", + "hyper", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", + "winapi", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" +dependencies = [ + "http", + "hyper", + "hyper-util", + "rustls", + "tokio", + "tokio-rustls", + "tower-service", + "webpki-roots", +] + +[[package]] +name = "hyper-util" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" +dependencies = [ + "base64", + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "ipnet", + "libc", + "percent-encoding", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", +] + +[[package]] +name = "hyperlocal" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7" +dependencies = [ + "hex", + "http-body-util", + "hyper", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + +[[package]] +name = "icu_collections" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" +dependencies = [ + "displaydoc", + "potential_utf", + "utf8_iter", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" +dependencies = [ + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" + +[[package]] +name = "icu_properties" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" +dependencies = [ + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" + +[[package]] +name = "icu_provider" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" +dependencies = [ + "displaydoc", + "icu_locale_core", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + [[package]] name = "id-arena" version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" +[[package]] +name = "idna" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + [[package]] name = "indexmap" version = "2.14.0" @@ -462,6 +916,12 @@ version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" +[[package]] +name = "ipnet" +version = "2.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" + [[package]] name = "is_ci" version = "1.2.0" @@ -480,6 +940,18 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" +[[package]] +name = "js-sys" +version = "0.3.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11" +dependencies = [ + "cfg-if", + "futures-util", + "once_cell", + "wasm-bindgen", +] + [[package]] name = "leb128fmt" version = "0.1.0" @@ -507,12 +979,24 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" +[[package]] +name = "litemap" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" + [[package]] name = "log" version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +[[package]] +name = "lru-slab" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" + [[package]] name = "memchr" version = "2.8.0" @@ -556,6 +1040,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.61.2", ] [[package]] @@ -629,6 +1125,36 @@ dependencies = [ "syn", ] +[[package]] +name = "percent-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" + +[[package]] +name = "pin-project-lite" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" + +[[package]] +name = "potential_utf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" +dependencies = [ + "zerovec", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + [[package]] name = "predicates" version = "3.1.4" @@ -691,6 +1217,61 @@ dependencies = [ "yansi", ] +[[package]] +name = "quinn" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" +dependencies = [ + "bytes", + "cfg_aliases", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "socket2", + "thiserror 2.0.18", + "tokio", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-proto" +version = "0.11.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098" +dependencies = [ + "bytes", + "getrandom 0.3.4", + "lru-slab", + "rand", + "ring", + "rustc-hash", + "rustls", + "rustls-pki-types", + "slab", + "thiserror 2.0.18", + "tinyvec", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-udp" +version = "0.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" +dependencies = [ + "cfg_aliases", + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.59.0", +] + [[package]] name = "quote" version = "1.0.45" @@ -700,12 +1281,47 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + [[package]] name = "r-efi" version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" +[[package]] +name = "rand" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" +dependencies = [ + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" +dependencies = [ + "getrandom 0.3.4", +] + [[package]] name = "redox_users" version = "0.5.2" @@ -746,12 +1362,70 @@ version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" +[[package]] +name = "reqwest" +version = "0.12.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" +dependencies = [ + "base64", + "bytes", + "futures-core", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "js-sys", + "log", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-rustls", + "tower", + "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", +] + +[[package]] +name = "ring" +version = "0.17.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.17", + "libc", + "untrusted", + "windows-sys 0.52.0", +] + [[package]] name = "rustc-demangle" version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d" +[[package]] +name = "rustc-hash" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" + [[package]] name = "rustix" version = "1.1.4" @@ -765,6 +1439,47 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "rustls" +version = "0.23.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" +dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pki-types" +version = "1.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9" +dependencies = [ + "web-time", + "zeroize", +] + +[[package]] +name = "rustls-webpki" +version = "0.103.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + [[package]] name = "ryu" version = "1.0.23" @@ -775,18 +1490,26 @@ checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" name = "sandcage" version = "0.1.0" dependencies = [ + "async-trait", + "bollard", "clap", "dialoguer", "dirs", "figment", + "flate2", + "futures-util", "hex", "indexmap", "miette", + "reqwest", "serde", + "serde_json", "serde_yaml", "sha2", + "tar", "tempfile", "thiserror 2.0.18", + "tokio", "toml_edit", "which", ] @@ -796,10 +1519,13 @@ name = "sandcage-test" version = "0.0.0" dependencies = [ "assert_cmd", + "bollard", + "futures-util", "predicates", "sandcage", "serde_yaml", "tempfile", + "tokio", ] [[package]] @@ -851,6 +1577,17 @@ dependencies = [ "zmij", ] +[[package]] +name = "serde_repr" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "serde_spanned" version = "0.6.9" @@ -860,6 +1597,18 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + [[package]] name = "serde_yaml" version = "0.9.34+deprecated" @@ -890,12 +1639,68 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc6fe69c597f9c37bfeeeeeb33da3530379845f10be461a66d16d03eca2ded77" +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" +dependencies = [ + "errno", + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" + +[[package]] +name = "slab" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" + +[[package]] +name = "smallvec" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" + +[[package]] +name = "socket2" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" +dependencies = [ + "libc", + "windows-sys 0.61.2", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" + [[package]] name = "strsim" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + [[package]] name = "supports-color" version = "3.0.2" @@ -928,6 +1733,37 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] + +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tar" +version = "0.4.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f6221d9a6003c78398e3b239969f352578258df48c8eb051caadae0015bc840" +dependencies = [ + "filetime", + "libc", + "xattr", +] + [[package]] name = "tempfile" version = "3.27.0" @@ -1007,6 +1843,81 @@ dependencies = [ "syn", ] +[[package]] +name = "tinystr" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tinyvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" +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 = "tokio" +version = "1.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" +dependencies = [ + "bytes", + "libc", + "mio", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.61.2", +] + +[[package]] +name = "tokio-macros" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + [[package]] name = "toml" version = "0.8.23" @@ -1048,6 +1959,76 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" +[[package]] +name = "tower" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" +dependencies = [ + "bitflags", + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", + "url", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + [[package]] name = "typenum" version = "1.20.0" @@ -1099,6 +2080,30 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -1120,6 +2125,15 @@ dependencies = [ "libc", ] +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + [[package]] name = "wasi" version = "0.11.1+wasi-snapshot-preview1" @@ -1144,6 +2158,61 @@ dependencies = [ "wit-bindgen 0.51.0", ] +[[package]] +name = "wasm-bindgen" +version = "0.2.122" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9473dbd2991ae90b6291c3c32c30c6187ac49aa32f9905d1cce280ec1e110b0f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.122" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.122" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e" +dependencies = [ + "bumpalo", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.122" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437" +dependencies = [ + "unicode-ident", +] + [[package]] name = "wasm-encoder" version = "0.244.0" @@ -1178,6 +2247,35 @@ dependencies = [ "semver", ] +[[package]] +name = "web-sys" +version = "0.3.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621441cfc37b84979402712047321980c178f299193a3589d05b99e8763436" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "which" version = "7.0.3" @@ -1190,12 +2288,43 @@ dependencies = [ "winsafe", ] +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + [[package]] name = "windows-link" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-sys" version = "0.59.0" @@ -1387,18 +2516,131 @@ dependencies = [ "wasmparser", ] +[[package]] +name = "writeable" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" + +[[package]] +name = "xattr" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" +dependencies = [ + "libc", + "rustix", +] + [[package]] name = "yansi" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" +[[package]] +name = "yoke" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca" +dependencies = [ + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.8.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zerofrom" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + [[package]] name = "zeroize" version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" +[[package]] +name = "zerotrie" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "zmij" version = "1.0.21" diff --git a/README.md b/README.md index 6bd9ddb..b38c75b 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,10 @@ sandcage claude --shell # shell for debugging sandcage build # build/rebuild container image sandcage init # generate .sandcage.yml for your project sandcage setup ssh # configure SSH key access for containers +sandcage acp run claude # ACP relay mode (bidirectional stdio) +sandcage acp list # list agents in the ACP registry +sandcage acp install # install an agent from the registry +sandcage acp installed # list locally installed agents ``` ## How It Works @@ -80,6 +84,10 @@ sandcage setup ssh # configure SSH key access for containers 4. The agent runs as the container entrypoint, working in the mounted workspace 5. All file changes are immediately visible on your host +## ACP Support + +Sandcage includes built-in support for the Agent Control Protocol (ACP). Running `sandcage acp run ` starts the named agent container and establishes a bidirectional stdio relay, letting any ACP-compatible client communicate with the agent over standard I/O. Agents can be installed from the ACP registry with `sandcage acp install ` and browsed with `sandcage acp list`. + ## Configuration

@@ -122,7 +130,8 @@ See **[Configuration Reference](docs/configuration.md)** for all available optio - **Support for custom harnesses** — bring your own agent runtime beyond the built-in Claude Code, Codex, and Gemini CLI - **Full encapsulation hardening** — for worker and CI environments, ensuring complete sandboxing of file system, network, and credentials -- **ACP integration** via [`dirigate`](https://github.com/dirigence/dirigate) — Agent Communication Protocol support for structured agent orchestration +- **Full bollard integration** — replace docker compose with direct Docker API calls for faster startup and richer container control +- **Interactive TTY mode** — full terminal emulation for agents that need a PTY ## Cross-Platform diff --git a/crates/sandcage/Cargo.toml b/crates/sandcage/Cargo.toml index 1ec9e3b..3a349b8 100644 --- a/crates/sandcage/Cargo.toml +++ b/crates/sandcage/Cargo.toml @@ -6,9 +6,20 @@ description = "Sandboxed containers for AI coding agents" license = "MIT" keywords = ["docker", "sandbox", "ai", "agent"] +[features] +default = ["bollard"] +bollard = [ + "dep:bollard", + "dep:futures-util", + "dep:reqwest", + "dep:flate2", + "dep:tar", +] + [dependencies] clap = { version = "4", features = ["derive"] } serde = { version = "1", features = ["derive"] } +serde_json = "1" serde_yaml = "0.9" figment = { version = "0.10", features = ["toml", "env"] } miette = { version = "7", features = ["fancy"] } @@ -21,3 +32,15 @@ indexmap = { version = "2", features = ["serde"] } tempfile = "3" dialoguer = "0.11" toml_edit = "0.22" +async-trait = "0.1" +tokio = { version = "1", features = [ + "rt-multi-thread", "io-std", "io-util", + "signal", "time", "macros", "process", +] } + +# Feature-gated +bollard = { version = "0.21", optional = true } +futures-util = { version = "0.3", optional = true } +reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"], optional = true } +flate2 = { version = "1", optional = true } +tar = { version = "0.4", optional = true } diff --git a/crates/sandcage/src/acp/mod.rs b/crates/sandcage/src/acp/mod.rs new file mode 100644 index 0000000..df482cb --- /dev/null +++ b/crates/sandcage/src/acp/mod.rs @@ -0,0 +1,229 @@ +pub mod registry; + +use clap::Subcommand; +use std::path::PathBuf; + +use crate::backend::ContainerBackend; +use crate::docker::DockerError; +use crate::service; +use crate::workspace; + +#[derive(Subcommand, Debug)] +pub enum AcpCommands { + /// Run a service in ACP relay mode (bidirectional stdio) + Run { + /// Service name (e.g., claude, codex, gemini) + service: String, + + /// Path to the project directory (defaults to current directory) + #[arg(long, short)] + path: Option, + + /// Arguments forwarded to the agent inside the container + #[arg(trailing_var_arg = true, allow_hyphen_values = true)] + agent_args: Vec, + }, + /// Install an agent from the ACP registry + Install { + /// Agent ID from the registry (e.g., claude-code) + agent_id: String, + /// Force re-download even if already installed + #[arg(long)] + force: bool, + }, + /// List available agents in the ACP registry + List { + /// Force refresh of the registry cache + #[arg(long)] + refresh: bool, + }, + /// List locally installed ACP agents + Installed, +} + +pub async fn handle( + cmd: AcpCommands, + backend: &dyn ContainerBackend, + workspace_path: Option, +) -> std::result::Result<(), DockerError> { + match cmd { + AcpCommands::Run { + service, + path, + agent_args, + } => { + let effective_path = path.or(workspace_path); + let workspace = workspace::resolve_workspace(effective_path.as_deref()) + .map_err(|e| DockerError::SpawnFailed(std::io::Error::new( + std::io::ErrorKind::Other, + e.to_string(), + )))?; + + crate::init::preseed() + .map_err(|e| DockerError::SpawnFailed(std::io::Error::new( + std::io::ErrorKind::Other, + e.to_string(), + )))?; + + let home = dirs::home_dir().ok_or(DockerError::NoHomeDir)?; + let global_config = home.join(".sandcage").join("config.toml"); + let project_config = workspace.join(".sandcage.yml"); + let local_config = workspace.join(".sandcage.local.yml"); + let cfg = crate::config::resolve_config( + Some(&global_config), + Some(&project_config), + Some(&local_config), + ) + .map_err(|e| DockerError::SpawnFailed(std::io::Error::new( + std::io::ErrorKind::Other, + e.to_string(), + )))?; + + let registry = service::registry::build_default_registry(&cfg); + let ctx = crate::docker::build_compose_context(&workspace, &cfg).await?; + + let svc = registry.get(&service).ok_or_else(|| DockerError::UnknownService { + service: service.clone(), + available: registry.names().collect::>().join(", "), + })?; + + if !svc.enabled() { + return Err(DockerError::ServiceDisabled { + service: service.clone(), + }); + } + + eprintln!("sandcage: workspace \u{2192} {}", workspace.display()); + eprintln!("sandcage: acp relay \u{2192} {service}"); + + let exit_code = backend.run_acp_relay(svc, &ctx, &cfg, &agent_args).await?; + + if exit_code != 0 { + return Err(DockerError::ServiceFailed { + service, + code: exit_code, + }); + } + + Ok(()) + } + AcpCommands::Install { agent_id, force } => { + handle_install(&agent_id, force).await.map_err(|e| { + DockerError::SpawnFailed(std::io::Error::new(std::io::ErrorKind::Other, e)) + }) + } + AcpCommands::List { refresh } => { + handle_list(refresh).await.map_err(|e| { + DockerError::SpawnFailed(std::io::Error::new(std::io::ErrorKind::Other, e)) + }) + } + AcpCommands::Installed => { + handle_installed().map_err(|e| { + DockerError::SpawnFailed(std::io::Error::new(std::io::ErrorKind::Other, e)) + }) + } + } +} + +async fn handle_install(agent_id: &str, force: bool) -> std::result::Result<(), String> { + let index = registry::fetch_registry(false).await?; + let entry = registry::find_agent(&index, agent_id) + .ok_or_else(|| format!("Agent '{}' not found in registry", agent_id))?; + + let platform = registry::platform_key(); + let target = entry + .distribution + .binary + .as_ref() + .and_then(|b| b.get(platform)) + .ok_or_else(|| { + format!( + "Agent '{}' has no binary for platform '{}'", + agent_id, platform + ) + })?; + + if !force && registry::is_agent_installed(agent_id, &entry.version) { + eprintln!("sandcage: {} v{} already installed", entry.name, entry.version); + return Ok(()); + } + + if force { + if let Some(dir) = registry::agent_install_dir(agent_id, &entry.version) { + std::fs::remove_dir_all(&dir).ok(); + } + } + + registry::install_agent(entry, target).await?; + Ok(()) +} + +async fn handle_list(refresh: bool) -> std::result::Result<(), String> { + let index = registry::fetch_registry(refresh).await?; + let platform = registry::platform_key(); + + println!("{:<25} {:<20} {:<10} {}", "ID", "NAME", "VERSION", "PLATFORM"); + println!("{}", "-".repeat(70)); + + for agent in &index.agents { + let has_binary = agent + .distribution + .binary + .as_ref() + .map(|b| b.contains_key(platform)) + .unwrap_or(false); + + let platform_status = if has_binary { + "binary" + } else if agent.distribution.npx.is_some() { + "npx" + } else { + "none" + }; + + println!( + "{:<25} {:<20} {:<10} {}", + agent.id, agent.name, agent.version, platform_status + ); + } + + Ok(()) +} + +fn handle_installed() -> std::result::Result<(), String> { + let base = dirs::home_dir() + .map(|h| h.join(".sandcage").join("agents")) + .ok_or("cannot determine home directory")?; + + if !base.exists() { + println!("No agents installed."); + return Ok(()); + } + + println!("{:<25} {:<15} {}", "AGENT", "VERSION", "PATH"); + println!("{}", "-".repeat(60)); + + let entries = std::fs::read_dir(&base).map_err(|e| e.to_string())?; + for entry in entries.flatten() { + let path = entry.path(); + if !path.is_dir() { + continue; + } + let agent_id = entry.file_name().to_string_lossy().to_string(); + if agent_id == "registry.json" || agent_id.ends_with(".timestamp") { + continue; + } + + let versions = std::fs::read_dir(&path).map_err(|e| e.to_string())?; + for ver_entry in versions.flatten() { + let ver_path = ver_entry.path(); + if !ver_path.is_dir() { + continue; + } + let version = ver_entry.file_name().to_string_lossy().to_string(); + println!("{:<25} {:<15} {}", agent_id, version, ver_path.display()); + } + } + + Ok(()) +} diff --git a/crates/sandcage/src/acp/registry.rs b/crates/sandcage/src/acp/registry.rs new file mode 100644 index 0000000..c990e36 --- /dev/null +++ b/crates/sandcage/src/acp/registry.rs @@ -0,0 +1,456 @@ +use std::collections::HashMap; +use std::path::{Path, PathBuf}; + +use serde::{Deserialize, Serialize}; + +const REGISTRY_URL: &str = + "https://cdn.agentclientprotocol.com/registry/v1/latest/registry.json"; +const REFRESH_INTERVAL_SECS: u64 = 3600; +const FETCH_TIMEOUT_SECS: u64 = 30; + +#[derive(Debug, Deserialize)] +pub struct RegistryIndex { + #[serde(rename = "version")] + pub _version: String, + pub agents: Vec, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct RegistryEntry { + pub id: String, + pub name: String, + pub version: String, + #[serde(default)] + pub description: String, + #[serde(default)] + pub repository: Option, + #[serde(default)] + pub website: Option, + #[serde(default)] + pub icon: Option, + pub distribution: RegistryDistribution, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct RegistryDistribution { + #[serde(default)] + pub binary: Option>, + #[serde(default)] + pub npx: Option, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct RegistryBinaryTarget { + pub archive: String, + pub cmd: String, + #[serde(default)] + pub args: Vec, + #[serde(default)] + pub env: HashMap, +} + +#[derive(Debug, Clone, Deserialize, Serialize)] +pub struct RegistryNpxDistribution { + pub package: String, + #[serde(default)] + pub args: Vec, + #[serde(default)] + pub env: HashMap, +} + +#[derive(Debug, Serialize, Deserialize)] +pub struct AgentMeta { + pub cmd: String, + pub args: Vec, + pub env: HashMap, + pub version: String, + pub installed_at: String, +} + +fn agents_dir() -> Option { + dirs::home_dir().map(|h| h.join(".sandcage").join("agents")) +} + +fn cache_path() -> Option { + agents_dir().map(|d| d.join("registry.json")) +} + +fn timestamp_path() -> Option { + agents_dir().map(|d| d.join("registry.json.timestamp")) +} + +fn is_cache_fresh() -> bool { + let Some(ts_path) = timestamp_path() else { + return false; + }; + let Ok(content) = std::fs::read_to_string(&ts_path) else { + return false; + }; + let Ok(ts) = content.trim().parse::() else { + return false; + }; + let now = std::time::SystemTime::now() + .duration_since(std::time::UNIX_EPOCH) + .unwrap_or_default() + .as_secs(); + now.saturating_sub(ts) < REFRESH_INTERVAL_SECS +} + +fn write_timestamp() { + if let Some(ts_path) = timestamp_path() { + let now = std::time::SystemTime::now() + .duration_since(std::time::UNIX_EPOCH) + .unwrap_or_default() + .as_secs(); + std::fs::write(&ts_path, now.to_string()).ok(); + } +} + +pub async fn fetch_registry(force_refresh: bool) -> std::result::Result { + let cache = cache_path().ok_or("cannot determine home directory")?; + + if !force_refresh && is_cache_fresh() { + if let Ok(data) = std::fs::read_to_string(&cache) { + if let Ok(index) = serde_json::from_str::(&data) { + return Ok(index); + } + } + } + + let client = reqwest::Client::builder() + .timeout(std::time::Duration::from_secs(FETCH_TIMEOUT_SECS)) + .build() + .map_err(|e| format!("HTTP client error: {e}"))?; + + let resp = client + .get(REGISTRY_URL) + .send() + .await + .map_err(|e| format!("Failed to fetch registry: {e}"))?; + + let body = resp + .text() + .await + .map_err(|e| format!("Failed to read registry response: {e}"))?; + + let index: RegistryIndex = + serde_json::from_str(&body).map_err(|e| format!("Failed to parse registry JSON: {e}"))?; + + if let Some(dir) = agents_dir() { + std::fs::create_dir_all(&dir).ok(); + } + if let Some(ref path) = cache_path() { + std::fs::write(path, &body).ok(); + } + write_timestamp(); + + Ok(index) +} + +pub fn find_agent<'a>(index: &'a RegistryIndex, agent_id: &str) -> Option<&'a RegistryEntry> { + index.agents.iter().find(|a| a.id == agent_id) +} + +pub fn platform_key() -> &'static str { + if cfg!(target_arch = "x86_64") { + "linux-x86_64" + } else if cfg!(target_arch = "aarch64") { + "linux-aarch64" + } else { + "linux-x86_64" + } +} + +pub fn agent_install_dir(agent_id: &str, version: &str) -> Option { + let sanitized_id = agent_id.replace(|c: char| !c.is_alphanumeric() && c != '-' && c != '_', "-"); + agents_dir().map(|d| d.join(&sanitized_id).join(version)) +} + +pub fn is_agent_installed(agent_id: &str, version: &str) -> bool { + agent_install_dir(agent_id, version) + .map(|d| d.exists()) + .unwrap_or(false) +} + +pub async fn install_agent( + entry: &RegistryEntry, + target: &RegistryBinaryTarget, +) -> std::result::Result { + let install_dir = agent_install_dir(&entry.id, &entry.version) + .ok_or("cannot determine install directory")?; + + if install_dir.exists() { + return Ok(install_dir); + } + + eprintln!("sandcage: downloading {} v{}...", entry.name, entry.version); + + let client = reqwest::Client::builder() + .timeout(std::time::Duration::from_secs(300)) + .build() + .map_err(|e| format!("HTTP client error: {e}"))?; + + let resp = client + .get(&target.archive) + .send() + .await + .map_err(|e| format!("Failed to download agent: {e}"))?; + + let bytes = resp + .bytes() + .await + .map_err(|e| format!("Failed to read agent archive: {e}"))?; + + let parent = install_dir.parent().ok_or("invalid install path")?; + std::fs::create_dir_all(parent).map_err(|e| format!("Failed to create directory: {e}"))?; + + let url_lower = target.archive.to_lowercase(); + if url_lower.ends_with(".tar.gz") || url_lower.ends_with(".tgz") { + let decoder = flate2::read::GzDecoder::new(&bytes[..]); + let mut archive = tar::Archive::new(decoder); + archive + .unpack(&install_dir) + .map_err(|e| format!("Failed to extract tar.gz: {e}"))?; + } else if url_lower.ends_with(".tar.bz2") || url_lower.ends_with(".tbz2") { + return Err("tar.bz2 extraction not yet supported".to_string()); + } else if url_lower.ends_with(".zip") { + return Err("zip extraction not yet supported — use tar.gz agents".to_string()); + } else { + return Err(format!("Unknown archive format: {}", target.archive)); + } + + let meta = AgentMeta { + cmd: target.cmd.clone(), + args: target.args.clone(), + env: target.env.clone(), + version: entry.version.clone(), + installed_at: chrono_free_now(), + }; + let meta_path = install_dir.join(".sandcage-meta.json"); + let meta_json = serde_json::to_string_pretty(&meta) + .map_err(|e| format!("Failed to serialize meta: {e}"))?; + std::fs::write(&meta_path, meta_json) + .map_err(|e| format!("Failed to write meta: {e}"))?; + + cleanup_old_versions(&entry.id, &entry.version); + + eprintln!("sandcage: installed {} v{}", entry.name, entry.version); + Ok(install_dir) +} + +fn chrono_free_now() -> String { + let dur = std::time::SystemTime::now() + .duration_since(std::time::UNIX_EPOCH) + .unwrap_or_default(); + format!("{}", dur.as_secs()) +} + +fn cleanup_old_versions(agent_id: &str, current_version: &str) { + let sanitized_id = agent_id.replace(|c: char| !c.is_alphanumeric() && c != '-' && c != '_', "-"); + let Some(base) = agents_dir().map(|d| d.join(&sanitized_id)) else { + return; + }; + let Ok(entries) = std::fs::read_dir(&base) else { + return; + }; + for entry in entries.flatten() { + let name = entry.file_name(); + let name_str = name.to_string_lossy(); + if name_str != current_version && entry.path().is_dir() && name_str != ".sandcage-meta.json" { + std::fs::remove_dir_all(entry.path()).ok(); + } + } +} + +pub fn resolve_agent_command( + install_dir: &Path, + target: &RegistryBinaryTarget, +) -> std::result::Result<(PathBuf, Vec, HashMap), String> { + let cmd = target.cmd.strip_prefix("./").unwrap_or(&target.cmd); + + if cmd.contains("..") { + return Err("path traversal in agent cmd is not allowed".to_string()); + } + + let bin_path = install_dir.join(cmd); + if !bin_path.exists() { + return Err(format!( + "agent binary not found at {}", + bin_path.display() + )); + } + + Ok((bin_path, target.args.clone(), target.env.clone())) +} + +#[cfg(test)] +mod tests { + use super::*; + + fn sample_registry_json() -> &'static str { + r#"{ + "version": "1", + "agents": [ + { + "id": "test-agent", + "name": "Test Agent", + "version": "1.0.0", + "description": "A test agent", + "distribution": { + "binary": { + "linux-x86_64": { + "archive": "https://example.com/test-agent-linux-x86_64.tar.gz", + "cmd": "./test-agent", + "args": ["--acp"], + "env": {"FOO": "bar"} + } + } + } + }, + { + "id": "npx-only-agent", + "name": "NPX Agent", + "version": "2.0.0", + "description": "NPX only", + "distribution": { + "npx": { + "package": "@test/agent@2.0.0", + "args": ["--stdio"], + "env": {} + } + } + } + ] + }"# + } + + #[test] + fn parse_registry_index() { + let index: RegistryIndex = + serde_json::from_str(sample_registry_json()).expect("parse registry"); + assert_eq!(index.agents.len(), 2); + assert_eq!(index.agents[0].id, "test-agent"); + assert_eq!(index.agents[1].id, "npx-only-agent"); + } + + #[test] + fn find_agent_by_id() { + let index: RegistryIndex = + serde_json::from_str(sample_registry_json()).expect("parse"); + assert!(find_agent(&index, "test-agent").is_some()); + assert!(find_agent(&index, "nonexistent").is_none()); + } + + #[test] + fn binary_target_has_correct_fields() { + let index: RegistryIndex = + serde_json::from_str(sample_registry_json()).expect("parse"); + let agent = find_agent(&index, "test-agent").unwrap(); + let target = agent + .distribution + .binary + .as_ref() + .unwrap() + .get("linux-x86_64") + .unwrap(); + assert_eq!(target.cmd, "./test-agent"); + assert_eq!(target.args, vec!["--acp"]); + assert_eq!(target.env.get("FOO"), Some(&"bar".to_string())); + } + + #[test] + fn npx_agent_has_package() { + let index: RegistryIndex = + serde_json::from_str(sample_registry_json()).expect("parse"); + let agent = find_agent(&index, "npx-only-agent").unwrap(); + let npx = agent.distribution.npx.as_ref().unwrap(); + assert_eq!(npx.package, "@test/agent@2.0.0"); + } + + #[test] + fn resolve_command_strips_dot_slash() { + let tmp = tempfile::tempdir().unwrap(); + let bin = tmp.path().join("test-agent"); + std::fs::write(&bin, "#!/bin/sh\necho ok").unwrap(); + + let target = RegistryBinaryTarget { + archive: String::new(), + cmd: "./test-agent".to_string(), + args: vec!["--acp".to_string()], + env: HashMap::new(), + }; + + let (path, args, _env) = resolve_agent_command(tmp.path(), &target).unwrap(); + assert_eq!(path, bin); + assert_eq!(args, vec!["--acp"]); + } + + #[test] + fn resolve_command_rejects_path_traversal() { + let tmp = tempfile::tempdir().unwrap(); + let target = RegistryBinaryTarget { + archive: String::new(), + cmd: "../../../etc/passwd".to_string(), + args: vec![], + env: HashMap::new(), + }; + + let result = resolve_agent_command(tmp.path(), &target); + assert!(result.is_err()); + assert!(result.unwrap_err().contains("path traversal")); + } + + #[test] + fn resolve_command_fails_for_missing_binary() { + let tmp = tempfile::tempdir().unwrap(); + let target = RegistryBinaryTarget { + archive: String::new(), + cmd: "./nonexistent".to_string(), + args: vec![], + env: HashMap::new(), + }; + + let result = resolve_agent_command(tmp.path(), &target); + assert!(result.is_err()); + assert!(result.unwrap_err().contains("not found")); + } + + #[test] + fn agent_install_dir_sanitizes_id() { + let dir = agent_install_dir("my@agent/test", "1.0.0").unwrap(); + let dir_name = dir.parent().unwrap().file_name().unwrap().to_string_lossy(); + assert!(!dir_name.contains('@')); + assert!(!dir_name.contains('/')); + } + + #[test] + fn parse_registry_with_missing_optional_fields() { + let json = r#"{ + "version": "1", + "agents": [{ + "id": "minimal", + "name": "Minimal", + "version": "0.1.0", + "description": "", + "distribution": { + "binary": { + "linux-x86_64": { + "archive": "https://example.com/a.tar.gz", + "cmd": "./agent" + } + } + } + }] + }"#; + + let index: RegistryIndex = serde_json::from_str(json).expect("parse"); + let agent = &index.agents[0]; + assert!(agent.repository.is_none()); + assert!(agent.website.is_none()); + assert!(agent.icon.is_none()); + + let target = agent.distribution.binary.as_ref().unwrap().get("linux-x86_64").unwrap(); + assert!(target.args.is_empty()); + assert!(target.env.is_empty()); + } +} diff --git a/crates/sandcage/src/backend/bollard.rs b/crates/sandcage/src/backend/bollard.rs new file mode 100644 index 0000000..94d718a --- /dev/null +++ b/crates/sandcage/src/backend/bollard.rs @@ -0,0 +1,315 @@ +use std::collections::HashMap; + +use async_trait::async_trait; +use bollard::container::LogOutput; +use bollard::models::{ContainerCreateBody, HostConfig, Mount, MountType}; +use bollard::Docker; +use futures_util::StreamExt; +use tokio::io::{self, AsyncReadExt, AsyncWriteExt}; + +use crate::config::SandcageConfig; +use crate::docker::{self, DockerError}; +use crate::service::registry::ServiceRegistry; +use crate::service::{ComposeContext, ComposeServiceDef, Service}; + +use super::Result; + +pub struct BollardBackend { + docker: Docker, +} + +impl BollardBackend { + pub fn new() -> Self { + let docker = Docker::connect_with_local_defaults() + .expect("failed to connect to Docker daemon"); + Self { docker } + } +} + +#[async_trait] +impl super::ContainerBackend for BollardBackend { + async fn run_interactive( + &self, + service: &dyn Service, + ctx: &ComposeContext, + config: &SandcageConfig, + registry: &ServiceRegistry, + shell_override: bool, + extra_args: &[String], + ) -> Result { + let compose = super::compose::ComposeBackend; + compose + .run_interactive(service, ctx, config, registry, shell_override, extra_args) + .await + } + + async fn run_acp_relay( + &self, + service: &dyn Service, + ctx: &ComposeContext, + config: &SandcageConfig, + extra_args: &[String], + ) -> Result { + let compose_def = service.compose_service(ctx); + self.acp_relay(&compose_def, config, extra_args).await + } + + async fn image_exists(&self, image: &str) -> Result { + Ok(self.docker.inspect_image(image).await.is_ok()) + } + + async fn volume_exists(&self, name: &str) -> Result { + Ok(self.docker.inspect_volume(name).await.is_ok()) + } + + async fn check_availability(&self) -> Result<()> { + self.docker.ping().await.map_err(|e| { + DockerError::SpawnFailed(std::io::Error::new( + std::io::ErrorKind::ConnectionRefused, + format!("Cannot connect to Docker: {e}"), + )) + })?; + Ok(()) + } +} + +impl BollardBackend { + fn build_container_config( + &self, + compose_def: &ComposeServiceDef, + config: &SandcageConfig, + extra_args: &[String], + ) -> ContainerCreateBody { + let mut env: Vec = compose_def.environment.clone(); + if let Some(ref env_map) = config.env { + for (key, value) in env_map { + env.push(format!("{key}={value}")); + } + } + + let mut binds: Vec = compose_def.volumes.clone(); + if let Some(ref mount_list) = config.mounts { + for mount in mount_list { + if mount.contains(':') { + binds.push(docker::expand_mount_path(mount)); + } + } + } + + let mut mounts: Vec = Vec::new(); + match config.ssh_mode.as_deref() { + Some("volume") => { + mounts.push(Mount { + target: Some("/home/agent/.ssh".to_string()), + source: Some("sandcage-ssh".to_string()), + typ: Some(MountType::VOLUME), + read_only: Some(true), + ..Default::default() + }); + } + Some("bind") => { + let mount = docker::expand_mount_path("~/.ssh:/home/agent/.ssh:ro"); + binds.push(mount); + } + _ => {} + } + + let cmd: Option> = if extra_args.is_empty() { + None + } else { + Some(extra_args.to_vec()) + }; + + let mut labels = HashMap::new(); + labels.insert("sandcage.managed".to_string(), "true".to_string()); + labels.insert("sandcage.mode".to_string(), "acp".to_string()); + + ContainerCreateBody { + image: Some(compose_def.image.clone()), + entrypoint: Some(compose_def.entrypoint.clone()), + cmd, + working_dir: Some(compose_def.working_dir.clone()), + user: Some(compose_def.user.clone()), + env: Some(env), + labels: Some(labels), + tty: Some(false), + open_stdin: Some(true), + attach_stdin: Some(true), + attach_stdout: Some(true), + attach_stderr: Some(true), + stdin_once: Some(false), + host_config: Some(HostConfig { + binds: Some(binds), + mounts: if mounts.is_empty() { None } else { Some(mounts) }, + auto_remove: Some(true), + ..Default::default() + }), + ..Default::default() + } + } + + async fn acp_relay( + &self, + compose_def: &ComposeServiceDef, + config: &SandcageConfig, + extra_args: &[String], + ) -> Result { + self.cleanup_orphans().await; + + let image = &compose_def.image; + self.docker.inspect_image(image).await.map_err(|_| { + DockerError::ImageNotFound { + image: image.clone(), + } + })?; + + let container_config = self.build_container_config(compose_def, config, extra_args); + + let container = self + .docker + .create_container( + None::, + container_config, + ) + .await + .map_err(|e| { + DockerError::SpawnFailed(std::io::Error::new( + std::io::ErrorKind::Other, + format!("Failed to create container: {e}"), + )) + })?; + let id = container.id.clone(); + + let docker_signal = self.docker.clone(); + let id_signal = id.clone(); + let signal_task = tokio::spawn(async move { + tokio::signal::ctrl_c().await.ok(); + eprintln!("sandcage: received interrupt, stopping container..."); + let opts = bollard::query_parameters::RemoveContainerOptionsBuilder::default() + .force(true) + .build(); + docker_signal + .remove_container(&id_signal, Some(opts)) + .await + .ok(); + std::process::exit(130); + }); + + self.docker + .start_container( + &id, + None::, + ) + .await + .map_err(|e| { + DockerError::SpawnFailed(std::io::Error::new( + std::io::ErrorKind::Other, + format!("Failed to start container: {e}"), + )) + })?; + + let attach_options = bollard::query_parameters::AttachContainerOptionsBuilder::default() + .stdin(true) + .stdout(true) + .stderr(true) + .stream(true) + .build(); + + let bollard::container::AttachContainerResults { mut output, mut input } = self + .docker + .attach_container(&id, Some(attach_options)) + .await + .map_err(|e| { + DockerError::SpawnFailed(std::io::Error::new( + std::io::ErrorKind::Other, + format!("Failed to attach to container: {e}"), + )) + })?; + + let docker_wait = self.docker.clone(); + let id_wait = id.clone(); + let wait_handle = tokio::spawn(async move { + let opts = bollard::query_parameters::WaitContainerOptionsBuilder::default() + .condition("not-running") + .build(); + let mut stream = docker_wait.wait_container(&id_wait, Some(opts)); + if let Some(Ok(resp)) = stream.next().await { + resp.status_code + } else { + -1 + } + }); + + let stdin_task = tokio::spawn(async move { + let mut host_stdin = io::stdin(); + let mut buf = vec![0u8; 8192]; + loop { + match host_stdin.read(&mut buf).await { + Ok(0) => { + input.shutdown().await.ok(); + break; + } + Ok(n) => { + if input.write_all(&buf[..n]).await.is_err() { + break; + } + if input.flush().await.is_err() { + break; + } + } + Err(_) => break, + } + } + }); + + let output_task = tokio::spawn(async move { + let mut host_stdout = io::stdout(); + let mut host_stderr = io::stderr(); + while let Some(result) = output.next().await { + match result { + Ok(LogOutput::StdOut { message }) => { + host_stdout.write_all(&message).await.ok(); + host_stdout.flush().await.ok(); + } + Ok(LogOutput::StdErr { message }) => { + host_stderr.write_all(&message).await.ok(); + host_stderr.flush().await.ok(); + } + Ok(_) => {} + Err(e) => { + eprintln!("sandcage: container stream error: {e}"); + break; + } + } + } + }); + + let _ = output_task.await; + stdin_task.abort(); + signal_task.abort(); + + let exit_code = wait_handle.await.unwrap_or(-1); + Ok(exit_code as i32) + } + + async fn cleanup_orphans(&self) { + let mut filters = HashMap::new(); + filters.insert("label", vec!["sandcage.managed=true"]); + let opts = bollard::query_parameters::ListContainersOptionsBuilder::default() + .all(true) + .filters(&filters) + .build(); + + if let Ok(containers) = self.docker.list_containers(Some(opts)).await { + for container in containers { + if let Some(id) = container.id { + eprintln!("sandcage: cleaning up orphaned container {}", &id[..12.min(id.len())]); + let rm_opts = bollard::query_parameters::RemoveContainerOptionsBuilder::default() + .force(true) + .build(); + self.docker.remove_container(&id, Some(rm_opts)).await.ok(); + } + } + } + } +} diff --git a/crates/sandcage/src/backend/compose.rs b/crates/sandcage/src/backend/compose.rs new file mode 100644 index 0000000..cb96a23 --- /dev/null +++ b/crates/sandcage/src/backend/compose.rs @@ -0,0 +1,103 @@ +use async_trait::async_trait; +use tokio::process::Command; + +use crate::config::SandcageConfig; +use crate::docker::{self, DockerError}; +use crate::service::registry::ServiceRegistry; +use crate::service::{ComposeContext, Service}; + +use super::Result; + +pub struct ComposeBackend; + +#[async_trait] +impl super::ContainerBackend for ComposeBackend { + async fn run_interactive( + &self, + service: &dyn Service, + ctx: &ComposeContext, + config: &SandcageConfig, + registry: &ServiceRegistry, + shell_override: bool, + extra_args: &[String], + ) -> Result { + let docker_path = docker::require_docker()?; + docker::require_compose(&docker_path).await?; + + let image_tag = format!("{}:latest", ctx.image); + docker::require_image(&docker_path, &image_tag).await?; + + if config.ssh_mode.as_deref() == Some("volume") { + let vol_check = Command::new(&docker_path) + .args(["volume", "inspect", "sandcage-ssh"]) + .output() + .await; + if !vol_check.map(|o| o.status.success()).unwrap_or(false) { + eprintln!( + "sandcage: SSH volume not found — run 'sandcage setup ssh --refresh' to populate it" + ); + } + } + + let compose_content = crate::service::compose::generate_compose(registry, ctx); + let compose_file = docker::write_compose_tempfile(&compose_content)?; + let compose_path = compose_file.path().to_string_lossy().into_owned(); + + let run_args = docker::build_run_args( + service.name(), + &compose_path, + config, + shell_override, + extra_args, + ); + + let mut cmd = Command::new(&docker_path); + cmd.args(&run_args); + cmd.stdin(std::process::Stdio::inherit()) + .stdout(std::process::Stdio::inherit()) + .stderr(std::process::Stdio::inherit()); + + let status = cmd.status().await.map_err(DockerError::SpawnFailed)?; + Ok(status.code().unwrap_or(-1)) + } + + async fn run_acp_relay( + &self, + _service: &dyn Service, + _ctx: &ComposeContext, + _config: &SandcageConfig, + _extra_args: &[String], + ) -> Result { + Err(DockerError::AcpRequiresBollard) + } + + async fn image_exists(&self, image: &str) -> Result { + let docker_path = docker::require_docker()?; + let status = Command::new(&docker_path) + .args(["image", "inspect", image]) + .stdout(std::process::Stdio::null()) + .stderr(std::process::Stdio::null()) + .status() + .await + .map_err(DockerError::SpawnFailed)?; + Ok(status.success()) + } + + async fn volume_exists(&self, name: &str) -> Result { + let docker_path = docker::require_docker()?; + let status = Command::new(&docker_path) + .args(["volume", "inspect", name]) + .stdout(std::process::Stdio::null()) + .stderr(std::process::Stdio::null()) + .status() + .await + .map_err(DockerError::SpawnFailed)?; + Ok(status.success()) + } + + async fn check_availability(&self) -> Result<()> { + let docker_path = docker::require_docker()?; + docker::require_compose(&docker_path).await?; + Ok(()) + } +} diff --git a/crates/sandcage/src/backend/mod.rs b/crates/sandcage/src/backend/mod.rs new file mode 100644 index 0000000..b35e195 --- /dev/null +++ b/crates/sandcage/src/backend/mod.rs @@ -0,0 +1,50 @@ +pub mod compose; +#[cfg(feature = "bollard")] +pub mod bollard; + +use async_trait::async_trait; + +use crate::config::SandcageConfig; +use crate::docker::DockerError; +use crate::service::{ComposeContext, Service}; + +pub type Result = std::result::Result; + +#[async_trait] +pub trait ContainerBackend: Send + Sync { + async fn run_interactive( + &self, + service: &dyn Service, + ctx: &ComposeContext, + config: &SandcageConfig, + registry: &crate::service::registry::ServiceRegistry, + shell_override: bool, + extra_args: &[String], + ) -> Result; + + async fn run_acp_relay( + &self, + service: &dyn Service, + ctx: &ComposeContext, + config: &SandcageConfig, + extra_args: &[String], + ) -> Result; + + async fn image_exists(&self, image: &str) -> Result; + + async fn volume_exists(&self, name: &str) -> Result; + + async fn check_availability(&self) -> Result<()>; +} + +pub fn default_backend() -> Box { + #[cfg(feature = "bollard")] + { + Box::new(bollard::BollardBackend::new()) + } + + #[cfg(not(feature = "bollard"))] + { + Box::new(compose::ComposeBackend) + } +} diff --git a/crates/sandcage/src/docker.rs b/crates/sandcage/src/docker.rs index a16bbfa..df6e31e 100644 --- a/crates/sandcage/src/docker.rs +++ b/crates/sandcage/src/docker.rs @@ -2,7 +2,7 @@ use std::collections::HashMap; use std::io::Write; use std::path::{Path, PathBuf}; -use std::process::Command; +use tokio::process::Command; use miette::Diagnostic; use sha2::{Digest, Sha256}; @@ -92,18 +92,26 @@ pub enum DockerError { help("Enable it with: services.{service}.enabled: true") )] ServiceDisabled { service: String }, + + #[error("ACP relay requires the 'bollard' feature")] + #[diagnostic( + code(sandcage::docker::acp_requires_bollard), + help("Rebuild sandcage with: cargo build --features bollard") + )] + AcpRequiresBollard, } pub type Result = std::result::Result; -fn require_docker() -> Result { +pub fn require_docker() -> Result { which::which("docker").map_err(|_| DockerError::DockerNotFound) } -fn require_compose(docker: &Path) -> Result<()> { +pub async fn require_compose(docker: &Path) -> Result<()> { let output = Command::new(docker) .args(["compose", "version"]) .output() + .await .map_err(|_| DockerError::ComposeNotFound)?; if !output.status.success() { @@ -112,10 +120,11 @@ fn require_compose(docker: &Path) -> Result<()> { Ok(()) } -fn id_flag(flag: &str) -> Result { +async fn id_flag(flag: &str) -> Result { let output = Command::new("id") .arg(flag) .output() + .await .map_err(|e| DockerError::IdFailed(e.to_string()))?; if !output.status.success() { @@ -128,7 +137,7 @@ fn id_flag(flag: &str) -> Result { Ok(String::from_utf8_lossy(&output.stdout).trim().to_string()) } -pub fn build_compose_env(workspace: &Path, config: &SandcageConfig) -> Result> { +pub async fn build_compose_env(workspace: &Path, config: &SandcageConfig) -> Result> { let home = dirs::home_dir().ok_or(DockerError::NoHomeDir)?; let sandcage_home = home.join(".sandcage"); @@ -137,7 +146,7 @@ pub fn build_compose_env(workspace: &Path, config: &SandcageConfig) -> Result Result Result { +pub async fn build_compose_context(workspace: &Path, config: &SandcageConfig) -> Result { let home = dirs::home_dir().ok_or(DockerError::NoHomeDir)?; let sandcage_home = home.join(".sandcage"); let (uid, gid) = if cfg!(windows) { ("1000".to_string(), "1000".to_string()) } else { - (id_flag("-u")?, id_flag("-g")?) + (id_flag("-u").await?, id_flag("-g").await?) }; let container_dir = match &config.container_workspace { @@ -209,7 +218,7 @@ fn default_container_dir(workspace: &Path) -> String { } } -fn write_compose_tempfile(content: &str) -> Result { +pub fn write_compose_tempfile(content: &str) -> Result { let mut tmp = tempfile::Builder::new() .prefix("sandcage-compose-") .suffix(".yml") @@ -223,22 +232,23 @@ fn write_compose_tempfile(content: &str) -> Result { Ok(tmp) } -fn require_image(docker: &Path, image: &str) -> Result<()> { - let output = Command::new(docker) +pub async fn require_image(docker: &Path, image: &str) -> Result<()> { + let status = Command::new(docker) .args(["image", "inspect", image]) .stdout(std::process::Stdio::null()) .stderr(std::process::Stdio::null()) - .status(); + .status() + .await; - match output { - Ok(status) if status.success() => Ok(()), + match status { + Ok(s) if s.success() => Ok(()), _ => Err(DockerError::ImageNotFound { image: image.to_string(), }), } } -fn expand_mount_path(mount: &str) -> String { +pub fn expand_mount_path(mount: &str) -> String { let Some(colon_pos) = mount.find(':') else { return mount.to_string(); }; @@ -332,7 +342,7 @@ pub fn build_run_args( args } -pub fn run_service( +pub async fn run_service( service: &str, workspace: &Path, config: &SandcageConfig, @@ -341,7 +351,7 @@ pub fn run_service( extra_args: &[String], ) -> Result<()> { let docker = require_docker()?; - require_compose(&docker)?; + require_compose(&docker).await?; let svc = registry.get(service).ok_or_else(|| DockerError::UnknownService { service: service.to_string(), @@ -354,14 +364,15 @@ pub fn run_service( }); } - let ctx = build_compose_context(workspace, config)?; + let ctx = build_compose_context(workspace, config).await?; let image_tag = format!("{}:latest", ctx.image); - require_image(&docker, &image_tag)?; + require_image(&docker, &image_tag).await?; if config.ssh_mode.as_deref() == Some("volume") { let vol_check = Command::new(&docker) .args(["volume", "inspect", "sandcage-ssh"]) - .output(); + .output() + .await; if !vol_check.map(|o| o.status.success()).unwrap_or(false) { eprintln!( "sandcage: SSH volume not found — run 'sandcage setup ssh --refresh' to populate it" @@ -382,7 +393,7 @@ pub fn run_service( .stdout(std::process::Stdio::inherit()) .stderr(std::process::Stdio::inherit()); - let status = cmd.status().map_err(DockerError::SpawnFailed)?; + let status = cmd.status().await.map_err(DockerError::SpawnFailed)?; if !status.success() { return Err(DockerError::ServiceFailed { @@ -452,7 +463,7 @@ fn write_stored_hashes(path: &Path, hashes: &HashMap) -> Result< } /// Build a single image from inline Dockerfile content (temp build context). -fn build_one_image_from_content(docker: &Path, image: &str, dockerfile_content: &str, no_cache: bool) -> Result<()> { +async fn build_one_image_from_content(docker: &Path, image: &str, dockerfile_content: &str, no_cache: bool) -> Result<()> { let tmp_dir = tempfile::Builder::new() .prefix("sandcage-build-") .tempdir() @@ -473,26 +484,26 @@ fn build_one_image_from_content(docker: &Path, image: &str, dockerfile_content: } } - run_docker_build(docker, image, tmp_dir.path(), None, no_cache) + run_docker_build(docker, image, tmp_dir.path(), None, no_cache).await } /// Build a single image from a user-provided path. /// If the path is a directory, it's used as the build context. /// If the path is a file, it's used as the Dockerfile with a temp context. -fn build_one_image_from_path(docker: &Path, image: &str, override_path: &Path, no_cache: bool) -> Result<()> { +async fn build_one_image_from_path(docker: &Path, image: &str, override_path: &Path, no_cache: bool) -> Result<()> { if override_path.is_dir() { - run_docker_build(docker, image, override_path, None, no_cache) + run_docker_build(docker, image, override_path, None, no_cache).await } else { let tmp_dir = tempfile::Builder::new() .prefix("sandcage-build-") .tempdir() .map_err(DockerError::TempDirFailed)?; - run_docker_build(docker, image, tmp_dir.path(), Some(override_path), no_cache) + run_docker_build(docker, image, tmp_dir.path(), Some(override_path), no_cache).await } } -fn run_docker_build( +async fn run_docker_build( docker: &Path, image: &str, context: &Path, @@ -515,7 +526,7 @@ fn run_docker_build( .stdout(std::process::Stdio::inherit()) .stderr(std::process::Stdio::inherit()); - let status = cmd.status().map_err(DockerError::SpawnFailed)?; + let status = cmd.status().await.map_err(DockerError::SpawnFailed)?; if !status.success() { return Err(DockerError::BuildFailed { @@ -544,7 +555,7 @@ fn read_dockerfile_at(path: &Path) -> Result { /// * When `force` is `true`, every image is rebuilt regardless of the stored hash. /// * Otherwise, an image is skipped when its Dockerfile hash matches the stored value. /// * After a successful build the hash is updated in `~/.sandcage/.build-hashes`. -pub fn build_images(force: bool, service_filter: &[String]) -> Result<()> { +pub async fn build_images(force: bool, service_filter: &[String]) -> Result<()> { let docker = require_docker()?; let home = dirs::home_dir().ok_or(DockerError::NoHomeDir)?; @@ -634,9 +645,9 @@ pub fn build_images(force: bool, service_filter: &[String]) -> Result<()> { } if let Some(path) = override_path { - build_one_image_from_path(&docker, image, path, force)?; + build_one_image_from_path(&docker, image, path, force).await?; } else { - build_one_image_from_content(&docker, image, bundled_dockerfile, force)?; + build_one_image_from_content(&docker, image, bundled_dockerfile, force).await?; } stored.insert(image.to_string(), current_hash); @@ -682,10 +693,10 @@ mod tests { assert!(yaml.contains("shell:"), "should contain shell service"); } - #[test] - fn build_compose_env_contains_required_keys() { + #[tokio::test] + async fn build_compose_env_contains_required_keys() { let workspace = PathBuf::from("/tmp/test-workspace"); - let env = build_compose_env(&workspace, &SandcageConfig::default()).expect("build_compose_env"); + let env = build_compose_env(&workspace, &SandcageConfig::default()).await.expect("build_compose_env"); assert!(env.contains_key("SANDCAGE_UID"), "missing SANDCAGE_UID"); assert!(env.contains_key("SANDCAGE_GID"), "missing SANDCAGE_GID"); @@ -694,17 +705,17 @@ mod tests { assert!(env.contains_key("SANDCAGE_CONTAINER_DIR"), "missing SANDCAGE_CONTAINER_DIR"); } - #[test] - fn build_compose_env_workspace_matches() { + #[tokio::test] + async fn build_compose_env_workspace_matches() { let workspace = PathBuf::from("/my/project"); - let env = build_compose_env(&workspace, &SandcageConfig::default()).expect("build_compose_env"); + let env = build_compose_env(&workspace, &SandcageConfig::default()).await.expect("build_compose_env"); assert_eq!(env["SANDCAGE_WORKSPACE"], "/my/project"); } - #[test] - fn build_compose_env_home_ends_with_sandcage() { + #[tokio::test] + async fn build_compose_env_home_ends_with_sandcage() { let workspace = PathBuf::from("/tmp"); - let env = build_compose_env(&workspace, &SandcageConfig::default()).expect("build_compose_env"); + let env = build_compose_env(&workspace, &SandcageConfig::default()).await.expect("build_compose_env"); assert!( env["SANDCAGE_HOME"].ends_with(".sandcage"), "SANDCAGE_HOME should end with .sandcage, got: {}", @@ -712,10 +723,10 @@ mod tests { ); } - #[test] - fn uid_gid_are_numeric() { + #[tokio::test] + async fn uid_gid_are_numeric() { let workspace = PathBuf::from("/tmp"); - let env = build_compose_env(&workspace, &SandcageConfig::default()).expect("build_compose_env"); + let env = build_compose_env(&workspace, &SandcageConfig::default()).await.expect("build_compose_env"); let uid: u32 = env["SANDCAGE_UID"] .parse() @@ -861,13 +872,13 @@ mod tests { assert!(path.exists(), "hash file should have been created"); } - #[test] - fn require_image_fails_for_nonexistent_image() { + #[tokio::test] + async fn require_image_fails_for_nonexistent_image() { let docker = match require_docker() { Ok(path) => path, Err(_) => return, // skip if docker not installed }; - let result = require_image(&docker, "sandcage-nonexistent-image-abc123"); + let result = require_image(&docker, "sandcage-nonexistent-image-abc123").await; assert!( matches!(result, Err(DockerError::ImageNotFound { .. })), "should fail for nonexistent image: {result:?}" @@ -944,33 +955,33 @@ mod tests { assert!(args.contains(&"--entrypoint".to_string())); } - #[test] - fn build_compose_env_container_dir_auto_derived() { + #[tokio::test] + async fn build_compose_env_container_dir_auto_derived() { let workspace = PathBuf::from("/home/user/projects/my-app"); let config = SandcageConfig::default(); - let env = build_compose_env(&workspace, &config).expect("build_compose_env"); + let env = build_compose_env(&workspace, &config).await.expect("build_compose_env"); assert_eq!(env["SANDCAGE_CONTAINER_DIR"], "/workspace/my-app"); } - #[test] - fn build_compose_env_container_dir_from_config() { + #[tokio::test] + async fn build_compose_env_container_dir_from_config() { let workspace = PathBuf::from("/home/user/projects/my-app"); let config = SandcageConfig { container_workspace: Some("/workspace/custom".to_string()), ..Default::default() }; - let env = build_compose_env(&workspace, &config).expect("build_compose_env"); + let env = build_compose_env(&workspace, &config).await.expect("build_compose_env"); assert_eq!(env["SANDCAGE_CONTAINER_DIR"], "/workspace/custom"); } - #[test] - fn build_compose_env_container_dir_ignores_relative_override() { + #[tokio::test] + async fn build_compose_env_container_dir_ignores_relative_override() { let workspace = PathBuf::from("/home/user/projects/my-app"); let config = SandcageConfig { container_workspace: Some("relative/path".to_string()), ..Default::default() }; - let env = build_compose_env(&workspace, &config).expect("build_compose_env"); + let env = build_compose_env(&workspace, &config).await.expect("build_compose_env"); assert_eq!( env["SANDCAGE_CONTAINER_DIR"], "/workspace/my-app", "relative paths should be ignored, falling back to auto-derive" @@ -1142,11 +1153,11 @@ mod tests { // May have .ssh in other mounts, but no SSH-specific mount } - #[test] - fn build_compose_env_container_dir_root_fallback() { + #[tokio::test] + async fn build_compose_env_container_dir_root_fallback() { let workspace = PathBuf::from("/"); let config = SandcageConfig::default(); - let env = build_compose_env(&workspace, &config).expect("build_compose_env"); + let env = build_compose_env(&workspace, &config).await.expect("build_compose_env"); assert_eq!(env["SANDCAGE_CONTAINER_DIR"], "/workspace"); } diff --git a/crates/sandcage/src/lib.rs b/crates/sandcage/src/lib.rs index ab38bba..adb874f 100644 --- a/crates/sandcage/src/lib.rs +++ b/crates/sandcage/src/lib.rs @@ -1,3 +1,4 @@ +pub mod backend; pub mod config; pub mod docker; pub mod init; @@ -5,3 +6,6 @@ pub mod service; pub mod setup; pub mod ssh_config; pub mod workspace; + +#[cfg(feature = "bollard")] +pub mod acp; diff --git a/crates/sandcage/src/main.rs b/crates/sandcage/src/main.rs index 63958ab..45a42c8 100644 --- a/crates/sandcage/src/main.rs +++ b/crates/sandcage/src/main.rs @@ -84,6 +84,12 @@ enum Commands { #[command(subcommand)] action: SetupAction, }, + /// ACP (Agent Control Protocol) commands + #[cfg(feature = "bollard")] + Acp { + #[command(subcommand)] + action: sandcage::acp::AcpCommands, + }, } #[derive(Subcommand, Debug)] @@ -131,7 +137,7 @@ enum AppError { Setup(#[from] setup::SetupError), } -fn run_service(service: &str, path: Option, shell_override: bool, agent_args: Vec) -> std::result::Result<(), AppError> { +async fn run_service(service: &str, path: Option, shell_override: bool, agent_args: Vec) -> std::result::Result<(), AppError> { let workspace = workspace::resolve_workspace(path.as_deref())?; eprintln!("sandcage: workspace \u{2192} {}", workspace.display()); @@ -150,27 +156,28 @@ fn run_service(service: &str, path: Option, shell_override: bool, agent let registry = service::registry::build_default_registry(&cfg); eprintln!("sandcage: service \u{2192} {service}"); - docker::run_service(service, &workspace, &cfg, ®istry, shell_override, &agent_args)?; + docker::run_service(service, &workspace, &cfg, ®istry, shell_override, &agent_args).await?; Ok(()) } -fn main() -> miette::Result<()> { +#[tokio::main] +async fn main() -> miette::Result<()> { let cli = Cli::parse(); match cli.command { Commands::Claude { path, shell, agent_args } => { - run_service("claude", path, shell, agent_args)? + run_service("claude", path, shell, agent_args).await? } Commands::Codex { path, shell, agent_args } => { - run_service("codex", path, shell, agent_args)? + run_service("codex", path, shell, agent_args).await? } Commands::Gemini { path, shell, agent_args } => { - run_service("gemini", path, shell, agent_args)? + run_service("gemini", path, shell, agent_args).await? } - Commands::Shell { path } => run_service("shell", path, false, vec![])?, + Commands::Shell { path } => run_service("shell", path, false, vec![]).await?, Commands::Build { force, services } => { - docker::build_images(force, &services)?; + docker::build_images(force, &services).await?; } Commands::Init => { let workspace = workspace::resolve_workspace(None)?; @@ -181,6 +188,14 @@ fn main() -> miette::Result<()> { setup::run_ssh_setup(global, yes, refresh, bind)?; } }, + #[cfg(feature = "bollard")] + Commands::Acp { action } => { + let backend = sandcage::backend::default_backend(); + backend.check_availability().await + .map_err(|e| AppError::Docker(e))?; + sandcage::acp::handle(action, backend.as_ref(), None).await + .map_err(|e| AppError::Docker(e))?; + } } Ok(()) diff --git a/docs/commands.md b/docs/commands.md index c2aef66..06d82d7 100644 --- a/docs/commands.md +++ b/docs/commands.md @@ -212,6 +212,122 @@ sandcage setup ssh --refresh --- +## acp + +Manage and run ACP (Agent Control Protocol) agents. This command group requires the `bollard` feature, which is enabled by default. + +``` +sandcage acp +``` + +--- + +### acp run + +Run a service in ACP relay mode, attaching stdin/stdout/stderr for bidirectional communication with the container. Uses the Bollard Docker API directly instead of docker compose. Designed for structured agent orchestration. + +``` +sandcage acp run [OPTIONS] [-- AGENT_ARGS...] +``` + +**Options:** + +| Flag | Description | +|------|-------------| +| `-p, --path ` | Path to the project directory (defaults to current directory) | + +**Positional arguments:** `` — the service name to run (e.g. `claude`, `codex`). + +**Trailing arguments:** Any arguments after `--` are forwarded directly to the agent binary inside the container. + +**Examples:** + +```sh +# Run the claude service in ACP relay mode +sandcage acp run claude + +# Run against a specific project directory +sandcage acp run claude --path /home/user/myproject + +# Forward arguments to the agent +sandcage acp run claude -- --resume +``` + +--- + +### acp install + +Install an agent from the ACP registry. Downloads the agent binary for the current platform and caches it at `~/.sandcage/agents///`. + +``` +sandcage acp install [OPTIONS] +``` + +**Options:** + +| Flag | Description | +|------|-------------| +| `--force` | Reinstall even if the agent is already installed | + +**Positional arguments:** `` — the identifier of the agent to install from the registry. + +**Examples:** + +```sh +# Install an agent from the registry +sandcage acp install my-agent + +# Force reinstall an already-installed agent +sandcage acp install my-agent --force +``` + +--- + +### acp list + +List available agents in the ACP registry. Fetches the agent list from the CDN with a 1-hour local cache. + +``` +sandcage acp list [OPTIONS] +``` + +**Options:** + +| Flag | Description | +|------|-------------| +| `--refresh` | Bypass the local cache and fetch a fresh list from the registry | + +**Examples:** + +```sh +# List available agents (uses cache if fresh) +sandcage acp list + +# Force a fresh fetch from the registry +sandcage acp list --refresh +``` + +--- + +### acp installed + +List locally installed ACP agents. + +``` +sandcage acp installed +``` + +No options. + +**Examples:** + +```sh +# Show all locally installed ACP agents +sandcage acp installed +``` + +--- + ## Common Patterns **Project path resolution:** All agent commands and `shell` accept `--path` (`-p`) to specify the project directory. When omitted, sandcage resolves the workspace from the current directory.