5920e2cd

Add distributed issues and patch review over git

a73x 2026-03-20 20:22

Commit message

Add distributed issues and patch review over git

.gitignore

Old		New
@@ -0,0 +1 @@
		1	/target

Cargo.lock

@@ @@ -0,0 +1,2359 @@ @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+[[package]]
+name = "aho-corasick"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
+dependencies = [
+ "memchr",
+]
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+[[package]]
+name = "anstream"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+[[package]]
+name = "anstyle"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
+dependencies = [
+ "windows-sys",
+]
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys",
+]
+[[package]]
+name = "anyhow"
+version = "1.0.102"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
+[[package]]
+name = "atomic"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a89cbf775b137e9b968e67227ef7f775587cde3fd31b0d8599dbd0f598a48340"
+dependencies = [
+ "bytemuck",
+]
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+[[package]]
+name = "bit-set"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+dependencies = [
+ "bit-vec",
+]
+[[package]]
+name = "bit-vec"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+[[package]]
+name = "bitflags"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+[[package]]
+name = "bumpalo"
+version = "3.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
+[[package]]
+name = "bytemuck"
+version = "1.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec"
+[[package]]
+name = "castaway"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dec551ab6e7578819132c713a93c022a05d60159dc86e7a7050223577484c55a"
+dependencies = [
+ "rustversion",
+]
+[[package]]
+name = "cc"
+version = "1.2.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423"
+dependencies = [
+ "find-msvc-tools",
+ "jobserver",
+ "libc",
+ "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 = "chrono"
+version = "0.4.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
+dependencies = [
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "serde",
+ "wasm-bindgen",
+ "windows-link",
+]
+[[package]]
+name = "clap"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+[[package]]
+name = "clap_builder"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+[[package]]
+name = "clap_derive"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+[[package]]
+name = "clap_lex"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
+[[package]]
+name = "colorchoice"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"
+[[package]]
+name = "compact_str"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb1325a1cece981e8a296ab8f0f9b63ae357bd0784a9faaf548cc7b480707a"
+dependencies = [
+ "castaway",
+ "cfg-if",
+ "itoa",
+ "rustversion",
+ "ryu",
+ "static_assertions",
+]
+[[package]]
+name = "convert_case"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9"
+dependencies = [
+ "unicode-segmentation",
+]
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+[[package]]
+name = "crossterm"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
+dependencies = [
+ "bitflags 2.11.0",
+ "crossterm_winapi",
+ "derive_more",
+ "document-features",
+ "mio",
+ "parking_lot",
+ "rustix",
+ "signal-hook",
+ "signal-hook-mio",
+ "winapi",
+]
+[[package]]
+name = "crossterm_winapi"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
+dependencies = [
+ "winapi",
+]
+[[package]]
+name = "crypto-common"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+[[package]]
+name = "csscolorparser"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf"
+dependencies = [
+ "lab",
+ "phf",
+]
+[[package]]
+name = "darling"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+[[package]]
+name = "darling_core"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0"
+dependencies = [
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.117",
+]
+[[package]]
+name = "darling_macro"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.117",
+]
+[[package]]
+name = "deltae"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5729f5117e208430e437df2f4843f5e5952997175992d1414f94c57d61e270b4"
+[[package]]
+name = "deranged"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
+dependencies = [
+ "powerfmt",
+]
+[[package]]
+name = "derive_more"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134"
+dependencies = [
+ "derive_more-impl",
+]
+[[package]]
+name = "derive_more-impl"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "syn 2.0.117",
+]
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+[[package]]
+name = "document-features"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
+dependencies = [
+ "litrs",
+]
+[[package]]
+name = "either"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+[[package]]
+name = "euclid"
+version = "0.22.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1a05365e3b1c6d1650318537c7460c6923f1abdd272ad6842baa2b509957a06"
+dependencies = [
+ "num-traits",
+]
+[[package]]
+name = "fancy-regex"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2"
+dependencies = [
+ "bit-set",
+ "regex",
+]
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+[[package]]
+name = "filedescriptor"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e40758ed24c9b2eeb76c35fb0aebc66c626084edd827e07e1552279814c6682d"
+dependencies = [
+ "libc",
+ "thiserror 1.0.69",
+ "winapi",
+]
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
+[[package]]
+name = "finl_unicode"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9844ddc3a6e533d62bba727eb6c28b5d360921d5175e9ff0f1e621a5c590a4d5"
+[[package]]
+name = "fixedbitset"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+[[package]]
+name = "foldhash"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
+[[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 = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+[[package]]
+name = "getrandom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi 5.3.0",
+ "wasip2",
+]
+[[package]]
+name = "getrandom"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi 6.0.0",
+ "wasip2",
+ "wasip3",
+]
+[[package]]
+name = "git-collab"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "clap",
+ "crossterm",
+ "git2",
+ "ratatui",
+ "serde",
+ "serde_json",
+ "tempfile",
+ "thiserror 2.0.18",
+]
+[[package]]
+name = "git2"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
+dependencies = [
+ "bitflags 2.11.0",
+ "libc",
+ "libgit2-sys",
+ "log",
+ "openssl-probe",
+ "openssl-sys",
+ "url",
+]
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+dependencies = [
+ "foldhash 0.1.5",
+]
+[[package]]
+name = "hashbrown"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash 0.2.0",
+]
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+[[package]]
+name = "iana-time-zone"
+version = "0.1.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "log",
+ "wasm-bindgen",
+ "windows-core",
+]
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+[[package]]
+name = "icu_collections"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+[[package]]
+name = "icu_locale_core"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+[[package]]
+name = "icu_normalizer"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
+dependencies = [
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+[[package]]
+name = "icu_normalizer_data"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
+[[package]]
+name = "icu_properties"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"
+dependencies = [
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "zerotrie",
+ "zerovec",
+]
+[[package]]
+name = "icu_properties_data"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"
+[[package]]
+name = "icu_provider"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
+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 = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+[[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.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+[[package]]
+name = "indexmap"
+version = "2.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.16.1",
+ "serde",
+ "serde_core",
+]
+[[package]]
+name = "indoc"
+version = "2.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
+dependencies = [
+ "rustversion",
+]
+[[package]]
+name = "instability"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5eb2d60ef19920a3a9193c3e371f726ec1dafc045dac788d0fb3704272458971"
+dependencies = [
+ "darling",
+ "indoc",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+[[package]]
+name = "itoa"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+[[package]]
+name = "jobserver"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
+dependencies = [
+ "getrandom 0.3.4",
+ "libc",
+]
+[[package]]
+name = "js-sys"
+version = "0.3.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+[[package]]
+name = "kasuari"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bde5057d6143cc94e861d90f591b9303d6716c6b9602309150bd068853c10899"
+dependencies = [
+ "hashbrown 0.16.1",
+ "portable-atomic",
+ "thiserror 2.0.18",
+]
+[[package]]
+name = "lab"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf36173d4167ed999940f804952e6b08197cae5ad5d572eb4db150ce8ad5d58f"
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+[[package]]
+name = "leb128fmt"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
+[[package]]
+name = "libc"
+version = "0.2.183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
+[[package]]
+name = "libgit2-sys"
+version = "0.17.0+1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
+dependencies = [
+ "cc",
+ "libc",
+ "libssh2-sys",
+ "libz-sys",
+ "openssl-sys",
+ "pkg-config",
+]
+[[package]]
+name = "libssh2-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "220e4f05ad4a218192533b300327f5150e809b54c4ec83b5a1d91833601811b9"
+dependencies = [
+ "cc",
+ "libc",
+ "libz-sys",
+ "openssl-sys",
+ "pkg-config",
+ "vcpkg",
+]
+[[package]]
+name = "libz-sys"
+version = "1.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52f4c29e2a68ac30c9087e1b772dc9f44a2b66ed44edf2266cf2be9b03dafc1"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+[[package]]
+name = "line-clipping"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f4de44e98ddbf09375cbf4d17714d18f39195f4f4894e8524501726fd9a8a4a"
+dependencies = [
+ "bitflags 2.11.0",
+]
+[[package]]
+name = "linux-raw-sys"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
+[[package]]
+name = "litemap"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
+[[package]]
+name = "litrs"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+[[package]]
+name = "log"
+version = "0.4.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+[[package]]
+name = "lru"
+version = "0.16.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1dc47f592c06f33f8e3aea9591776ec7c9f9e4124778ff8a3c3b87159f7e593"
+dependencies = [
+ "hashbrown 0.16.1",
+]
+[[package]]
+name = "mac_address"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0aeb26bf5e836cc1c341c8106051b573f1766dfa05aa87f0b98be5e51b02303"
+dependencies = [
+ "nix",
+ "winapi",
+]
+[[package]]
+name = "memchr"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
+[[package]]
+name = "memmem"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15"
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+[[package]]
+name = "mio"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
+dependencies = [
+ "libc",
+ "log",
+ "wasi",
+ "windows-sys",
+]
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.11.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+ "memoffset",
+]
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+[[package]]
+name = "num-conv"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
+[[package]]
+name = "num-derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+[[package]]
+name = "num_threads"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
+dependencies = [
+ "libc",
+]
+[[package]]
+name = "once_cell"
+version = "1.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
+[[package]]
+name = "openssl-probe"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+[[package]]
+name = "openssl-sys"
+version = "0.9.112"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57d55af3b3e226502be1526dfdba67ab0e9c96fc293004e79576b2b9edb0dbdb"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+[[package]]
+name = "ordered-float"
+version = "4.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951"
+dependencies = [
+ "num-traits",
+]
+[[package]]
+name = "parking_lot"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+[[package]]
+name = "parking_lot_core"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-link",
+]
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+[[package]]
+name = "pest"
+version = "2.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0848c601009d37dfa3430c4666e147e49cdcf1b92ecd3e63657d8a5f19da662"
+dependencies = [
+ "memchr",
+ "ucd-trie",
+]
+[[package]]
+name = "pest_derive"
+version = "2.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11f486f1ea21e6c10ed15d5a7c77165d0ee443402f0780849d1768e7d9d6fe77"
+dependencies = [
+ "pest",
+ "pest_generator",
+]
+[[package]]
+name = "pest_generator"
+version = "2.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8040c4647b13b210a963c1ed407c1ff4fdfa01c31d6d2a098218702e6664f94f"
+dependencies = [
+ "pest",
+ "pest_meta",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+[[package]]
+name = "pest_meta"
+version = "2.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89815c69d36021a140146f26659a81d6c2afa33d216d736dd4be5381a7362220"
+dependencies = [
+ "pest",
+ "sha2",
+]
+[[package]]
+name = "phf"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+]
+[[package]]
+name = "phf_codegen"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+]
+[[package]]
+name = "phf_generator"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+[[package]]
+name = "phf_macros"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+[[package]]
+name = "phf_shared"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
+dependencies = [
+ "siphasher",
+]
+[[package]]
+name = "pkg-config"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+[[package]]
+name = "portable-atomic"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
+[[package]]
+name = "potential_utf"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
+dependencies = [
+ "zerovec",
+]
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.117",
+]
+[[package]]
+name = "proc-macro2"
+version = "1.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+dependencies = [
+ "unicode-ident",
+]
+[[package]]
+name = "quote"
+version = "1.0.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+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.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "rand_core",
+]
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+[[package]]
+name = "ratatui"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1ce67fb8ba4446454d1c8dbaeda0557ff5e94d39d5e5ed7f10a65eb4c8266bc"
+dependencies = [
+ "instability",
+ "ratatui-core",
+ "ratatui-crossterm",
+ "ratatui-macros",
+ "ratatui-termwiz",
+ "ratatui-widgets",
+]
+[[package]]
+name = "ratatui-core"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ef8dea09a92caaf73bff7adb70b76162e5937524058a7e5bff37869cbbec293"
+dependencies = [
+ "bitflags 2.11.0",
+ "compact_str",
+ "hashbrown 0.16.1",
+ "indoc",
+ "itertools",
+ "kasuari",
+ "lru",
+ "strum",
+ "thiserror 2.0.18",
+ "unicode-segmentation",
+ "unicode-truncate",
+ "unicode-width",
+]
+[[package]]
+name = "ratatui-crossterm"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "577c9b9f652b4c121fb25c6a391dd06406d3b092ba68827e6d2f09550edc54b3"
+dependencies = [
+ "cfg-if",
+ "crossterm",
+ "instability",
+ "ratatui-core",
+]
+[[package]]
+name = "ratatui-macros"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7f1342a13e83e4bb9d0b793d0ea762be633f9582048c892ae9041ef39c936f4"
+dependencies = [
+ "ratatui-core",
+ "ratatui-widgets",
+]
+[[package]]
+name = "ratatui-termwiz"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f76fe0bd0ed4295f0321b1676732e2454024c15a35d01904ddb315afd3d545c"
+dependencies = [
+ "ratatui-core",
+ "termwiz",
+]
+[[package]]
+name = "ratatui-widgets"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7dbfa023cd4e604c2553483820c5fe8aa9d71a42eea5aa77c6e7f35756612db"
+dependencies = [
+ "bitflags 2.11.0",
+ "hashbrown 0.16.1",
+ "indoc",
+ "instability",
+ "itertools",
+ "line-clipping",
+ "ratatui-core",
+ "strum",
+ "time",
+ "unicode-segmentation",
+ "unicode-width",
+]
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags 2.11.0",
+]
+[[package]]
+name = "regex"
+version = "1.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+[[package]]
+name = "regex-automata"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+[[package]]
+name = "regex-syntax"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+[[package]]
+name = "rustix"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
+dependencies = [
+ "bitflags 2.11.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+[[package]]
+name = "semver"
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+[[package]]
+name = "serde_json"
+version = "1.0.149"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
+dependencies = [
+ "itoa",
+ "memchr",
+ "serde",
+ "serde_core",
+ "zmij",
+]
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+[[package]]
+name = "signal-hook"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2"
+dependencies = [
+ "libc",
+ "signal-hook-registry",
+]
+[[package]]
+name = "signal-hook-mio"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b75a19a7a740b25bc7944bdee6172368f988763b744e3d4dfe753f6b4ece40cc"
+dependencies = [
+ "libc",
+ "mio",
+ "signal-hook",
+]
+[[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 = "siphasher"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e"
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+[[package]]
+name = "strum"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
+dependencies = [
+ "strum_macros",
+]
+[[package]]
+name = "strum_macros"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+[[package]]
+name = "syn"
+version = "2.0.117"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+[[package]]
+name = "tempfile"
+version = "3.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
+dependencies = [
+ "fastrand",
+ "getrandom 0.4.2",
+ "once_cell",
+ "rustix",
+ "windows-sys",
+]
+[[package]]
+name = "terminfo"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4ea810f0692f9f51b382fff5893887bb4580f5fa246fde546e0b13e7fcee662"
+dependencies = [
+ "fnv",
+ "nom",
+ "phf",
+ "phf_codegen",
+]
+[[package]]
+name = "termios"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b"
+dependencies = [
+ "libc",
+]
+[[package]]
+name = "termwiz"
+version = "0.23.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4676b37242ccbd1aabf56edb093a4827dc49086c0ffd764a5705899e0f35f8f7"
+dependencies = [
+ "anyhow",
+ "base64",
+ "bitflags 2.11.0",
+ "fancy-regex",
+ "filedescriptor",
+ "finl_unicode",
+ "fixedbitset",
+ "hex",
+ "lazy_static",
+ "libc",
+ "log",
+ "memmem",
+ "nix",
+ "num-derive",
+ "num-traits",
+ "ordered-float",
+ "pest",
+ "pest_derive",
+ "phf",
+ "sha2",
+ "signal-hook",
+ "siphasher",
+ "terminfo",
+ "termios",
+ "thiserror 1.0.69",
+ "ucd-trie",
+ "unicode-segmentation",
+ "vtparse",
+ "wezterm-bidi",
+ "wezterm-blob-leases",
+ "wezterm-color-types",
+ "wezterm-dynamic",
+ "wezterm-input-types",
+ "winapi",
+]
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+[[package]]
+name = "thiserror"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
+dependencies = [
+ "thiserror-impl 2.0.18",
+]
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+[[package]]
+name = "thiserror-impl"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+[[package]]
+name = "time"
+version = "0.3.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
+dependencies = [
+ "deranged",
+ "libc",
+ "num-conv",
+ "num_threads",
+ "powerfmt",
+ "serde_core",
+ "time-core",
+]
+[[package]]
+name = "time-core"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
+[[package]]
+name = "tinystr"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+[[package]]
+name = "typenum"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
+[[package]]
+name = "ucd-trie"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
+[[package]]
+name = "unicode-ident"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+[[package]]
+name = "unicode-segmentation"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+[[package]]
+name = "unicode-truncate"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16b380a1238663e5f8a691f9039c73e1cdae598a30e9855f541d29b08b53e9a5"
+dependencies = [
+ "itertools",
+ "unicode-segmentation",
+ "unicode-width",
+]
+[[package]]
+name = "unicode-width"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+[[package]]
+name = "uuid"
+version = "1.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a68d3c8f01c0cfa54a75291d83601161799e4a89a39e0929f4b0354d88757a37"
+dependencies = [
+ "atomic",
+ "getrandom 0.4.2",
+ "js-sys",
+ "wasm-bindgen",
+]
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+[[package]]
+name = "vtparse"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d9b2acfb050df409c972a37d3b8e08cdea3bddb0c09db9d53137e504cfabed0"
+dependencies = [
+ "utf8parse",
+]
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+[[package]]
+name = "wasip2"
+version = "1.0.2+wasi-0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+dependencies = [
+ "wit-bindgen",
+]
+[[package]]
+name = "wasip3"
+version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
+dependencies = [
+ "wit-bindgen",
+]
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.114"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.114"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.114"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3"
+dependencies = [
+ "bumpalo",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+ "wasm-bindgen-shared",
+]
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.114"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16"
+dependencies = [
+ "unicode-ident",
+]
+[[package]]
+name = "wasm-encoder"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
+dependencies = [
+ "leb128fmt",
+ "wasmparser",
+]
+[[package]]
+name = "wasm-metadata"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
+dependencies = [
+ "anyhow",
+ "indexmap",
+ "wasm-encoder",
+ "wasmparser",
+]
+[[package]]
+name = "wasmparser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
+dependencies = [
+ "bitflags 2.11.0",
+ "hashbrown 0.15.5",
+ "indexmap",
+ "semver",
+]
+[[package]]
+name = "wezterm-bidi"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c0a6e355560527dd2d1cf7890652f4f09bb3433b6aadade4c9b5ed76de5f3ec"
+dependencies = [
+ "log",
+ "wezterm-dynamic",
+]
+[[package]]
+name = "wezterm-blob-leases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "692daff6d93d94e29e4114544ef6d5c942a7ed998b37abdc19b17136ea428eb7"
+dependencies = [
+ "getrandom 0.3.4",
+ "mac_address",
+ "sha2",
+ "thiserror 1.0.69",
+ "uuid",
+]
+[[package]]
+name = "wezterm-color-types"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7de81ef35c9010270d63772bebef2f2d6d1f2d20a983d27505ac850b8c4b4296"
+dependencies = [
+ "csscolorparser",
+ "deltae",
+ "lazy_static",
+ "wezterm-dynamic",
+]
+[[package]]
+name = "wezterm-dynamic"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f2ab60e120fd6eaa68d9567f3226e876684639d22a4219b313ff69ec0ccd5ac"
+dependencies = [
+ "log",
+ "ordered-float",
+ "strsim",
+ "thiserror 1.0.69",
+ "wezterm-dynamic-derive",
+]
+[[package]]
+name = "wezterm-dynamic-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c0cf2d539c645b448eaffec9ec494b8b19bd5077d9e58cb1ae7efece8d575b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+[[package]]
+name = "wezterm-input-types"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7012add459f951456ec9d6c7e6fc340b1ce15d6fc9629f8c42853412c029e57e"
+dependencies = [
+ "bitflags 1.3.2",
+ "euclid",
+ "lazy_static",
+ "serde",
+ "wezterm-dynamic",
+]
+[[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-core"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
+[[package]]
+name = "windows-implement"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+[[package]]
+name = "windows-interface"
+version = "0.59.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+[[package]]
+name = "windows-result"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
+dependencies = [
+ "windows-link",
+]
+[[package]]
+name = "windows-strings"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
+dependencies = [
+ "windows-link",
+]
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+[[package]]
+name = "wit-bindgen"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+dependencies = [
+ "wit-bindgen-rust-macro",
+]
+[[package]]
+name = "wit-bindgen-core"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
+dependencies = [
+ "anyhow",
+ "heck",
+ "wit-parser",
+]
+[[package]]
+name = "wit-bindgen-rust"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
+dependencies = [
+ "anyhow",
+ "heck",
+ "indexmap",
+ "prettyplease",
+ "syn 2.0.117",
+ "wasm-metadata",
+ "wit-bindgen-core",
+ "wit-component",
+]
+[[package]]
+name = "wit-bindgen-rust-macro"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
+dependencies = [
+ "anyhow",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+ "wit-bindgen-core",
+ "wit-bindgen-rust",
+]
+[[package]]
+name = "wit-component"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+dependencies = [
+ "anyhow",
+ "bitflags 2.11.0",
+ "indexmap",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-encoder",
+ "wasm-metadata",
+ "wasmparser",
+ "wit-parser",
+]
+[[package]]
+name = "wit-parser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
+dependencies = [
+ "anyhow",
+ "id-arena",
+ "indexmap",
+ "log",
+ "semver",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "unicode-xid",
+ "wasmparser",
+]
+[[package]]
+name = "writeable"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
+[[package]]
+name = "yoke"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
+dependencies = [
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+[[package]]
+name = "yoke-derive"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+ "synstructure",
+]
+[[package]]
+name = "zerofrom"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+dependencies = [
+ "zerofrom-derive",
+]
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+ "synstructure",
+]
+[[package]]
+name = "zerotrie"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+[[package]]
+name = "zerovec"
+version = "0.11.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+[[package]]
+name = "zerovec-derive"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+[[package]]
+name = "zmij"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"

Cargo.toml

@@ @@ -0,0 +1,17 @@ @@
+[package]
+name = "git-collab"
+version = "0.1.0"
+edition = "2021"
+[dependencies]
+git2 = "0.19"
+clap = { version = "4", features = ["derive"] }
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+chrono = { version = "0.4", features = ["serde"] }
+thiserror = "2"
+ratatui = "0.30.0"
+crossterm = "0.29.0"
+[dev-dependencies]
+tempfile = "3"

Makefile

@@ @@ -0,0 +1,52 @@ @@
+CARGO   := cargo
+PROFILE ?= debug
+BIN     := git-collab
+PREFIX  ?= /usr/local
+# --- Building blocks ---
+.PHONY: fmt check clippy test build install clean
+fmt:
+	$(CARGO) fmt
+check:
+	$(CARGO) check
+clippy:
+	$(CARGO) clippy -- -D warnings
+test:
+	$(CARGO) test
+build:
+	$(CARGO) build $(if $(filter release,$(PROFILE)),--release,)
+# --- Composites ---
+.PHONY: lint ci
+lint: fmt check clippy
+ci: lint test build
+# --- Install ---
+install: PROFILE := release
+install: build
+	install -Dm755 target/release/$(BIN) $(PREFIX)/bin/$(BIN)
+uninstall:
+	rm -f $(PREFIX)/bin/$(BIN)
+clean:
+	$(CARGO) clean
+# --- Dev helpers ---
+.PHONY: run dev dashboard
+run:
+	$(CARGO) run -- $(ARGS)
+dev: fmt
+	$(CARGO) run -- $(ARGS)
+dashboard: fmt
+	$(CARGO) run -- dashboard

src/cli.rs

@@ @@ -0,0 +1,159 @@ @@
+use clap::{Parser, Subcommand};
+#[derive(Parser)]
+#[command(
+    name = "git-collab",
+    about = "Distributed issues and code review over Git"
+)]
+pub struct Cli {
+    #[command(subcommand)]
+    pub command: Commands,
+}
+#[derive(Subcommand)]
+pub enum Commands {
+    /// Initialize collab refspecs on all remotes
+    Init,
+    /// Manage issues
+    #[command(subcommand)]
+    Issue(IssueCmd),
+    /// Manage patches (code review)
+    #[command(subcommand)]
+    Patch(PatchCmd),
+    /// Interactive patch review dashboard
+    Dashboard,
+    /// Sync with a remote (fetch, reconcile, push)
+    Sync {
+        /// Remote name (default: origin)
+        #[arg(default_value = "origin")]
+        remote: String,
+    },
+}
+#[derive(Subcommand)]
+pub enum IssueCmd {
+    /// Open a new issue
+    Open {
+        /// Issue title
+        #[arg(short, long)]
+        title: String,
+        /// Issue body
+        #[arg(short, long, default_value = "")]
+        body: String,
+    },
+    /// List issues
+    List {
+        /// Show closed issues too
+        #[arg(short = 'a', long)]
+        all: bool,
+    },
+    /// Show issue details
+    Show {
+        /// Issue ID (prefix match)
+        id: String,
+    },
+    /// Comment on an issue
+    Comment {
+        /// Issue ID (prefix match)
+        id: String,
+        /// Comment body
+        #[arg(short, long)]
+        body: String,
+    },
+    /// Close an issue
+    Close {
+        /// Issue ID (prefix match)
+        id: String,
+        /// Reason for closing
+        #[arg(short, long)]
+        reason: Option<String>,
+    },
+    /// Reopen a closed issue
+    Reopen {
+        /// Issue ID (prefix match)
+        id: String,
+    },
+}
+#[derive(Subcommand)]
+pub enum PatchCmd {
+    /// Create a new patch for review
+    Create {
+        /// Patch title
+        #[arg(short, long)]
+        title: String,
+        /// Patch description
+        #[arg(short, long, default_value = "")]
+        body: String,
+        /// Base branch ref
+        #[arg(long, default_value = "main")]
+        base: String,
+        /// Head commit to review
+        #[arg(long)]
+        head: String,
+    },
+    /// List patches
+    List {
+        /// Show closed/merged patches too
+        #[arg(short = 'a', long)]
+        all: bool,
+    },
+    /// Show patch details
+    Show {
+        /// Patch ID (prefix match)
+        id: String,
+    },
+    /// Comment on a patch (use --file and --line for inline comments)
+    Comment {
+        /// Patch ID (prefix match)
+        id: String,
+        /// Comment body
+        #[arg(short, long)]
+        body: String,
+        /// File path for inline comment
+        #[arg(short, long)]
+        file: Option<String>,
+        /// Line number for inline comment
+        #[arg(short, long)]
+        line: Option<u32>,
+    },
+    /// Review a patch
+    Review {
+        /// Patch ID (prefix match)
+        id: String,
+        /// Verdict: approve, request-changes, comment
+        #[arg(short, long)]
+        verdict: String,
+        /// Review body
+        #[arg(short, long)]
+        body: String,
+    },
+    /// Revise a patch with a new head commit
+    Revise {
+        /// Patch ID (prefix match)
+        id: String,
+        /// New head commit
+        #[arg(long)]
+        head: String,
+        /// Updated description
+        #[arg(short, long)]
+        body: Option<String>,
+    },
+    /// Merge a patch into its base branch
+    Merge {
+        /// Patch ID (prefix match)
+        id: String,
+    },
+    /// Close a patch
+    Close {
+        /// Patch ID (prefix match)
+        id: String,
+        /// Reason for closing
+        #[arg(short, long)]
+        reason: Option<String>,
+    },
+}

src/dag.rs

@@ @@ -0,0 +1,147 @@ @@
+use git2::{Oid, Repository, Sort};
+use crate::error::Error;
+use crate::event::{Action, Event};
+use crate::identity::author_signature;
+/// Create an orphan commit (no parents) with the given event.
+/// Returns the new commit OID which also serves as the entity ID.
+pub fn create_root_event(repo: &Repository, event: &Event) -> Result<Oid, Error> {
+    let json = serde_json::to_vec_pretty(event)?;
+    let blob_oid = repo.blob(&json)?;
+    let mut tb = repo.treebuilder(None)?;
+    tb.insert("event.json", blob_oid, 0o100644)?;
+    let tree_oid = tb.write()?;
+    let tree = repo.find_tree(tree_oid)?;
+    let sig = author_signature(&event.author)?;
+    let message = commit_message(&event.action);
+    let oid = repo.commit(None, &sig, &sig, &message, &tree, &[])?;
+    Ok(oid)
+}
+/// Append an event to an existing DAG. The current tip is the parent.
+pub fn append_event(repo: &Repository, ref_name: &str, event: &Event) -> Result<Oid, Error> {
+    let json = serde_json::to_vec_pretty(event)?;
+    let blob_oid = repo.blob(&json)?;
+    let mut tb = repo.treebuilder(None)?;
+    tb.insert("event.json", blob_oid, 0o100644)?;
+    let tree_oid = tb.write()?;
+    let tree = repo.find_tree(tree_oid)?;
+    let sig = author_signature(&event.author)?;
+    let message = commit_message(&event.action);
+    let parent_oid = repo.refname_to_id(ref_name)?;
+    let parent = repo.find_commit(parent_oid)?;
+    let oid = repo.commit(Some(ref_name), &sig, &sig, &message, &tree, &[&parent])?;
+    Ok(oid)
+}
+/// Walk the DAG from the given ref in topological order (oldest first).
+/// Returns (commit_oid, event) pairs.
+pub fn walk_events(repo: &Repository, ref_name: &str) -> Result<Vec<(Oid, Event)>, Error> {
+    let tip = repo.refname_to_id(ref_name)?;
+    let mut revwalk = repo.revwalk()?;
+    revwalk.set_sorting(Sort::TOPOLOGICAL | Sort::REVERSE)?;
+    revwalk.push(tip)?;
+    let mut events = Vec::new();
+    for oid_result in revwalk {
+        let oid = oid_result?;
+        let commit = repo.find_commit(oid)?;
+        let tree = commit.tree()?;
+        let entry = tree
+            .get_name("event.json")
+            .ok_or_else(|| git2::Error::from_str("missing event.json in commit tree"))?;
+        let blob = repo.find_blob(entry.id())?;
+        let event: Event = serde_json::from_slice(blob.content())?;
+        events.push((oid, event));
+    }
+    Ok(events)
+}
+/// Reconcile a local ref with a remote ref. Returns the final tip OID.
+///
+/// - If they're the same: no-op
+/// - If remote is ancestor of local: local is ahead, no-op
+/// - If local is ancestor of remote: fast-forward
+/// - Otherwise: create a merge commit
+pub fn reconcile(
+    repo: &Repository,
+    local_ref: &str,
+    remote_ref: &str,
+    merge_author: &crate::event::Author,
+) -> Result<Oid, Error> {
+    let local_oid = repo.refname_to_id(local_ref)?;
+    let remote_oid = repo.refname_to_id(remote_ref)?;
+    if local_oid == remote_oid {
+        return Ok(local_oid);
+    }
+    let merge_base = repo.merge_base(local_oid, remote_oid)?;
+    if merge_base == remote_oid {
+        // Remote is ancestor of local — local is ahead
+        return Ok(local_oid);
+    }
+    if merge_base == local_oid {
+        // Local is ancestor of remote — fast-forward
+        repo.reference(local_ref, remote_oid, true, "fast-forward reconcile")?;
+        return Ok(remote_oid);
+    }
+    // True fork — create merge commit
+    let merge_event = Event {
+        timestamp: chrono::Utc::now().to_rfc3339(),
+        author: merge_author.clone(),
+        action: Action::Merge,
+    };
+    let json = serde_json::to_vec_pretty(&merge_event)?;
+    let blob_oid = repo.blob(&json)?;
+    let mut tb = repo.treebuilder(None)?;
+    tb.insert("event.json", blob_oid, 0o100644)?;
+    let tree_oid = tb.write()?;
+    let tree = repo.find_tree(tree_oid)?;
+    let sig = author_signature(merge_author)?;
+    let local_commit = repo.find_commit(local_oid)?;
+    let remote_commit = repo.find_commit(remote_oid)?;
+    let oid = repo.commit(
+        Some(local_ref),
+        &sig,
+        &sig,
+        "collab: reconcile merge",
+        &tree,
+        &[&local_commit, &remote_commit],
+    )?;
+    Ok(oid)
+}
+fn commit_message(action: &Action) -> String {
+    match action {
+        Action::IssueOpen { title, .. } => format!("issue: open \"{}\"", title),
+        Action::IssueComment { .. } => "issue: comment".to_string(),
+        Action::IssueClose { .. } => "issue: close".to_string(),
+        Action::IssueReopen => "issue: reopen".to_string(),
+        Action::PatchCreate { title, .. } => format!("patch: create \"{}\"", title),
+        Action::PatchRevise { .. } => "patch: revise".to_string(),
+        Action::PatchReview { verdict, .. } => format!("patch: review ({:?})", verdict),
+        Action::PatchComment { .. } => "patch: comment".to_string(),
+        Action::PatchInlineComment { ref file, line, .. } => {
+            format!("patch: inline comment on {}:{}", file, line)
+        }
+        Action::PatchClose { .. } => "patch: close".to_string(),
+        Action::PatchMerge => "patch: merge".to_string(),
+        Action::Merge => "collab: merge".to_string(),
+    }
+}

src/error.rs

@@ @@ -0,0 +1,16 @@ @@
+use thiserror::Error;
+#[derive(Debug, Error)]
+pub enum Error {
+    #[error(transparent)]
+    Git(#[from] git2::Error),
+    #[error(transparent)]
+    Json(#[from] serde_json::Error),
+    #[error("{0}")]
+    Cmd(String),
+    #[error(transparent)]
+    Io(#[from] std::io::Error),
+}

src/event.rs

@@ @@ -0,0 +1,64 @@ @@
+use serde::{Deserialize, Serialize};
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Author {
+    pub name: String,
+    pub email: String,
+}
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Event {
+    pub timestamp: String,
+    pub author: Author,
+    pub action: Action,
+}
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(tag = "type")]
+pub enum Action {
+    IssueOpen {
+        title: String,
+        body: String,
+    },
+    IssueComment {
+        body: String,
+    },
+    IssueClose {
+        reason: Option<String>,
+    },
+    IssueReopen,
+    PatchCreate {
+        title: String,
+        body: String,
+        base_ref: String,
+        head_commit: String,
+    },
+    PatchRevise {
+        body: Option<String>,
+        head_commit: String,
+    },
+    PatchReview {
+        verdict: ReviewVerdict,
+        body: String,
+    },
+    PatchComment {
+        body: String,
+    },
+    PatchInlineComment {
+        file: String,
+        line: u32,
+        body: String,
+    },
+    PatchClose {
+        reason: Option<String>,
+    },
+    PatchMerge,
+    Merge,
+}
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub enum ReviewVerdict {
+    Approve,
+    RequestChanges,
+    Comment,
+}

src/identity.rs

@@ @@ -0,0 +1,14 @@ @@
+use git2::Repository;
+use crate::event::Author;
+pub fn get_author(repo: &Repository) -> Result<Author, git2::Error> {
+    let config = repo.config()?;
+    let name = config.get_string("user.name")?;
+    let email = config.get_string("user.email")?;
+    Ok(Author { name, email })
+}
+pub fn author_signature(author: &Author) -> Result<git2::Signature<'static>, git2::Error> {
+    git2::Signature::now(&author.name, &author.email)
+}

src/issue.rs

@@ @@ -0,0 +1,122 @@ @@
+use git2::Repository;
+use crate::dag;
+use crate::event::{Action, Event};
+use crate::identity::get_author;
+use crate::state::{self, IssueStatus};
+pub fn open(repo: &Repository, title: &str, body: &str) -> Result<String, crate::error::Error> {
+    let author = get_author(repo)?;
+    let event = Event {
+        timestamp: chrono::Utc::now().to_rfc3339(),
+        author,
+        action: Action::IssueOpen {
+            title: title.to_string(),
+            body: body.to_string(),
+        },
+    };
+    let oid = dag::create_root_event(repo, &event)?;
+    let id = oid.to_string();
+    let ref_name = format!("refs/collab/issues/{}", id);
+    repo.reference(&ref_name, oid, false, "issue open")?;
+    Ok(id)
+}
+pub fn list(repo: &Repository, show_closed: bool) -> Result<(), crate::error::Error> {
+    let issues = state::list_issues(repo)?;
+    let filtered: Vec<_> = issues
+        .iter()
+        .filter(|i| show_closed || i.status == IssueStatus::Open)
+        .collect();
+    if filtered.is_empty() {
+        println!("No issues found.");
+        return Ok(());
+    }
+    for issue in &filtered {
+        let status = match issue.status {
+            IssueStatus::Open => "open",
+            IssueStatus::Closed => "closed",
+        };
+        println!(
+            "{:.8}  {:6}  {}  (by {})",
+            issue.id, status, issue.title, issue.author.name
+        );
+    }
+    Ok(())
+}
+pub fn show(repo: &Repository, id_prefix: &str) -> Result<(), crate::error::Error> {
+    let (ref_name, id) = state::resolve_issue_ref(repo, id_prefix)?;
+    let issue = state::IssueState::from_ref(repo, &ref_name, &id)?;
+    let status = match issue.status {
+        IssueStatus::Open => "open",
+        IssueStatus::Closed => "closed",
+    };
+    println!("Issue {} [{}]", &issue.id[..8], status);
+    println!("Title: {}", issue.title);
+    println!("Author: {} <{}>", issue.author.name, issue.author.email);
+    println!("Created: {}", issue.created_at);
+    if let Some(ref reason) = issue.close_reason {
+        println!("Closed:  {}", reason);
+    }
+    if !issue.body.is_empty() {
+        println!("\n{}", issue.body);
+    }
+    if !issue.comments.is_empty() {
+        println!("\n--- Comments ---");
+        for c in &issue.comments {
+            println!("\n{} ({}):\n{}", c.author.name, c.timestamp, c.body);
+        }
+    }
+    Ok(())
+}
+pub fn comment(repo: &Repository, id_prefix: &str, body: &str) -> Result<(), crate::error::Error> {
+    let (ref_name, _id) = state::resolve_issue_ref(repo, id_prefix)?;
+    let author = get_author(repo)?;
+    let event = Event {
+        timestamp: chrono::Utc::now().to_rfc3339(),
+        author,
+        action: Action::IssueComment {
+            body: body.to_string(),
+        },
+    };
+    dag::append_event(repo, &ref_name, &event)?;
+    println!("Comment added.");
+    Ok(())
+}
+pub fn close(
+    repo: &Repository,
+    id_prefix: &str,
+    reason: Option<&str>,
+) -> Result<(), crate::error::Error> {
+    let (ref_name, _id) = state::resolve_issue_ref(repo, id_prefix)?;
+    let author = get_author(repo)?;
+    let event = Event {
+        timestamp: chrono::Utc::now().to_rfc3339(),
+        author,
+        action: Action::IssueClose {
+            reason: reason.map(|s| s.to_string()),
+        },
+    };
+    dag::append_event(repo, &ref_name, &event)?;
+    println!("Issue closed.");
+    Ok(())
+}
+pub fn reopen(repo: &Repository, id_prefix: &str) -> Result<(), crate::error::Error> {
+    let (ref_name, _id) = state::resolve_issue_ref(repo, id_prefix)?;
+    let author = get_author(repo)?;
+    let event = Event {
+        timestamp: chrono::Utc::now().to_rfc3339(),
+        author,
+        action: Action::IssueReopen,
+    };
+    dag::append_event(repo, &ref_name, &event)?;
+    println!("Issue reopened.");
+    Ok(())
+}

src/lib.rs

@@ @@ -0,0 +1,10 @@ @@
+pub mod cli;
+pub mod dag;
+pub mod error;
+pub mod event;
+pub mod identity;
+pub mod issue;
+pub mod patch;
+pub mod state;
+pub mod sync;
+pub mod tui;

src/main.rs

@@ @@ -0,0 +1,86 @@ @@
+mod cli;
+mod dag;
+mod error;
+mod event;
+mod identity;
+mod issue;
+mod patch;
+mod state;
+mod sync;
+mod tui;
+use clap::Parser;
+use cli::{Cli, Commands, IssueCmd, PatchCmd};
+use event::ReviewVerdict;
+use git2::Repository;
+fn main() {
+    let cli = Cli::parse();
+    let result = run(cli);
+    if let Err(e) = result {
+        eprintln!("error: {}", e);
+        std::process::exit(1);
+    }
+}
+fn run(cli: Cli) -> Result<(), error::Error> {
+    let repo = Repository::open_from_env()?;
+    match cli.command {
+        Commands::Init => sync::init(&repo),
+        Commands::Issue(cmd) => match cmd {
+            IssueCmd::Open { title, body } => {
+                let id = issue::open(&repo, &title, &body)?;
+                println!("Opened issue {:.8}", id);
+                Ok(())
+            }
+            IssueCmd::List { all } => issue::list(&repo, all),
+            IssueCmd::Show { id } => issue::show(&repo, &id),
+            IssueCmd::Comment { id, body } => issue::comment(&repo, &id, &body),
+            IssueCmd::Close { id, reason } => issue::close(&repo, &id, reason.as_deref()),
+            IssueCmd::Reopen { id } => issue::reopen(&repo, &id),
+        },
+        Commands::Patch(cmd) => match cmd {
+            PatchCmd::Create {
+                title,
+                body,
+                base,
+                head,
+            } => {
+                let id = patch::create(&repo, &title, &body, &base, &head)?;
+                println!("Created patch {:.8}", id);
+                Ok(())
+            }
+            PatchCmd::List { all } => patch::list(&repo, all),
+            PatchCmd::Show { id } => patch::show(&repo, &id),
+            PatchCmd::Comment {
+                id,
+                body,
+                file,
+                line,
+            } => patch::comment(&repo, &id, &body, file.as_deref(), line),
+            PatchCmd::Review { id, verdict, body } => {
+                let v = match verdict.as_str() {
+                    "approve" => ReviewVerdict::Approve,
+                    "request-changes" => ReviewVerdict::RequestChanges,
+                    "comment" => ReviewVerdict::Comment,
+                    _ => {
+                        return Err(git2::Error::from_str(
+                            "verdict must be: approve, request-changes, or comment",
+                        )
+                        .into());
+                    }
+                };
+                patch::review(&repo, &id, v, &body)
+            }
+            PatchCmd::Revise { id, head, body } => {
+                patch::revise(&repo, &id, &head, body.as_deref())
+            }
+            PatchCmd::Merge { id } => patch::merge(&repo, &id),
+            PatchCmd::Close { id, reason } => patch::close(&repo, &id, reason.as_deref()),
+        },
+        Commands::Dashboard => tui::run(&repo),
+        Commands::Sync { remote } => sync::sync(&repo, &remote),
+    }
+}

src/patch.rs

@@ @@ -0,0 +1,265 @@ @@
+use git2::Repository;
+use crate::dag;
+use crate::event::{Action, Event, ReviewVerdict};
+use crate::identity::get_author;
+use crate::state::{self, PatchStatus};
+pub fn create(
+    repo: &Repository,
+    title: &str,
+    body: &str,
+    base_ref: &str,
+    head_commit: &str,
+) -> Result<String, crate::error::Error> {
+    let author = get_author(repo)?;
+    let event = Event {
+        timestamp: chrono::Utc::now().to_rfc3339(),
+        author,
+        action: Action::PatchCreate {
+            title: title.to_string(),
+            body: body.to_string(),
+            base_ref: base_ref.to_string(),
+            head_commit: head_commit.to_string(),
+        },
+    };
+    let oid = dag::create_root_event(repo, &event)?;
+    let id = oid.to_string();
+    let ref_name = format!("refs/collab/patches/{}", id);
+    repo.reference(&ref_name, oid, false, "patch create")?;
+    Ok(id)
+}
+pub fn list(repo: &Repository, show_closed: bool) -> Result<(), crate::error::Error> {
+    let patches = state::list_patches(repo)?;
+    let filtered: Vec<_> = patches
+        .iter()
+        .filter(|p| show_closed || p.status == PatchStatus::Open)
+        .collect();
+    if filtered.is_empty() {
+        println!("No patches found.");
+        return Ok(());
+    }
+    for p in &filtered {
+        let status = match p.status {
+            PatchStatus::Open => "open",
+            PatchStatus::Closed => "closed",
+            PatchStatus::Merged => "merged",
+        };
+        println!(
+            "{:.8}  {:6}  {}  (by {})",
+            p.id, status, p.title, p.author.name
+        );
+    }
+    Ok(())
+}
+pub fn show(repo: &Repository, id_prefix: &str) -> Result<(), crate::error::Error> {
+    let (ref_name, id) = state::resolve_patch_ref(repo, id_prefix)?;
+    let p = state::PatchState::from_ref(repo, &ref_name, &id)?;
+    let status = match p.status {
+        PatchStatus::Open => "open",
+        PatchStatus::Closed => "closed",
+        PatchStatus::Merged => "merged",
+    };
+    println!("Patch {} [{}]", &p.id[..8], status);
+    println!("Title: {}", p.title);
+    println!("Author: {} <{}>", p.author.name, p.author.email);
+    println!("Base: {}  Head: {:.8}", p.base_ref, p.head_commit);
+    println!("Created: {}", p.created_at);
+    if !p.body.is_empty() {
+        println!("\n{}", p.body);
+    }
+    if !p.reviews.is_empty() {
+        println!("\n--- Reviews ---");
+        for r in &p.reviews {
+            println!(
+                "\n{} ({:?}) - {}:\n{}",
+                r.author.name, r.verdict, r.timestamp, r.body
+            );
+        }
+    }
+    if !p.inline_comments.is_empty() {
+        println!("\n--- Inline Comments ---");
+        for c in &p.inline_comments {
+            println!(
+                "\n{} on {}:{} ({}):\n  {}",
+                c.author.name, c.file, c.line, c.timestamp, c.body
+            );
+        }
+    }
+    if !p.comments.is_empty() {
+        println!("\n--- Comments ---");
+        for c in &p.comments {
+            println!("\n{} ({}):\n{}", c.author.name, c.timestamp, c.body);
+        }
+    }
+    Ok(())
+}
+pub fn comment(
+    repo: &Repository,
+    id_prefix: &str,
+    body: &str,
+    file: Option<&str>,
+    line: Option<u32>,
+) -> Result<(), crate::error::Error> {
+    let (ref_name, _id) = state::resolve_patch_ref(repo, id_prefix)?;
+    let author = get_author(repo)?;
+    let action = match (file, line) {
+        (Some(f), Some(l)) => Action::PatchInlineComment {
+            file: f.to_string(),
+            line: l,
+            body: body.to_string(),
+        },
+        (Some(_), None) | (None, Some(_)) => {
+            return Err(git2::Error::from_str(
+                "--file and --line must both be provided for inline comments",
+            )
+            .into());
+        }
+        (None, None) => Action::PatchComment {
+            body: body.to_string(),
+        },
+    };
+    let event = Event {
+        timestamp: chrono::Utc::now().to_rfc3339(),
+        author,
+        action,
+    };
+    dag::append_event(repo, &ref_name, &event)?;
+    println!("Comment added.");
+    Ok(())
+}
+pub fn review(
+    repo: &Repository,
+    id_prefix: &str,
+    verdict: ReviewVerdict,
+    body: &str,
+) -> Result<(), crate::error::Error> {
+    let (ref_name, _id) = state::resolve_patch_ref(repo, id_prefix)?;
+    let author = get_author(repo)?;
+    let event = Event {
+        timestamp: chrono::Utc::now().to_rfc3339(),
+        author,
+        action: Action::PatchReview {
+            verdict,
+            body: body.to_string(),
+        },
+    };
+    dag::append_event(repo, &ref_name, &event)?;
+    println!("Review submitted.");
+    Ok(())
+}
+pub fn revise(
+    repo: &Repository,
+    id_prefix: &str,
+    head_commit: &str,
+    body: Option<&str>,
+) -> Result<(), crate::error::Error> {
+    let (ref_name, _id) = state::resolve_patch_ref(repo, id_prefix)?;
+    let author = get_author(repo)?;
+    let event = Event {
+        timestamp: chrono::Utc::now().to_rfc3339(),
+        author,
+        action: Action::PatchRevise {
+            body: body.map(|s| s.to_string()),
+            head_commit: head_commit.to_string(),
+        },
+    };
+    dag::append_event(repo, &ref_name, &event)?;
+    println!("Patch revised.");
+    Ok(())
+}
+pub fn merge(repo: &Repository, id_prefix: &str) -> Result<(), crate::error::Error> {
+    let (ref_name, id) = state::resolve_patch_ref(repo, id_prefix)?;
+    let p = state::PatchState::from_ref(repo, &ref_name, &id)?;
+    if p.status != PatchStatus::Open {
+        return Err(git2::Error::from_str(&format!(
+            "patch is {:?}, can only merge open patches",
+            p.status
+        ))
+        .into());
+    }
+    // Resolve the head commit (supports short OIDs via revparse)
+    let head_obj = repo
+        .revparse_single(&p.head_commit)
+        .map_err(|_| git2::Error::from_str("cannot resolve head commit in patch"))?;
+    let head_commit = head_obj
+        .into_commit()
+        .map_err(|_| git2::Error::from_str("head ref is not a commit"))?;
+    let base_ref = format!("refs/heads/{}", p.base_ref);
+    let base_oid = repo.refname_to_id(&base_ref)?;
+    // Fast-forward: the base must be an ancestor of head
+    let head_oid = head_commit.id();
+    if repo.graph_descendant_of(head_oid, base_oid)? {
+        repo.reference(&base_ref, head_oid, true, "collab: merge patch")?;
+    } else if head_oid == base_oid {
+        // Already at the same point, nothing to do
+    } else {
+        // Not a fast-forward — create a merge commit on the base branch
+        let base_commit = repo.find_commit(base_oid)?;
+        let author = get_author(repo)?;
+        let sig = crate::identity::author_signature(&author)?;
+        let mut index = repo.merge_commits(&base_commit, &head_commit, None)?;
+        if index.has_conflicts() {
+            return Err(git2::Error::from_str(
+                "merge has conflicts; resolve manually then revise the patch",
+            )
+            .into());
+        }
+        let tree_oid = index.write_tree_to(repo)?;
+        let tree = repo.find_tree(tree_oid)?;
+        let msg = format!("Merge patch {:.8}: {}", id, p.title);
+        repo.commit(
+            Some(&base_ref),
+            &sig,
+            &sig,
+            &msg,
+            &tree,
+            &[&base_commit, &head_commit],
+        )?;
+    }
+    // Record the merge event in the patch DAG
+    let author = get_author(repo)?;
+    let event = Event {
+        timestamp: chrono::Utc::now().to_rfc3339(),
+        author,
+        action: Action::PatchMerge,
+    };
+    dag::append_event(repo, &ref_name, &event)?;
+    println!("Patch {:.8} merged into {}.", id, p.base_ref);
+    Ok(())
+}
+pub fn close(
+    repo: &Repository,
+    id_prefix: &str,
+    reason: Option<&str>,
+) -> Result<(), crate::error::Error> {
+    let (ref_name, _id) = state::resolve_patch_ref(repo, id_prefix)?;
+    let author = get_author(repo)?;
+    let event = Event {
+        timestamp: chrono::Utc::now().to_rfc3339(),
+        author,
+        action: Action::PatchClose {
+            reason: reason.map(|s| s.to_string()),
+        },
+    };
+    dag::append_event(repo, &ref_name, &event)?;
+    println!("Patch closed.");
+    Ok(())
+}

src/state.rs

@@ @@ -0,0 +1,330 @@ @@
+use git2::{Oid, Repository};
+use crate::dag;
+use crate::event::{Action, Author, ReviewVerdict};
+#[derive(Debug, Clone, PartialEq)]
+pub enum IssueStatus {
+    Open,
+    Closed,
+}
+#[derive(Debug, Clone)]
+#[allow(dead_code)]
+pub struct Comment {
+    pub author: Author,
+    pub body: String,
+    pub timestamp: String,
+    pub commit_id: Oid,
+}
+#[derive(Debug, Clone)]
+pub struct IssueState {
+    pub id: String,
+    pub title: String,
+    pub body: String,
+    pub status: IssueStatus,
+    pub close_reason: Option<String>,
+    pub comments: Vec<Comment>,
+    pub created_at: String,
+    pub author: Author,
+}
+#[derive(Debug, Clone)]
+pub struct Review {
+    pub author: Author,
+    pub verdict: ReviewVerdict,
+    pub body: String,
+    pub timestamp: String,
+}
+#[derive(Debug, Clone, PartialEq)]
+#[allow(dead_code)]
+pub enum PatchStatus {
+    Open,
+    Closed,
+    Merged,
+}
+#[derive(Debug, Clone)]
+pub struct InlineComment {
+    pub author: Author,
+    pub file: String,
+    pub line: u32,
+    pub body: String,
+    pub timestamp: String,
+}
+#[derive(Debug, Clone)]
+pub struct PatchState {
+    pub id: String,
+    pub title: String,
+    pub body: String,
+    pub status: PatchStatus,
+    pub base_ref: String,
+    pub head_commit: String,
+    pub comments: Vec<Comment>,
+    pub inline_comments: Vec<InlineComment>,
+    pub reviews: Vec<Review>,
+    pub created_at: String,
+    pub author: Author,
+}
+impl IssueState {
+    pub fn from_ref(
+        repo: &Repository,
+        ref_name: &str,
+        id: &str,
+    ) -> Result<Self, crate::error::Error> {
+        let events = dag::walk_events(repo, ref_name)?;
+        let mut state: Option<IssueState> = None;
+        // Track the timestamp of the latest status-changing event so that
+        // concurrent close/reopen conflicts resolve deterministically:
+        // the event with the later timestamp wins.
+        let mut status_ts: Option<String> = None;
+        for (oid, event) in events {
+            match event.action {
+                Action::IssueOpen { title, body } => {
+                    state = Some(IssueState {
+                        id: id.to_string(),
+                        title,
+                        body,
+                        status: IssueStatus::Open,
+                        close_reason: None,
+                        comments: Vec::new(),
+                        created_at: event.timestamp.clone(),
+                        author: event.author.clone(),
+                    });
+                }
+                Action::IssueComment { body } => {
+                    if let Some(ref mut s) = state {
+                        s.comments.push(Comment {
+                            author: event.author.clone(),
+                            body,
+                            timestamp: event.timestamp.clone(),
+                            commit_id: oid,
+                        });
+                    }
+                }
+                Action::IssueClose { reason } => {
+                    if let Some(ref mut s) = state {
+                        if status_ts.as_ref().is_none_or(|ts| event.timestamp >= *ts) {
+                            s.status = IssueStatus::Closed;
+                            s.close_reason = reason;
+                            status_ts = Some(event.timestamp.clone());
+                        }
+                    }
+                }
+                Action::IssueReopen => {
+                    if let Some(ref mut s) = state {
+                        if status_ts.as_ref().is_none_or(|ts| event.timestamp >= *ts) {
+                            s.status = IssueStatus::Open;
+                            status_ts = Some(event.timestamp.clone());
+                        }
+                    }
+                }
+                Action::Merge => {}
+                _ => {}
+            }
+        }
+        state.ok_or_else(|| git2::Error::from_str("no IssueOpen event found in DAG").into())
+    }
+}
+impl PatchState {
+    pub fn from_ref(
+        repo: &Repository,
+        ref_name: &str,
+        id: &str,
+    ) -> Result<Self, crate::error::Error> {
+        let events = dag::walk_events(repo, ref_name)?;
+        let mut state: Option<PatchState> = None;
+        let mut status_ts: Option<String> = None;
+        for (oid, event) in events {
+            match event.action {
+                Action::PatchCreate {
+                    title,
+                    body,
+                    base_ref,
+                    head_commit,
+                } => {
+                    state = Some(PatchState {
+                        id: id.to_string(),
+                        title,
+                        body,
+                        status: PatchStatus::Open,
+                        base_ref,
+                        head_commit,
+                        comments: Vec::new(),
+                        inline_comments: Vec::new(),
+                        reviews: Vec::new(),
+                        created_at: event.timestamp.clone(),
+                        author: event.author.clone(),
+                    });
+                }
+                Action::PatchRevise { body, head_commit } => {
+                    if let Some(ref mut s) = state {
+                        s.head_commit = head_commit;
+                        if let Some(b) = body {
+                            s.body = b;
+                        }
+                    }
+                }
+                Action::PatchReview { verdict, body } => {
+                    if let Some(ref mut s) = state {
+                        s.reviews.push(Review {
+                            author: event.author.clone(),
+                            verdict,
+                            body,
+                            timestamp: event.timestamp.clone(),
+                        });
+                    }
+                }
+                Action::PatchComment { body } => {
+                    if let Some(ref mut s) = state {
+                        s.comments.push(Comment {
+                            author: event.author.clone(),
+                            body,
+                            timestamp: event.timestamp.clone(),
+                            commit_id: oid,
+                        });
+                    }
+                }
+                Action::PatchInlineComment { file, line, body } => {
+                    if let Some(ref mut s) = state {
+                        s.inline_comments.push(InlineComment {
+                            author: event.author.clone(),
+                            file,
+                            line,
+                            body,
+                            timestamp: event.timestamp.clone(),
+                        });
+                    }
+                }
+                Action::PatchClose { .. } => {
+                    if let Some(ref mut s) = state {
+                        if status_ts.as_ref().is_none_or(|ts| event.timestamp >= *ts) {
+                            s.status = PatchStatus::Closed;
+                            status_ts = Some(event.timestamp.clone());
+                        }
+                    }
+                }
+                Action::PatchMerge => {
+                    if let Some(ref mut s) = state {
+                        if status_ts.as_ref().is_none_or(|ts| event.timestamp >= *ts) {
+                            s.status = PatchStatus::Merged;
+                            status_ts = Some(event.timestamp.clone());
+                        }
+                    }
+                }
+                Action::Merge => {}
+                _ => {}
+            }
+        }
+        state.ok_or_else(|| git2::Error::from_str("no PatchCreate event found in DAG").into())
+    }
+}
+/// List all issue refs and return their materialized state.
+pub fn list_issues(repo: &Repository) -> Result<Vec<IssueState>, crate::error::Error> {
+    let mut issues = Vec::new();
+    let refs = repo.references_glob("refs/collab/issues/*")?;
+    for r in refs {
+        let r = r?;
+        let ref_name = r.name().unwrap_or_default().to_string();
+        let id = ref_name
+            .strip_prefix("refs/collab/issues/")
+            .unwrap_or_default()
+            .to_string();
+        match IssueState::from_ref(repo, &ref_name, &id) {
+            Ok(state) => issues.push(state),
+            Err(_) => continue,
+        }
+    }
+    Ok(issues)
+}
+/// List all patch refs and return their materialized state.
+pub fn list_patches(repo: &Repository) -> Result<Vec<PatchState>, crate::error::Error> {
+    let mut patches = Vec::new();
+    let refs = repo.references_glob("refs/collab/patches/*")?;
+    for r in refs {
+        let r = r?;
+        let ref_name = r.name().unwrap_or_default().to_string();
+        let id = ref_name
+            .strip_prefix("refs/collab/patches/")
+            .unwrap_or_default()
+            .to_string();
+        match PatchState::from_ref(repo, &ref_name, &id) {
+            Ok(state) => patches.push(state),
+            Err(_) => continue,
+        }
+    }
+    Ok(patches)
+}
+/// Resolve a short ID prefix to the full ref name. Returns (ref_name, id).
+pub fn resolve_issue_ref(
+    repo: &Repository,
+    prefix: &str,
+) -> Result<(String, String), crate::error::Error> {
+    let refs = repo.references_glob("refs/collab/issues/*")?;
+    let mut matches = Vec::new();
+    for r in refs {
+        let r = r?;
+        let ref_name = r.name().unwrap_or_default().to_string();
+        let id = ref_name
+            .strip_prefix("refs/collab/issues/")
+            .unwrap_or_default()
+            .to_string();
+        if id.starts_with(prefix) {
+            matches.push((ref_name, id));
+        }
+    }
+    match matches.len() {
+=> Err(git2::Error::from_str(&format!("no issue found matching '{}'", prefix)).into()),
+=> Ok(matches.into_iter().next().unwrap()),
+        _ => Err(git2::Error::from_str(&format!(
+            "ambiguous issue prefix '{}': {} matches",
+            prefix,
+            matches.len()
+        ))
+        .into()),
+    }
+}
+/// Resolve a short ID prefix to the full patch ref name.
+pub fn resolve_patch_ref(
+    repo: &Repository,
+    prefix: &str,
+) -> Result<(String, String), crate::error::Error> {
+    let refs = repo.references_glob("refs/collab/patches/*")?;
+    let mut matches = Vec::new();
+    for r in refs {
+        let r = r?;
+        let ref_name = r.name().unwrap_or_default().to_string();
+        let id = ref_name
+            .strip_prefix("refs/collab/patches/")
+            .unwrap_or_default()
+            .to_string();
+        if id.starts_with(prefix) {
+            matches.push((ref_name, id));
+        }
+    }
+    match matches.len() {
+=> Err(git2::Error::from_str(&format!("no patch found matching '{}'", prefix)).into()),
+=> Ok(matches.into_iter().next().unwrap()),
+        _ => Err(git2::Error::from_str(&format!(
+            "ambiguous patch prefix '{}': {} matches",
+            prefix,
+            matches.len()
+        ))
+        .into()),
+    }
+}

src/sync.rs

@@ @@ -0,0 +1,139 @@ @@
+use std::process::Command;
+use git2::Repository;
+use crate::dag;
+use crate::error::Error;
+use crate::identity::get_author;
+/// Add collab refspecs to all remotes.
+pub fn init(repo: &Repository) -> Result<(), Error> {
+    let remotes = repo.remotes()?;
+    if remotes.is_empty() {
+        println!("No remotes configured.");
+        return Ok(());
+    }
+    for remote_name in remotes.iter().flatten() {
+        let fetch_spec = format!("+refs/collab/*:refs/collab/sync/{}/*", remote_name);
+        repo.remote_add_fetch(remote_name, &fetch_spec)?;
+        println!("Configured remote '{}'", remote_name);
+    }
+    println!("Collab refspecs initialized.");
+    Ok(())
+}
+/// Sync with a specific remote: fetch, reconcile, push.
+pub fn sync(repo: &Repository, remote_name: &str) -> Result<(), Error> {
+    let author = get_author(repo)?;
+    let workdir = repo.path().parent().unwrap_or(repo.path()).to_path_buf();
+    // Step 1: Fetch collab refs using system git (handles SSH agent, credentials, etc.)
+    println!("Fetching from '{}'...", remote_name);
+    let fetch_status = Command::new("git")
+        .args([
+            "fetch",
+            remote_name,
+            "+refs/collab/issues/*:refs/collab/sync/issues/*",
+            "+refs/collab/patches/*:refs/collab/sync/patches/*",
+        ])
+        .current_dir(&workdir)
+        .status()
+        .map_err(|e| Error::Cmd(format!("failed to run git fetch: {}", e)))?;
+    if !fetch_status.success() {
+        return Err(Error::Cmd(format!(
+            "git fetch exited with status {}",
+            fetch_status
+        )));
+    }
+    // Step 2: Reconcile
+    // Re-open repo to see the fetched refs (git2 caches ref state)
+    let repo = Repository::open(repo.path())?;
+    reconcile_refs(&repo, "issues", &author)?;
+    reconcile_refs(&repo, "patches", &author)?;
+    // Step 3: Push collab refs using system git
+    println!("Pushing to '{}'...", remote_name);
+    let mut push_args = vec!["push", remote_name];
+    let mut refspecs: Vec<String> = Vec::new();
+    for pattern in &["refs/collab/issues/*", "refs/collab/patches/*"] {
+        let refs = repo.references_glob(pattern)?;
+        for r in refs {
+            let r = r?;
+            if let Some(name) = r.name() {
+                refspecs.push(format!("+{}:{}", name, name));
+            }
+        }
+    }
+    if refspecs.is_empty() {
+        println!("Nothing to push.");
+    } else {
+        let refspec_strs: Vec<&str> = refspecs.iter().map(|s| s.as_str()).collect();
+        push_args.extend(refspec_strs);
+        let push_status = Command::new("git")
+            .args(&push_args)
+            .current_dir(&workdir)
+            .status()
+            .map_err(|e| Error::Cmd(format!("failed to run git push: {}", e)))?;
+        if !push_status.success() {
+            return Err(Error::Cmd(format!(
+                "git push exited with status {}",
+                push_status
+            )));
+        }
+    }
+    // Step 4: Clean up sync refs
+    for prefix in &["refs/collab/sync/issues/", "refs/collab/sync/patches/"] {
+        let refs: Vec<String> = repo
+            .references_glob(&format!("{}*", prefix))?
+            .filter_map(|r| r.ok()?.name().map(|n| n.to_string()))
+            .collect();
+        for ref_name in refs {
+            let mut r = repo.find_reference(&ref_name)?;
+            r.delete()?;
+        }
+    }
+    println!("Sync complete.");
+    Ok(())
+}
+/// Reconcile all refs of a given kind (issues or patches) from sync refs.
+fn reconcile_refs(
+    repo: &Repository,
+    kind: &str,
+    author: &crate::event::Author,
+) -> Result<(), Error> {
+    let sync_prefix = format!("refs/collab/sync/{}/", kind);
+    let sync_refs: Vec<(String, String)> = {
+        let refs = repo.references_glob(&format!("{}*", sync_prefix))?;
+        refs.filter_map(|r| {
+            let r = r.ok()?;
+            let name = r.name()?.to_string();
+            let id = name.strip_prefix(&sync_prefix)?.to_string();
+            Some((name, id))
+        })
+        .collect()
+    };
+    for (remote_ref, id) in &sync_refs {
+        let local_ref = format!("refs/collab/{}/{}", kind, id);
+        if repo.refname_to_id(&local_ref).is_ok() {
+            match dag::reconcile(repo, &local_ref, remote_ref, author) {
+                Ok(_) => println!("  Reconciled {} {:.8}", kind, id),
+                Err(e) => eprintln!("  Failed to reconcile {} {:.8}: {}", kind, id, e),
+            }
+        } else {
+            let oid = repo.refname_to_id(remote_ref)?;
+            repo.reference(&local_ref, oid, false, "sync: new from remote")?;
+            println!("  New {} {:.8} from remote", kind, id);
+        }
+    }
+    Ok(())
+}

src/tui.rs

@@ @@ -0,0 +1,851 @@ @@
+use std::collections::HashMap;
+use std::io::{self, stdout};
+use std::time::Duration;
+use crossterm::event::{self, Event, KeyCode, KeyModifiers};
+use crossterm::terminal::{self, EnterAlternateScreen, LeaveAlternateScreen};
+use crossterm::ExecutableCommand;
+use git2::{DiffFormat, Repository};
+use ratatui::prelude::*;
+use ratatui::widgets::{Block, Borders, List, ListItem, ListState, Paragraph, Tabs, Wrap};
+use crate::error::Error;
+use crate::state::{self, IssueState, IssueStatus, PatchState, PatchStatus};
+#[derive(PartialEq)]
+enum Pane {
+    ItemList,
+    Detail,
+}
+#[derive(PartialEq, Clone, Copy)]
+enum Tab {
+    Issues,
+    Patches,
+}
+#[derive(PartialEq)]
+enum ViewMode {
+    Details,
+    Diff,
+}
+struct App {
+    tab: Tab,
+    issues: Vec<IssueState>,
+    patches: Vec<PatchState>,
+    list_state: ListState,
+    diff_cache: HashMap<String, String>,
+    scroll: u16,
+    pane: Pane,
+    mode: ViewMode,
+    show_all: bool,
+}
+impl App {
+    fn new(issues: Vec<IssueState>, patches: Vec<PatchState>) -> Self {
+        let mut list_state = ListState::default();
+        if !issues.is_empty() {
+            list_state.select(Some(0));
+        }
+        Self {
+            tab: Tab::Issues,
+            issues,
+            patches,
+            list_state,
+            diff_cache: HashMap::new(),
+            scroll: 0,
+            pane: Pane::ItemList,
+            mode: ViewMode::Details,
+            show_all: false,
+        }
+    }
+    fn visible_issue_count(&self) -> usize {
+        if self.show_all {
+            self.issues.len()
+        } else {
+            self.issues
+                .iter()
+                .filter(|i| i.status == IssueStatus::Open)
+                .count()
+        }
+    }
+    fn visible_issues(&self) -> Vec<&IssueState> {
+        if self.show_all {
+            self.issues.iter().collect()
+        } else {
+            self.issues
+                .iter()
+                .filter(|i| i.status == IssueStatus::Open)
+                .collect()
+        }
+    }
+    fn visible_patches(&self) -> Vec<&PatchState> {
+        if self.show_all {
+            self.patches.iter().collect()
+        } else {
+            self.patches
+                .iter()
+                .filter(|p| p.status == PatchStatus::Open)
+                .collect()
+        }
+    }
+    fn visible_count(&self) -> usize {
+        match self.tab {
+            Tab::Issues => self.visible_issue_count(),
+            Tab::Patches => self.visible_patches().len(),
+        }
+    }
+    fn move_selection(&mut self, delta: i32) {
+        let len = self.visible_count();
+        if len == 0 {
+            return;
+        }
+        let current = self.list_state.selected().unwrap_or(0);
+        let new = if delta > 0 {
+            (current + delta as usize).min(len - 1)
+        } else {
+            current.saturating_sub((-delta) as usize)
+        };
+        self.list_state.select(Some(new));
+        self.scroll = 0;
+    }
+    fn switch_tab(&mut self, tab: Tab) {
+        if self.tab == tab {
+            return;
+        }
+        self.tab = tab;
+        self.list_state.select(if self.visible_count() > 0 {
+            Some(0)
+        } else {
+            None
+        });
+        self.scroll = 0;
+        self.mode = ViewMode::Details;
+        self.pane = Pane::ItemList;
+    }
+    fn reload(&mut self, repo: &Repository) {
+        if let Ok(issues) = state::list_issues(repo) {
+            self.issues = issues;
+        }
+        if let Ok(patches) = state::list_patches(repo) {
+            self.patches = patches;
+        }
+        let visible_len = self.visible_count();
+        if let Some(sel) = self.list_state.selected() {
+            if sel >= visible_len {
+                self.list_state.select(if visible_len > 0 {
+                    Some(visible_len - 1)
+                } else {
+                    None
+                });
+            }
+        }
+    }
+}
+fn generate_diff(repo: &Repository, patch: &PatchState) -> String {
+    let result = (|| -> Result<String, Error> {
+        let head_obj = repo
+            .revparse_single(&patch.head_commit)
+            .map_err(|e| Error::Cmd(format!("bad head ref: {}", e)))?;
+        let head_commit = head_obj
+            .into_commit()
+            .map_err(|_| Error::Cmd("head ref is not a commit".to_string()))?;
+        let head_tree = head_commit.tree()?;
+        let base_ref = format!("refs/heads/{}", patch.base_ref);
+        let base_tree = if let Ok(base_oid) = repo.refname_to_id(&base_ref) {
+            let base_commit = repo.find_commit(base_oid)?;
+            Some(base_commit.tree()?)
+        } else {
+            None
+        };
+        let diff = repo.diff_tree_to_tree(base_tree.as_ref(), Some(&head_tree), None)?;
+        let mut output = String::new();
+        let mut lines = 0usize;
+        diff.print(DiffFormat::Patch, |_delta, _hunk, line| {
+            if lines >= 5000 {
+                return false;
+            }
+            let prefix = match line.origin() {
+                '+' => "+",
+                '-' => "-",
+                ' ' => " ",
+                'H' | 'F' => "",
+                _ => "",
+            };
+            if !prefix.is_empty() || matches!(line.origin(), 'H' | 'F') {
+                output.push_str(prefix);
+            }
+            if let Ok(content) = std::str::from_utf8(line.content()) {
+                output.push_str(content);
+            }
+            lines += 1;
+            true
+        })?;
+        if lines >= 5000 {
+            output.push_str("\n[truncated at 5000 lines]");
+        }
+        Ok(output)
+    })();
+    match result {
+        Ok(diff) => {
+            if diff.is_empty() {
+                "No diff available (commits may be identical)".to_string()
+            } else {
+                diff
+            }
+        }
+        Err(e) => format!("Diff unavailable: {}", e),
+    }
+}
+pub fn run(repo: &Repository) -> Result<(), Error> {
+    let issues = state::list_issues(repo)?;
+    let patches = state::list_patches(repo)?;
+    let mut app = App::new(issues, patches);
+    terminal::enable_raw_mode()?;
+    stdout().execute(EnterAlternateScreen)?;
+    let mut terminal = Terminal::new(CrosstermBackend::new(stdout()))?;
+    let result = run_loop(&mut terminal, &mut app, repo);
+    terminal::disable_raw_mode()?;
+    stdout().execute(LeaveAlternateScreen)?;
+    result
+}
+fn run_loop(
+    terminal: &mut Terminal<CrosstermBackend<io::Stdout>>,
+    app: &mut App,
+    repo: &Repository,
+) -> Result<(), Error> {
+    loop {
+        // Cache diff for selected patch if needed
+        if app.tab == Tab::Patches && app.mode == ViewMode::Diff {
+            if let Some(idx) = app.list_state.selected() {
+                let visible = app.visible_patches();
+                if let Some(patch) = visible.get(idx) {
+                    if !app.diff_cache.contains_key(&patch.id) {
+                        let id = patch.id.clone();
+                        let diff = generate_diff(repo, patch);
+                        app.diff_cache.insert(id, diff);
+                    }
+                }
+            }
+        }
+        terminal.draw(|frame| ui(frame, app))?;
+        if event::poll(Duration::from_millis(100))? {
+            if let Event::Key(key) = event::read()? {
+                match key.code {
+                    KeyCode::Char('q') | KeyCode::Esc => return Ok(()),
+                    KeyCode::Char('c') if key.modifiers.contains(KeyModifiers::CONTROL) => {
+                        return Ok(())
+                    }
+                    KeyCode::Char('1') => app.switch_tab(Tab::Issues),
+                    KeyCode::Char('2') => app.switch_tab(Tab::Patches),
+                    KeyCode::Char('j') | KeyCode::Down => {
+                        if app.pane == Pane::ItemList {
+                            app.move_selection(1);
+                        } else {
+                            app.scroll = app.scroll.saturating_add(1);
+                        }
+                    }
+                    KeyCode::Char('k') | KeyCode::Up => {
+                        if app.pane == Pane::ItemList {
+                            app.move_selection(-1);
+                        } else {
+                            app.scroll = app.scroll.saturating_sub(1);
+                        }
+                    }
+                    KeyCode::PageDown => app.scroll = app.scroll.saturating_add(20),
+                    KeyCode::PageUp => app.scroll = app.scroll.saturating_sub(20),
+                    KeyCode::Tab | KeyCode::Enter => {
+                        app.pane = match app.pane {
+                            Pane::ItemList => Pane::Detail,
+                            Pane::Detail => Pane::ItemList,
+                        };
+                    }
+                    KeyCode::Char('d') => {
+                        if app.tab == Tab::Patches {
+                            app.mode = match app.mode {
+                                ViewMode::Details => ViewMode::Diff,
+                                ViewMode::Diff => ViewMode::Details,
+                            };
+                            app.scroll = 0;
+                        }
+                    }
+                    KeyCode::Char('a') => {
+                        app.show_all = !app.show_all;
+                        let count = app.visible_count();
+                        app.list_state
+                            .select(if count > 0 { Some(0) } else { None });
+                    }
+                    KeyCode::Char('r') => {
+                        app.reload(repo);
+                    }
+                    _ => {}
+                }
+            }
+        }
+    }
+}
+fn ui(frame: &mut Frame, app: &mut App) {
+    let chunks = Layout::default()
+        .direction(Direction::Vertical)
+        .constraints([
+            Constraint::Length(1),
+            Constraint::Min(1),
+            Constraint::Length(1),
+        ])
+        .split(frame.area());
+    let tab_area = chunks[0];
+    let main_area = chunks[1];
+    let footer_area = chunks[2];
+    // Tab bar
+    let tab_titles = vec!["1:Issues", "2:Patches"];
+    let selected_tab = match app.tab {
+        Tab::Issues => 0,
+        Tab::Patches => 1,
+    };
+    let tabs = Tabs::new(tab_titles)
+        .select(selected_tab)
+        .highlight_style(
+            Style::default()
+                .fg(Color::Yellow)
+                .add_modifier(Modifier::BOLD),
+        )
+        .divider(" | ");
+    frame.render_widget(tabs, tab_area);
+    let panes = Layout::default()
+        .direction(Direction::Horizontal)
+        .constraints([Constraint::Percentage(35), Constraint::Percentage(65)])
+        .split(main_area);
+    render_list(frame, app, panes[0]);
+    render_detail(frame, app, panes[1]);
+    render_footer(frame, app, footer_area);
+}
+fn render_list(frame: &mut Frame, app: &mut App, area: Rect) {
+    let border_style = if app.pane == Pane::ItemList {
+        Style::default().fg(Color::Yellow)
+    } else {
+        Style::default().fg(Color::DarkGray)
+    };
+    match app.tab {
+        Tab::Issues => {
+            let visible = app.visible_issues();
+            let items: Vec<ListItem> = visible
+                .iter()
+                .map(|i| {
+                    let status = match i.status {
+                        IssueStatus::Open => "open",
+                        IssueStatus::Closed => "closed",
+                    };
+                    let style = match i.status {
+                        IssueStatus::Open => Style::default().fg(Color::Green),
+                        IssueStatus::Closed => Style::default().fg(Color::Red),
+                    };
+                    ListItem::new(format!("{:.8}  {:6}  {}", i.id, status, i.title)).style(style)
+                })
+                .collect();
+            let title = if app.show_all {
+                "Issues (all)"
+            } else {
+                "Issues (open)"
+            };
+            let list = List::new(items)
+                .block(
+                    Block::default()
+                        .borders(Borders::ALL)
+                        .title(title)
+                        .border_style(border_style),
+                )
+                .highlight_style(
+                    Style::default()
+                        .bg(Color::DarkGray)
+                        .add_modifier(Modifier::BOLD),
+                )
+                .highlight_symbol("> ");
+            frame.render_stateful_widget(list, area, &mut app.list_state);
+        }
+        Tab::Patches => {
+            let visible = app.visible_patches();
+            let items: Vec<ListItem> = visible
+                .iter()
+                .map(|p| {
+                    let status = match p.status {
+                        PatchStatus::Open => "open",
+                        PatchStatus::Closed => "closed",
+                        PatchStatus::Merged => "merged",
+                    };
+                    let style = match p.status {
+                        PatchStatus::Open => Style::default().fg(Color::Green),
+                        PatchStatus::Closed => Style::default().fg(Color::Red),
+                        PatchStatus::Merged => Style::default().fg(Color::Cyan),
+                    };
+                    ListItem::new(format!("{:.8}  {:6}  {}", p.id, status, p.title)).style(style)
+                })
+                .collect();
+            let title = if app.show_all {
+                "Patches (all)"
+            } else {
+                "Patches (open)"
+            };
+            let list = List::new(items)
+                .block(
+                    Block::default()
+                        .borders(Borders::ALL)
+                        .title(title)
+                        .border_style(border_style),
+                )
+                .highlight_style(
+                    Style::default()
+                        .bg(Color::DarkGray)
+                        .add_modifier(Modifier::BOLD),
+                )
+                .highlight_symbol("> ");
+            frame.render_stateful_widget(list, area, &mut app.list_state);
+        }
+    }
+}
+fn render_detail(frame: &mut Frame, app: &App, area: Rect) {
+    let border_style = if app.pane == Pane::Detail {
+        Style::default().fg(Color::Yellow)
+    } else {
+        Style::default().fg(Color::DarkGray)
+    };
+    let title = match (&app.tab, &app.mode) {
+        (Tab::Issues, _) => "Issue Details",
+        (Tab::Patches, ViewMode::Details) => "Patch Details",
+        (Tab::Patches, ViewMode::Diff) => "Diff",
+    };
+    let content: Text = match app.tab {
+        Tab::Issues => {
+            let visible = app.visible_issues();
+            let selected_idx = app.list_state.selected().unwrap_or(0);
+            match visible.get(selected_idx) {
+                Some(issue) => build_issue_detail(issue),
+                None => Text::raw("No issues to display."),
+            }
+        }
+        Tab::Patches => {
+            let visible = app.visible_patches();
+            let selected_idx = app.list_state.selected().unwrap_or(0);
+            match visible.get(selected_idx) {
+                Some(patch) => match app.mode {
+                    ViewMode::Details => build_patch_detail(patch),
+                    ViewMode::Diff => {
+                        let diff_text = app
+                            .diff_cache
+                            .get(&patch.id)
+                            .map(|s| s.as_str())
+                            .unwrap_or("Loading...");
+                        colorize_diff(diff_text, &patch.inline_comments)
+                    }
+                },
+                None => Text::raw("No patches to display."),
+            }
+        }
+    };
+    let block = Block::default()
+        .borders(Borders::ALL)
+        .title(title)
+        .border_style(border_style);
+    let para = Paragraph::new(content)
+        .block(block)
+        .wrap(Wrap { trim: false })
+        .scroll((app.scroll, 0));
+    frame.render_widget(para, area);
+}
+fn build_issue_detail(issue: &IssueState) -> Text<'static> {
+    let status = match issue.status {
+        IssueStatus::Open => "open",
+        IssueStatus::Closed => "closed",
+    };
+    let mut lines: Vec<Line> = vec![
+        Line::from(vec![
+            Span::styled("Issue ", Style::default().add_modifier(Modifier::BOLD)),
+            Span::styled(
+                format!("{:.8}", issue.id),
+                Style::default()
+                    .fg(Color::Yellow)
+                    .add_modifier(Modifier::BOLD),
+            ),
+            Span::raw(format!(" [{}]", status)),
+        ]),
+        Line::from(vec![
+            Span::styled("Title:   ", Style::default().fg(Color::DarkGray)),
+            Span::raw(issue.title.clone()),
+        ]),
+        Line::from(vec![
+            Span::styled("Author:  ", Style::default().fg(Color::DarkGray)),
+            Span::raw(format!("{} <{}>", issue.author.name, issue.author.email)),
+        ]),
+        Line::from(vec![
+            Span::styled("Created: ", Style::default().fg(Color::DarkGray)),
+            Span::raw(issue.created_at.clone()),
+        ]),
+    ];
+    if let Some(ref reason) = issue.close_reason {
+        lines.push(Line::from(vec![
+            Span::styled("Closed:  ", Style::default().fg(Color::Red)),
+            Span::raw(reason.clone()),
+        ]));
+    }
+    if !issue.body.is_empty() {
+        lines.push(Line::raw(""));
+        for l in issue.body.lines() {
+            lines.push(Line::raw(l.to_string()));
+        }
+    }
+    if !issue.comments.is_empty() {
+        lines.push(Line::raw(""));
+        lines.push(Line::styled(
+            "--- Comments ---",
+            Style::default()
+                .fg(Color::Blue)
+                .add_modifier(Modifier::BOLD),
+        ));
+        for c in &issue.comments {
+            lines.push(Line::raw(""));
+            lines.push(Line::from(vec![
+                Span::styled(
+                    c.author.name.clone(),
+                    Style::default().add_modifier(Modifier::BOLD),
+                ),
+                Span::styled(
+                    format!(" ({})", c.timestamp),
+                    Style::default().fg(Color::DarkGray),
+                ),
+            ]));
+            for l in c.body.lines() {
+                lines.push(Line::raw(format!("  {}", l)));
+            }
+        }
+    }
+    Text::from(lines)
+}
+fn build_patch_detail(patch: &PatchState) -> Text<'static> {
+    let status = match patch.status {
+        PatchStatus::Open => "open",
+        PatchStatus::Closed => "closed",
+        PatchStatus::Merged => "merged",
+    };
+    let mut lines: Vec<Line> = vec![
+        Line::from(vec![
+            Span::styled("Patch ", Style::default().add_modifier(Modifier::BOLD)),
+            Span::styled(
+                format!("{:.8}", patch.id),
+                Style::default()
+                    .fg(Color::Yellow)
+                    .add_modifier(Modifier::BOLD),
+            ),
+            Span::raw(format!(" [{}]", status)),
+        ]),
+        Line::from(vec![
+            Span::styled("Title:   ", Style::default().fg(Color::DarkGray)),
+            Span::raw(patch.title.clone()),
+        ]),
+        Line::from(vec![
+            Span::styled("Author:  ", Style::default().fg(Color::DarkGray)),
+            Span::raw(format!("{} <{}>", patch.author.name, patch.author.email)),
+        ]),
+        Line::from(vec![
+            Span::styled("Base:    ", Style::default().fg(Color::DarkGray)),
+            Span::raw(patch.base_ref.clone()),
+            Span::raw("  "),
+            Span::styled("Head: ", Style::default().fg(Color::DarkGray)),
+            Span::styled(
+                format!("{:.8}", patch.head_commit),
+                Style::default().fg(Color::Cyan),
+            ),
+        ]),
+        Line::from(vec![
+            Span::styled("Created: ", Style::default().fg(Color::DarkGray)),
+            Span::raw(patch.created_at.clone()),
+        ]),
+    ];
+    if !patch.body.is_empty() {
+        lines.push(Line::raw(""));
+        for l in patch.body.lines() {
+            lines.push(Line::raw(l.to_string()));
+        }
+    }
+    if !patch.reviews.is_empty() {
+        lines.push(Line::raw(""));
+        lines.push(Line::styled(
+            "--- Reviews ---",
+            Style::default()
+                .fg(Color::Magenta)
+                .add_modifier(Modifier::BOLD),
+        ));
+        for r in &patch.reviews {
+            lines.push(Line::raw(""));
+            let verdict_style = match r.verdict {
+                crate::event::ReviewVerdict::Approve => Style::default().fg(Color::Green),
+                crate::event::ReviewVerdict::RequestChanges => Style::default().fg(Color::Red),
+                crate::event::ReviewVerdict::Comment => Style::default().fg(Color::Yellow),
+            };
+            lines.push(Line::from(vec![
+                Span::raw(format!("{} ", r.author.name)),
+                Span::styled(format!("({:?})", r.verdict), verdict_style),
+                Span::styled(
+                    format!(" - {}", r.timestamp),
+                    Style::default().fg(Color::DarkGray),
+                ),
+            ]));
+            for l in r.body.lines() {
+                lines.push(Line::raw(format!("  {}", l)));
+            }
+        }
+    }
+    if !patch.inline_comments.is_empty() {
+        lines.push(Line::raw(""));
+        lines.push(Line::styled(
+            "--- Inline Comments ---",
+            Style::default()
+                .fg(Color::Magenta)
+                .add_modifier(Modifier::BOLD),
+        ));
+        for c in &patch.inline_comments {
+            lines.push(Line::raw(""));
+            lines.push(Line::from(vec![
+                Span::styled(
+                    format!("{}:{}", c.file, c.line),
+                    Style::default().fg(Color::Cyan),
+                ),
+                Span::raw(format!(" - {} ", c.author.name)),
+                Span::styled(
+                    format!("({})", c.timestamp),
+                    Style::default().fg(Color::DarkGray),
+                ),
+            ]));
+            for l in c.body.lines() {
+                lines.push(Line::raw(format!("  {}", l)));
+            }
+        }
+    }
+    if !patch.comments.is_empty() {
+        lines.push(Line::raw(""));
+        lines.push(Line::styled(
+            "--- Comments ---",
+            Style::default()
+                .fg(Color::Blue)
+                .add_modifier(Modifier::BOLD),
+        ));
+        for c in &patch.comments {
+            lines.push(Line::raw(""));
+            lines.push(Line::from(vec![
+                Span::styled(
+                    c.author.name.clone(),
+                    Style::default().add_modifier(Modifier::BOLD),
+                ),
+                Span::styled(
+                    format!(" ({})", c.timestamp),
+                    Style::default().fg(Color::DarkGray),
+                ),
+            ]));
+            for l in c.body.lines() {
+                lines.push(Line::raw(format!("  {}", l)));
+            }
+        }
+    }
+    Text::from(lines)
+}
+fn colorize_diff(diff: &str, inline_comments: &[state::InlineComment]) -> Text<'static> {
+    // Build a lookup: (file, line) -> vec of comments
+    let mut comment_map: HashMap<(String, u32), Vec<&state::InlineComment>> = HashMap::new();
+    for c in inline_comments {
+        comment_map
+            .entry((c.file.clone(), c.line))
+            .or_default()
+            .push(c);
+    }
+    let mut lines: Vec<Line> = Vec::new();
+    let mut current_file = String::new();
+    let mut current_new_line: u32 = 0;
+    for diff_line in diff.lines() {
+        // Track which file we're in from +++ headers
+        if let Some(file) = diff_line.strip_prefix("+++ b/") {
+            current_file = file.to_string();
+        } else if diff_line.starts_with("+++ ") {
+            // +++ /dev/null or similar
+            current_file.clear();
+        }
+        // Track line numbers from @@ hunk headers
+        if diff_line.starts_with("@@") {
+            // Parse @@ -old,len +new,len @@
+            if let Some(plus_part) = diff_line.split('+').nth(1) {
+                if let Some(line_str) = plus_part.split(',').next().or(plus_part.split(' ').next())
+                {
+                    current_new_line = line_str.parse().unwrap_or(0);
+                }
+            }
+        }
+        // Colorize the diff line
+        let style = if diff_line.starts_with('+') && !diff_line.starts_with("+++") {
+            Style::default().fg(Color::Green)
+        } else if diff_line.starts_with('-') && !diff_line.starts_with("---") {
+            Style::default().fg(Color::Red)
+        } else if diff_line.starts_with("@@") {
+            Style::default().fg(Color::Cyan)
+        } else if diff_line.starts_with("diff ") || diff_line.starts_with("index ") {
+            Style::default().fg(Color::DarkGray)
+        } else if diff_line.starts_with("+++") || diff_line.starts_with("---") {
+            Style::default().fg(Color::Yellow)
+        } else {
+            Style::default()
+        };
+        lines.push(Line::styled(diff_line.to_string(), style));
+        // After rendering this line, check for inline comments at current position
+        if !current_file.is_empty()
+            && current_new_line > 0
+            && (diff_line.starts_with('+')
+                || diff_line.starts_with(' ')
+                || diff_line.starts_with("@@"))
+        {
+            if let Some(comments) = comment_map.get(&(current_file.clone(), current_new_line)) {
+                for c in comments {
+                    lines.push(Line::styled(
+                        format!("  ┌─ {} ({})", c.author.name, c.timestamp),
+                        Style::default()
+                            .fg(Color::Magenta)
+                            .add_modifier(Modifier::BOLD),
+                    ));
+                    for body_line in c.body.lines() {
+                        lines.push(Line::styled(
+                            format!("  │ {}", body_line),
+                            Style::default().fg(Color::Magenta),
+                        ));
+                    }
+                    lines.push(Line::styled(
+                        "  └─".to_string(),
+                        Style::default().fg(Color::Magenta),
+                    ));
+                }
+            }
+        }
+        // Advance line counter for added/context lines (not removed or header)
+        if (diff_line.starts_with('+') && !diff_line.starts_with("+++"))
+            || diff_line.starts_with(' ')
+        {
+            current_new_line += 1;
+        }
+    }
+    // Show any inline comments for files not covered by the diff
+    let files_in_diff: std::collections::HashSet<&str> = diff
+        .lines()
+        .filter_map(|l| l.strip_prefix("+++ b/"))
+        .collect();
+    let mut orphan_comments: Vec<&state::InlineComment> = inline_comments
+        .iter()
+        .filter(|c| !files_in_diff.contains(c.file.as_str()))
+        .collect();
+    if !orphan_comments.is_empty() {
+        orphan_comments.sort_by(|a, b| (&a.file, a.line).cmp(&(&b.file, b.line)));
+        lines.push(Line::raw(""));
+        lines.push(Line::styled(
+            "--- Comments on files not in diff ---",
+            Style::default()
+                .fg(Color::Magenta)
+                .add_modifier(Modifier::BOLD),
+        ));
+        for c in orphan_comments {
+            lines.push(Line::styled(
+                format!(
+                    "  {}:{} - {} ({}):",
+                    c.file, c.line, c.author.name, c.timestamp
+                ),
+                Style::default().fg(Color::Magenta),
+            ));
+            for body_line in c.body.lines() {
+                lines.push(Line::styled(
+                    format!("    {}", body_line),
+                    Style::default().fg(Color::Magenta),
+                ));
+            }
+        }
+    }
+    Text::from(lines)
+}
+fn render_footer(frame: &mut Frame, app: &App, area: Rect) {
+    let mode_hint = if app.tab == Tab::Patches {
+        match app.mode {
+            ViewMode::Details => "  d:diff",
+            ViewMode::Diff => "  d:details",
+        }
+    } else {
+        ""
+    };
+    let filter_hint = if app.show_all {
+        "a:open only"
+    } else {
+        "a:show all"
+    };
+    let text = format!(
+        " 1:issues  2:patches  j/k:navigate  Tab:pane  {}{}  r:refresh  q:quit",
+        filter_hint, mode_hint
+    );
+    let para = Paragraph::new(text).style(Style::default().bg(Color::DarkGray).fg(Color::White));
+    frame.render_widget(para, area);
+}

tests/collab_test.rs

@@ @@ -0,0 +1,601 @@ @@
+use git2::Repository;
+use std::path::Path;
+use tempfile::TempDir;
+use git_collab::dag;
+use git_collab::event::{Action, Author, Event, ReviewVerdict};
+use git_collab::state::{self, IssueState, IssueStatus, PatchState, PatchStatus};
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+fn alice() -> Author {
+    Author {
+        name: "Alice".to_string(),
+        email: "alice@example.com".to_string(),
+    }
+}
+fn bob() -> Author {
+    Author {
+        name: "Bob".to_string(),
+        email: "bob@example.com".to_string(),
+    }
+}
+fn now() -> String {
+    chrono::Utc::now().to_rfc3339()
+}
+/// Create a bare repo in a tempdir and configure user identity.
+fn init_repo(dir: &Path, author: &Author) -> Repository {
+    let repo = Repository::init(dir).expect("init repo");
+    {
+        let mut config = repo.config().unwrap();
+        config.set_str("user.name", &author.name).unwrap();
+        config.set_str("user.email", &author.email).unwrap();
+    }
+    repo
+}
+/// Open an issue directly using DAG primitives (for fine-grained control in tests).
+fn open_issue(repo: &Repository, author: &Author, title: &str) -> (String, String) {
+    let event = Event {
+        timestamp: now(),
+        author: author.clone(),
+        action: Action::IssueOpen {
+            title: title.to_string(),
+            body: "".to_string(),
+        },
+    };
+    let oid = dag::create_root_event(repo, &event).unwrap();
+    let id = oid.to_string();
+    let ref_name = format!("refs/collab/issues/{}", id);
+    repo.reference(&ref_name, oid, false, "test open").unwrap();
+    (ref_name, id)
+}
+/// Append a comment event to a ref.
+fn add_comment(repo: &Repository, ref_name: &str, author: &Author, body: &str) {
+    let event = Event {
+        timestamp: now(),
+        author: author.clone(),
+        action: Action::IssueComment {
+            body: body.to_string(),
+        },
+    };
+    dag::append_event(repo, ref_name, &event).unwrap();
+}
+/// Append a close event to a ref.
+fn close_issue(repo: &Repository, ref_name: &str, author: &Author) {
+    let event = Event {
+        timestamp: now(),
+        author: author.clone(),
+        action: Action::IssueClose { reason: None },
+    };
+    dag::append_event(repo, ref_name, &event).unwrap();
+}
+/// Append a reopen event to a ref.
+fn reopen_issue(repo: &Repository, ref_name: &str, author: &Author) {
+    let event = Event {
+        timestamp: now(),
+        author: author.clone(),
+        action: Action::IssueReopen,
+    };
+    dag::append_event(repo, ref_name, &event).unwrap();
+}
+// ---------------------------------------------------------------------------
+// Basic DAG tests
+// ---------------------------------------------------------------------------
+#[test]
+fn test_create_and_walk_issue_dag() {
+    let tmp = TempDir::new().unwrap();
+    let repo = init_repo(tmp.path(), &alice());
+    let (ref_name, id) = open_issue(&repo, &alice(), "First issue");
+    add_comment(&repo, &ref_name, &alice(), "A comment");
+    let events = dag::walk_events(&repo, &ref_name).unwrap();
+    assert_eq!(events.len(), 2);
+    assert!(matches!(events[0].1.action, Action::IssueOpen { .. }));
+    assert!(matches!(events[1].1.action, Action::IssueComment { .. }));
+    // State materializes correctly
+    let state = IssueState::from_ref(&repo, &ref_name, &id).unwrap();
+    assert_eq!(state.title, "First issue");
+    assert_eq!(state.status, IssueStatus::Open);
+    assert_eq!(state.comments.len(), 1);
+}
+#[test]
+fn test_issue_lifecycle() {
+    let tmp = TempDir::new().unwrap();
+    let repo = init_repo(tmp.path(), &alice());
+    let (ref_name, id) = open_issue(&repo, &alice(), "Bug report");
+    add_comment(&repo, &ref_name, &bob(), "I can reproduce");
+    close_issue(&repo, &ref_name, &alice());
+    let s = IssueState::from_ref(&repo, &ref_name, &id).unwrap();
+    assert_eq!(s.status, IssueStatus::Closed);
+    assert_eq!(s.comments.len(), 1);
+    // Reopen
+    reopen_issue(&repo, &ref_name, &bob());
+    let s = IssueState::from_ref(&repo, &ref_name, &id).unwrap();
+    assert_eq!(s.status, IssueStatus::Open);
+}
+#[test]
+fn test_list_issues_filters_by_status() {
+    let tmp = TempDir::new().unwrap();
+    let repo = init_repo(tmp.path(), &alice());
+    let (_ref1, _) = open_issue(&repo, &alice(), "Open issue");
+    let (ref2, _) = open_issue(&repo, &alice(), "Closed issue");
+    close_issue(&repo, &ref2, &alice());
+    let all = state::list_issues(&repo).unwrap();
+    assert_eq!(all.len(), 2);
+    let open: Vec<_> = all
+        .iter()
+        .filter(|i| i.status == IssueStatus::Open)
+        .collect();
+    assert_eq!(open.len(), 1);
+    assert_eq!(open[0].title, "Open issue");
+}
+// ---------------------------------------------------------------------------
+// Multi-user collaboration: concurrent edits → forked DAG → reconcile
+// ---------------------------------------------------------------------------
+#[test]
+fn test_concurrent_comments_create_fork_and_reconcile() {
+    // Simulate two users commenting on the same issue concurrently.
+    //
+    // Starting state:
+    //   commit A (IssueOpen)
+    //
+    // Alice adds comment → commit B (parent: A)
+    // Bob adds comment   → commit C (parent: A)  ← fork!
+    //
+    // Reconciliation creates merge commit M (parents: B, C)
+    // State replay should see all 3 events (open + 2 comments)
+    let tmp = TempDir::new().unwrap();
+    let repo = init_repo(tmp.path(), &alice());
+    // Create the issue (commit A)
+    let (ref_name, id) = open_issue(&repo, &alice(), "Concurrent test");
+    let root_oid = repo.refname_to_id(&ref_name).unwrap();
+    // Alice comments (commit B) — advances the ref
+    add_comment(&repo, &ref_name, &alice(), "Alice's comment");
+    let alice_tip = repo.refname_to_id(&ref_name).unwrap();
+    // Simulate Bob's concurrent comment: reset ref back to root, then append
+    repo.reference(&ref_name, root_oid, true, "simulate bob fork")
+        .unwrap();
+    add_comment(&repo, &ref_name, &bob(), "Bob's comment");
+    let bob_tip = repo.refname_to_id(&ref_name).unwrap();
+    // Now we have two tips diverged from root_oid.
+    // Put Bob's tip in a "remote" ref so we can reconcile.
+    let remote_ref = format!("refs/collab/sync/origin/issues/{}", id);
+    repo.reference(&remote_ref, bob_tip, true, "remote tip")
+        .unwrap();
+    // Reset local ref to Alice's tip
+    repo.reference(&ref_name, alice_tip, true, "restore alice tip")
+        .unwrap();
+    // Reconcile
+    let merge_oid = dag::reconcile(&repo, &ref_name, &remote_ref, &alice()).unwrap();
+    // Verify merge commit has 2 parents
+    let merge_commit = repo.find_commit(merge_oid).unwrap();
+    assert_eq!(merge_commit.parent_count(), 2);
+    // Walk events — should see open + both comments + merge
+    let events = dag::walk_events(&repo, &ref_name).unwrap();
+    let actions: Vec<_> = events.iter().map(|(_, e)| &e.action).collect();
+    // Must have the open event
+    assert!(actions
+        .iter()
+        .any(|a| matches!(a, Action::IssueOpen { .. })));
+    // Must have both comments
+    let comments: Vec<_> = actions
+        .iter()
+        .filter(|a| matches!(a, Action::IssueComment { .. }))
+        .collect();
+    assert_eq!(comments.len(), 2, "both concurrent comments should appear");
+    // Must have the merge
+    assert!(actions.iter().any(|a| matches!(a, Action::Merge)));
+    // State should show both comments
+    let state = IssueState::from_ref(&repo, &ref_name, &id).unwrap();
+    assert_eq!(state.comments.len(), 2);
+    assert_eq!(state.status, IssueStatus::Open);
+}
+#[test]
+fn test_concurrent_close_and_comment() {
+    // Alice closes the issue while Bob comments on it concurrently.
+    // After reconciliation, the issue should be closed (last event wins by topo order)
+    // and Bob's comment should still be visible.
+    let tmp = TempDir::new().unwrap();
+    let repo = init_repo(tmp.path(), &alice());
+    let (ref_name, id) = open_issue(&repo, &alice(), "Close vs comment");
+    let root_oid = repo.refname_to_id(&ref_name).unwrap();
+    // Alice closes
+    close_issue(&repo, &ref_name, &alice());
+    let alice_tip = repo.refname_to_id(&ref_name).unwrap();
+    // Bob comments (from root)
+    repo.reference(&ref_name, root_oid, true, "bob fork")
+        .unwrap();
+    add_comment(&repo, &ref_name, &bob(), "Wait, I have thoughts");
+    let bob_tip = repo.refname_to_id(&ref_name).unwrap();
+    // Set up for reconciliation
+    let remote_ref = format!("refs/collab/sync/origin/issues/{}", id);
+    repo.reference(&remote_ref, bob_tip, true, "remote")
+        .unwrap();
+    repo.reference(&ref_name, alice_tip, true, "restore")
+        .unwrap();
+    dag::reconcile(&repo, &ref_name, &remote_ref, &alice()).unwrap();
+    let state = IssueState::from_ref(&repo, &ref_name, &id).unwrap();
+    // Both the close and comment should be in the DAG
+    assert_eq!(state.comments.len(), 1);
+    // The close event should have taken effect
+    assert_eq!(state.status, IssueStatus::Closed);
+}
+#[test]
+fn test_concurrent_close_and_reopen() {
+    // Alice closes while Bob reopens from a previously-closed state.
+    // This tests conflicting status transitions.
+    let tmp = TempDir::new().unwrap();
+    let repo = init_repo(tmp.path(), &alice());
+    let (ref_name, id) = open_issue(&repo, &alice(), "Status conflict");
+    // First, close the issue so both users start from "closed"
+    close_issue(&repo, &ref_name, &alice());
+    let closed_oid = repo.refname_to_id(&ref_name).unwrap();
+    // Alice comments on the closed issue
+    add_comment(&repo, &ref_name, &alice(), "Staying closed");
+    let alice_tip = repo.refname_to_id(&ref_name).unwrap();
+    // Bob reopens from the closed state
+    repo.reference(&ref_name, closed_oid, true, "bob fork")
+        .unwrap();
+    reopen_issue(&repo, &ref_name, &bob());
+    let bob_tip = repo.refname_to_id(&ref_name).unwrap();
+    let remote_ref = format!("refs/collab/sync/origin/issues/{}", id);
+    repo.reference(&remote_ref, bob_tip, true, "remote")
+        .unwrap();
+    repo.reference(&ref_name, alice_tip, true, "restore")
+        .unwrap();
+    dag::reconcile(&repo, &ref_name, &remote_ref, &alice()).unwrap();
+    let _state = IssueState::from_ref(&repo, &ref_name, &id).unwrap();
+    // Both branches are replayed — the final status depends on topo order.
+    // The important thing is that we don't crash and both events are present.
+    let events = dag::walk_events(&repo, &ref_name).unwrap();
+    let has_close = events
+        .iter()
+        .any(|(_, e)| matches!(e.action, Action::IssueClose { .. }));
+    let has_reopen = events
+        .iter()
+        .any(|(_, e)| matches!(e.action, Action::IssueReopen));
+    assert!(has_close, "close event must be in DAG");
+    assert!(has_reopen, "reopen event must be in DAG");
+}
+#[test]
+fn test_fast_forward_reconcile() {
+    // If local is behind remote (remote has strictly more events), reconcile
+    // should fast-forward without creating a merge commit.
+    let tmp = TempDir::new().unwrap();
+    let repo = init_repo(tmp.path(), &alice());
+    let (ref_name, id) = open_issue(&repo, &alice(), "FF test");
+    let root_oid = repo.refname_to_id(&ref_name).unwrap();
+    // Add comment (advances ref)
+    add_comment(&repo, &ref_name, &alice(), "Extra comment");
+    let ahead_tip = repo.refname_to_id(&ref_name).unwrap();
+    // Simulate: local is at root, remote is at ahead_tip
+    repo.reference(&ref_name, root_oid, true, "reset local")
+        .unwrap();
+    let remote_ref = format!("refs/collab/sync/origin/issues/{}", id);
+    repo.reference(&remote_ref, ahead_tip, true, "remote ahead")
+        .unwrap();
+    let result = dag::reconcile(&repo, &ref_name, &remote_ref, &alice()).unwrap();
+    assert_eq!(result, ahead_tip, "should fast-forward to remote tip");
+    // No merge commit — walk should have exactly 2 events
+    let events = dag::walk_events(&repo, &ref_name).unwrap();
+    assert_eq!(events.len(), 2);
+    assert!(!events
+        .iter()
+        .any(|(_, e)| matches!(e.action, Action::Merge)));
+}
+#[test]
+fn test_no_op_when_already_in_sync() {
+    let tmp = TempDir::new().unwrap();
+    let repo = init_repo(tmp.path(), &alice());
+    let (ref_name, id) = open_issue(&repo, &alice(), "Already synced");
+    let tip = repo.refname_to_id(&ref_name).unwrap();
+    let remote_ref = format!("refs/collab/sync/origin/issues/{}", id);
+    repo.reference(&remote_ref, tip, true, "same tip").unwrap();
+    let result = dag::reconcile(&repo, &ref_name, &remote_ref, &alice()).unwrap();
+    assert_eq!(result, tip);
+}
+#[test]
+fn test_local_ahead_no_merge() {
+    // If local has more events than remote, reconcile should be a no-op.
+    let tmp = TempDir::new().unwrap();
+    let repo = init_repo(tmp.path(), &alice());
+    let (ref_name, id) = open_issue(&repo, &alice(), "Local ahead");
+    let root_oid = repo.refname_to_id(&ref_name).unwrap();
+    add_comment(&repo, &ref_name, &alice(), "Local only comment");
+    let local_tip = repo.refname_to_id(&ref_name).unwrap();
+    let remote_ref = format!("refs/collab/sync/origin/issues/{}", id);
+    repo.reference(&remote_ref, root_oid, true, "remote behind")
+        .unwrap();
+    let result = dag::reconcile(&repo, &ref_name, &remote_ref, &alice()).unwrap();
+    assert_eq!(result, local_tip, "local should stay ahead");
+}
+// ---------------------------------------------------------------------------
+// Patch collaboration tests
+// ---------------------------------------------------------------------------
+fn create_patch(repo: &Repository, author: &Author, title: &str) -> (String, String) {
+    let event = Event {
+        timestamp: now(),
+        author: author.clone(),
+        action: Action::PatchCreate {
+            title: title.to_string(),
+            body: "".to_string(),
+            base_ref: "main".to_string(),
+            head_commit: "abc123".to_string(),
+        },
+    };
+    let oid = dag::create_root_event(repo, &event).unwrap();
+    let id = oid.to_string();
+    let ref_name = format!("refs/collab/patches/{}", id);
+    repo.reference(&ref_name, oid, false, "test patch").unwrap();
+    (ref_name, id)
+}
+fn add_review(repo: &Repository, ref_name: &str, author: &Author, verdict: ReviewVerdict) {
+    let event = Event {
+        timestamp: now(),
+        author: author.clone(),
+        action: Action::PatchReview {
+            verdict,
+            body: "review comment".to_string(),
+        },
+    };
+    dag::append_event(repo, ref_name, &event).unwrap();
+}
+#[test]
+fn test_patch_review_workflow() {
+    let tmp = TempDir::new().unwrap();
+    let repo = init_repo(tmp.path(), &alice());
+    let (ref_name, id) = create_patch(&repo, &alice(), "Add feature X");
+    // Bob reviews
+    add_review(&repo, &ref_name, &bob(), ReviewVerdict::RequestChanges);
+    let state = PatchState::from_ref(&repo, &ref_name, &id).unwrap();
+    assert_eq!(state.reviews.len(), 1);
+    assert_eq!(state.reviews[0].verdict, ReviewVerdict::RequestChanges);
+    // Alice revises
+    let event = Event {
+        timestamp: now(),
+        author: alice(),
+        action: Action::PatchRevise {
+            body: Some("Updated implementation".to_string()),
+            head_commit: "def456".to_string(),
+        },
+    };
+    dag::append_event(&repo, &ref_name, &event).unwrap();
+    // Bob approves
+    add_review(&repo, &ref_name, &bob(), ReviewVerdict::Approve);
+    let state = PatchState::from_ref(&repo, &ref_name, &id).unwrap();
+    assert_eq!(state.reviews.len(), 2);
+    assert_eq!(state.head_commit, "def456");
+    assert_eq!(state.body, "Updated implementation");
+}
+#[test]
+fn test_concurrent_reviews_on_patch() {
+    // Alice and Bob both review the same patch concurrently.
+    let tmp = TempDir::new().unwrap();
+    let repo = init_repo(tmp.path(), &alice());
+    let (ref_name, id) = create_patch(&repo, &alice(), "Concurrent review");
+    let root_oid = repo.refname_to_id(&ref_name).unwrap();
+    // Alice approves
+    add_review(&repo, &ref_name, &alice(), ReviewVerdict::Approve);
+    let alice_tip = repo.refname_to_id(&ref_name).unwrap();
+    // Bob requests changes (from root)
+    repo.reference(&ref_name, root_oid, true, "bob fork")
+        .unwrap();
+    add_review(&repo, &ref_name, &bob(), ReviewVerdict::RequestChanges);
+    let bob_tip = repo.refname_to_id(&ref_name).unwrap();
+    // Reconcile
+    let remote_ref = format!("refs/collab/sync/origin/patches/{}", id);
+    repo.reference(&remote_ref, bob_tip, true, "remote")
+        .unwrap();
+    repo.reference(&ref_name, alice_tip, true, "restore")
+        .unwrap();
+    dag::reconcile(&repo, &ref_name, &remote_ref, &alice()).unwrap();
+    let state = PatchState::from_ref(&repo, &ref_name, &id).unwrap();
+    assert_eq!(state.reviews.len(), 2, "both reviews should be present");
+    assert_eq!(state.status, PatchStatus::Open);
+}
+// ---------------------------------------------------------------------------
+// Three-way concurrent edits
+// ---------------------------------------------------------------------------
+#[test]
+fn test_three_way_fork_sequential_reconcile() {
+    // Three users all comment from the same base.
+    // We reconcile them pairwise: first alice+bob, then result+charlie.
+    let tmp = TempDir::new().unwrap();
+    let repo = init_repo(tmp.path(), &alice());
+    let charlie = Author {
+        name: "Charlie".to_string(),
+        email: "charlie@example.com".to_string(),
+    };
+    let (ref_name, id) = open_issue(&repo, &alice(), "Three-way");
+    let root_oid = repo.refname_to_id(&ref_name).unwrap();
+    // Alice comments
+    add_comment(&repo, &ref_name, &alice(), "Alice here");
+    let alice_tip = repo.refname_to_id(&ref_name).unwrap();
+    // Bob comments from root
+    repo.reference(&ref_name, root_oid, true, "bob").unwrap();
+    add_comment(&repo, &ref_name, &bob(), "Bob here");
+    let bob_tip = repo.refname_to_id(&ref_name).unwrap();
+    // Charlie comments from root
+    repo.reference(&ref_name, root_oid, true, "charlie")
+        .unwrap();
+    add_comment(&repo, &ref_name, &charlie, "Charlie here");
+    let charlie_tip = repo.refname_to_id(&ref_name).unwrap();
+    // Reconcile alice + bob
+    repo.reference(&ref_name, alice_tip, true, "alice").unwrap();
+    let bob_ref = "refs/collab/sync/origin/issues/bob_temp";
+    repo.reference(bob_ref, bob_tip, true, "bob remote")
+        .unwrap();
+    dag::reconcile(&repo, &ref_name, bob_ref, &alice()).unwrap();
+    // Reconcile result + charlie
+    let charlie_ref = "refs/collab/sync/origin/issues/charlie_temp";
+    repo.reference(charlie_ref, charlie_tip, true, "charlie remote")
+        .unwrap();
+    dag::reconcile(&repo, &ref_name, charlie_ref, &alice()).unwrap();
+    let state = IssueState::from_ref(&repo, &ref_name, &id).unwrap();
+    assert_eq!(state.comments.len(), 3, "all three comments must survive");
+    let bodies: Vec<&str> = state.comments.iter().map(|c| c.body.as_str()).collect();
+    assert!(bodies.contains(&"Alice here"));
+    assert!(bodies.contains(&"Bob here"));
+    assert!(bodies.contains(&"Charlie here"));
+}
+// ---------------------------------------------------------------------------
+// Multiple issues don't interfere
+// ---------------------------------------------------------------------------
+#[test]
+fn test_multiple_issues_independent() {
+    let tmp = TempDir::new().unwrap();
+    let repo = init_repo(tmp.path(), &alice());
+    let (ref1, id1) = open_issue(&repo, &alice(), "Issue one");
+    let (ref2, id2) = open_issue(&repo, &bob(), "Issue two");
+    add_comment(&repo, &ref1, &bob(), "Comment on issue one");
+    close_issue(&repo, &ref2, &bob());
+    let s1 = IssueState::from_ref(&repo, &ref1, &id1).unwrap();
+    let s2 = IssueState::from_ref(&repo, &ref2, &id2).unwrap();
+    assert_eq!(s1.status, IssueStatus::Open);
+    assert_eq!(s1.comments.len(), 1);
+    assert_eq!(s2.status, IssueStatus::Closed);
+    assert_eq!(s2.comments.len(), 0);
+}
+// ---------------------------------------------------------------------------
+// Edge cases
+// ---------------------------------------------------------------------------
+#[test]
+fn test_empty_issue_body() {
+    let tmp = TempDir::new().unwrap();
+    let repo = init_repo(tmp.path(), &alice());
+    let (ref_name, id) = open_issue(&repo, &alice(), "No body");
+    let state = IssueState::from_ref(&repo, &ref_name, &id).unwrap();
+    assert_eq!(state.body, "");
+}
+#[test]
+fn test_many_comments_performance() {
+    let tmp = TempDir::new().unwrap();
+    let repo = init_repo(tmp.path(), &alice());
+    let (ref_name, id) = open_issue(&repo, &alice(), "Many comments");
+    for i in 0..50 {
+        add_comment(&repo, &ref_name, &alice(), &format!("Comment {}", i));
+    }
+    let state = IssueState::from_ref(&repo, &ref_name, &id).unwrap();
+    assert_eq!(state.comments.len(), 50);
+}
+#[test]
+fn test_resolve_prefix_match() {
+    let tmp = TempDir::new().unwrap();
+    let repo = init_repo(tmp.path(), &alice());
+    let (_, id) = open_issue(&repo, &alice(), "Prefix test");
+    let short = &id[..8];
+    let (resolved_ref, resolved_id) = state::resolve_issue_ref(&repo, short).unwrap();
+    assert_eq!(resolved_id, id);
+    assert_eq!(resolved_ref, format!("refs/collab/issues/{}", id));
+}

tests/sync_test.rs

@@ @@ -0,0 +1,509 @@ @@
+//! End-to-end sync tests with two repos sharing a bare remote.
+//!
+//! Topology for every test:
+//!
+//!   bare_remote  <---push/fetch--->  alice_repo
+//!                <---push/fetch--->  bob_repo
+use tempfile::TempDir;
+use git2::Repository;
+use git_collab::dag;
+use git_collab::event::{Action, Author, Event, ReviewVerdict};
+use git_collab::state::{self, IssueState, IssueStatus, PatchState};
+use git_collab::sync;
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+fn alice() -> Author {
+    Author {
+        name: "Alice".to_string(),
+        email: "alice@example.com".to_string(),
+    }
+}
+fn bob() -> Author {
+    Author {
+        name: "Bob".to_string(),
+        email: "bob@example.com".to_string(),
+    }
+}
+fn now() -> String {
+    chrono::Utc::now().to_rfc3339()
+}
+/// Set up the standard test topology: bare remote + two clones.
+/// Returns (bare_dir, alice_dir, bob_dir) — TempDirs that must be kept alive.
+struct TestCluster {
+    _bare_dir: TempDir,
+    alice_dir: TempDir,
+    bob_dir: TempDir,
+}
+impl TestCluster {
+    fn new() -> Self {
+        let bare_dir = TempDir::new().unwrap();
+        let bare_repo = Repository::init_bare(bare_dir.path()).unwrap();
+        // Need at least one ref in the bare repo for clones to work,
+        // so we create a dummy initial commit on refs/heads/main.
+        {
+            let sig = git2::Signature::now("init", "init@test").unwrap();
+            let tree_oid = bare_repo.treebuilder(None).unwrap().write().unwrap();
+            let tree = bare_repo.find_tree(tree_oid).unwrap();
+            bare_repo
+                .commit(Some("refs/heads/main"), &sig, &sig, "init", &tree, &[])
+                .unwrap();
+        }
+        drop(bare_repo);
+        let alice_dir = TempDir::new().unwrap();
+        let bob_dir = TempDir::new().unwrap();
+        // Clone for Alice
+        let alice_repo =
+            Repository::clone(bare_dir.path().to_str().unwrap(), alice_dir.path()).unwrap();
+        {
+            let mut config = alice_repo.config().unwrap();
+            config.set_str("user.name", "Alice").unwrap();
+            config.set_str("user.email", "alice@example.com").unwrap();
+        }
+        sync::init(&alice_repo).unwrap();
+        // Clone for Bob
+        let bob_repo =
+            Repository::clone(bare_dir.path().to_str().unwrap(), bob_dir.path()).unwrap();
+        {
+            let mut config = bob_repo.config().unwrap();
+            config.set_str("user.name", "Bob").unwrap();
+            config.set_str("user.email", "bob@example.com").unwrap();
+        }
+        sync::init(&bob_repo).unwrap();
+        TestCluster {
+            _bare_dir: bare_dir,
+            alice_dir,
+            bob_dir,
+        }
+    }
+    fn alice_repo(&self) -> Repository {
+        Repository::open(self.alice_dir.path()).unwrap()
+    }
+    fn bob_repo(&self) -> Repository {
+        Repository::open(self.bob_dir.path()).unwrap()
+    }
+}
+fn open_issue(repo: &Repository, author: &Author, title: &str) -> (String, String) {
+    let event = Event {
+        timestamp: now(),
+        author: author.clone(),
+        action: Action::IssueOpen {
+            title: title.to_string(),
+            body: "".to_string(),
+        },
+    };
+    let oid = dag::create_root_event(repo, &event).unwrap();
+    let id = oid.to_string();
+    let ref_name = format!("refs/collab/issues/{}", id);
+    repo.reference(&ref_name, oid, false, "open").unwrap();
+    (ref_name, id)
+}
+fn add_comment(repo: &Repository, ref_name: &str, author: &Author, body: &str) {
+    let event = Event {
+        timestamp: now(),
+        author: author.clone(),
+        action: Action::IssueComment {
+            body: body.to_string(),
+        },
+    };
+    dag::append_event(repo, ref_name, &event).unwrap();
+}
+fn close_issue(repo: &Repository, ref_name: &str, author: &Author) {
+    let event = Event {
+        timestamp: now(),
+        author: author.clone(),
+        action: Action::IssueClose { reason: None },
+    };
+    dag::append_event(repo, ref_name, &event).unwrap();
+}
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+#[test]
+fn test_alice_creates_issue_bob_syncs_and_sees_it() {
+    let cluster = TestCluster::new();
+    let alice_repo = cluster.alice_repo();
+    let bob_repo = cluster.bob_repo();
+    // Alice creates an issue and syncs
+    let (_ref_name, id) = open_issue(&alice_repo, &alice(), "Bug from Alice");
+    sync::sync(&alice_repo, "origin").unwrap();
+    // Bob syncs and should see the issue
+    sync::sync(&bob_repo, "origin").unwrap();
+    let bob_ref = format!("refs/collab/issues/{}", id);
+    let state = IssueState::from_ref(&bob_repo, &bob_ref, &id).unwrap();
+    assert_eq!(state.title, "Bug from Alice");
+    assert_eq!(state.author.name, "Alice");
+    assert_eq!(state.status, IssueStatus::Open);
+}
+#[test]
+fn test_bob_comments_on_alice_issue_then_sync() {
+    let cluster = TestCluster::new();
+    let alice_repo = cluster.alice_repo();
+    let bob_repo = cluster.bob_repo();
+    // Alice creates issue, syncs
+    let (alice_ref, id) = open_issue(&alice_repo, &alice(), "Needs discussion");
+    sync::sync(&alice_repo, "origin").unwrap();
+    // Bob syncs, sees the issue, adds a comment, syncs
+    sync::sync(&bob_repo, "origin").unwrap();
+    let bob_ref = format!("refs/collab/issues/{}", id);
+    add_comment(&bob_repo, &bob_ref, &bob(), "I have thoughts on this");
+    sync::sync(&bob_repo, "origin").unwrap();
+    // Alice syncs again — should see Bob's comment
+    sync::sync(&alice_repo, "origin").unwrap();
+    let state = IssueState::from_ref(&alice_repo, &alice_ref, &id).unwrap();
+    assert_eq!(state.comments.len(), 1);
+    assert_eq!(state.comments[0].author.name, "Bob");
+    assert_eq!(state.comments[0].body, "I have thoughts on this");
+}
+#[test]
+fn test_concurrent_comments_sync_convergence() {
+    // Alice and Bob both comment on the same issue without syncing first.
+    // After both sync, they should converge to the same state.
+    let cluster = TestCluster::new();
+    let alice_repo = cluster.alice_repo();
+    let bob_repo = cluster.bob_repo();
+    // Alice creates issue, syncs so Bob can get it
+    let (alice_ref, id) = open_issue(&alice_repo, &alice(), "Concurrent comments");
+    sync::sync(&alice_repo, "origin").unwrap();
+    sync::sync(&bob_repo, "origin").unwrap();
+    // Both comment independently (no sync between)
+    add_comment(&alice_repo, &alice_ref, &alice(), "Alice's take");
+    let bob_ref = format!("refs/collab/issues/{}", id);
+    add_comment(&bob_repo, &bob_ref, &bob(), "Bob's take");
+    // Alice syncs first — pushes her comment
+    sync::sync(&alice_repo, "origin").unwrap();
+    // Bob syncs — fetches Alice's comment, reconciles fork, pushes merge
+    sync::sync(&bob_repo, "origin").unwrap();
+    // Alice syncs again to get the merge
+    sync::sync(&alice_repo, "origin").unwrap();
+    // Both should now have the same state
+    let alice_state = IssueState::from_ref(&alice_repo, &alice_ref, &id).unwrap();
+    let bob_state = IssueState::from_ref(&bob_repo, &bob_ref, &id).unwrap();
+    assert_eq!(alice_state.comments.len(), 2, "Alice should see 2 comments");
+    assert_eq!(bob_state.comments.len(), 2, "Bob should see 2 comments");
+    // Both should have the same comment bodies (order may vary)
+    let mut alice_bodies: Vec<&str> = alice_state
+        .comments
+        .iter()
+        .map(|c| c.body.as_str())
+        .collect();
+    let mut bob_bodies: Vec<&str> = bob_state.comments.iter().map(|c| c.body.as_str()).collect();
+    alice_bodies.sort();
+    bob_bodies.sort();
+    assert_eq!(alice_bodies, bob_bodies);
+    assert!(alice_bodies.contains(&"Alice's take"));
+    assert!(alice_bodies.contains(&"Bob's take"));
+}
+#[test]
+fn test_both_create_different_issues() {
+    // Alice and Bob each create their own issue without syncing.
+    // After sync, both should see both issues.
+    let cluster = TestCluster::new();
+    let alice_repo = cluster.alice_repo();
+    let bob_repo = cluster.bob_repo();
+    let (_, _alice_issue_id) = open_issue(&alice_repo, &alice(), "Alice's bug");
+    let (_, _bob_issue_id) = open_issue(&bob_repo, &bob(), "Bob's feature request");
+    // Alice syncs first
+    sync::sync(&alice_repo, "origin").unwrap();
+    // Bob syncs — gets Alice's issue, pushes his own
+    sync::sync(&bob_repo, "origin").unwrap();
+    // Alice syncs again — gets Bob's issue
+    sync::sync(&alice_repo, "origin").unwrap();
+    // Both repos should have both issues
+    let alice_issues = state::list_issues(&alice_repo).unwrap();
+    let bob_issues = state::list_issues(&bob_repo).unwrap();
+    assert_eq!(alice_issues.len(), 2);
+    assert_eq!(bob_issues.len(), 2);
+    let alice_titles: Vec<&str> = alice_issues.iter().map(|i| i.title.as_str()).collect();
+    assert!(alice_titles.contains(&"Alice's bug"));
+    assert!(alice_titles.contains(&"Bob's feature request"));
+}
+#[test]
+fn test_alice_closes_while_bob_comments() {
+    // Alice closes an issue while Bob comments on it concurrently.
+    let cluster = TestCluster::new();
+    let alice_repo = cluster.alice_repo();
+    let bob_repo = cluster.bob_repo();
+    let (alice_ref, id) = open_issue(&alice_repo, &alice(), "Close vs comment");
+    sync::sync(&alice_repo, "origin").unwrap();
+    sync::sync(&bob_repo, "origin").unwrap();
+    // Alice closes
+    close_issue(&alice_repo, &alice_ref, &alice());
+    // Bob comments
+    let bob_ref = format!("refs/collab/issues/{}", id);
+    add_comment(&bob_repo, &bob_ref, &bob(), "But wait...");
+    // Alice pushes first
+    sync::sync(&alice_repo, "origin").unwrap();
+    // Bob syncs — reconciles the fork
+    sync::sync(&bob_repo, "origin").unwrap();
+    // Alice syncs to get the merge
+    sync::sync(&alice_repo, "origin").unwrap();
+    // Both should see the comment AND the close
+    let alice_state = IssueState::from_ref(&alice_repo, &alice_ref, &id).unwrap();
+    let bob_state = IssueState::from_ref(&bob_repo, &bob_ref, &id).unwrap();
+    assert_eq!(alice_state.comments.len(), 1);
+    assert_eq!(bob_state.comments.len(), 1);
+    // Close happened, so status should be closed
+    // (both close and comment are in DAG; topo replay applies both)
+    assert_eq!(alice_state.status, bob_state.status);
+}
+#[test]
+fn test_sync_idempotent() {
+    // Syncing twice in a row should be a no-op the second time.
+    let cluster = TestCluster::new();
+    let alice_repo = cluster.alice_repo();
+    let bob_repo = cluster.bob_repo();
+    let (alice_ref, id) = open_issue(&alice_repo, &alice(), "Idempotent test");
+    add_comment(&alice_repo, &alice_ref, &alice(), "A comment");
+    sync::sync(&alice_repo, "origin").unwrap();
+    sync::sync(&bob_repo, "origin").unwrap();
+    // Sync again immediately — should not fail or duplicate
+    sync::sync(&bob_repo, "origin").unwrap();
+    let bob_ref = format!("refs/collab/issues/{}", id);
+    let state = IssueState::from_ref(&bob_repo, &bob_ref, &id).unwrap();
+    assert_eq!(state.comments.len(), 1, "no duplicate comments");
+}
+#[test]
+fn test_three_user_convergence() {
+    // Three users (Alice, Bob, Charlie) all working on the same issue.
+    // Charlie uses Alice's repo path as a second remote.
+    let cluster = TestCluster::new();
+    let alice_repo = cluster.alice_repo();
+    let bob_repo = cluster.bob_repo();
+    // Alice creates issue, everyone syncs
+    let (alice_ref, id) = open_issue(&alice_repo, &alice(), "Three users");
+    sync::sync(&alice_repo, "origin").unwrap();
+    sync::sync(&bob_repo, "origin").unwrap();
+    // Alice and Bob both comment
+    add_comment(&alice_repo, &alice_ref, &alice(), "Alice's comment");
+    let bob_ref = format!("refs/collab/issues/{}", id);
+    add_comment(&bob_repo, &bob_ref, &bob(), "Bob's comment");
+    // Alice syncs, Bob syncs, Alice syncs again (full convergence)
+    sync::sync(&alice_repo, "origin").unwrap();
+    sync::sync(&bob_repo, "origin").unwrap();
+    sync::sync(&alice_repo, "origin").unwrap();
+    let alice_state = IssueState::from_ref(&alice_repo, &alice_ref, &id).unwrap();
+    let bob_state = IssueState::from_ref(&bob_repo, &bob_ref, &id).unwrap();
+    assert_eq!(alice_state.comments.len(), 2);
+    assert_eq!(bob_state.comments.len(), 2);
+}
+#[test]
+fn test_patch_review_across_repos() {
+    let cluster = TestCluster::new();
+    let alice_repo = cluster.alice_repo();
+    let bob_repo = cluster.bob_repo();
+    // Alice creates a patch
+    let event = Event {
+        timestamp: now(),
+        author: alice(),
+        action: Action::PatchCreate {
+            title: "Add feature X".to_string(),
+            body: "Please review".to_string(),
+            base_ref: "main".to_string(),
+            head_commit: "abc123".to_string(),
+        },
+    };
+    let oid = dag::create_root_event(&alice_repo, &event).unwrap();
+    let id = oid.to_string();
+    let alice_ref = format!("refs/collab/patches/{}", id);
+    alice_repo
+        .reference(&alice_ref, oid, false, "patch create")
+        .unwrap();
+    // Alice syncs
+    sync::sync(&alice_repo, "origin").unwrap();
+    // Bob syncs, reviews the patch
+    sync::sync(&bob_repo, "origin").unwrap();
+    let bob_ref = format!("refs/collab/patches/{}", id);
+    let review_event = Event {
+        timestamp: now(),
+        author: bob(),
+        action: Action::PatchReview {
+            verdict: ReviewVerdict::Approve,
+            body: "LGTM!".to_string(),
+        },
+    };
+    dag::append_event(&bob_repo, &bob_ref, &review_event).unwrap();
+    sync::sync(&bob_repo, "origin").unwrap();
+    // Alice syncs and sees the review
+    sync::sync(&alice_repo, "origin").unwrap();
+    let state = PatchState::from_ref(&alice_repo, &alice_ref, &id).unwrap();
+    assert_eq!(state.reviews.len(), 1);
+    assert_eq!(state.reviews[0].verdict, ReviewVerdict::Approve);
+    assert_eq!(state.reviews[0].author.name, "Bob");
+}
+#[test]
+fn test_concurrent_review_and_revise() {
+    // Bob reviews while Alice revises the patch concurrently.
+    let cluster = TestCluster::new();
+    let alice_repo = cluster.alice_repo();
+    let bob_repo = cluster.bob_repo();
+    // Alice creates patch, syncs
+    let event = Event {
+        timestamp: now(),
+        author: alice(),
+        action: Action::PatchCreate {
+            title: "WIP feature".to_string(),
+            body: "".to_string(),
+            base_ref: "main".to_string(),
+            head_commit: "v1".to_string(),
+        },
+    };
+    let oid = dag::create_root_event(&alice_repo, &event).unwrap();
+    let id = oid.to_string();
+    let alice_ref = format!("refs/collab/patches/{}", id);
+    alice_repo
+        .reference(&alice_ref, oid, false, "patch")
+        .unwrap();
+    sync::sync(&alice_repo, "origin").unwrap();
+    sync::sync(&bob_repo, "origin").unwrap();
+    // Alice revises (without syncing)
+    let revise_event = Event {
+        timestamp: now(),
+        author: alice(),
+        action: Action::PatchRevise {
+            body: Some("Updated description".to_string()),
+            head_commit: "v2".to_string(),
+        },
+    };
+    dag::append_event(&alice_repo, &alice_ref, &revise_event).unwrap();
+    // Bob reviews (without syncing)
+    let bob_ref = format!("refs/collab/patches/{}", id);
+    let review_event = Event {
+        timestamp: now(),
+        author: bob(),
+        action: Action::PatchReview {
+            verdict: ReviewVerdict::RequestChanges,
+            body: "Needs work".to_string(),
+        },
+    };
+    dag::append_event(&bob_repo, &bob_ref, &review_event).unwrap();
+    // Both sync
+    sync::sync(&alice_repo, "origin").unwrap();
+    sync::sync(&bob_repo, "origin").unwrap();
+    sync::sync(&alice_repo, "origin").unwrap();
+    // Both should see revise + review
+    let alice_state = PatchState::from_ref(&alice_repo, &alice_ref, &id).unwrap();
+    let bob_state = PatchState::from_ref(&bob_repo, &bob_ref, &id).unwrap();
+    assert_eq!(alice_state.reviews.len(), 1);
+    assert_eq!(bob_state.reviews.len(), 1);
+    // The revise should have updated the head_commit
+    assert_eq!(alice_state.head_commit, bob_state.head_commit);
+}
+#[test]
+fn test_multiple_rounds_of_sync() {
+    // Simulate a realistic back-and-forth conversation on an issue.
+    let cluster = TestCluster::new();
+    let alice_repo = cluster.alice_repo();
+    let bob_repo = cluster.bob_repo();
+    // Round 1: Alice opens issue
+    let (alice_ref, id) = open_issue(&alice_repo, &alice(), "Discussion thread");
+    sync::sync(&alice_repo, "origin").unwrap();
+    sync::sync(&bob_repo, "origin").unwrap();
+    let bob_ref = format!("refs/collab/issues/{}", id);
+    // Round 2: Bob comments
+    add_comment(&bob_repo, &bob_ref, &bob(), "First response");
+    sync::sync(&bob_repo, "origin").unwrap();
+    sync::sync(&alice_repo, "origin").unwrap();
+    // Round 3: Alice replies
+    add_comment(&alice_repo, &alice_ref, &alice(), "Thanks for the input");
+    sync::sync(&alice_repo, "origin").unwrap();
+    sync::sync(&bob_repo, "origin").unwrap();
+    // Round 4: Bob closes
+    close_issue(&bob_repo, &bob_ref, &bob());
+    sync::sync(&bob_repo, "origin").unwrap();
+    sync::sync(&alice_repo, "origin").unwrap();
+    let state = IssueState::from_ref(&alice_repo, &alice_ref, &id).unwrap();
+    assert_eq!(state.comments.len(), 2);
+    assert_eq!(state.status, IssueStatus::Closed);
+    assert_eq!(state.comments[0].body, "First response");
+    assert_eq!(state.comments[1].body, "Thanks for the input");
+}