diff --git a/Cargo.lock b/Cargo.lock index f018b5d..c39b1a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -63,7 +63,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" dependencies = [ "anstyle", - "anstyle-parse", + "anstyle-parse 0.2.7", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstream" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" +dependencies = [ + "anstyle", + "anstyle-parse 1.0.0", "anstyle-query", "anstyle-wincon", "colorchoice", @@ -86,6 +101,15 @@ dependencies = [ "utf8parse", ] +[[package]] +name = "anstyle-parse" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e" +dependencies = [ + "utf8parse", +] + [[package]] name = "anstyle-query" version = "1.1.5" @@ -112,39 +136,6 @@ version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" -[[package]] -name = "async-stream" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - -[[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 2.0.117", -] - [[package]] name = "atomic" version = "0.6.1" @@ -188,59 +179,6 @@ dependencies = [ "fs_extra", ] -[[package]] -name = "axum" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" -dependencies = [ - "async-trait", - "axum-core", - "bytes", - "futures-util", - "http", - "http-body", - "http-body-util", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper", - "tower 0.5.3", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "http-body-util", - "mime", - "pin-project-lite", - "rustversion", - "sync_wrapper", - "tower-layer", - "tower-service", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "base64" version = "0.22.1" @@ -349,12 +287,6 @@ version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec" -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - [[package]] name = "bytes" version = "1.11.1" @@ -469,7 +401,7 @@ version = "4.5.60" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24a241312cea5059b13574bb9b3861cabf758b879c15190b37b6d6fd63ab6876" dependencies = [ - "anstream", + "anstream 0.6.21", "anstyle", "clap_lex", "strsim", @@ -539,16 +471,16 @@ dependencies = [ "capnp", "capnp-rpc", "dirs", + "env_logger", "futures", "json5", + "log", "poc-memory", "rustls", "serde", "tokio", "tokio-rustls", "tokio-util", - "tracing", - "tracing-subscriber", "webpki-roots", ] @@ -559,12 +491,12 @@ dependencies = [ "capnp", "capnp-rpc", "dirs", + "env_logger", "futures", + "log", "poc-memory", "tokio", "tokio-util", - "tracing", - "tracing-subscriber", ] [[package]] @@ -574,15 +506,15 @@ dependencies = [ "capnp", "capnp-rpc", "dirs", + "env_logger", "futures", + "log", "poc-memory", "reqwest", "serde", "serde_json", "tokio", "tokio-util", - "tracing", - "tracing-subscriber", ] [[package]] @@ -592,55 +524,16 @@ dependencies = [ "capnp", "capnp-rpc", "dirs", + "env_logger", "futures", "json5", "libc", + "log", "poc-memory", "scopeguard", "serde", "tokio", "tokio-util", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "console-api" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8030735ecb0d128428b64cd379809817e620a40e5001c54465b99ec5feec2857" -dependencies = [ - "futures-core", - "prost", - "prost-types", - "tonic", - "tracing-core", -] - -[[package]] -name = "console-subscriber" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6539aa9c6a4cd31f4b1c040f860a1eac9aa80e7df6b05d506a6e7179936d6a01" -dependencies = [ - "console-api", - "crossbeam-channel", - "crossbeam-utils", - "futures-task", - "hdrhistogram", - "humantime", - "hyper-util", - "prost", - "prost-types", - "serde", - "serde_json", - "thread_local", - "tokio", - "tokio-stream", - "tonic", - "tracing", - "tracing-core", - "tracing-subscriber", ] [[package]] @@ -686,15 +579,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" version = "0.8.6" @@ -914,6 +798,29 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" +[[package]] +name = "env_filter" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e90c2accc4b07a8456ea0debdc2e7587bdd890680d71173a15d4ae604f6eef" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0621c04f2196ac3f488dd583365b9c09be011a4ab8b9f37248ffcc8f6198b56a" +dependencies = [ + "anstream 1.0.0", + "anstyle", + "env_filter", + "jiff", + "log", +] + [[package]] name = "equivalent" version = "1.0.2" @@ -1210,25 +1117,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" -[[package]] -name = "h2" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http", - "indexmap 2.13.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "hashbrown" version = "0.12.3" @@ -1258,19 +1146,6 @@ dependencies = [ "foldhash 0.2.0", ] -[[package]] -name = "hdrhistogram" -version = "7.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" -dependencies = [ - "base64 0.21.7", - "byteorder", - "flate2", - "nom 7.1.3", - "num-traits", -] - [[package]] name = "heck" version = "0.5.0" @@ -1322,18 +1197,6 @@ 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 = "humantime" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" - [[package]] name = "hyper" version = "1.8.1" @@ -1344,11 +1207,9 @@ dependencies = [ "bytes", "futures-channel", "futures-core", - "h2", "http", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", "pin-utils", @@ -1373,26 +1234,13 @@ dependencies = [ "tower-service", ] -[[package]] -name = "hyper-timeout" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" -dependencies = [ - "hyper", - "hyper-util", - "pin-project-lite", - "tokio", - "tower-service", -] - [[package]] name = "hyper-util" version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" dependencies = [ - "base64 0.22.1", + "base64", "bytes", "futures-channel", "futures-util", @@ -1403,7 +1251,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.6.2", + "socket2", "tokio", "tower-service", "tracing", @@ -1547,16 +1395,6 @@ dependencies = [ "icu_properties", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - [[package]] name = "indexmap" version = "2.13.0" @@ -1634,6 +1472,30 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" +[[package]] +name = "jiff" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a3546dc96b6d42c5f24902af9e2538e82e39ad350b0c766eb3fbf2d8f3d8359" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde_core", +] + +[[package]] +name = "jiff-static" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a8c8b344124222efd714b73bb41f8b5120b27a7cc1c75593a6ff768d9d05aa4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "jni" version = "0.21.1" @@ -1684,7 +1546,6 @@ version = "0.3.0" source = "git+https://evilpiepirate.org/git/jobkit.git#4aacaac22c5f59a7fbc6ce3a65708fc370e55754" dependencies = [ "chrono", - "console-subscriber", "libc", "log", "profiling", @@ -1840,21 +1701,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "matchers" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" -dependencies = [ - "regex-automata", -] - -[[package]] -name = "matchit" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - [[package]] name = "memchr" version = "2.8.0" @@ -1885,12 +1731,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -1951,15 +1791,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "nu-ansi-term" -version = "0.50.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" -dependencies = [ - "windows-sys 0.61.2", -] - [[package]] name = "num-conv" version = "0.2.0" @@ -2230,26 +2061,6 @@ dependencies = [ "siphasher", ] -[[package]] -name = "pin-project" -version = "1.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "pin-project-lite" version = "0.2.17" @@ -2274,8 +2085,8 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07" dependencies = [ - "base64 0.22.1", - "indexmap 2.13.0", + "base64", + "indexmap", "quick-xml", "serde", "time", @@ -2286,7 +2097,7 @@ name = "poc-memory" version = "0.4.0" dependencies = [ "anyhow", - "base64 0.22.1", + "base64", "bincode", "capnp", "capnp-rpc", @@ -2295,6 +2106,7 @@ dependencies = [ "clap", "crossterm", "dirs", + "env_logger", "figment", "futures", "glob", @@ -2320,9 +2132,6 @@ dependencies = [ "tokio-scoped", "tokio-util", "toml", - "tracing", - "tracing-appender", - "tracing-subscriber", "tui-markdown", "tui-textarea-2", "uuid", @@ -2334,6 +2143,15 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" +[[package]] +name = "portable-atomic-util" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "091397be61a01d4be58e7841595bd4bfedb15f1cd54977d79b8271e94ed799a3" +dependencies = [ + "portable-atomic", +] + [[package]] name = "potential_utf" version = "0.1.4" @@ -2384,7 +2202,7 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ - "toml_edit 0.25.5+spec-1.1.0", + "toml_edit 0.25.10+spec-1.1.0", ] [[package]] @@ -2428,38 +2246,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "prost" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-derive" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn 2.0.117", -] - -[[package]] -name = "prost-types" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16" -dependencies = [ - "prost", -] - [[package]] name = "ptr_meta" version = "0.1.4" @@ -2482,9 +2268,9 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c41efbf8f90ac44de7f3a868f0867851d261b56291732d0cbf7cceaaeb55a6" +checksum = "7c3a14896dfa883796f1cb410461aef38810ea05f2b2c33c5aded3649095fdad" dependencies = [ "bitflags 2.11.0", "getopts", @@ -2521,7 +2307,7 @@ dependencies = [ "quinn-udp", "rustc-hash 2.1.2", "rustls", - "socket2 0.6.2", + "socket2", "thiserror 2.0.18", "tokio", "tracing", @@ -2559,7 +2345,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.6.2", + "socket2", "tracing", "windows-sys 0.60.2", ] @@ -2591,8 +2377,6 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "libc", - "rand_chacha 0.3.1", "rand_core 0.6.4", ] @@ -2602,20 +2386,10 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ - "rand_chacha 0.9.0", + "rand_chacha", "rand_core 0.9.5", ] -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - [[package]] name = "rand_chacha" version = "0.9.0" @@ -2631,9 +2405,6 @@ name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.17", -] [[package]] name = "rand_core" @@ -2828,7 +2599,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801" dependencies = [ - "base64 0.22.1", + "base64", "bytes", "futures-core", "http", @@ -2850,7 +2621,7 @@ dependencies = [ "sync_wrapper", "tokio", "tokio-rustls", - "tower 0.5.3", + "tower", "tower-http", "tower-service", "url", @@ -3176,15 +2947,6 @@ dependencies = [ "digest", ] -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - [[package]] name = "shlex" version = "1.3.0" @@ -3224,9 +2986,9 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" +checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" [[package]] name = "simdutf8" @@ -3258,16 +3020,6 @@ version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" -[[package]] -name = "socket2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "socket2" version = "0.6.2" @@ -3420,7 +3172,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4676b37242ccbd1aabf56edb093a4827dc49086c0ffd764a5705899e0f35f8f7" dependencies = [ "anyhow", - "base64 0.22.1", + "base64", "bitflags 2.11.0", "fancy-regex 0.11.0", "filedescriptor", @@ -3495,15 +3247,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "thread_local" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" -dependencies = [ - "cfg-if", -] - [[package]] name = "tiktoken-rs" version = "0.9.1" @@ -3511,7 +3254,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a19830747d9034cd9da43a60eaa8e552dfda7712424aebf187b7a60126bae0d" dependencies = [ "anyhow", - "base64 0.22.1", + "base64", "bstr", "fancy-regex 0.13.0", "lazy_static", @@ -3589,9 +3332,8 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.6.2", + "socket2", "tokio-macros", - "tracing", "windows-sys 0.61.2", ] @@ -3674,9 +3416,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "1.0.1+spec-1.1.0" +version = "1.1.1+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b320e741db58cac564e26c607d3cc1fdc4a88fd36c879568c07856ed83ff3e9" +checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7" dependencies = [ "serde_core", ] @@ -3687,7 +3429,7 @@ version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.13.0", + "indexmap", "serde", "serde_spanned", "toml_datetime 0.6.11", @@ -3697,23 +3439,23 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.25.5+spec-1.1.0" +version = "0.25.10+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca1a40644a28bce036923f6a431df0b34236949d111cc07cb6dca830c9ef2e1" +checksum = "a82418ca169e235e6c399a84e395ab6debeb3bc90edc959bf0f48647c6a32d1b" dependencies = [ - "indexmap 2.13.0", - "toml_datetime 1.0.1+spec-1.1.0", + "indexmap", + "toml_datetime 1.1.1+spec-1.1.0", "toml_parser", - "winnow 1.0.0", + "winnow 1.0.1", ] [[package]] name = "toml_parser" -version = "1.0.10+spec-1.1.0" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7df25b4befd31c4816df190124375d5a20c6b6921e2cad937316de3fccd63420" +checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" dependencies = [ - "winnow 1.0.0", + "winnow 1.0.1", ] [[package]] @@ -3722,56 +3464,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" -[[package]] -name = "tonic" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.22.1", - "bytes", - "h2", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-timeout", - "hyper-util", - "percent-encoding", - "pin-project", - "prost", - "socket2 0.5.10", - "tokio", - "tokio-stream", - "tower 0.4.13", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "indexmap 1.9.3", - "pin-project", - "pin-project-lite", - "rand 0.8.5", - "slab", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tower" version = "0.5.3" @@ -3800,7 +3492,7 @@ dependencies = [ "http-body", "iri-string", "pin-project-lite", - "tower 0.5.3", + "tower", "tower-layer", "tower-service", ] @@ -3828,18 +3520,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "tracing-appender" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "786d480bce6247ab75f005b14ae1624ad978d3029d9113f0a22fa1ac773faeaf" -dependencies = [ - "crossbeam-channel", - "thiserror 2.0.18", - "time", - "tracing-subscriber", -] - [[package]] name = "tracing-attributes" version = "0.1.31" @@ -3858,36 +3538,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex-automata", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", ] [[package]] @@ -4030,12 +3680,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "valuable" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" - [[package]] name = "version_check" version = "0.9.5" @@ -4170,7 +3814,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" dependencies = [ "anyhow", - "indexmap 2.13.0", + "indexmap", "wasm-encoder", "wasmparser", ] @@ -4183,7 +3827,7 @@ checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" dependencies = [ "bitflags 2.11.0", "hashbrown 0.15.5", - "indexmap 2.13.0", + "indexmap", "semver", ] @@ -4620,9 +4264,9 @@ dependencies = [ [[package]] name = "winnow" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8" +checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5" dependencies = [ "memchr", ] @@ -4655,7 +4299,7 @@ checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" dependencies = [ "anyhow", "heck", - "indexmap 2.13.0", + "indexmap", "prettyplease", "syn 2.0.117", "wasm-metadata", @@ -4686,7 +4330,7 @@ checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" dependencies = [ "anyhow", "bitflags 2.11.0", - "indexmap 2.13.0", + "indexmap", "log", "serde", "serde_derive", @@ -4705,7 +4349,7 @@ checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" dependencies = [ "anyhow", "id-arena", - "indexmap 2.13.0", + "indexmap", "log", "semver", "serde", diff --git a/Cargo.toml b/Cargo.toml index f8cbf2f..e7e8061 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,8 +35,8 @@ memmap2 = "0.9" rayon = "1" peg = "0.8" paste = "1" -jobkit = { git = "https://evilpiepirate.org/git/jobkit.git", features = ["daemon", "console"] } -tokio = { version = "1", features = ["full", "tracing"] } +jobkit = { git = "https://evilpiepirate.org/git/jobkit.git", features = ["daemon"] } +tokio = { version = "1", features = ["full"] } reqwest = { version = "0.13", default-features = false, features = ["json", "rustls"] } glob = "0.3" anyhow = "1" @@ -55,9 +55,7 @@ skillratings = "0.28" capnp-rpc = "0.20" tokio-util = { version = "0.7", features = ["compat"] } toml = "0.8" -tracing = { version = "0.1", default-features = false } -tracing-subscriber = { version = "0.3", features = ["env-filter"] } -tracing-appender = "0.2" +env_logger = "0.11" tokio-scoped = "0.2.0" [build-dependencies] diff --git a/channels/irc/Cargo.toml b/channels/irc/Cargo.toml index c338e25..55cec1d 100644 --- a/channels/irc/Cargo.toml +++ b/channels/irc/Cargo.toml @@ -15,6 +15,6 @@ serde = { version = "1", features = ["derive"] } tokio = { version = "1", features = ["full"] } tokio-rustls = "0.26" tokio-util = { version = "0.7", features = ["compat"] } -tracing = { version = "0.1", default-features = false } -tracing-subscriber = { version = "0.3", features = ["env-filter"] } +log = "0.4" +env_logger = "0.11" webpki-roots = "1" diff --git a/channels/irc/src/main.rs b/channels/irc/src/main.rs index d9cb83e..06d3041 100644 --- a/channels/irc/src/main.rs +++ b/channels/irc/src/main.rs @@ -24,7 +24,7 @@ use futures::AsyncReadExt; use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader}; use tokio::net::UnixListener; use tokio_util::compat::TokioAsyncReadCompatExt; -use tracing::{error, info, warn}; +use log::{info, warn, error}; use poc_memory::channel_capnp::{channel_client, channel_server}; @@ -609,7 +609,7 @@ fn channel_to_target(channel: &str) -> String { #[tokio::main(flavor = "current_thread")] async fn main() -> Result<(), Box> { - tracing_subscriber::fmt::init(); + env_logger::init(); let config = load_config(); let state = Rc::new(RefCell::new(State::new(config))); diff --git a/channels/socat/Cargo.toml b/channels/socat/Cargo.toml index 7335317..0f57cb3 100644 --- a/channels/socat/Cargo.toml +++ b/channels/socat/Cargo.toml @@ -11,5 +11,5 @@ futures = "0.3" poc-memory = { path = "../.." } tokio = { version = "1", features = ["full"] } tokio-util = { version = "0.7", features = ["compat"] } -tracing = { version = "0.1", default-features = false } -tracing-subscriber = { version = "0.3", features = ["env-filter"] } +log = "0.4" +env_logger = "0.11" diff --git a/channels/socat/src/main.rs b/channels/socat/src/main.rs index a82ef66..890f013 100644 --- a/channels/socat/src/main.rs +++ b/channels/socat/src/main.rs @@ -17,7 +17,7 @@ use futures::AsyncReadExt; use tokio::io::{AsyncBufReadExt, AsyncWriteExt}; use tokio::net::{TcpStream, UnixListener, UnixStream}; use tokio_util::compat::TokioAsyncReadCompatExt; -use tracing::{error, info, warn}; +use log::{info, warn, error}; use poc_memory::channel_capnp::{channel_client, channel_server}; use poc_memory::thalamus::channel_log::ChannelLog; @@ -256,7 +256,7 @@ impl channel_server::Server for ChannelServerImpl { #[tokio::main(flavor = "current_thread")] async fn main() -> Result<(), Box> { - tracing_subscriber::fmt::init(); + env_logger::init(); let dir = dirs::home_dir() .unwrap_or_default() diff --git a/channels/telegram/Cargo.toml b/channels/telegram/Cargo.toml index 42d0924..f9168c6 100644 --- a/channels/telegram/Cargo.toml +++ b/channels/telegram/Cargo.toml @@ -14,5 +14,5 @@ serde = { version = "1", features = ["derive"] } serde_json = "1" tokio = { version = "1", features = ["full"] } tokio-util = { version = "0.7", features = ["compat"] } -tracing = { version = "0.1", default-features = false } -tracing-subscriber = { version = "0.3", features = ["env-filter"] } +log = "0.4" +env_logger = "0.11" diff --git a/channels/telegram/src/main.rs b/channels/telegram/src/main.rs index 890053e..7138fb4 100644 --- a/channels/telegram/src/main.rs +++ b/channels/telegram/src/main.rs @@ -17,7 +17,7 @@ use capnp_rpc::{pry, rpc_twoparty_capnp, twoparty, RpcSystem}; use futures::AsyncReadExt; use tokio::net::UnixListener; use tokio_util::compat::TokioAsyncReadCompatExt; -use tracing::{error, info}; +use log::{info, warn, error}; use poc_memory::channel_capnp::{channel_client, channel_server}; @@ -309,7 +309,7 @@ impl channel_server::Server for ChannelServerImpl { #[tokio::main(flavor = "current_thread")] async fn main() -> Result<(), Box> { - tracing_subscriber::fmt::init(); + env_logger::init(); let config = load_config(); let state = Rc::new(RefCell::new(State::new(config))); diff --git a/channels/tmux/Cargo.toml b/channels/tmux/Cargo.toml index fe927a9..7e7324b 100644 --- a/channels/tmux/Cargo.toml +++ b/channels/tmux/Cargo.toml @@ -15,5 +15,5 @@ poc-memory = { path = "../.." } serde = { version = "1", features = ["derive"] } tokio = { version = "1", features = ["full"] } tokio-util = { version = "0.7", features = ["compat"] } -tracing = { version = "0.1", default-features = false } -tracing-subscriber = { version = "0.3", features = ["env-filter"] } +log = "0.4" +env_logger = "0.11" diff --git a/channels/tmux/src/main.rs b/channels/tmux/src/main.rs index b2f9dd0..30288d6 100644 --- a/channels/tmux/src/main.rs +++ b/channels/tmux/src/main.rs @@ -18,7 +18,7 @@ use futures::AsyncReadExt; use tokio::io::AsyncBufReadExt; use tokio::net::UnixListener; use tokio_util::compat::TokioAsyncReadCompatExt; -use tracing::{error, info, warn}; +use log::{info, warn, error}; use poc_memory::channel_capnp::{channel_client, channel_server}; use poc_memory::thalamus::channel_log::ChannelLog; @@ -337,7 +337,7 @@ fn cleanup_pipes(config: &Config) { #[tokio::main] async fn main() -> Result<(), Box> { - tracing_subscriber::fmt::init(); + env_logger::init(); let config = load_config(); let state = Rc::new(RefCell::new(State::new(&config))); diff --git a/src/claude/config.rs b/src/claude/config.rs index c38dc21..fb6ee9a 100644 --- a/src/claude/config.rs +++ b/src/claude/config.rs @@ -77,7 +77,7 @@ impl Config { let path = config_path(); match fs::read_to_string(&path) { Ok(data) => toml::from_str(&data).unwrap_or_else(|e| { - tracing::warn!("bad config {}: {e}, using defaults", path.display()); + log::warn!("bad config {}: {e}, using defaults", path.display()); Self::default() }), Err(_) => { diff --git a/src/claude/idle.rs b/src/claude/idle.rs index e30bdc3..43e536b 100644 --- a/src/claude/idle.rs +++ b/src/claude/idle.rs @@ -6,7 +6,7 @@ use super::{context, tmux}; use crate::thalamus::{home, now, notify, idle as thalamus_idle}; -use tracing::info; +use log::info; /// Claude Code idle state — wraps the universal state machine. pub struct State { diff --git a/src/claude/mod.rs b/src/claude/mod.rs index 8c7e73d..c394e1c 100644 --- a/src/claude/mod.rs +++ b/src/claude/mod.rs @@ -22,7 +22,7 @@ use capnp_rpc::{rpc_twoparty_capnp, twoparty, RpcSystem}; use clap::{Parser, Subcommand}; use futures::AsyncReadExt; use tokio::net::UnixListener; -use tracing::{error, info}; +use log::{error, info}; use crate::thalamus::{daemon_capnp, home, now, notify}; @@ -435,18 +435,7 @@ async fn module_command( // -- Server mode ---------------------------------------------------------- async fn server_main() -> Result<(), Box> { - let log_path = home().join(".consciousness/logs/daemon.log"); - let file_appender = tracing_appender::rolling::daily( - log_path.parent().unwrap(), - "daemon.log", - ); - tracing_subscriber::fmt() - .with_writer(file_appender) - .with_ansi(false) - .with_target(false) - .with_level(false) - .with_timer(tracing_subscriber::fmt::time::time()) - .init(); + env_logger::init(); let sock = sock_path(); let _ = std::fs::remove_file(&sock); diff --git a/src/claude/rpc.rs b/src/claude/rpc.rs index ab876d1..20197e6 100644 --- a/src/claude/rpc.rs +++ b/src/claude/rpc.rs @@ -11,7 +11,7 @@ use daemon_capnp::daemon; use capnp::capability::Promise; use std::cell::RefCell; use std::rc::Rc; -use tracing::info; +use log::info; pub struct DaemonImpl { state: Rc>, diff --git a/src/claude/tmux.rs b/src/claude/tmux.rs index f3e0cfd..ea920d6 100644 --- a/src/claude/tmux.rs +++ b/src/claude/tmux.rs @@ -3,7 +3,7 @@ use std::process::Command; use std::thread; use std::time::Duration; -use tracing::info; +use log::info; /// Find Claude Code's tmux pane by scanning for the "claude" process. pub fn find_claude_pane() -> Option { diff --git a/src/thalamus/channels.rs b/src/thalamus/channels.rs index 4bc00c7..22d299a 100644 --- a/src/thalamus/channels.rs +++ b/src/thalamus/channels.rs @@ -10,7 +10,7 @@ use capnp_rpc::{rpc_twoparty_capnp, twoparty, RpcSystem}; use futures::AsyncReadExt; use tokio::net::UnixStream; use tokio_util::compat::TokioAsyncReadCompatExt; -use tracing::{info, warn}; +use log::{info, warn}; use crate::channel_capnp::{channel_client, channel_server}; use capnp::capability::Promise; diff --git a/src/thalamus/idle.rs b/src/thalamus/idle.rs index 32fba8d..ad16f7e 100644 --- a/src/thalamus/idle.rs +++ b/src/thalamus/idle.rs @@ -10,7 +10,7 @@ use crate::thalamus::{home, now, notify}; use serde::{Deserialize, Serialize}; use std::fs; -use tracing::info; +use log::info; // Defaults pub const DEFAULT_IDLE_TIMEOUT: f64 = 5.0 * 60.0; diff --git a/src/thalamus/notify.rs b/src/thalamus/notify.rs index 012d666..7421a80 100644 --- a/src/thalamus/notify.rs +++ b/src/thalamus/notify.rs @@ -22,7 +22,7 @@ use serde::{Deserialize, Serialize}; use std::collections::BTreeMap; use std::fs; use std::path::PathBuf; -use tracing::info; +use log::info; use super::home; diff --git a/src/thalamus/supervisor.rs b/src/thalamus/supervisor.rs index 3a07c2e..b38f9b3 100644 --- a/src/thalamus/supervisor.rs +++ b/src/thalamus/supervisor.rs @@ -11,7 +11,7 @@ use std::collections::BTreeMap; use std::fs::File; use std::path::PathBuf; use std::process::Child; -use tracing::{info, warn, error}; +use log::{info, warn, error}; fn channels_dir() -> PathBuf { dirs::home_dir()