malice

public

Star0

Fork 0

Watch0

89 commits 2 branches 0 tags 0 releases4.4 MiB

Commit `249e439c27e5`

tarball

atagen <boss@atagen.co>2026-10-25 13:44 UTC

29 files changed+1661-326

macltok: adapt to e521a71

Event context, search and thread lists are now sessions in macltok, so the old room-keyed context routes could never page and are replaced by commands carrying context_id, and search and thread lists close what they open. The foldout prefers the timeline thread summary over the thread list count because the list currently double counts replies. Mention coverage dropped incomplete_history, which made every mentions page fail to parse.

Modified file: Cargo.lock+506 additions−12 deletions@@ -51,6 +51,12 @@ dependencies = [
 ]
 
 [[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.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -86,6 +92,15 @@ dependencies = [
 ]
 
 [[package]]
+name = "arc-swap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "380962b3d93b99642e50b9febf72c071e97e8b32d86eae9cf4ef582bb960ae6e"
+dependencies = [
+ "rustversion",
+]
+
+[[package]]
 name = "archery"
 version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -361,6 +376,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6"
 
 [[package]]
+name = "bitpacking"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96a7139abd3d9cebf8cd6f920a389cf3dc9576172e32f4563f188cae3c3eb019"
+dependencies = [
+ "crunchy",
+]
+
+[[package]]
 name = "blake3"
 version = "1.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -392,6 +416,29 @@ dependencies = [
 ]
 
 [[package]]
+name = "bon"
+version = "3.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a05442cd7005532d0cfedec676b5b9333d2b4c7c3afabe2b1a9ce2742fbe2ee6"
+dependencies = [
+ "bon-macros",
+]
+
+[[package]]
+name = "bon-macros"
+version = "3.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93833e97ac7c46ba97045afcf247238c27057538fcf2f06344662ddd5f567be6"
+dependencies = [
+ "darling",
+ "ident_case",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn 3.0.6",
+]
+
+[[package]]
 name = "bs58"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -464,6 +511,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "census"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f4c707c6a209cbe82d10abd08e1ea8995e9ea937d2550646e02798948992be0"
+
+[[package]]
 name = "cfg-if"
 version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -668,12 +721,46 @@ dependencies = [
 ]
 
 [[package]]
+name = "crossbeam-channel"
+version = "0.5.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98b0cc327b5bc766e7fda9c9260cc0fa81b43a8e240440422dff70788e3f9ef1"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "622f3fc73690be383c7214310406f28a90e6edeadc3cea882f9d71e495b9711a"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc74980687109a3b14c72fd458107bf0baa1da1a1a805e178d15501ba9b86d9d"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
 name = "crossbeam-utils"
 version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6"
 
 [[package]]
+name = "crunchy"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+
+[[package]]
 name = "crypto-common"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -732,6 +819,46 @@ dependencies = [
 ]
 
 [[package]]
+name = "darling"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed17f5901b6630b993ca003def43f2f8ef4014fc13b047b57aad617ff32bc2ec"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6837e2cf7485aaae18f86181d2f0e9a7ed297a025e220aeabf63fdebd3a2ddff"
+dependencies = [
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 3.0.6",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ac7135c3ef02b2f7833bbeb1be5ba7f966dcde8a87c6b87f65a778d71a02785"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 3.0.6",
+]
+
+[[package]]
+name = "datasketches"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c286de4e81ea2590afc24d754e0f83810c566f50a1388fa75ebd57928c0d9745"
+
+[[package]]
 name = "date_header"
 version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -818,6 +945,9 @@ name = "deranged"
 version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
+dependencies = [
+ "serde_core",
+]
 
 [[package]]
 name = "derivative"
@@ -895,6 +1025,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "downcast-rs"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "117240f60069e65410b3ae1bb213295bd828f707b5bec6596a1afc8793ce0cbc"
+
+[[package]]
 name = "dunce"
 version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -969,6 +1105,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
+name = "erased-serde"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e59b668157f32d3459d4bd634861a06ffa2503a461ca5f0916b9f0252605e66"
+dependencies = [
+ "serde",
+ "serde_core",
+ "typeid",
+]
+
+[[package]]
 name = "errno"
 version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1063,6 +1210,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "fastdivide"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9afc2bd4d5a73106dd53d10d73d3401c2f32730ba2c0b93ddb888a8983680471"
+
+[[package]]
 name = "fastrand"
 version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1113,6 +1266,12 @@ 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"
@@ -1362,7 +1521,18 @@ version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 dependencies = [
- "foldhash",
+ "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]]
@@ -1421,6 +1591,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "htmlescape"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163"
+
+[[package]]
 name = "http"
 version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1639,6 +1815,12 @@ dependencies = [
 ]
 
 [[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"
@@ -1779,6 +1961,15 @@ dependencies = [
 ]
 
 [[package]]
+name = "inventory"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6928282826c822ad91bf1c9a1cb90a30ba1c26770749929b4656cd6be829cd7c"
+dependencies = [
+ "rustversion",
+]
+
+[[package]]
 name = "ipnet"
 version = "2.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1919,6 +2110,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
+name = "levenshtein_automata"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25"
+
+[[package]]
 name = "libc"
 version = "0.2.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1992,15 +2189,30 @@ dependencies = [
 ]
 
 [[package]]
+name = "lru"
+version = "0.16.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f66e8d5d03f609abc3a39e6f08e4164ebf1447a732906d39eb9b99b7919ef39"
+dependencies = [
+ "hashbrown 0.16.1",
+]
+
+[[package]]
 name = "lru-slab"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4050469837a6ff301cd14c1f8f24f88549e6d548f24f64e2148eb0f72cebc51f"
 
 [[package]]
+name = "lz4_flex"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ef0d4ed8669f8f8826eb00dc878084aa8f253506c4fd5e8f58f5bce72ddb97e"
+
+[[package]]
 name = "macltok"
 version = "0.1.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/macltok?rev=8fd8dcf69c68a45d7ceb5d553230e1df3efada9d#8fd8dcf69c68a45d7ceb5d553230e1df3efada9d"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/macltok?rev=e521a7177da3a9606f06df063e7095e5a1f00447#e521a7177da3a9606f06df063e7095e5a1f00447"
 dependencies = [
  "futures-util",
  "getrandom 0.2.17",
@@ -2008,6 +2220,7 @@ dependencies = [
  "getrandom 0.4.3",
  "http",
  "imbl",
+ "log",
  "matrix-sdk",
  "matrix-sdk-base",
  "matrix-sdk-crypto",
@@ -2020,6 +2233,8 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2",
+ "tantivy",
+ "tantivy-common",
  "thiserror 2.0.21",
  "tokio",
  "tracing",
@@ -2232,7 +2447,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=9b2c17fb10703d90b177b02588912a34cecfa11f#9b2c17fb10703d90b177b02588912a34cecfa11f"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
 dependencies = [
  "anymap2",
  "aquamarine",
@@ -2295,7 +2510,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-base"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=9b2c17fb10703d90b177b02588912a34cecfa11f#9b2c17fb10703d90b177b02588912a34cecfa11f"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
 dependencies = [
  "as_variant",
  "assert_matches",
@@ -2325,7 +2540,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-common"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=9b2c17fb10703d90b177b02588912a34cecfa11f#9b2c17fb10703d90b177b02588912a34cecfa11f"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
 dependencies = [
  "eyeball-im",
  "futures-core",
@@ -2348,7 +2563,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-crypto"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=9b2c17fb10703d90b177b02588912a34cecfa11f#9b2c17fb10703d90b177b02588912a34cecfa11f"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
 dependencies = [
  "aes",
  "aquamarine",
@@ -2389,7 +2604,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-indexeddb"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=9b2c17fb10703d90b177b02588912a34cecfa11f#9b2c17fb10703d90b177b02588912a34cecfa11f"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -2420,7 +2635,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-sqlite"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=9b2c17fb10703d90b177b02588912a34cecfa11f#9b2c17fb10703d90b177b02588912a34cecfa11f"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
 dependencies = [
  "as_variant",
  "async-trait",
@@ -2447,7 +2662,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-store-encryption"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=9b2c17fb10703d90b177b02588912a34cecfa11f#9b2c17fb10703d90b177b02588912a34cecfa11f"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
 dependencies = [
  "base64 0.22.1",
  "blake3",
@@ -2468,7 +2683,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-test"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=9b2c17fb10703d90b177b02588912a34cecfa11f#9b2c17fb10703d90b177b02588912a34cecfa11f"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
 dependencies = [
  "as_variant",
  "ctor",
@@ -2491,7 +2706,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-test-macros"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=9b2c17fb10703d90b177b02588912a34cecfa11f#9b2c17fb10703d90b177b02588912a34cecfa11f"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
 dependencies = [
  "quote",
  "syn 2.0.119",
@@ -2500,7 +2715,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-ui"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=9b2c17fb10703d90b177b02588912a34cecfa11f#9b2c17fb10703d90b177b02588912a34cecfa11f"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
 dependencies = [
  "as_variant",
  "async-rx",
@@ -2575,6 +2790,15 @@ dependencies = [
 ]
 
 [[package]]
+name = "measure_time"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51c55d61e72fc3ab704396c5fa16f4c184db37978ae4e94ca8959693a235fc0e"
+dependencies = [
+ "log",
+]
+
+[[package]]
 name = "memchr"
 version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2613,6 +2837,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
 name = "miniz_oxide"
 version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2698,12 +2928,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "743fb55ba31b18fb1ecef6bdc9aa2743314978ac084044301a7eee33fb99a20d"
 
 [[package]]
+name = "murmurhash32"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b"
+
+[[package]]
 name = "new_debug_unreachable"
 version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
 [[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 = "nu-ansi-term"
 version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2774,6 +3020,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
+name = "oneshot"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "269bca4c2591a28585d6bf10d9ed0332b7d76900a1b02bec41bdc3a2cdcda107"
+
+[[package]]
 name = "oorandom"
 version = "11.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2792,6 +3044,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
 
 [[package]]
+name = "ordered-float"
+version = "5.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c7c9e0d9b23589f26070720bac724174bfec1083e82f7854cdd0267518343c0"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "ownedbytes"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fbd56f7631767e61784dc43f8580f403f4475bd4aaa4da003e6295e1bab4a7e"
+dependencies = [
+ "stable_deref_trait",
+]
+
+[[package]]
 name = "parking"
 version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2993,6 +3263,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
 [[package]]
+name = "prettyplease"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bfe0f4c752e450fc2faf62654f1c134747922825d5b04ca717b8874f41a40c0"
+dependencies = [
+ "proc-macro2",
+ "syn 3.0.6",
+]
+
+[[package]]
 name = "proc-macro-crate"
 version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3239,6 +3519,26 @@ dependencies = [
 ]
 
 [[package]]
+name = "rayon"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
 name = "readlock"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3900,6 +4200,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
 
 [[package]]
+name = "sketches-ddsketch"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "513c3f5f732bfd6fbb187619c2dfe9d2f25f1a2976f01d575f0fd329d565df56"
+dependencies = [
+ "serde",
+]
+
+[[package]]
 name = "slab"
 version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3971,6 +4280,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
 name = "subtle"
 version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4030,6 +4345,149 @@ dependencies = [
 ]
 
 [[package]]
+name = "tantivy"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "861facfabd71044968f364837f9a083b56464ba5a59079f88706ee5c451ca069"
+dependencies = [
+ "aho-corasick",
+ "arc-swap",
+ "base64 0.22.1",
+ "bitpacking",
+ "bon",
+ "byteorder",
+ "census",
+ "crc32fast",
+ "crossbeam-channel",
+ "datasketches",
+ "downcast-rs",
+ "fastdivide",
+ "fnv",
+ "htmlescape",
+ "itertools 0.14.0",
+ "levenshtein_automata",
+ "log",
+ "lru",
+ "lz4_flex",
+ "measure_time",
+ "once_cell",
+ "oneshot",
+ "rayon",
+ "regex",
+ "rustc-hash",
+ "serde",
+ "serde_json",
+ "sketches-ddsketch",
+ "smallvec",
+ "tantivy-bitpacker",
+ "tantivy-columnar",
+ "tantivy-common",
+ "tantivy-fst",
+ "tantivy-query-grammar",
+ "tantivy-stacker",
+ "tantivy-tokenizer-api",
+ "thiserror 2.0.21",
+ "time",
+ "typetag",
+ "uuid",
+ "winapi",
+]
+
+[[package]]
+name = "tantivy-bitpacker"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fed3d674429bcd2de5d0a6d1aa5495fed8afd9c5ecce993019caf7615f53fa4"
+dependencies = [
+ "bitpacking",
+]
+
+[[package]]
+name = "tantivy-columnar"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c57166f5bcfd478f370ab8445afb4678dce44801fa5ce5c451aaf8595583c5dc"
+dependencies = [
+ "downcast-rs",
+ "fastdivide",
+ "itertools 0.14.0",
+ "serde",
+ "tantivy-bitpacker",
+ "tantivy-common",
+ "tantivy-sstable",
+ "tantivy-stacker",
+]
+
+[[package]]
+name = "tantivy-common"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbf10915aa75da3c3b0d58b58853d2e889efbaf32d4982a4c3715dde6bba23e5"
+dependencies = [
+ "async-trait",
+ "byteorder",
+ "ownedbytes",
+ "serde",
+ "time",
+]
+
+[[package]]
+name = "tantivy-fst"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d60769b80ad7953d8a7b2c70cdfe722bbcdcac6bccc8ac934c40c034d866fc18"
+dependencies = [
+ "byteorder",
+ "regex-syntax",
+ "utf8-ranges",
+]
+
+[[package]]
+name = "tantivy-query-grammar"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfadb8526b6da90704feb293b0701a6aae62ea14983143344be2dc5ce30f1d82"
+dependencies = [
+ "fnv",
+ "nom",
+ "ordered-float",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "tantivy-sstable"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a2cfc3ac5164cbadc28965ffb145a8f47582a60ae5897859ad8d4316596c606"
+dependencies = [
+ "futures-util",
+ "itertools 0.14.0",
+ "tantivy-bitpacker",
+ "tantivy-common",
+ "tantivy-fst",
+]
+
+[[package]]
+name = "tantivy-stacker"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6cbb051742da9d53ca9e8fff43a9b10e319338b24e2c0e15d0372df19ffeb951"
+dependencies = [
+ "murmurhash32",
+ "tantivy-common",
+]
+
+[[package]]
+name = "tantivy-tokenizer-api"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eac258c2c6390673f2685813afeeafcb8c4e0ee7de8dd3fc46838dcc37263f98"
+dependencies = [
+ "serde",
+]
+
+[[package]]
 name = "tempfile"
 version = "3.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4379,12 +4837,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
+name = "typeid"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
+
+[[package]]
 name = "typenum"
 version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
 
 [[package]]
+name = "typetag"
+version = "0.2.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c90e86058a30d42a1a928dfb4b49bb33c98c3a2b4909492e6b0881cd94798ec2"
+dependencies = [
+ "erased-serde",
+ "inventory",
+ "once_cell",
+ "serde",
+ "typetag-impl",
+]
+
+[[package]]
+name = "typetag-impl"
+version = "0.2.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f153acc4e99a5f2a5aefa09fb078be54e26271b2813f6041200b224c098d8328"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.6",
+]
+
+[[package]]
 name = "typewit"
 version = "1.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4475,6 +4963,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
 [[package]]
+name = "utf8-ranges"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba"
+
+[[package]]
 name = "utf8_iter"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"

Modified file: Cargo.toml+1−1

@@ -3,7 +3,7 @@ resolver = "3"

33 members = ["crates/malice-core", "crates/malice-server", "crates/malice-static"]

55 [workspace.dependencies]

-macltok = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/macltok", rev = "8fd8dcf69c68a45d7ceb5d553230e1df3efada9d" }

+macltok = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/macltok", rev = "e521a7177da3a9606f06df063e7095e5a1f00447" }

77 ruma = { version = "0.16", default-features = false }

88 serde = { version = "1", features = ["derive"] }

99 serde_json = "1"

Modified file: crates/malice-core/src/error.rs+6 additions−3 deletions@@ -52,9 +52,12 @@ impl From<macltok::Error> for CoreError {
                 );
             }
             ErrorKind::QueueFull | ErrorKind::RoomBusy | ErrorKind::RateLimited => Failure::Busy,
-            ErrorKind::RoomUnknown | ErrorKind::EventNotFound | ErrorKind::MediaUnknown | ErrorKind::MediaUnavailable => {
-                Failure::NotFound
-            }
+            ErrorKind::RoomUnknown
+            | ErrorKind::EventNotFound
+            | ErrorKind::MediaUnknown
+            | ErrorKind::MediaUnavailable
+            | ErrorKind::EventContextNotOpen
+            | ErrorKind::SearchNotOpen => Failure::NotFound,
             ErrorKind::MediaTooLarge => Failure::TooLarge,
             ErrorKind::Forbidden => Failure::Forbidden,
             ErrorKind::Invalid | ErrorKind::EmptyBody => Failure::BadRequest,

Modified file: crates/malice-core/src/feed.rs+51 additions−3 deletions@@ -2,9 +2,10 @@ use std::collections::HashMap;
 
 use futures_util::{Stream, StreamExt, stream};
 use macltok::{
-    ConnectionState, EncryptionState, ImagePacks, MentionsPage, MentionsUpdate, MirrorHandle,
-    RecentHistoryState, RoomSummary, SessionStatus, State, StateChange, TimelineChange, TimelineId,
-    TimelineItem, UploadOutcome, VerificationState, imbl::Vector,
+    ConnectionState, EncryptionState, HistoryState, ImagePacks, MentionsPage, MentionsUpdate,
+    MirrorHandle, RecentHistoryState, RoomSummary, SessionStatus, State, StateChange,
+    ThreadListChange, ThreadListEntry, ThreadListState, TimelineChange, TimelineId, TimelineItem,
+    UploadOutcome, VerificationState, imbl::Vector,
 };
 use serde::Serialize;
 
@@ -49,6 +50,23 @@ pub enum WireEvent {
         room_id: String,
         root_event_id: String,
     },
+    ThreadList {
+        room_id: String,
+        entries: Vector<ThreadListEntry>,
+    },
+    ThreadListHistory {
+        room_id: String,
+        state: HistoryState,
+    },
+    ThreadListClosed {
+        room_id: String,
+    },
+    EventContextClosed {
+        context_id: String,
+    },
+    SearchClosed {
+        search_id: String,
+    },
     Connection {
         state: String,
     },
@@ -75,6 +93,7 @@ pub struct Snapshot {
     pub timelines: HashMap<String, Vector<TimelineItem>>,
     pub pinned: HashMap<String, Vector<TimelineItem>>,
     pub threads: Vec<ThreadItems>,
+    pub thread_lists: HashMap<String, ThreadListState>,
     pub connection: String,
     pub encryption: Option<EncryptionState>,
     pub verification: Option<VerificationState>,
@@ -152,6 +171,11 @@ pub fn snapshot_event(state: &State) -> WireEvent {
         timelines,
         pinned,
         threads,
+        thread_lists: state
+            .thread_lists
+            .iter()
+            .map(|(room_id, list)| (room_id.as_str().to_owned(), list.clone()))
+            .collect(),
         connection: connection_label(&state.connection),
         encryption: state.encryption.clone(),
         verification: state.verification.clone(),
@@ -256,6 +280,30 @@ pub fn wire_events(change: &StateChange) -> Vec<WireEvent> {
             state: state.clone(),
         }],
         StateChange::NotificationSettings => vec![WireEvent::NotificationSettings],
+        StateChange::ThreadList { room_id, change } => {
+            let room_id = room_id.as_str().to_owned();
+            match change {
+                ThreadListChange::Reset { entries } | ThreadListChange::Changed { entries, .. } => {
+                    vec![WireEvent::ThreadList {
+                        room_id,
+                        entries: entries.clone(),
+                    }]
+                }
+                ThreadListChange::History(state) => vec![WireEvent::ThreadListHistory {
+                    room_id,
+                    state: state.clone(),
+                }],
+                ThreadListChange::Closed(_) => vec![WireEvent::ThreadListClosed { room_id }],
+            }
+        }
+        StateChange::EventContextClosed { context_id, .. } => {
+            vec![WireEvent::EventContextClosed {
+                context_id: context_id.clone(),
+            }]
+        }
+        StateChange::SearchClosed { search_id, .. } => vec![WireEvent::SearchClosed {
+            search_id: search_id.clone(),
+        }],
         StateChange::Failed(failure) => vec![error(&failure.message)],
         StateChange::SessionSaveFailed(_) => {
             vec![error(

Modified file: crates/malice-core/src/request.rs+123 additions−19 deletions@@ -2,7 +2,8 @@ use macltok::ruma::{OwnedTransactionId, events::GlobalAccountDataEventType, serd
 use macltok::{
     AttachmentUpload, ClientHandle, CreateRoomOptions, ImagePackSource, MediaId, MediaSize,
     MemberFilter, MentionKey, MentionsBoundary, MessageContent, MessageEditContent, MirrorHandle,
-    PackImageInfo, PackUsage, Patch, RichText, TimelineId, VerificationAction, VerificationTarget,
+    PackImageInfo, PackUsage, Patch, RichText, SearchScope, TimelineId, VerificationAction,
+    VerificationTarget,
 };
 use serde::Deserialize;
 use serde_json::json;
@@ -113,7 +114,7 @@ pub enum Request {
         #[serde(default)]
         thread_root: Option<String>,
     },
-    StartRecentHistory {
+    RetryRecentHistory {
         room_id: String,
     },
     FillHistoryGap {
@@ -132,7 +133,7 @@ pub enum Request {
     },
     EventContextBefore {
         #[serde(default)]
-        room_id: String,
+        context_id: String,
         #[serde(default)]
         token: String,
         #[serde(default)]
@@ -140,12 +141,44 @@ pub enum Request {
     },
     EventContextAfter {
         #[serde(default)]
-        room_id: String,
+        context_id: String,
         #[serde(default)]
         token: String,
         #[serde(default)]
         limit: u32,
     },
+    CloseEventContext {
+        context_id: String,
+    },
+    OpenThreadList {
+        room_id: String,
+    },
+    PaginateThreadList {
+        room_id: String,
+        #[serde(default)]
+        limit: u32,
+    },
+    CloseThreadList {
+        room_id: String,
+    },
+    Search {
+        query: String,
+        scope: SearchScope,
+        #[serde(default)]
+        limit: u32,
+    },
+    SearchMore {
+        search_id: String,
+        cursor: String,
+        #[serde(default)]
+        limit: u32,
+    },
+    CloseSearch {
+        search_id: String,
+    },
+    SearchCoverage {
+        scope: SearchScope,
+    },
     MentionsPage {
         #[serde(default)]
         cursor: Option<String>,
@@ -358,6 +391,8 @@ pub enum Request {
     },
     SendSticker {
         room_id: String,
+        #[serde(default)]
+        thread_root: Option<String>,
         pack_id: String,
         shortcode: String,
     },
@@ -477,6 +512,22 @@ fn pack_text(value: String, what: &str) -> Result<String, CoreError> {
     Ok(value)
 }
 
+/// A page of zero is macltok's Invalid, so an omitted limit means a full page instead.
+fn page_limit(limit: u32) -> Result<u16, CoreError> {
+    match limit {
+        0 => Ok(50),
+        1..=50 => Ok(limit as u16),
+        _ => Err(CoreError::bad_request("limit must be 1..50")),
+    }
+}
+
+fn context_limit(limit: u32) -> Result<u16, CoreError> {
+    if limit > 50 {
+        return Err(CoreError::bad_request("limit must be 0..50"));
+    }
+    Ok(limit as u16)
+}
+
 fn clone_usage(usage: Option<Vec<PackUsage>>) -> Result<Option<Vec<PackUsage>>, CoreError> {
     if usage.as_ref().is_some_and(Vec::is_empty) {
         return Err(CoreError::bad_request(
@@ -610,9 +661,9 @@ pub async fn dispatch(
                 .await?;
             Ok(Reply::Done)
         }
-        Request::StartRecentHistory { room_id } => {
+        Request::RetryRecentHistory { room_id } => {
             handle
-                .start_recent_history(parse_room_id(&room_id)?)
+                .retry_recent_history(parse_room_id(&room_id)?)
                 .await?;
             Ok(Reply::Done)
         }
@@ -633,29 +684,81 @@ pub async fn dispatch(
         } => {
             let room_id = parse_room_id(&room_id)?;
             let event_id = parse_event_id(&event_id)?;
-            let context = handle
-                .event_context(&room_id, &event_id, before_limit, after_limit)
+            let session = handle
+                .event_context(
+                    &room_id,
+                    &event_id,
+                    context_limit(before_limit)?,
+                    context_limit(after_limit)?,
+                )
                 .await?;
-            Ok(Reply::Json(json!(context)))
+            Ok(Reply::Json(json!(session)))
         }
         Request::EventContextBefore {
-            room_id,
+            context_id,
             token,
             limit,
         } => {
-            let room_id = parse_room_id(&room_id)?;
-            let page = handle.event_context_before(&room_id, &token, limit).await?;
+            let page = handle
+                .event_context_before(&context_id, &token, page_limit(limit)?)
+                .await?;
             Ok(Reply::Json(json!(page)))
         }
         Request::EventContextAfter {
-            room_id,
+            context_id,
             token,
             limit,
         } => {
-            let room_id = parse_room_id(&room_id)?;
-            let page = handle.event_context_after(&room_id, &token, limit).await?;
+            let page = handle
+                .event_context_after(&context_id, &token, page_limit(limit)?)
+                .await?;
+            Ok(Reply::Json(json!(page)))
+        }
+        Request::CloseEventContext { context_id } => {
+            handle.close_event_context(&context_id).await?;
+            Ok(Reply::Done)
+        }
+        Request::OpenThreadList { room_id } => {
+            handle.open_thread_list(parse_room_id(&room_id)?).await?;
+            Ok(Reply::Done)
+        }
+        Request::PaginateThreadList { room_id, limit } => {
+            handle
+                .paginate_thread_list(parse_room_id(&room_id)?, page_limit(limit)?)
+                .await?;
+            Ok(Reply::Done)
+        }
+        Request::CloseThreadList { room_id } => {
+            handle.close_thread_list(parse_room_id(&room_id)?).await?;
+            Ok(Reply::Done)
+        }
+        Request::Search {
+            query,
+            scope,
+            limit,
+        } => {
+            let session = handle
+                .search_messages(&query, scope, page_limit(limit)?)
+                .await?;
+            Ok(Reply::Json(json!(session)))
+        }
+        Request::SearchMore {
+            search_id,
+            cursor,
+            limit,
+        } => {
+            let page = handle
+                .search_more(&search_id, &cursor, page_limit(limit)?)
+                .await?;
             Ok(Reply::Json(json!(page)))
         }
+        Request::CloseSearch { search_id } => {
+            handle.close_search(&search_id).await?;
+            Ok(Reply::Done)
+        }
+        Request::SearchCoverage { scope } => {
+            Ok(Reply::Json(json!(handle.search_coverage(scope).await?)))
+        }
         Request::MentionsPage { cursor, limit } => {
             let page = handle
                 .mentions_page(cursor, if limit == 0 { 50 } else { limit.clamp(1, 50) })
@@ -1111,12 +1214,13 @@ pub async fn dispatch(
         }
         Request::SendSticker {
             room_id,
+            thread_root,
             pack_id,
             shortcode,
         } => {
             handle
                 .send_sticker(
-                    parse_room_id(&room_id)?,
+                    timeline_for(&room_id, thread_root.as_deref())?,
                     pack_text(pack_id, "pack_id")?,
                     pack_text(shortcode, "shortcode")?,
                 )
@@ -1222,7 +1326,7 @@ pub async fn dispatch(
             usage,
         } => {
             let shortcode = handle
-                .clone_pack_image_with_usage(
+                .clone_pack_image(
                     pack_text(from_pack, "pack_id")?,
                     pack_text(shortcode, "shortcode")?,
                     to.source()?,
@@ -1239,7 +1343,7 @@ pub async fn dispatch(
             usage,
         } => {
             let shortcode = handle
-                .clone_sticker_with_usage(
+                .clone_sticker(
                     parse_room_id(&room_id)?,
                     parse_event_id(&event_id)?,
                     to.source()?,
@@ -1256,7 +1360,7 @@ pub async fn dispatch(
             usage,
         } => {
             let skipped = handle
-                .clone_pack_with_usage(
+                .clone_pack(
                     pack_text(from_pack, "pack_id")?,
                     to.source()?,
                     display_name,

Modified file: crates/malice-server/Cargo.toml+1−1

@@ -31,7 +31,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }

3131 [dev-dependencies]

3232 http-body-util = "0.1"

3333 tower = { version = "0.5", features = ["util"] }

-matrix-sdk = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "9b2c17fb10703d90b177b02588912a34cecfa11f", default-features = false, features = ["testing"] }

+matrix-sdk = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd", default-features = false, features = ["testing"] }

3535 reqwest = { version = "0.13", default-features = false, features = ["json", "query", "rustls"] }

3636 tempfile = "3"

3737 wiremock = "0.6"

Modified file: crates/malice-server/src/routes.rs+12 additions−96 deletions@@ -60,28 +60,6 @@ struct PaginateBody {
 }
 
 #[derive(Debug, Deserialize)]
-struct EventContextBody {
-    #[serde(default)]
-    room_id: String,
-    #[serde(default)]
-    event_id: String,
-    #[serde(default)]
-    before_limit: u32,
-    #[serde(default)]
-    after_limit: u32,
-}
-
-#[derive(Debug, Deserialize)]
-struct EventContextPageBody {
-    #[serde(default)]
-    room_id: String,
-    #[serde(default)]
-    token: String,
-    #[serde(default)]
-    limit: u32,
-}
-
-#[derive(Debug, Deserialize)]
 struct JoinBody {
     #[serde(default)]
     room: String,
@@ -584,7 +562,18 @@ async fn post_command(
             | Request::SetMentionsRead { .. }
             | Request::MarkMentionsReadThrough { .. }
             | Request::RecoverMentions
-            | Request::StartRecentHistory { .. }
+            | Request::RetryRecentHistory { .. }
+            | Request::EventContext { .. }
+            | Request::EventContextBefore { .. }
+            | Request::EventContextAfter { .. }
+            | Request::CloseEventContext { .. }
+            | Request::OpenThreadList { .. }
+            | Request::PaginateThreadList { .. }
+            | Request::CloseThreadList { .. }
+            | Request::Search { .. }
+            | Request::SearchMore { .. }
+            | Request::CloseSearch { .. }
+            | Request::SearchCoverage { .. }
             | Request::FillHistoryGap { .. }
             | Request::Kick { .. }
             | Request::Ban { .. }
@@ -720,76 +709,6 @@ async fn rooms_paginate(
     )
 }
 
-async fn rooms_context(
-    State(state): State<AppState>,
-    headers: HeaderMap,
-    body: axum::Json<EventContextBody>,
-) -> Response {
-    let (user, _) = match auth(&state, &headers).await {
-        Ok(pair) => pair,
-        Err(error) => return error.into_response(),
-    };
-    respond(
-        dispatch(
-            &user.handle,
-            &user.mirror,
-            Request::EventContext {
-                room_id: body.0.room_id,
-                event_id: body.0.event_id,
-                before_limit: body.0.before_limit,
-                after_limit: body.0.after_limit,
-            },
-        )
-        .await,
-    )
-}
-
-async fn rooms_context_before(
-    State(state): State<AppState>,
-    headers: HeaderMap,
-    body: axum::Json<EventContextPageBody>,
-) -> Response {
-    let (user, _) = match auth(&state, &headers).await {
-        Ok(pair) => pair,
-        Err(error) => return error.into_response(),
-    };
-    respond(
-        dispatch(
-            &user.handle,
-            &user.mirror,
-            Request::EventContextBefore {
-                room_id: body.0.room_id,
-                token: body.0.token,
-                limit: body.0.limit,
-            },
-        )
-        .await,
-    )
-}
-
-async fn rooms_context_after(
-    State(state): State<AppState>,
-    headers: HeaderMap,
-    body: axum::Json<EventContextPageBody>,
-) -> Response {
-    let (user, _) = match auth(&state, &headers).await {
-        Ok(pair) => pair,
-        Err(error) => return error.into_response(),
-    };
-    respond(
-        dispatch(
-            &user.handle,
-            &user.mirror,
-            Request::EventContextAfter {
-                room_id: body.0.room_id,
-                token: body.0.token,
-                limit: body.0.limit,
-            },
-        )
-        .await,
-    )
-}
-
 async fn rooms_join(
     State(state): State<AppState>,
     headers: HeaderMap,
@@ -1188,9 +1107,6 @@ pub fn router(state: AppState, web_dir: Option<String>) -> Router {
         .route("/rooms/close", post(rooms_close))
         .route("/rooms/send", post(rooms_send))
         .route("/rooms/paginate", post(rooms_paginate))
-        .route("/rooms/context", post(rooms_context))
-        .route("/rooms/context/before", post(rooms_context_before))
-        .route("/rooms/context/after", post(rooms_context_after))
         .route(
             "/rooms/upload",
             post(rooms_upload).layer(DefaultBodyLimit::max(21 * 1024 * 1024)),

Modified file: crates/malice-server/src/state.rs+3 additions@@ -436,6 +436,9 @@ async fn wait_authenticated(mirror: &MirrorHandle) -> Option<String> {
                 | StateChange::History { .. }
                 | StateChange::HistoryRepair(_)
                 | StateChange::RecentHistory { .. }
+                | StateChange::ThreadList { .. }
+                | StateChange::EventContextClosed { .. }
+                | StateChange::SearchClosed { .. }
                 | StateChange::Typing(_)
                 | StateChange::Upload { .. }
                 | StateChange::UploadFinished { .. }

Modified file: crates/malice-worker/Cargo.lock+526 additions−10 deletions@@ -51,6 +51,12 @@ dependencies = [
 ]
 
 [[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.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -86,6 +92,15 @@ dependencies = [
 ]
 
 [[package]]
+name = "arc-swap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "380962b3d93b99642e50b9febf72c071e97e8b32d86eae9cf4ef582bb960ae6e"
+dependencies = [
+ "rustversion",
+]
+
+[[package]]
 name = "archery"
 version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -274,6 +289,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6"
 
 [[package]]
+name = "bitpacking"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96a7139abd3d9cebf8cd6f920a389cf3dc9576172e32f4563f188cae3c3eb019"
+dependencies = [
+ "crunchy",
+]
+
+[[package]]
 name = "blake3"
 version = "1.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -305,6 +329,29 @@ dependencies = [
 ]
 
 [[package]]
+name = "bon"
+version = "3.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a05442cd7005532d0cfedec676b5b9333d2b4c7c3afabe2b1a9ce2742fbe2ee6"
+dependencies = [
+ "bon-macros",
+]
+
+[[package]]
+name = "bon-macros"
+version = "3.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93833e97ac7c46ba97045afcf247238c27057538fcf2f06344662ddd5f567be6"
+dependencies = [
+ "darling",
+ "ident_case",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn 3.0.6",
+]
+
+[[package]]
 name = "bs58"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -377,6 +424,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "census"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f4c707c6a209cbe82d10abd08e1ea8995e9ea937d2550646e02798948992be0"
+
+[[package]]
 name = "cfg-if"
 version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -564,12 +617,46 @@ dependencies = [
 ]
 
 [[package]]
+name = "crossbeam-channel"
+version = "0.5.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98b0cc327b5bc766e7fda9c9260cc0fa81b43a8e240440422dff70788e3f9ef1"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "622f3fc73690be383c7214310406f28a90e6edeadc3cea882f9d71e495b9711a"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc74980687109a3b14c72fd458107bf0baa1da1a1a805e178d15501ba9b86d9d"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
 name = "crossbeam-utils"
 version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6"
 
 [[package]]
+name = "crunchy"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+
+[[package]]
 name = "crypto-common"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -618,6 +705,46 @@ dependencies = [
 ]
 
 [[package]]
+name = "darling"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed17f5901b6630b993ca003def43f2f8ef4014fc13b047b57aad617ff32bc2ec"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6837e2cf7485aaae18f86181d2f0e9a7ed297a025e220aeabf63fdebd3a2ddff"
+dependencies = [
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 3.0.6",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ac7135c3ef02b2f7833bbeb1be5ba7f966dcde8a87c6b87f65a778d71a02785"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 3.0.6",
+]
+
+[[package]]
+name = "datasketches"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c286de4e81ea2590afc24d754e0f83810c566f50a1388fa75ebd57928c0d9745"
+
+[[package]]
 name = "date_header"
 version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -686,6 +813,9 @@ name = "deranged"
 version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
+dependencies = [
+ "serde_core",
+]
 
 [[package]]
 name = "derivative"
@@ -763,6 +893,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "downcast-rs"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "117240f60069e65410b3ae1bb213295bd828f707b5bec6596a1afc8793ce0cbc"
+
+[[package]]
 name = "dunce"
 version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -816,6 +952,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
+name = "erased-serde"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e59b668157f32d3459d4bd634861a06ffa2503a461ca5f0916b9f0252605e66"
+dependencies = [
+ "serde",
+ "serde_core",
+ "typeid",
+]
+
+[[package]]
 name = "errno"
 version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -910,6 +1057,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "fastdivide"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9afc2bd4d5a73106dd53d10d73d3401c2f32730ba2c0b93ddb888a8983680471"
+
+[[package]]
 name = "fastrand"
 version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -960,6 +1113,12 @@ 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"
@@ -1193,7 +1352,18 @@ version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
 dependencies = [
- "foldhash",
+ "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]]
@@ -1246,6 +1416,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "htmlescape"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163"
+
+[[package]]
 name = "http"
 version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1452,6 +1628,12 @@ dependencies = [
 ]
 
 [[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"
@@ -1577,6 +1759,15 @@ dependencies = [
 ]
 
 [[package]]
+name = "inventory"
+version = "0.3.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6928282826c822ad91bf1c9a1cb90a30ba1c26770749929b4656cd6be829cd7c"
+dependencies = [
+ "rustversion",
+]
+
+[[package]]
 name = "ipnet"
 version = "2.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1717,6 +1908,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
+name = "levenshtein_automata"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25"
+
+[[package]]
 name = "libc"
 version = "0.2.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1779,15 +1976,30 @@ dependencies = [
 ]
 
 [[package]]
+name = "lru"
+version = "0.16.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f66e8d5d03f609abc3a39e6f08e4164ebf1447a732906d39eb9b99b7919ef39"
+dependencies = [
+ "hashbrown 0.16.1",
+]
+
+[[package]]
 name = "lru-slab"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4050469837a6ff301cd14c1f8f24f88549e6d548f24f64e2148eb0f72cebc51f"
 
 [[package]]
+name = "lz4_flex"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ef0d4ed8669f8f8826eb00dc878084aa8f253506c4fd5e8f58f5bce72ddb97e"
+
+[[package]]
 name = "macltok"
 version = "0.1.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/macltok?rev=8fd8dcf69c68a45d7ceb5d553230e1df3efada9d#8fd8dcf69c68a45d7ceb5d553230e1df3efada9d"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/macltok?rev=e521a7177da3a9606f06df063e7095e5a1f00447#e521a7177da3a9606f06df063e7095e5a1f00447"
 dependencies = [
  "futures-util",
  "getrandom 0.2.17",
@@ -1796,6 +2008,7 @@ dependencies = [
  "http",
  "imbl",
  "js-sys",
+ "log",
  "matrix-sdk",
  "matrix-sdk-base",
  "matrix-sdk-crypto",
@@ -1808,6 +2021,8 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2",
+ "tantivy",
+ "tantivy-common",
  "thiserror 2.0.21",
  "tokio",
  "tracing",
@@ -1995,7 +2210,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=9b2c17fb10703d90b177b02588912a34cecfa11f#9b2c17fb10703d90b177b02588912a34cecfa11f"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
 dependencies = [
  "anymap2",
  "aquamarine",
@@ -2055,7 +2270,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-base"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=9b2c17fb10703d90b177b02588912a34cecfa11f#9b2c17fb10703d90b177b02588912a34cecfa11f"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
 dependencies = [
  "as_variant",
  "async-trait",
@@ -2081,7 +2296,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-common"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=9b2c17fb10703d90b177b02588912a34cecfa11f#9b2c17fb10703d90b177b02588912a34cecfa11f"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
 dependencies = [
  "eyeball-im",
  "futures-core",
@@ -2104,7 +2319,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-crypto"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=9b2c17fb10703d90b177b02588912a34cecfa11f#9b2c17fb10703d90b177b02588912a34cecfa11f"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
 dependencies = [
  "aes",
  "aquamarine",
@@ -2144,7 +2359,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-indexeddb"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=9b2c17fb10703d90b177b02588912a34cecfa11f#9b2c17fb10703d90b177b02588912a34cecfa11f"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -2176,7 +2391,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-sqlite"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=9b2c17fb10703d90b177b02588912a34cecfa11f#9b2c17fb10703d90b177b02588912a34cecfa11f"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
 dependencies = [
  "as_variant",
  "async-trait",
@@ -2203,7 +2418,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-store-encryption"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=9b2c17fb10703d90b177b02588912a34cecfa11f#9b2c17fb10703d90b177b02588912a34cecfa11f"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
 dependencies = [
  "base64 0.22.1",
  "blake3",
@@ -2224,7 +2439,7 @@ dependencies = [
 [[package]]
 name = "matrix-sdk-ui"
 version = "0.18.0"
-source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=9b2c17fb10703d90b177b02588912a34cecfa11f#9b2c17fb10703d90b177b02588912a34cecfa11f"
+source = "git+ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk?rev=5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd#5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd"
 dependencies = [
  "as_variant",
  "async-rx",
@@ -2299,6 +2514,15 @@ dependencies = [
 ]
 
 [[package]]
+name = "measure_time"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51c55d61e72fc3ab704396c5fa16f4c184db37978ae4e94ca8959693a235fc0e"
+dependencies = [
+ "log",
+]
+
+[[package]]
 name = "memchr"
 version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2327,6 +2551,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
 name = "miniz_oxide"
 version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2368,12 +2598,28 @@ dependencies = [
 ]
 
 [[package]]
+name = "murmurhash32"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b"
+
+[[package]]
 name = "new_debug_unreachable"
 version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
 [[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 = "nu-ansi-term"
 version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2444,6 +2690,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
+name = "oneshot"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "269bca4c2591a28585d6bf10d9ed0332b7d76900a1b02bec41bdc3a2cdcda107"
+
+[[package]]
 name = "oorandom"
 version = "11.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2462,6 +2714,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
 
 [[package]]
+name = "ordered-float"
+version = "5.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c7c9e0d9b23589f26070720bac724174bfec1083e82f7854cdd0267518343c0"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "ownedbytes"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fbd56f7631767e61784dc43f8580f403f4475bd4aaa4da003e6295e1bab4a7e"
+dependencies = [
+ "stable_deref_trait",
+]
+
+[[package]]
 name = "parking"
 version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2621,6 +2891,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
 [[package]]
+name = "prettyplease"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bfe0f4c752e450fc2faf62654f1c134747922825d5b04ca717b8874f41a40c0"
+dependencies = [
+ "proc-macro2",
+ "syn 3.0.6",
+]
+
+[[package]]
 name = "proc-macro-crate"
 version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2867,6 +3147,26 @@ dependencies = [
 ]
 
 [[package]]
+name = "rayon"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
 name = "readlock"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3491,6 +3791,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33f4fe9184a62d842c9ef383018f3306d8ba224fd9d836f56d7288308847c256"
 
 [[package]]
+name = "sketches-ddsketch"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "513c3f5f732bfd6fbb187619c2dfe9d2f25f1a2976f01d575f0fd329d565df56"
+dependencies = [
+ "serde",
+]
+
+[[package]]
 name = "slab"
 version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3556,6 +3865,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
 name = "subtle"
 version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3615,6 +3930,149 @@ dependencies = [
 ]
 
 [[package]]
+name = "tantivy"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "861facfabd71044968f364837f9a083b56464ba5a59079f88706ee5c451ca069"
+dependencies = [
+ "aho-corasick",
+ "arc-swap",
+ "base64 0.22.1",
+ "bitpacking",
+ "bon",
+ "byteorder",
+ "census",
+ "crc32fast",
+ "crossbeam-channel",
+ "datasketches",
+ "downcast-rs",
+ "fastdivide",
+ "fnv",
+ "htmlescape",
+ "itertools 0.14.0",
+ "levenshtein_automata",
+ "log",
+ "lru",
+ "lz4_flex",
+ "measure_time",
+ "once_cell",
+ "oneshot",
+ "rayon",
+ "regex",
+ "rustc-hash",
+ "serde",
+ "serde_json",
+ "sketches-ddsketch",
+ "smallvec",
+ "tantivy-bitpacker",
+ "tantivy-columnar",
+ "tantivy-common",
+ "tantivy-fst",
+ "tantivy-query-grammar",
+ "tantivy-stacker",
+ "tantivy-tokenizer-api",
+ "thiserror 2.0.21",
+ "time",
+ "typetag",
+ "uuid",
+ "winapi",
+]
+
+[[package]]
+name = "tantivy-bitpacker"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fed3d674429bcd2de5d0a6d1aa5495fed8afd9c5ecce993019caf7615f53fa4"
+dependencies = [
+ "bitpacking",
+]
+
+[[package]]
+name = "tantivy-columnar"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c57166f5bcfd478f370ab8445afb4678dce44801fa5ce5c451aaf8595583c5dc"
+dependencies = [
+ "downcast-rs",
+ "fastdivide",
+ "itertools 0.14.0",
+ "serde",
+ "tantivy-bitpacker",
+ "tantivy-common",
+ "tantivy-sstable",
+ "tantivy-stacker",
+]
+
+[[package]]
+name = "tantivy-common"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbf10915aa75da3c3b0d58b58853d2e889efbaf32d4982a4c3715dde6bba23e5"
+dependencies = [
+ "async-trait",
+ "byteorder",
+ "ownedbytes",
+ "serde",
+ "time",
+]
+
+[[package]]
+name = "tantivy-fst"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d60769b80ad7953d8a7b2c70cdfe722bbcdcac6bccc8ac934c40c034d866fc18"
+dependencies = [
+ "byteorder",
+ "regex-syntax",
+ "utf8-ranges",
+]
+
+[[package]]
+name = "tantivy-query-grammar"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfadb8526b6da90704feb293b0701a6aae62ea14983143344be2dc5ce30f1d82"
+dependencies = [
+ "fnv",
+ "nom",
+ "ordered-float",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "tantivy-sstable"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a2cfc3ac5164cbadc28965ffb145a8f47582a60ae5897859ad8d4316596c606"
+dependencies = [
+ "futures-util",
+ "itertools 0.14.0",
+ "tantivy-bitpacker",
+ "tantivy-common",
+ "tantivy-fst",
+]
+
+[[package]]
+name = "tantivy-stacker"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6cbb051742da9d53ca9e8fff43a9b10e319338b24e2c0e15d0372df19ffeb951"
+dependencies = [
+ "murmurhash32",
+ "tantivy-common",
+]
+
+[[package]]
+name = "tantivy-tokenizer-api"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eac258c2c6390673f2685813afeeafcb8c4e0ee7de8dd3fc46838dcc37263f98"
+dependencies = [
+ "serde",
+]
+
+[[package]]
 name = "tempfile"
 version = "3.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3953,12 +4411,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
+name = "typeid"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
+
+[[package]]
 name = "typenum"
 version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
 
 [[package]]
+name = "typetag"
+version = "0.2.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c90e86058a30d42a1a928dfb4b49bb33c98c3a2b4909492e6b0881cd94798ec2"
+dependencies = [
+ "erased-serde",
+ "inventory",
+ "once_cell",
+ "serde",
+ "typetag-impl",
+]
+
+[[package]]
+name = "typetag-impl"
+version = "0.2.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f153acc4e99a5f2a5aefa09fb078be54e26271b2813f6041200b224c098d8328"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.6",
+]
+
+[[package]]
 name = "typewit"
 version = "1.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4037,6 +4525,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
 [[package]]
+name = "utf8-ranges"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba"
+
+[[package]]
 name = "utf8_iter"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4325,6 +4819,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29333c3ea1ba8b17211763463ff24ee84e41c78224c16b001cd907e663a38c68"
 
 [[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-util"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4334,6 +4844,12 @@ dependencies = [
 ]
 
 [[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"

Modified file: crates/malice-worker/Cargo.toml+2 additions−2 deletions@@ -14,7 +14,7 @@ publish = false
 crate-type = ["cdylib", "rlib"]
 
 [target.'cfg(target_family = "wasm")'.dependencies]
-macltok = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/macltok", rev = "8fd8dcf69c68a45d7ceb5d553230e1df3efada9d", features = ["indexeddb", "serde", "mirror"] }
+macltok = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/macltok", rev = "e521a7177da3a9606f06df063e7095e5a1f00447", features = ["indexeddb", "serde", "mirror"] }
 malice-core = { path = "../malice-core" }
 ruma = { version = "0.16", default-features = false }
 futures-util = { version = "0.3", default-features = false, features = ["std"] }
@@ -27,7 +27,7 @@ wasm-bindgen-futures = "=0.4.78"
 js-sys = "=0.3.105"
 
 [dev-dependencies]
-matrix-sdk = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "9b2c17fb10703d90b177b02588912a34cecfa11f", default-features = false }
+matrix-sdk = { git = "ssh://brewery@pls.lobotomise.me:33/atagen/matrix-rust-sdk", rev = "5ec7600f0a5f648c6e2a34b5be0a1494a4e2eafd", default-features = false }
 wasm-bindgen-test = "0.3"
 web-sys = { version = "0.3", features = ["SharedWorkerGlobalScope"] }
 gloo-timers = { version = "0.3", features = ["futures"] }

Modified file: crates/malice-worker/src/account.rs+3 additions@@ -113,6 +113,9 @@ async fn wait_authenticated(mirror: &MirrorHandle) -> Option<String> {
             | StateChange::History { .. }
             | StateChange::HistoryRepair(_)
             | StateChange::RecentHistory { .. }
+            | StateChange::ThreadList { .. }
+            | StateChange::EventContextClosed { .. }
+            | StateChange::SearchClosed { .. }
             | StateChange::Typing(_)
             | StateChange::Upload { .. }
             | StateChange::UploadFinished { .. }

Modified file: web/src/App.svelte+16 additions−8 deletions@@ -12,7 +12,7 @@
   import type { ScopeOption } from './lib/search-model';
   import { releaseStaged, stageFiles as stageAttachments, type StagedAttachment, type StickerHandlers } from './lib/staging';
   import RoomThreads from './lib/RoomThreads.svelte';
-  import { loadPinnedThreads, openThread, showThread, threadsByRoom } from './lib/threads';
+  import { loadOlderThreads, loadPinnedThreads, openThread, showThread, syncThreadLists, threadsByRoom } from './lib/threads';
   import { threadMatches } from './lib/thread-index';
   import ContextMenu, { type MenuItem } from './lib/ContextMenu.svelte';
   import PackManager from './lib/PackManager.svelte';
@@ -38,7 +38,7 @@
     getSession,
     getSpaceChildren,
     fillHistoryGap,
-    startRecentHistory,
+    retryRecentHistory as requestRecentHistory,
     joinRoom,
     leaveRoom,
     logout,
@@ -58,6 +58,7 @@
   import { isKnownCommand, parseCommand, splitTarget, unescapeCommand } from './lib/commands';
   import type { ParsedCommand } from './lib/commands';
   import {
+    threadLists,
     banners,
     blocked,
     connectEvents,
@@ -1185,7 +1186,7 @@
     if (recentRetrying[roomId]) return;
     recentRetrying = { ...recentRetrying, [roomId]: true };
     try {
-      await startRecentHistory(roomId);
+      await requestRecentHistory(roomId);
     } catch (e) {
       pushBanner(e instanceof Error ? e.message : 'Loading recent history failed');
     } finally {
@@ -1270,6 +1271,8 @@
     if ($selectedRoomId === roomId) openThreadHere(rootEventId);
   }
 
+  $: syncThreadLists([...new Set([...($selectedRoomId ? [$selectedRoomId] : []), ...Object.keys(threadFolds).filter((id) => threadFolds[id])])]);
+
   function threadFoldOpen(roomId: string, folds: Record<string, boolean>, q: string): boolean {
     if (q) return ($threadsByRoom[roomId] ?? []).some((t) => threadMatches(t, q));
     return !!folds[roomId];
@@ -1491,9 +1494,9 @@
     return $rooms.find((r) => r.room_id === roomId)?.name ?? roomId;
   }
 
-  function roomStickers(roomId: string): StickerHandlers {
+  function roomStickers(roomId: string, threadRoot: string | null = null): StickerHandlers {
     return {
-      onSend: (pack, image) => void sendSticker(roomId, pack, image),
+      onSend: (pack, image) => void sendSticker(roomId, pack, image, threadRoot),
       onClone: (pack, image, x, y) => openCloneImageMenu(pack, image, x, y),
       onClonePack: (pack, x, y) => openClonePackMenu(pack, x, y),
       onManage: () => (dialog = 'packs'),
@@ -1501,10 +1504,10 @@
     };
   }
 
-  async function sendSticker(roomId: string, pack: ImagePack, image: PackImage): Promise<void> {
-    stickToBottom = true;
+  async function sendSticker(roomId: string, pack: ImagePack, image: PackImage, threadRoot: string | null = null): Promise<void> {
+    if (!threadRoot) stickToBottom = true;
     try {
-      await runCommand({ op: 'send_sticker', room_id: roomId, pack_id: pack.id, shortcode: image.shortcode });
+      await runCommand({ op: 'send_sticker', room_id: roomId, thread_root: threadRoot, pack_id: pack.id, shortcode: image.shortcode });
       if (peeking === roomId) stopPeeking();
     } catch (e) {
       pushBanner(e instanceof Error ? e.message : 'Could not send the sticker');
@@ -2119,6 +2122,8 @@
                       <RoomThreads
                         roomId={room.room_id}
                         threads={$threadsByRoom[room.room_id] ?? []}
+                        history={$threadLists[room.room_id]?.history ?? null}
+                        onOlder={() => void loadOlderThreads(room.room_id)}
                         {query}
                         activeRoot={threadView?.room_id === room.room_id ? threadView.root_event_id : null}
                         onOpen={(root) => void openThreadIn(room.room_id, root)}
@@ -2174,6 +2179,8 @@
                       <RoomThreads
                         roomId={room.room_id}
                         threads={$threadsByRoom[room.room_id] ?? []}
+                        history={$threadLists[room.room_id]?.history ?? null}
+                        onOlder={() => void loadOlderThreads(room.room_id)}
                         {query}
                         activeRoot={threadView?.room_id === room.room_id ? threadView.root_event_id : null}
                         onOpen={(root) => void openThreadIn(room.room_id, root)}
@@ -2491,6 +2498,7 @@
             onMore={(ev, x, y) => void openMessageMenu(ev, x, y)}
             onMentionStart={() => !$membersByRoom[threadView.room_id] && void loadMembers(threadView.room_id)}
             focusEventId={threadView.focus_event_id ?? null}
+            stickers={roomStickers(threadView.room_id, threadView.root_event_id)}
             onClose={() => void showThread(null)}
           />
         {/if}

Modified file: web/src/lib/ContextTimeline.svelte+42 additions−9 deletions@@ -1,6 +1,6 @@
 <script lang="ts">
   import { onDestroy, onMount, tick } from 'svelte';
-  import { eventContextAfter, eventContextBefore } from './api';
+  import { closeEventContext, eventContext, eventContextAfter, eventContextBefore } from './api';
   import EmojiText from './EmojiText.svelte';
   import MessageRow from './MessageRow.svelte';
   import { formatDay } from './format';
@@ -38,6 +38,8 @@
   let alive = true;
   let identity = '';
   let centered = false;
+  let contextId: string | null = null;
+  let contextFor = '';
 
   const stable = (event: TimelineEvent) => event.event_id || event.item_id;
   const key = (item: TimelineItem) => item.kind === 'event'
@@ -76,6 +78,7 @@
     if (identity !== nextIdentity) {
       generation++;
       identity = nextIdentity;
+      closeSession();
       rows = [];
       beforeToken = null;
       afterToken = null;
@@ -90,7 +93,7 @@
     }
     const request = generation;
     viewport?.capture();
-    const initial = normalize([...next.events_before, ...(next.event ? [next.event] : []), ...next.events_after]);
+    const initial = normalize([...next.events_before, next.event, ...next.events_after]);
     rows = rows.length ? merge(rows, initial) : initial;
     if (!beforeExtended) {
       beforeToken = next.start_token;
@@ -125,6 +128,29 @@
     });
   }
 
+  function closeSession(): void {
+    if (contextId) void closeEventContext(contextId).catch(() => undefined);
+    contextId = null;
+  }
+
+  /** The saved capture has no session, so paging opens one on demand and takes over its tokens. */
+  async function openSession(): Promise<string | null> {
+    if (contextId && contextFor === identity) return contextId;
+    const forIdentity = identity;
+    const opened = await eventContext(roomId, eventId, 20);
+    if (!alive || forIdentity !== identity) {
+      void closeEventContext(opened.context_id).catch(() => undefined);
+      return null;
+    }
+    closeSession();
+    contextId = opened.context_id;
+    contextFor = forIdentity;
+    rows = merge(rows, normalize([...opened.context.events_before, opened.context.event, ...opened.context.events_after]));
+    if (!beforeExtended) beforeToken = opened.context.start_token;
+    if (!afterExtended) afterToken = opened.context.end_token;
+    return contextId;
+  }
+
   async function load(direction: 'before' | 'after'): Promise<void> {
     const token = direction === 'before' ? beforeToken : afterToken;
     if (!token || !canPaginate || (direction === 'before' ? beforeBusy : afterBusy)) return;
@@ -133,22 +159,28 @@
     else afterBusy = true;
     error = '';
     try {
-      const requestedRoom = roomId;
-      const requestedEvent = eventId;
+      const session = await openSession();
+      if (!session || !alive || request !== generation) return;
+      const from = direction === 'before' ? beforeToken : afterToken;
+      if (!from) {
+        if (direction === 'before') beforeEnded = true;
+        else afterEnded = true;
+        return;
+      }
       const page = direction === 'before'
-        ? await eventContextBefore(requestedRoom, requestedEvent, token, 20)
-        : await eventContextAfter(requestedRoom, requestedEvent, token, 20);
-      if (!alive || request !== generation || requestedRoom !== roomId || requestedEvent !== eventId) return;
+        ? await eventContextBefore(session, from, 20)
+        : await eventContextAfter(session, from, 20);
+      if (!alive || request !== generation) return;
       viewport?.capture();
       rows = merge(rows, page.events);
       if (direction === 'before') {
         beforeExtended = true;
         beforeToken = page.next_token;
-        beforeEnded = page.end_reached || !page.next_token;
+        beforeEnded = !page.next_token;
       } else {
         afterExtended = true;
         afterToken = page.next_token;
-        afterEnded = page.end_reached || !page.next_token;
+        afterEnded = !page.next_token;
       }
       await tick();
       if (alive && request === generation) viewport?.restore();
@@ -166,6 +198,7 @@
     if (!viewport?.consumeScroll()) viewport?.capture();
   }
   onDestroy(() => {
+    closeSession();
     alive = false;
     generation++;
     observer?.disconnect();

Modified file: web/src/lib/MentionsInbox.svelte+18 additions−3 deletions@@ -51,6 +51,22 @@
   function roomName(entry: MentionEntry): string {
     return entry.room_name || joinedRooms.get(entry.key.room_id)?.name || entry.key.room_id;
   }
+  const GAP_LABELS: Record<string, string> = {
+    SyncDiscontinuity: 'Sync was interrupted',
+    LimitedTimeline: 'Too many messages arrived at once',
+    RoomLeft: 'You left the room',
+    ContextUnavailable: 'Context could not be loaded',
+    NotificationHistoryUnavailable: 'Notification history unavailable',
+    CandidateExpired: 'A message could not be read',
+    StoreReset: 'Inbox was reset',
+    StoreFailed: 'Inbox could not be saved',
+    HookTimedOut: 'Checking a message timed out'
+  };
+
+  function gapLabel(reason: string): string {
+    return GAP_LABELS[reason] ?? reason;
+  }
+
   function reasonLabel(reason: string): string {
     return reason === 'Direct' ? 'Direct mention' : reason === 'Reply' ? 'Reply' : reason === 'Keyword' ? 'Keyword' : 'Room mention';
   }
@@ -424,17 +440,16 @@
   {:else}
     <header><h2>Mentions {#if page}<span>({unreadCount} unread)</span>{/if}</h2><button disabled={!page || unreadCount === 0 || actionBusy} onclick={markAllRead}>Mark all read</button></header>
     <details class="coverage">
-      <summary>{page?.coverage.recovering ? 'Recovering mention history…' : 'History coverage'}{#if page?.coverage.incomplete_history} · Incomplete{/if}</summary>
+      <summary>{page?.coverage.recovering ? 'Recovering mention history…' : 'History coverage'}{#if page?.coverage.gaps.length} · Incomplete{/if}</summary>
       <div class="coverage-body">
         {#if page}
           {#if page.coverage.recovering}<p>History recovery is in progress.</p>{/if}
-          {#if page.coverage.incomplete_history}<p>Some mention history could not be checked.</p>{/if}
           {#if page.coverage.truncated}<p>Results are truncated.</p>{/if}
           {#if page.coverage.historical_supported === false}<p>Historical mention search is unsupported.</p>{/if}
           {#if page.coverage.unresolved_candidates}<p>{page.coverage.unresolved_candidates} possible mentions could not be resolved.</p>{/if}
           {#if page.coverage.gaps.length}<p>{page.coverage.gaps.length} history gaps remain.</p>{/if}
           {#if page.coverage.earliest_timestamp_ms}<p>Oldest observed event from {new Date(page.coverage.earliest_timestamp_ms).toLocaleString()}.</p>{/if}
-          {#each page.coverage.gaps as gap}<p><EmojiText text={gap.room_id ? joinedRooms.get(gap.room_id)?.name ?? gap.room_id : 'Unknown room'} /> · <EmojiText text={gap.reason} /></p>{/each}
+          {#each page.coverage.gaps as gap}<p><EmojiText text={gap.room_id ? joinedRooms.get(gap.room_id)?.name ?? gap.room_id : 'Unknown room'} /> · {gapLabel(gap.reason)}</p>{/each}
         {:else}<p>Coverage is loading.</p>{/if}
         <button disabled={actionBusy || page?.coverage.recovering} onclick={recover}>Recover history</button>
       </div>

Modified file: web/src/lib/PackManager.stories.ts+1

@@ -22,6 +22,7 @@ function room(

2222 unread_messages: 0,

2323 unread_mentions: 0,

2424 unread_notifications: 0,

25+ thread_unreads: {},

2526 encrypted: false,

2627 space,

2728 direct: false,

Modified file: web/src/lib/RoomThreads.svelte+11 additions−1 deletions@@ -5,13 +5,16 @@
   import { formatClock, formatDay } from './format';
   import { threadMatches } from './thread-index';
   import type { ThreadEntry } from './thread-index';
+  import type { ListHistoryState } from './types';
   import { togglePinnedThread } from './threads';
 
   export let roomId: string;
   export let threads: ThreadEntry[];
   export let query = '';
   export let activeRoot: string | null = null;
+  export let history: ListHistoryState | null = null;
   export let onOpen: (rootEventId: string) => void;
+  export let onOlder: () => void;
 
   const COLLAPSED_LIMIT = 6;
   let showAll = false;
@@ -19,6 +22,7 @@
   $: matching = threads.filter((t) => threadMatches(t, query));
   $: shown = query || showAll ? matching : matching.slice(0, COLLAPSED_LIMIT);
   $: hidden = matching.length - shown.length;
+  $: canLoadOlder = !query && hidden === 0 && history !== null && history !== 'StartReached';
 
   function label(t: ThreadEntry): string {
     return t.preview || (t.pinned ? 'Pinned thread' : 'Thread');
@@ -36,7 +40,8 @@
         on:click={() => onOpen(t.root_event_id)}
       >
         <span class="thread-preview"><EmojiText text={label(t)} /></span>
-        {#if t.reply_count > 0}<span class="thread-meta">{t.reply_count}</span>{/if}
+        {#if t.unread > 0}<span class="thread-unread" class:mention={t.mentions > 0} aria-label={`${t.unread} unread`}>{t.unread > 99 ? '99+' : t.unread}</span>
+        {:else if t.reply_count > 0}<span class="thread-meta">{t.reply_count}</span>{/if}
         {#if t.latest_ms}<time class="thread-meta" datetime={new Date(t.latest_ms).toISOString()}>{formatDay(t.latest_ms)} {formatClock(t.latest_ms)}</time>{/if}
       </button>
       <PinButton pinned={t.pinned} label={`thread ${label(t)}`} onToggle={() => void togglePinnedThread(roomId, t.root_event_id)} />
@@ -44,6 +49,8 @@
   {/each}
   {#if hidden > 0}
     <li><button type="button" class="thread-more" on:click={() => (showAll = true)}>{hidden} more</button></li>
+  {:else if canLoadOlder}
+    <li><button type="button" class="thread-more" disabled={history === 'Loading'} on:click={onOlder}>{history === 'Loading' ? 'Loading…' : 'Older threads'}</button></li>
   {/if}
 </ul>
 
@@ -57,5 +64,8 @@
   .thread-preview { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
   .thread-meta { flex: none; font-size: 11px; color: var(--muted); font-variant-numeric: tabular-nums; }
   .thread-item:hover :global(.pin-btn), .thread-item :global(.pin-btn.pinned) { opacity: 1; }
+  .thread-unread { flex: none; min-width: 16px; padding: 0 4px; border-radius: var(--r-sm); background: var(--panel-2); color: var(--text); font-size: 10.5px; font-weight: 600; text-align: center; font-variant-numeric: tabular-nums; }
+  .thread-unread.mention { background: var(--accent); color: var(--on-accent); }
+  .thread-more:disabled { color: var(--muted); cursor: default; }
   .thread-more { border: none; background: transparent; color: var(--accent); font: inherit; font-size: 12px; padding: 2px 6px; cursor: pointer; }
 </style>

Modified file: web/src/lib/RoomTimelineRows.svelte+7 additions−10 deletions@@ -74,16 +74,13 @@
     {:else if g.item.kind === 'start'}
       <p class="start-note">Beginning of history</p>
     {:else if g.item.kind === 'historyGap'}
-      {#if g.item.gap.continuity !== 'Verified'}
-        {@const gap = g.item.gap}
-        {@const filling = fillingGap === gap.id || gap.lifecycle === 'Fetching'}
-        <div class="history-gap">
-          <span>{gap.failure ?? 'Some history is not loaded'}</span>
-          <button type="button" class="ghost-btn" disabled={!!fillingGap || gap.lifecycle === 'Fetching' || gap.lifecycle === 'Unavailable'} on:click={() => onFillGap(gap.id)}>
-            {filling ? 'Loading…' : gap.lifecycle === 'Unavailable' ? 'History unavailable' : 'Fetch older history'}
-          </button>
-        </div>
-      {/if}
+      {@const gap = g.item.gap}
+      <div class="history-gap">
+        <span>{gap.failure ?? 'Some history is not loaded'}</span>
+        <button type="button" class="ghost-btn" disabled={!!fillingGap || gap.lifecycle === 'Unavailable'} on:click={() => onFillGap(gap.id)}>
+          {fillingGap === gap.id ? 'Loading…' : gap.lifecycle === 'Unavailable' ? 'History unavailable' : 'Fetch older history'}
+        </button>
+      </div>
     {:else if g.item.kind === 'unknown'}
       <p class="unknown-note">Unsupported event ({g.item.label})</p>
     {:else}

Modified file: web/src/lib/SearchView.svelte+25 additions−6 deletions@@ -1,11 +1,11 @@
 <script lang="ts">
-  import { onMount } from 'svelte';
+  import { onDestroy, onMount } from 'svelte';
   import EmojiText from './EmojiText.svelte';
   import MessageRow from './MessageRow.svelte';
-  import { searchMessages } from './api';
+  import { closeSearch, searchMessages, searchMore } from './api';
   import { formatDay } from './format';
   import { groupByRoom } from './search-model';
-  import type { ScopeOption, SearchCoverage, SearchHit } from './search-model';
+  import type { ScopeOption, SearchCoverage, SearchHit, SearchPage } from './search-model';
 
   export let scopes: ScopeOption[];
   export let initialScope = 0;
@@ -17,18 +17,25 @@
   let query = '';
   let scopeIndex = Math.min(initialScope, scopes.length - 1);
   let hits: SearchHit[] = [];
-  let coverage: SearchCoverage[] = [];
+  let coverage: SearchCoverage | null = null;
   let next: string | null = null;
+  let searchId: string | null = null;
   let searched = '';
   let busy = false;
   let error = '';
   let generation = 0;
 
   $: groups = groupByRoom(hits);
-  $: partial = coverage.filter((c) => !c.reached_start);
+  $: partial = coverage?.rooms.filter((c) => !c.start_reached) ?? [];
   $: oldest = partial.reduce<number | null>((min, c) => (c.oldest_indexed_ms === null ? min : min === null ? c.oldest_indexed_ms : Math.max(min, c.oldest_indexed_ms)), null);
 
   onMount(() => input?.focus());
+  onDestroy(() => dropSearch());
+
+  function dropSearch(): void {
+    if (searchId) void closeSearch(searchId).catch(() => undefined);
+    searchId = null;
+  }
 
   async function run(more = false): Promise<void> {
     const text = query.trim();
@@ -37,7 +44,19 @@
     busy = true;
     error = '';
     try {
-      const page = await searchMessages(text, scopes[scopeIndex].scope, more ? next : null);
+      let page: SearchPage;
+      if (more && searchId && next) {
+        page = await searchMore(searchId, next);
+      } else {
+        const session = await searchMessages(text, scopes[scopeIndex].scope);
+        if (run !== generation) {
+          void closeSearch(session.search_id).catch(() => undefined);
+          return;
+        }
+        dropSearch();
+        searchId = session.search_id;
+        page = session.page;
+      }
       if (run !== generation) return;
       hits = more ? [...hits, ...page.hits] : page.hits;
       coverage = page.coverage;

Modified file: web/src/lib/ThreadPane.svelte+3 additions−1 deletions@@ -2,7 +2,7 @@
   import { sessionUser } from './store';
   import { releaseStaged as release } from './staging';
   import type { Mention } from './mentions';
-  import type { StagedAttachment } from './staging';
+  import type { StagedAttachment, StickerHandlers } from './staging';
 
   interface ThreadDraft {
     text: string;
@@ -49,6 +49,7 @@
   export let onUser: ((userId: string, x: number, y: number, menu: boolean) => void) | null = null;
   export let onMore: ((event: TimelineEvent, x: number, y: number) => void) | null = null;
   export let onMentionStart: () => void = () => {};
+  export let stickers: StickerHandlers | null = null;
   export let focusEventId: string | null = null;
   export let onClose: () => void;
 
@@ -356,6 +357,7 @@
         {self}
         {emotes}
         {packs}
+        {stickers}
         onSubmit={() => void submit()}
         onEditLast={editLastOwn}
         {onMentionStart}

Modified file: web/src/lib/api.ts+47 additions−19 deletions@@ -1,6 +1,7 @@
 // Backend-agnostic API surface. Every call forwards to whichever transport
 // this build was compiled for, hosted (fetch + SSE) or on-device (worker).
-import type { EventContext, EventContextPage, MemberSummary, RoomSummary } from './types';
+import { parseEventContextPage, parseEventContextSession } from './types';
+import type { EventContextPage, EventContextSession, MemberSummary, RoomSummary } from './types';
 import type { Emote } from './emotes';
 import type { MentionKey, MentionsBoundary, MentionsPage, SavedMentionContext } from './mentions-model';
 export { mentionKey, parseMentionsPage, parseSavedMentionContext, parseMentionsUpdate } from './mentions-model';
@@ -8,7 +9,7 @@ export type { MentionKey, MentionReason, MentionCaptureState, MentionEntry, Ment
 import { formatBody } from './markdown';
 import { mentionedUserIds, type Mention } from './mentions';
 import { HttpTransport } from './transport-http';
-import { parseSearchPage, scopeWire, type SearchPage, type SearchScope } from './search-model';
+import { parseSearchPage, parseSearchSession, scopeWire, type SearchPage, type SearchScope, type SearchSession } from './search-model';
 import type { CommandRequest, SendKind, SessionInfo, Transport, VerifyAction } from './transport';
 export type { HistoryRequest } from './transport';
 import { createDeviceTransport } from 'malice:device-transport';
@@ -56,32 +57,59 @@ export const uploadAvatar = (file: File) => transport.uploadAvatar(file);
 export const uploadRoomAvatar = (room_id: string, file: File) => transport.uploadRoomAvatar(room_id, file);
 export const uploadMedia = (file: File) => transport.uploadMedia(file);
 export const paginateRoom = (room_id: string, thread_root: string | null = null) => transport.paginateRoom(room_id, thread_root);
-export const eventContext = (room_id: string, event_id: string, limit?: number): Promise<EventContext> =>
-  transport.eventContext(room_id, event_id, limit);
-export const eventContextBefore = (room_id: string, event_id: string, from: string, limit?: number): Promise<EventContextPage> =>
-  transport.eventContextBefore(room_id, event_id, from, limit);
-export const eventContextAfter = (room_id: string, event_id: string, from: string, limit?: number): Promise<EventContextPage> =>
-  transport.eventContextAfter(room_id, event_id, from, limit);
+export async function eventContext(room_id: string, event_id: string, limit = 20): Promise<EventContextSession> {
+  const parsed = parseEventContextSession(
+    await transport.command({ op: 'event_context', room_id, event_id, before_limit: limit, after_limit: limit })
+  );
+  if (!parsed) throw new ApiError(502, 'Invalid event context response');
+  return parsed;
+}
+async function eventContextPage(op: 'event_context_before' | 'event_context_after', context_id: string, token: string, limit: number): Promise<EventContextPage> {
+  const parsed = parseEventContextPage(await transport.command({ op, context_id, token, limit }));
+  if (!parsed) throw new ApiError(502, 'Invalid event context page response');
+  return parsed;
+}
+export const eventContextBefore = (context_id: string, token: string, limit = 20): Promise<EventContextPage> =>
+  eventContextPage('event_context_before', context_id, token, limit);
+export const eventContextAfter = (context_id: string, token: string, limit = 20): Promise<EventContextPage> =>
+  eventContextPage('event_context_after', context_id, token, limit);
+export async function closeEventContext(context_id: string): Promise<void> {
+  await transport.command({ op: 'close_event_context', context_id });
+}
 export const mentionsPage = (cursor: string | null = null, limit = 50): Promise<MentionsPage> => transport.mentionsPage(cursor, limit);
 export const mentionContext = (room_id: string, event_id: string): Promise<SavedMentionContext> => transport.mentionContext(room_id, event_id);
 export const retryMentionContext = (room_id: string, event_id: string): Promise<SavedMentionContext> => transport.retryMentionContext(room_id, event_id);
 export const setMentionsRead = (keys: MentionKey[], read: boolean) => transport.setMentionsRead(keys, read);
 export const markMentionsReadThrough = (boundary: MentionsBoundary) => transport.markMentionsReadThrough(boundary);
 export const recoverMentions = () => transport.recoverMentions();
-export async function searchMessages(query: string, scope: SearchScope, cursor: string | null = null, limit = 30): Promise<SearchPage> {
-  let raw: unknown;
-  try {
-    raw = await transport.command({ op: 'search', query, scope: scopeWire(scope), cursor, limit });
-  } catch (e) {
-    if (e instanceof ApiError && (e.status === 400 || e.status === 422)) throw new ApiError(400, "Search isn't available yet");
-    throw e;
-  }
-  const page = parseSearchPage(raw);
+export async function searchMessages(query: string, scope: SearchScope, limit = 30): Promise<SearchSession> {
+  const session = parseSearchSession(await transport.command({ op: 'search', query, scope: scopeWire(scope), limit }));
+  if (!session) throw new ApiError(502, 'Invalid search response');
+  return session;
+}
+export async function searchMore(search_id: string, cursor: string, limit = 30): Promise<SearchPage> {
+  const page = parseSearchPage(await transport.command({ op: 'search_more', search_id, cursor, limit }));
   if (!page) throw new ApiError(502, 'Invalid search response');
   return page;
 }
-export const startRecentHistory = (room_id: string): Promise<void> => transport.startRecentHistory(room_id);
-export const fillHistoryGap = (room_id: string, gap_id: string): Promise<void> => transport.fillHistoryGap(room_id, gap_id);
+export async function closeSearch(search_id: string): Promise<void> {
+  await transport.command({ op: 'close_search', search_id });
+}
+export async function retryRecentHistory(room_id: string): Promise<void> {
+  await transport.command({ op: 'retry_recent_history', room_id });
+}
+export async function fillHistoryGap(room_id: string, gap_id: string): Promise<void> {
+  await transport.command({ op: 'fill_history_gap', room_id, gap_id });
+}
+export async function openThreadList(room_id: string): Promise<void> {
+  await transport.command({ op: 'open_thread_list', room_id });
+}
+export async function paginateThreadList(room_id: string, limit = 20): Promise<void> {
+  await transport.command({ op: 'paginate_thread_list', room_id, limit });
+}
+export async function closeThreadList(room_id: string): Promise<void> {
+  await transport.command({ op: 'close_thread_list', room_id });
+}
 export const setTyping = (room_id: string, typing: boolean) => transport.setTyping(room_id, typing);
 export const getAccountData = (eventType: string) => transport.getAccountData(eventType);
 export const getUrlPreview = (room_id: string, url: string) => transport.getUrlPreview(room_id, url);

Modified file: web/src/lib/mentions-model.ts+3 additions−3 deletions@@ -13,7 +13,7 @@ export interface MentionEntry {
 }
 export interface MentionCoverage {
   earliest_timestamp_ms: number | null; historical_supported: boolean | null; recovering: boolean;
-  incomplete_history: boolean; gaps: MentionGap[]; truncated: boolean; unresolved_candidates: number;
+  gaps: MentionGap[]; truncated: boolean; unresolved_candidates: number;
 }
 export interface MentionGap { room_id: string | null; reason: string; token: string | null }
 export interface MentionsBoundary { account: string; revision: number }
@@ -52,8 +52,8 @@ function page(v: unknown): MentionsPage | null {
   if (!obj(v) || !obj(v.coverage) || !Array.isArray(v.entries) || !Array.isArray(v.coverage['gaps'])) return null;
   const entries=v.entries.map(entry), cov=v.coverage as Obj;
   const gaps=(cov['gaps'] as unknown[]).map(gap);
-  if (entries.some(x=>!x) || gaps.some(x=>!x) || !(v.next_cursor === null || str(v.next_cursor)) || !bool(v.end_reached) || !(cov['earliest_timestamp_ms'] === null || nat(cov['earliest_timestamp_ms'])) || !(cov['historical_supported'] === null || bool(cov['historical_supported'])) || !bool(cov['recovering']) || !bool(cov['incomplete_history']) || !bool(cov['truncated']) || !nat(cov['unresolved_candidates']) || !nat(v.unread_count) || !nat(v.revision) || !obj(v.boundary) || !str(v.boundary['account']) || !v.boundary['account'] || !nat(v.boundary['revision'])) return null;
-  return { entries:entries as MentionEntry[], next_cursor:v.next_cursor as string|null, end_reached:v.end_reached, coverage:{earliest_timestamp_ms:cov['earliest_timestamp_ms'] as number|null,historical_supported:cov['historical_supported'] as boolean|null,recovering:cov['recovering'],incomplete_history:cov['incomplete_history'],gaps:gaps as MentionGap[],truncated:cov['truncated'],unresolved_candidates:cov['unresolved_candidates']}, unread_count:v.unread_count, revision:v.revision, boundary:{account:v.boundary['account'],revision:v.boundary['revision']} };
+  if (entries.some(x=>!x) || gaps.some(x=>!x) || !(v.next_cursor === null || str(v.next_cursor)) || !bool(v.end_reached) || !(cov['earliest_timestamp_ms'] === null || nat(cov['earliest_timestamp_ms'])) || !(cov['historical_supported'] === null || bool(cov['historical_supported'])) || !bool(cov['recovering']) || !bool(cov['truncated']) || !nat(cov['unresolved_candidates']) || !nat(v.unread_count) || !nat(v.revision) || !obj(v.boundary) || !str(v.boundary['account']) || !v.boundary['account'] || !nat(v.boundary['revision'])) return null;
+  return { entries:entries as MentionEntry[], next_cursor:v.next_cursor as string|null, end_reached:v.end_reached, coverage:{earliest_timestamp_ms:cov['earliest_timestamp_ms'] as number|null,historical_supported:cov['historical_supported'] as boolean|null,recovering:cov['recovering'],gaps:gaps as MentionGap[],truncated:cov['truncated'],unresolved_candidates:cov['unresolved_candidates']}, unread_count:v.unread_count, revision:v.revision, boundary:{account:v.boundary['account'],revision:v.boundary['revision']} };
 }
 export function parseMentionsPage(raw: unknown): MentionsPage | null { try { return page(raw); } catch { return null; } }
 export function parseSavedMentionContext(raw: unknown): SavedMentionContext | null {

Modified file: web/src/lib/search-model.ts+63 additions−16 deletions@@ -1,5 +1,5 @@
 import { isRecord } from './guards';
-import { parseTimelineItem } from './types';
+import { parseTimelineEvent } from './types';
 import type { TimelineEvent } from './types';
 
 export type SearchScope = { kind: 'room'; room_id: string } | { kind: 'rooms'; room_ids: string[] } | { kind: 'all' };
@@ -17,16 +17,30 @@ export interface SearchHit {
   ranges: [number, number][];
 }
 
-export interface SearchCoverage {
+export type SearchBackfill = 'Waiting' | 'Running' | 'Paused' | 'Complete' | 'Disabled' | { Failed: string };
+
+export interface RoomSearchCoverage {
   room_id: string;
   oldest_indexed_ms: number | null;
-  reached_start: boolean;
+  start_reached: boolean;
+  backfill: SearchBackfill;
+}
+
+export interface SearchCoverage {
+  rooms: RoomSearchCoverage[];
+  persistent: boolean;
+  undecrypted: number;
 }
 
 export interface SearchPage {
   hits: SearchHit[];
   next: string | null;
-  coverage: SearchCoverage[];
+  coverage: SearchCoverage;
+}
+
+export interface SearchSession {
+  search_id: string;
+  page: SearchPage;
 }
 
 /** The wire form of a scope, as macltok's externally tagged enum. */
@@ -36,32 +50,59 @@ export function scopeWire(scope: SearchScope): unknown {
   return 'All';
 }
 
-function parseRanges(raw: unknown): [number, number][] {
+/** macltok's matches are utf-8 byte ranges, so they're mapped back to string offsets against the body. */
+function parseRanges(raw: unknown, body: string): [number, number][] {
   if (!Array.isArray(raw)) return [];
+  const bytes = new TextEncoder().encode(body);
+  const decoder = new TextDecoder();
+  const offset = (byte: number) => decoder.decode(bytes.subarray(0, byte)).length;
   return raw.flatMap((range) =>
-    Array.isArray(range) && typeof range[0] === 'number' && typeof range[1] === 'number' ? [[range[0], range[1]] as [number, number]] : []
+    isRecord(range) && typeof range['start'] === 'number' && typeof range['end'] === 'number'
+      ? [[offset(range['start']), offset(range['end'])] as [number, number]]
+      : []
   );
 }
 
+function hitBody(event: TimelineEvent): string {
+  const content = event.content;
+  if (content.kind === 'Message') return content.message.body;
+  return '';
+}
+
 function parseHit(raw: unknown): SearchHit | null {
-  if (!isRecord(raw) || typeof raw['room_id'] !== 'string' || typeof raw['event_id'] !== 'string') return null;
-  const item = parseTimelineItem(raw['preview'] ?? raw['event']);
-  if (item?.kind !== 'event') return null;
+  if (!isRecord(raw) || typeof raw['room_id'] !== 'string' || typeof raw['event_id'] !== 'string' || !isRecord(raw['event'])) return null;
+  const event = parseTimelineEvent(raw['event']);
   return {
     room_id: raw['room_id'],
     event_id: raw['event_id'],
-    timestamp_ms: typeof raw['timestamp_ms'] === 'number' ? raw['timestamp_ms'] : item.event.timestamp_ms,
-    event: item.event,
-    ranges: parseRanges(raw['ranges'])
+    timestamp_ms: typeof raw['timestamp_ms'] === 'number' ? raw['timestamp_ms'] : event.timestamp_ms,
+    event,
+    ranges: parseRanges(raw['matches'], hitBody(event))
   };
 }
 
-function parseCoverage(raw: unknown): SearchCoverage | null {
+function parseBackfill(raw: unknown): SearchBackfill {
+  if (raw === 'Waiting' || raw === 'Running' || raw === 'Paused' || raw === 'Complete' || raw === 'Disabled') return raw;
+  if (isRecord(raw) && isRecord(raw['Failed']) && typeof raw['Failed']['message'] === 'string') return { Failed: raw['Failed']['message'] };
+  return 'Waiting';
+}
+
+function parseRoomCoverage(raw: unknown): RoomSearchCoverage | null {
   if (!isRecord(raw) || typeof raw['room_id'] !== 'string') return null;
   return {
     room_id: raw['room_id'],
     oldest_indexed_ms: typeof raw['oldest_indexed_ms'] === 'number' ? raw['oldest_indexed_ms'] : null,
-    reached_start: raw['reached_start'] === true
+    start_reached: raw['start_reached'] === true,
+    backfill: parseBackfill(raw['backfill'])
+  };
+}
+
+function parseCoverage(raw: unknown): SearchCoverage {
+  if (!isRecord(raw)) return { rooms: [], persistent: false, undecrypted: 0 };
+  return {
+    rooms: Array.isArray(raw['rooms']) ? raw['rooms'].flatMap((room) => parseRoomCoverage(room) ?? []) : [],
+    persistent: raw['persistent'] === true,
+    undecrypted: typeof raw['undecrypted'] === 'number' ? raw['undecrypted'] : 0
   };
 }
 
@@ -69,11 +110,17 @@ export function parseSearchPage(raw: unknown): SearchPage | null {
   if (!isRecord(raw) || !Array.isArray(raw['hits'])) return null;
   return {
     hits: raw['hits'].flatMap((hit) => parseHit(hit) ?? []),
-    next: typeof raw['next'] === 'string' ? raw['next'] : null,
-    coverage: Array.isArray(raw['coverage']) ? raw['coverage'].flatMap((c) => parseCoverage(c) ?? []) : []
+    next: typeof raw['next_cursor'] === 'string' ? raw['next_cursor'] : null,
+    coverage: parseCoverage(raw['coverage'])
   };
 }
 
+export function parseSearchSession(raw: unknown): SearchSession | null {
+  if (!isRecord(raw) || typeof raw['search_id'] !== 'string') return null;
+  const page = parseSearchPage(raw['page']);
+  return page ? { search_id: raw['search_id'], page } : null;
+}
+
 /** Hits grouped by room, keeping the order in which each room first appears. */
 export function groupByRoom(hits: SearchHit[]): { room_id: string; hits: SearchHit[] }[] {
   const groups = new Map<string, SearchHit[]>();

Modified file: web/src/lib/store.ts+34 additions@@ -13,7 +13,9 @@ import {
   EMPTY_IMAGE_PACKS,
   parseEncryptionState,
   parseImagePacks,
+  parseListHistoryState,
   parseRecentHistoryMap,
+  parseThreadListEntries,
   parseRecentHistoryState,
   parseRoomList,
   parseTimelineList,
@@ -23,9 +25,11 @@ import type {
   EncryptionState,
   EventContext,
   ImagePacks,
+  ListHistoryState,
   MemberSummary,
   RecentHistoryState,
   RoomSummary,
+  ThreadListEntry,
   TimelineItem,
   VerificationState
 } from './types';
@@ -49,6 +53,21 @@ export const pinnedTimelines = writable<Record<string, TimelineItem[]>>({});
 export const pinnedTimelineVersions = writable<Record<string, number>>({});
 export const threadTimelines = writable<Record<string, TimelineItem[]>>({});
 
+export interface ThreadListView {
+  entries: ThreadListEntry[];
+  history: ListHistoryState;
+}
+export const threadLists = writable<Record<string, ThreadListView>>({});
+
+function parseThreadListMap(raw: unknown): Record<string, ThreadListView> {
+  const out: Record<string, ThreadListView> = {};
+  if (!isRecord(raw)) return out;
+  for (const [roomId, list] of Object.entries(raw)) {
+    if (isRecord(list)) out[roomId] = { entries: parseThreadListEntries(list['entries']), history: parseListHistoryState(list['history']) };
+  }
+  return out;
+}
+
 export function threadKey(roomId: string, rootEventId: string): string {
   return `${roomId}\u0000${rootEventId}`;
 }
@@ -91,6 +110,7 @@ export function resetClientState(): void {
   pinnedTimelines.set({});
   pinnedTimelineVersions.set({});
   threadTimelines.set({});
+  threadLists.set({});
   recentHistory.set({});
   eventContexts.set({});
   connection.set('connecting');
@@ -189,6 +209,7 @@ function handlePayload(text: string): void {
       }
       threadTimelines.set(next);
     }
+    threadLists.set(parseThreadListMap(data['thread_lists']));
     const rawPinned = data['pinned'];
     if (isRecord(rawPinned)) {
       const next: Record<string, TimelineItem[]> = {};
@@ -238,6 +259,19 @@ function handlePayload(text: string): void {
     }
     return;
   }
+  if (kind === 'thread_list' || kind === 'thread_list_history' || kind === 'thread_list_closed') {
+    const roomId = data['room_id'];
+    if (typeof roomId !== 'string') return;
+    threadLists.update((all) => {
+      const { [roomId]: current, ...rest } = all;
+      if (kind === 'thread_list_closed') return rest;
+      const base = current ?? { entries: [], history: 'Idle' as const };
+      return kind === 'thread_list'
+        ? { ...rest, [roomId]: { ...base, entries: parseThreadListEntries(data['entries']) } }
+        : { ...rest, [roomId]: { ...base, history: parseListHistoryState(data['state']) } };
+    });
+    return;
+  }
   if (kind === 'thread' || kind === 'thread_closed') {
     const roomId = data['room_id'];
     const root = data['root_event_id'];

Modified file: web/src/lib/thread-index.ts+33 additions−6 deletions@@ -1,4 +1,4 @@
-import type { TimelineEvent, TimelineItem } from './types';
+import type { ThreadListEntry, ThreadUnread, TimelineEvent, TimelineItem } from './types';
 
 export interface ThreadEntry {
   room_id: string;
@@ -8,6 +8,8 @@ export interface ThreadEntry {
   reply_count: number;
   latest_ms: number;
   pinned: boolean;
+  unread: number;
+  mentions: number;
 }
 
 function previewOf(event: TimelineEvent): string {
@@ -27,12 +29,23 @@ function entryFor(roomId: string, event: TimelineEvent, pinned: boolean): Thread
     sender: event.sender.display_name ?? event.sender.user_id,
     reply_count: event.thread_summary?.reply_count ?? 0,
     latest_ms: event.thread_summary?.latest_event_timestamp_ms ?? event.timestamp_ms,
-    pinned
+    pinned,
+    unread: 0,
+    mentions: 0
   };
 }
 
-/** Pinned threads first, then by latest activity. Pins whose root isn't loaded still get a row. */
-export function roomThreads(roomId: string, items: TimelineItem[], pinnedRoots: string[]): ThreadEntry[] {
+/**
+ * Pinned threads first, then by latest activity. The server's thread list wins over roots seen in the
+ * loaded timeline, and pins or unread roots that neither has loaded still get a row.
+ */
+export function roomThreads(
+  roomId: string,
+  items: TimelineItem[],
+  pinnedRoots: string[],
+  listed: ThreadListEntry[] = [],
+  unreads: Record<string, ThreadUnread> = {}
+): ThreadEntry[] {
   const pinned = new Set(pinnedRoots);
   const found = new Map<string, ThreadEntry>();
   for (const item of items) {
@@ -42,11 +55,25 @@ export function roomThreads(roomId: string, items: TimelineItem[], pinnedRoots: 
     const entry = entryFor(roomId, item.event, pinned.has(id));
     if (entry) found.set(id, entry);
   }
-  for (const root of pinnedRoots) {
+  for (const listedEntry of listed) {
+    const entry = entryFor(roomId, listedEntry.root, pinned.has(listedEntry.root_event_id));
+    if (!entry) continue;
+    const loaded = found.get(listedEntry.root_event_id);
+    found.set(listedEntry.root_event_id, {
+      ...entry,
+      reply_count: loaded?.reply_count || listedEntry.reply_count,
+      latest_ms: Math.max(loaded?.latest_ms ?? 0, listedEntry.latest_activity_ms)
+    });
+  }
+  for (const root of new Set([...pinnedRoots, ...Object.keys(unreads)])) {
     if (!found.has(root)) {
-      found.set(root, { room_id: roomId, root_event_id: root, preview: '', sender: '', reply_count: 0, latest_ms: 0, pinned: true });
+      found.set(root, { room_id: roomId, root_event_id: root, preview: '', sender: '', reply_count: 0, latest_ms: 0, pinned: pinned.has(root), unread: 0, mentions: 0 });
     }
   }
+  for (const [root, unread] of Object.entries(unreads)) {
+    const entry = found.get(root);
+    if (entry) found.set(root, { ...entry, unread: unread.messages, mentions: unread.mentions });
+  }
   return [...found.values()].sort((a, b) => Number(b.pinned) - Number(a.pinned) || b.latest_ms - a.latest_ms);
 }
 

Modified file: web/src/lib/threads.ts+36 additions−5 deletions@@ -1,6 +1,6 @@
 import { derived, get, writable } from 'svelte/store';
-import { getAccountData, runCommand, setAccountData } from './api';
-import { pushBanner, sessionUser, timelines } from './store';
+import { closeThreadList, getAccountData, openThreadList, paginateThreadList, runCommand, setAccountData } from './api';
+import { pushBanner, rooms, sessionUser, threadLists, timelines } from './store';
 import { roomThreads } from './thread-index';
 import type { ThreadEntry } from './thread-index';
 
@@ -15,15 +15,45 @@ export interface OpenThread {
 export const openThread = writable<OpenThread | null>(null);
 export const pinnedThreads = writable<Record<string, string[]>>({});
 
-export const threadsByRoom = derived([timelines, pinnedThreads], ([$timelines, $pinned]) => {
+export const threadsByRoom = derived([timelines, pinnedThreads, threadLists, rooms], ([$timelines, $pinned, $lists, $rooms]) => {
+  const unreads = new Map($rooms.map((room) => [room.room_id, room.thread_unreads]));
   const out: Record<string, ThreadEntry[]> = {};
-  for (const roomId of new Set([...Object.keys($timelines), ...Object.keys($pinned)])) {
-    const list = roomThreads(roomId, $timelines[roomId] ?? [], $pinned[roomId] ?? []);
+  const ids = [...Object.keys($timelines), ...Object.keys($pinned), ...Object.keys($lists), ...unreads.keys()];
+  for (const roomId of new Set(ids)) {
+    const list = roomThreads(roomId, $timelines[roomId] ?? [], $pinned[roomId] ?? [], $lists[roomId]?.entries ?? [], unreads.get(roomId) ?? {});
     if (list.length) out[roomId] = list;
   }
   return out;
 });
 
+const THREAD_PAGE = 20;
+const openLists = new Set<string>();
+
+/** Keeps a server thread list open for exactly the rooms in `wanted`, loading a first page for each new one. */
+export function syncThreadLists(wanted: string[]): void {
+  const want = new Set(wanted);
+  for (const roomId of [...openLists]) {
+    if (want.has(roomId)) continue;
+    openLists.delete(roomId);
+    void closeThreadList(roomId).catch(() => undefined);
+  }
+  for (const roomId of want) {
+    if (openLists.has(roomId)) continue;
+    openLists.add(roomId);
+    void openThreadList(roomId)
+      .then(() => paginateThreadList(roomId, THREAD_PAGE))
+      .catch(() => openLists.delete(roomId));
+  }
+}
+
+export async function loadOlderThreads(roomId: string): Promise<void> {
+  try {
+    await paginateThreadList(roomId, THREAD_PAGE);
+  } catch (e) {
+    pushBanner(e instanceof Error ? e.message : 'Could not load older threads');
+  }
+}
+
 function parsePinned(raw: unknown): Record<string, string[]> {
   if (typeof raw !== 'object' || raw === null) return {};
   const rooms = (raw as Record<string, unknown>)['rooms'];
@@ -83,6 +113,7 @@ let account: string | null | undefined;
 sessionUser.subscribe((user) => {
   if (user === account) return;
   account = user;
+  openLists.clear();
   opened = null;
   openThread.set(null);
   pinnedThreads.set({});

Modified file: web/src/lib/transport-http.ts+1 additions−36 deletions@@ -1,5 +1,4 @@
-import type { EventContext, EventContextPage, MemberSummary, RoomSummary } from './types';
-import { parseEventContext, parseEventContextPage } from './types';
+import type { MemberSummary, RoomSummary } from './types';
 import { parseMentionsPage, parseSavedMentionContext } from './mentions-model';
 import type { MentionKey, MentionsBoundary, MentionsPage, SavedMentionContext } from './mentions-model';
 import { ApiError, type CommandRequest, type SendKind, type SessionInfo, type Transport, type UploadExtras, type VerifyAction } from './transport';
@@ -107,17 +106,6 @@ export class HttpTransport implements Transport {
   paginateRoom(room_id: string, thread_root: string | null = null): Promise<void> {
     return this.roomCommand(ROOM_COMMAND_PATHS.paginate, { room_id, thread_root });
   }
-  async eventContext(room_id: string, event_id: string, limit = 20): Promise<EventContext> {
-    const res = await fetch('/api/rooms/context', {
-      method: 'POST',
-      credentials: 'same-origin',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify({ room_id, event_id, limit })
-    });
-    const parsed = parseEventContext(await json<unknown>(res, 'Could not load event context'));
-    if (!parsed) throw new ApiError(502, 'Invalid event context response');
-    return parsed;
-  }
   async mentionsPage(cursor: string | null = null, limit = 50): Promise<MentionsPage> {
     const parsed = parseMentionsPage(await this.command({ op: 'mentions_page', cursor, limit }));
     if (!parsed) throw new ApiError(502, 'Invalid mentions page response');
@@ -141,29 +129,6 @@ export class HttpTransport implements Transport {
     await this.command({ op: 'mark_mentions_read_through', boundary });
   }
   async recoverMentions(): Promise<void> { await this.command({ op: 'recover_mentions' }); }
-  async startRecentHistory(room_id: string): Promise<void> {
-    await this.command({ op: 'start_recent_history', room_id });
-  }
-  async fillHistoryGap(room_id: string, gap_id: string): Promise<void> {
-    await this.command({ op: 'fill_history_gap', room_id, gap_id });
-  }
-  async eventContextBefore(room_id: string, event_id: string, from: string, limit = 20): Promise<EventContextPage> {
-    return this.eventContextPage('before', room_id, event_id, from, limit);
-  }
-  async eventContextAfter(room_id: string, event_id: string, from: string, limit = 20): Promise<EventContextPage> {
-    return this.eventContextPage('after', room_id, event_id, from, limit);
-  }
-  private async eventContextPage(direction: 'before' | 'after', room_id: string, event_id: string, from: string, limit: number): Promise<EventContextPage> {
-    const res = await fetch(`/api/rooms/context/${direction}`, {
-      method: 'POST',
-      credentials: 'same-origin',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify({ room_id, event_id, from, limit })
-    });
-    const parsed = parseEventContextPage(await json<unknown>(res, 'Could not load event context'));
-    if (!parsed) throw new ApiError(502, 'Invalid event context page response');
-    return parsed;
-  }
   setTyping(room_id: string, typing: boolean): Promise<void> {
     return this.roomCommand(ROOM_COMMAND_PATHS.typing, { room_id, typing });
   }

Modified file: web/src/lib/transport-worker.ts+1 additions−27 deletions@@ -1,7 +1,6 @@
-import { parseEventContext, parseEventContextPage } from './types';
 import { parseMentionsPage, parseSavedMentionContext } from './mentions-model';
 import type { MentionKey, MentionsBoundary, MentionsPage, SavedMentionContext } from './mentions-model';
-import type { EventContext, EventContextPage, MemberSummary, RoomSummary } from './types';
+import type { MemberSummary, RoomSummary } from './types';
 import { ApiError, type CommandRequest, type SendKind, type SessionInfo, type SoftLogout, type Transport, type UploadExtras, type VerifyAction } from './transport';
 import { statusForKind } from './wire-status';
 
@@ -248,31 +247,6 @@ export class WorkerTransport implements Transport {
   async setMentionsRead(keys: MentionKey[], read: boolean): Promise<void> { await this.client.call('set_mentions_read', { keys, read }); }
   async markMentionsReadThrough(boundary: MentionsBoundary): Promise<void> { await this.client.call('mark_mentions_read_through', { boundary }); }
   async recoverMentions(): Promise<void> { await this.client.call('recover_mentions'); }
-  async startRecentHistory(room_id: string): Promise<void> {
-    await this.client.call('start_recent_history', { room_id });
-  }
-  async fillHistoryGap(room_id: string, gap_id: string): Promise<void> {
-    await this.client.call('fill_history_gap', { room_id, gap_id });
-  }
-  eventContext(room_id: string, event_id: string, limit = 20): Promise<EventContext> {
-    return this.contextCall('event_context', { room_id, event_id, limit });
-  }
-  eventContextBefore(room_id: string, event_id: string, from: string, limit = 20): Promise<EventContextPage> {
-    return this.contextPageCall('event_context_before', { room_id, event_id, from, limit });
-  }
-  eventContextAfter(room_id: string, event_id: string, from: string, limit = 20): Promise<EventContextPage> {
-    return this.contextPageCall('event_context_after', { room_id, event_id, from, limit });
-  }
-  private async contextCall(op: string, fields: Record<string, unknown>): Promise<EventContext> {
-    const parsed = parseEventContext(await this.client.call(op, fields));
-    if (!parsed) throw new ApiError(502, 'Invalid event context response');
-    return parsed;
-  }
-  private async contextPageCall(op: string, fields: Record<string, unknown>): Promise<EventContextPage> {
-    const parsed = parseEventContextPage(await this.client.call(op, fields));
-    if (!parsed) throw new ApiError(502, 'Invalid event context page response');
-    return parsed;
-  }
   setTyping(room_id: string, typing: boolean): Promise<void> {
     return this.client.call('typing', { room_id, typing });
   }

Modified file: web/src/lib/transport.ts+12 additions−10 deletions@@ -1,4 +1,4 @@
-import type { EventContext, EventContextPage, MemberSummary, PackUsage, RoomSummary } from './types';
+import type { MemberSummary, PackUsage, RoomSummary } from './types';
 import type { MentionKey, MentionsBoundary, MentionsPage, SavedMentionContext } from './mentions-model';
 
 export class ApiError extends Error {
@@ -37,13 +37,17 @@ export type CommandRequest =
   | { op: 'set_room_avatar'; room_id: string; mxc: string | null }
   | { op: 'mute'; room_id: string; user_id: string; muted: boolean }
   | { op: 'notification_keywords' }
-  | { op: 'search'; query: string; scope: unknown; cursor: string | null; limit: number }
+  | { op: 'search'; query: string; scope: unknown; limit: number }
+  | { op: 'search_more'; search_id: string; cursor: string; limit: number }
+  | { op: 'close_search'; search_id: string }
+  | { op: 'open_thread_list' | 'close_thread_list'; room_id: string }
+  | { op: 'paginate_thread_list'; room_id: string; limit: number }
   | { op: 'add_notification_keyword' | 'remove_notification_keyword'; keyword: string }
   | { op: 'ignore' | 'unignore'; user_id: string }
   | { op: 'power_levels'; room_id: string }
   | { op: 'open_pinned' | 'close_pinned'; room_id: string }
   | { op: 'set_pinned'; room_id: string; event_id: string; pinned: boolean }
-  | { op: 'send_sticker'; room_id: string; pack_id: string; shortcode: string }
+  | { op: 'send_sticker'; room_id: string; thread_root?: string | null; pack_id: string; shortcode: string }
   | { op: 'create_room_pack'; room_id: string; state_key: string; display_name: string }
   | { op: 'delete_pack'; target: PackTarget }
   | {
@@ -72,8 +76,11 @@ export type CommandRequest =
   | MentionsRequest;
 
 export type HistoryRequest =
-  | { op: 'start_recent_history'; room_id: string }
-  | { op: 'fill_history_gap'; room_id: string; gap_id: string };
+  | { op: 'retry_recent_history'; room_id: string }
+  | { op: 'fill_history_gap'; room_id: string; gap_id: string }
+  | { op: 'event_context'; room_id: string; event_id: string; before_limit: number; after_limit: number }
+  | { op: 'event_context_before' | 'event_context_after'; context_id: string; token: string; limit: number }
+  | { op: 'close_event_context'; context_id: string };
 
 export type MentionsRequest =
   | { op: 'mentions_page'; cursor: string | null; limit: number }
@@ -118,17 +125,12 @@ export interface Transport {
     thread_root?: string | null
   ): Promise<void>;
   paginateRoom(room_id: string, thread_root?: string | null): Promise<void>;
-  eventContext(room_id: string, event_id: string, limit?: number): Promise<EventContext>;
-  eventContextBefore(room_id: string, event_id: string, from: string, limit?: number): Promise<EventContextPage>;
-  eventContextAfter(room_id: string, event_id: string, from: string, limit?: number): Promise<EventContextPage>;
   mentionsPage(cursor?: string | null, limit?: number): Promise<MentionsPage>;
   mentionContext(room_id: string, event_id: string): Promise<SavedMentionContext>;
   retryMentionContext(room_id: string, event_id: string): Promise<SavedMentionContext>;
   setMentionsRead(keys: MentionKey[], read: boolean): Promise<void>;
   markMentionsReadThrough(boundary: MentionsBoundary): Promise<void>;
   recoverMentions(): Promise<void>;
-  startRecentHistory(room_id: string): Promise<void>;
-  fillHistoryGap(room_id: string, gap_id: string): Promise<void>;
   setTyping(room_id: string, typing: boolean): Promise<void>;
   getAccountData(eventType: string): Promise<unknown | null>;
   getUrlPreview(room_id: string, url: string): Promise<unknown | null>;

Modified file: web/src/lib/types.ts+74 additions−19 deletions@@ -21,6 +21,7 @@ export interface RoomSummary {
   unread_messages: number;
   unread_mentions: number;
   unread_notifications: number;
+  thread_unreads: Record<string, ThreadUnread>;
   encrypted: boolean;
   space: boolean;
   direct: boolean;
@@ -348,6 +349,7 @@ export function parseRoomSummary(raw: unknown): RoomSummary | null {
     unread_messages: numberField(raw, 'unread_messages'),
     unread_mentions: numberField(raw, 'unread_mentions'),
     unread_notifications: numberField(raw, 'unread_notifications'),
+    thread_unreads: parseThreadUnreads(raw['thread_unreads']),
     encrypted: raw['encrypted'] === true,
     space: raw['space'] === true,
     direct: raw['direct'] === true,
@@ -630,7 +632,7 @@ function parseReactions(raw: unknown): Reaction[] {
   return out;
 }
 
-function parseTimelineEvent(raw: Record<string, unknown>): TimelineEvent {
+export function parseTimelineEvent(raw: Record<string, unknown>): TimelineEvent {
   return {
     item_id: stringField(raw, 'item_id'),
     event_id: optionalString(raw, 'event_id'),
@@ -658,10 +660,10 @@ export type TimelineItem =
   | { kind: 'start' }
   | { kind: 'unknown'; label: string };
 
-export type RecentHistoryState = 'Idle' | 'Loading' | 'Loaded' | { Failed: string };
+export type RecentHistoryState = 'Idle' | 'Loading' | 'Loaded' | 'Cancelled' | { Failed: string };
 
 export function parseRecentHistoryState(raw: unknown): RecentHistoryState | null {
-  if (raw === 'Idle' || raw === 'Loading' || raw === 'Loaded') return raw;
+  if (raw === 'Idle' || raw === 'Loading' || raw === 'Loaded' || raw === 'Cancelled') return raw;
   if (isRecord(raw) && typeof raw['Failed'] === 'string') return { Failed: raw['Failed'] };
   return null;
 }
@@ -680,26 +682,26 @@ export interface HistoryGap {
   id: string;
   older_boundary: string | null;
   newer_boundary: string | null;
-  lifecycle: 'Idle' | 'Fetching' | 'Paused' | 'Failed' | 'Unavailable';
-  continuity: 'Unresolved' | 'Verified' | 'AccessibleStart';
+  lifecycle: 'Idle' | 'Paused' | 'Failed' | 'Unavailable';
   failure: string | null;
 }
 
 export interface EventContext {
   events_before: TimelineItem[];
-  event: TimelineItem | null;
+  event: TimelineItem;
   events_after: TimelineItem[];
   start_token: string | null;
   end_token: string | null;
 }
 
-export type EventContextDirection = 'Before' | 'After';
+export interface EventContextSession {
+  context_id: string;
+  context: EventContext;
+}
 
 export interface EventContextPage {
-  direction: EventContextDirection;
   events: TimelineItem[];
   next_token: string | null;
-  end_reached: boolean;
 }
 
 /** Normalize one TimelineItem from external-tag serde form. */
@@ -711,15 +713,13 @@ export function parseTimelineItem(raw: unknown): TimelineItem | null {
   if (isRecord(raw['HistoryGap'])) {
     const gap = raw['HistoryGap'];
     const lifecycle = gap['lifecycle'];
-    const continuity = gap['continuity'];
     return {
       kind: 'historyGap',
       gap: {
         id: stringField(gap, 'id'),
         older_boundary: optionalString(gap, 'older_boundary'),
         newer_boundary: optionalString(gap, 'newer_boundary'),
-        lifecycle: lifecycle === 'Fetching' || lifecycle === 'Paused' || lifecycle === 'Failed' || lifecycle === 'Unavailable' ? lifecycle : 'Idle',
-        continuity: continuity === 'Verified' || continuity === 'AccessibleStart' ? continuity : 'Unresolved',
+        lifecycle: lifecycle === 'Paused' || lifecycle === 'Failed' || lifecycle === 'Unavailable' ? lifecycle : 'Idle',
         failure: optionalString(gap, 'failure')
       }
     };
@@ -746,28 +746,83 @@ export function parseTimelineList(raw: unknown): TimelineItem[] {
 
 export function parseEventContext(raw: unknown): EventContext | null {
   if (!isRecord(raw)) return null;
-  const eventRaw = raw['event'];
+  const event = parseTimelineItem(raw['event']);
+  if (!event) return null;
   return {
     events_before: parseTimelineList(raw['events_before']),
-    event: eventRaw == null ? null : parseTimelineItem(eventRaw),
+    event,
     events_after: parseTimelineList(raw['events_after']),
     start_token: optionalString(raw, 'start_token'),
     end_token: optionalString(raw, 'end_token')
   };
 }
 
+export function parseEventContextSession(raw: unknown): EventContextSession | null {
+  if (!isRecord(raw) || typeof raw['context_id'] !== 'string') return null;
+  const context = parseEventContext(raw['context']);
+  return context ? { context_id: raw['context_id'], context } : null;
+}
+
 export function parseEventContextPage(raw: unknown): EventContextPage | null {
   if (!isRecord(raw)) return null;
-  const direction = raw['direction'];
-  if (direction !== 'Before' && direction !== 'After') return null;
   return {
-    direction,
     events: parseTimelineList(raw['events']),
-    next_token: optionalString(raw, 'next_token'),
-    end_reached: raw['end_reached'] === true
+    next_token: optionalString(raw, 'next_token')
+  };
+}
+
+export interface ThreadUnread {
+  messages: number;
+  mentions: number;
+  notifications: number;
+}
+
+function parseThreadUnreads(raw: unknown): Record<string, ThreadUnread> {
+  const out: Record<string, ThreadUnread> = {};
+  if (!isRecord(raw)) return out;
+  for (const [root, value] of Object.entries(raw)) {
+    if (!isRecord(value)) continue;
+    out[root] = { messages: numberField(value, 'messages'), mentions: numberField(value, 'mentions'), notifications: numberField(value, 'notifications') };
+  }
+  return out;
+}
+
+export type ListHistoryState = 'Idle' | 'Loading' | 'StartReached' | { Failed: string };
+
+export function parseListHistoryState(raw: unknown): ListHistoryState {
+  if (raw === 'Loading' || raw === 'StartReached') return raw;
+  if (isRecord(raw) && typeof raw['Failed'] === 'string') return { Failed: raw['Failed'] };
+  return 'Idle';
+}
+
+export interface ThreadListEntry {
+  root_event_id: string;
+  root: TimelineEvent;
+  reply_count: number;
+  latest_reply: TimelineEvent | null;
+  latest_activity_ms: number;
+}
+
+export function parseThreadListEntry(raw: unknown): ThreadListEntry | null {
+  if (!isRecord(raw) || typeof raw['root_event_id'] !== 'string') return null;
+  const root = parseTimelineItem(raw['root']);
+  if (!root || root.kind !== 'event') return null;
+  const latest = raw['latest_reply'] == null ? null : parseTimelineItem(raw['latest_reply']);
+  const summary = isRecord(raw['summary']) ? raw['summary'] : {};
+  return {
+    root_event_id: raw['root_event_id'],
+    root: root.event,
+    reply_count: numberField(summary, 'reply_count'),
+    latest_reply: latest && latest.kind === 'event' ? latest.event : null,
+    latest_activity_ms: numberField(raw, 'latest_activity_ms')
   };
 }
 
+export function parseThreadListEntries(raw: unknown): ThreadListEntry[] {
+  if (!Array.isArray(raw)) return [];
+  return raw.map(parseThreadListEntry).filter((entry): entry is ThreadListEntry => entry !== null);
+}
+
 export type PackUsage = 'Emoticon' | 'Sticker';
 export interface PackImage {
   shortcode: string;

malice

Commit 249e439c27e5

Commit `249e439c27e5`