chore: Release

.gitea/workflows/rust.yml

@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-            toolchain: stable
+            toolchain: nightly
             target: wasm32-unknown-unknown
       - run: cargo install trunk
       - run: cd web; trunk build

Cargo.lock

@@ -55,13 +55,13 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "ammonia"
-version = "4.0.0"
+version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ab99eae5ee58501ab236beb6f20f6ca39be615267b014899c89b2f0bc18a459"
+checksum = "3ada2ee439075a3e70b6992fce18ac4e407cd05aea9ca3f75d2c0b0c20bbb364"
 dependencies = [
- "html5ever 0.27.0",
+ "cssparser 0.35.0",
+ "html5ever 0.31.0",
  "maplit",
- "once_cell",
  "tendril",
  "url",
 ]
@@ -613,9 +613,9 @@ dependencies = [
 
 [[package]]
 name = "bon"
-version = "3.6.0"
+version = "3.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8baa8e2f74b721b16b14e6b8e0516c8df35708273d5e89ca7be391cb9a419ff9"
+checksum = "ced38439e7a86a4761f7f7d5ded5ff009135939ecb464a24452eaa4c1696af7d"
 dependencies = [
  "bon-macros",
  "rustversion",
@@ -623,9 +623,9 @@ dependencies = [
 
 [[package]]
 name = "bon-macros"
-version = "3.6.0"
+version = "3.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff68fc8bb0a7a05683bc799f9c50ec05379c4a6104446eb1fed7b07341eebc5"
+checksum = "0ce61d2d3844c6b8d31b2353d9f66cf5e632b3e9549583fe3cac2f4f6136725e"
 dependencies = [
  "darling 0.20.11",
  "ident_case",
@@ -1280,6 +1280,19 @@ dependencies = [
  "smallvec 1.15.0",
 ]
 
+[[package]]
+name = "cssparser"
+version = "0.35.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e901edd733a1472f944a45116df3f846f54d37e67e68640ac8bb69689aca2aa"
+dependencies = [
+ "cssparser-macros",
+ "dtoa-short",
+ "itoa 1.0.15",
+ "phf 0.11.3",
+ "smallvec 1.15.0",
+]
+
 [[package]]
 name = "cssparser-macros"
 version = "0.6.1"
@@ -1368,9 +1381,9 @@ checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
 
 [[package]]
 name = "der"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
+checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
 dependencies = [
  "const-oid",
  "pem-rfc7468",
@@ -1564,9 +1577,9 @@ dependencies = [
 
 [[package]]
 name = "enclose"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef4f6f904480430009ad8f22edc9573e26e4f137365f014d7ea998d5341639a"
+checksum = "eef75b364b1baff88ff28dc34e4c7c0ebd138abd76f4e58e24e37d9b7f54b8f1"
 
 [[package]]
 name = "encoding_rs"
@@ -2382,6 +2395,18 @@ dependencies = [
  "match_token",
 ]
 
+[[package]]
+name = "html5ever"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "953cbbe631aae7fc0a112702ad5d3aaf09da38beaf45ea84610d6e1c358f569c"
+dependencies = [
+ "log",
+ "mac",
+ "markup5ever 0.16.1",
+ "match_token",
+]
+
 [[package]]
 name = "htmlescape"
 version = "0.3.1"
@@ -2995,9 +3020,9 @@ dependencies = [
 
 [[package]]
 name = "letterbox-notmuch"
-version = "0.16.0"
+version = "0.17.9"
 source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/"
-checksum = "f7cdd2798042f4cc63342d798f450e7152231f4f592b3142cd63a0a9f4b879d8"
+checksum = "aea61000b7ea6d2cca754dea71bafb54aa913a98f30f7b01836cce1414af5614"
 dependencies = [
  "log",
  "mailparse",
@@ -3009,7 +3034,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-notmuch"
-version = "0.17.2"
+version = "0.17.13"
 dependencies = [
  "itertools",
  "log",
@@ -3024,12 +3049,12 @@ dependencies = [
 
 [[package]]
 name = "letterbox-procmail2notmuch"
-version = "0.17.2"
+version = "0.17.13"
 dependencies = [
  "anyhow",
  "clap",
- "letterbox-notmuch 0.16.0",
+ "letterbox-notmuch 0.17.9",
- "letterbox-shared 0.16.0",
+ "letterbox-shared 0.17.9",
  "serde",
  "sqlx",
  "tokio 1.44.2",
@@ -3037,7 +3062,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-server"
-version = "0.17.2"
+version = "0.17.13"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -3055,8 +3080,8 @@ dependencies = [
  "futures 0.3.31",
  "headers",
  "html-escape",
- "letterbox-notmuch 0.16.0",
+ "letterbox-notmuch 0.17.13",
- "letterbox-shared 0.16.0",
+ "letterbox-shared 0.17.13",
  "linkify",
  "log",
  "lol_html",
@@ -3081,12 +3106,12 @@ dependencies = [
 
 [[package]]
 name = "letterbox-shared"
-version = "0.16.0"
+version = "0.17.9"
 source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/"
-checksum = "18fcc018014a200754ea7524f41fc4e5e14f5edc4cb0ca5d7afbaa476cb0d297"
+checksum = "359b4c3ab6b8a91d9a66798b3ee87285f102b7820d38f1d5d3f4be4ea7480803"
 dependencies = [
  "build-info",
- "letterbox-notmuch 0.16.0",
+ "letterbox-notmuch 0.17.9",
  "regex",
  "serde",
  "sqlx",
@@ -3096,10 +3121,10 @@ dependencies = [
 
 [[package]]
 name = "letterbox-shared"
-version = "0.17.2"
+version = "0.17.13"
 dependencies = [
  "build-info",
- "letterbox-notmuch 0.16.0",
+ "letterbox-notmuch 0.17.13",
  "regex",
  "serde",
  "sqlx",
@@ -3109,7 +3134,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-web"
-version = "0.17.2"
+version = "0.17.13"
 dependencies = [
  "build-info",
  "build-info-build",
@@ -3121,8 +3146,7 @@ dependencies = [
  "graphql_client",
  "human_format",
  "itertools",
- "letterbox-notmuch 0.16.0",
+ "letterbox-shared 0.17.9",
- "letterbox-shared 0.16.0",
  "log",
  "seed",
  "seed_hooks",
@@ -3145,9 +3169,9 @@ checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25"
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
 name = "libgit2-sys"
@@ -3163,9 +3187,9 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.11"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
+checksum = "c9627da5196e5d8ed0b0495e61e518847578da83483c37288316d9b2e03a7f72"
 
 [[package]]
 name = "libredox"
@@ -3253,9 +3277,9 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "lol_html"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b1058123f6262982b891dccc395cff0144d9439de366460b47fab719258b96e"
+checksum = "1e24940eb633a7240c1155e61595e18ec6c72b8571837531933f19de3a8c3786"
 dependencies = [
  "bitflags 2.9.0",
  "cfg-if 1.0.0",
@@ -3334,6 +3358,17 @@ dependencies = [
  "tendril",
 ]
 
+[[package]]
+name = "markup5ever"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a8096766c229e8c88a3900c9b44b7e06aa7f7343cc229158c3e58ef8f9973a"
+dependencies = [
+ "log",
+ "tendril",
+ "web_atoms",
+]
+
 [[package]]
 name = "match_token"
 version = "0.1.0"
@@ -3889,7 +3924,7 @@ dependencies = [
  "glob",
  "opentelemetry",
  "percent-encoding",
- "rand 0.9.0",
+ "rand 0.9.1",
  "serde_json",
  "thiserror 2.0.12",
  "tokio 1.44.2",
@@ -4380,9 +4415,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
@@ -4441,13 +4476,13 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.10"
+version = "0.11.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b820744eb4dc9b57a3398183639c511b5a26d2ed702cedd3febaa1393caa22cc"
+checksum = "bcbafbbdbb0f638fe3f35f3c56739f77a8a1d070cb25603226c83339b391472b"
 dependencies = [
  "bytes 1.10.1",
  "getrandom 0.3.2",
- "rand 0.9.0",
+ "rand 0.9.1",
  "ring",
  "rustc-hash",
  "rustls",
@@ -4532,13 +4567,12 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
+checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.3",
- "zerocopy",
 ]
 
 [[package]]
@@ -5518,9 +5552,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.2"
+version = "1.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
 dependencies = [
  "libc",
 ]
@@ -5995,9 +6029,9 @@ dependencies = [
 
 [[package]]
 name = "tantivy"
-version = "0.24.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b21ad8b222d71c57aa979353ed702f0bc6d97e66d368962cbded57fbd19eedd7"
+checksum = "ca2374a21157427c5faff2d90930f035b6c22a5d7b0e5b0b7f522e988ef33c06"
 dependencies = [
  "aho-corasick",
  "arc-swap",
@@ -6841,7 +6875,7 @@ dependencies = [
  "http 1.3.1",
  "httparse",
  "log",
- "rand 0.9.0",
+ "rand 0.9.1",
  "sha1",
  "thiserror 2.0.12",
  "utf-8",
@@ -7184,6 +7218,18 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "web_atoms"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "954c5a41f2bcb7314344079d0891505458cc2f4b422bdea1d5bfbe6d1a04903b"
+dependencies = [
+ "phf 0.11.3",
+ "phf_codegen 0.11.3",
+ "string_cache",
+ "string_cache_codegen",
+]
+
 [[package]]
 name = "webpki-roots"
 version = "0.26.8"
@@ -7238,7 +7284,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -7586,9 +7632,9 @@ checksum = "a62ce76d9b56901b19a74f19431b0d8b3bc7ca4ad685a746dfd78ca8f4fc6bda"
 
 [[package]]
 name = "xtracing"
-version = "0.3.1"
+version = "0.3.2"
 source = "sparse+https://git.z.xinu.tv/api/packages/wathiede/cargo/"
-checksum = "bb7fe734574f346e72c8ed2d8d6d8f35b7d65ecc289ead1fa4ffcfcdee003d09"
+checksum = "ef54d77517715b6cd50871e60000909c2e78bacd9a6131c2794cfad3d76abe13"
 dependencies = [
  "chrono",
  "console-subscriber",

Cargo.toml

@@ -8,7 +8,7 @@ authors = ["Bill Thiede <git@xinu.tv>"]
 edition = "2021"
 license = "UNLICENSED"
 publish = ["xinu"]
-version = "0.17.2"
+version = "0.17.13"
 repository = "https://git.z.xinu.tv/wathiede/letterbox"
 
 [profile.dev]

notmuch/Cargo.toml

@@ -11,14 +11,14 @@ version.workspace = true
 
 
 [dependencies]
-log = "0.4.14"
+log = "0.4.27"
-mailparse = "0.16.0"
+mailparse = "0.16.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["unbounded_depth"] }
-thiserror = "2.0.0"
+thiserror = "2.0.12"
 tracing = "0.1.41"
 
 [dev-dependencies]
 itertools = "0.14.0"
 pretty_assertions = "1"
-rayon = "1.5"
+rayon = "1.10"

notmuch/src/lib.rs

@@ -503,15 +503,28 @@ impl Notmuch {
         self.tags_for_query("*")
     }
 
-    #[instrument(skip_all, fields(tag=tag,search_term=search_term))]
     pub fn tag_add(&self, tag: &str, search_term: &str) -> Result<(), NotmuchError> {
-        self.run_notmuch(["tag", &format!("+{tag}"), search_term])?;
+        self.tags_add(tag, &[search_term])
+    }
+
+    #[instrument(skip_all, fields(tag=tag,search_term=?search_term))]
+    pub fn tags_add(&self, tag: &str, search_term: &[&str]) -> Result<(), NotmuchError> {
+        let tag = format!("+{tag}");
+        let mut args = vec!["tag", &tag];
+        args.extend(search_term);
+        self.run_notmuch(&args)?;
         Ok(())
     }
 
-    #[instrument(skip_all, fields(tag=tag,search_term=search_term))]
     pub fn tag_remove(&self, tag: &str, search_term: &str) -> Result<(), NotmuchError> {
-        self.run_notmuch(["tag", &format!("-{tag}"), search_term])?;
+        self.tags_remove(tag, &[search_term])
+    }
+    #[instrument(skip_all, fields(tag=tag,search_term=?search_term))]
+    pub fn tags_remove(&self, tag: &str, search_term: &[&str]) -> Result<(), NotmuchError> {
+        let tag = format!("-{tag}");
+        let mut args = vec!["tag", &tag];
+        args.extend(search_term);
+        self.run_notmuch(&args)?;
         Ok(())
     }
 

procmail2notmuch/Cargo.toml

@@ -11,10 +11,10 @@ version.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0.69"
+anyhow = "1.0.98"
 clap = { version = "4.5.37", features = ["derive", "env"] }
-letterbox-notmuch = { version = "0.16.0", registry = "xinu" }
+letterbox-notmuch = { version = "0.17.9", registry = "xinu" }
-letterbox-shared = { version = "0.16.0", registry = "xinu" }
+letterbox-shared = { version = "0.17.9", registry = "xinu" }
 serde = { version = "1.0.219", features = ["derive"] }
 sqlx = { version = "0.8.5", features = ["postgres", "runtime-tokio"] }
 tokio = { version = "1.44.2", features = ["rt", "macros", "rt-multi-thread"] }

server/Cargo.toml

@@ -12,45 +12,45 @@ version.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ammonia = "4.0.0"
+ammonia = "4.1.0"
-anyhow = "1.0.79"
+anyhow = "1.0.98"
 async-graphql = { version = "7", features = ["log"] }
-async-graphql-axum = "7.0.15"
+async-graphql-axum = "7.0.16"
-async-trait = "0.1.81"
+async-trait = "0.1.88"
 axum = { version = "0.8.3", features = ["ws"] }
 axum-macros = "0.5.0"
 build-info = "0.0.40"
 cacher = { version = "0.2.0", registry = "xinu" }
-chrono = "0.4.39"
+chrono = "0.4.40"
-clap = { version = "4.5.36", features = ["derive"] }
+clap = { version = "4.5.37", features = ["derive"] }
-css-inline = "0.14.0"
+css-inline = "0.14.4"
 futures = "0.3.31"
 headers = "0.4.0"
 html-escape = "0.2.13"
-letterbox-notmuch = { version = "0.16.0", registry = "xinu" }
+letterbox-notmuch = { path = "../notmuch", version = "0.17.13", registry = "xinu" }
-letterbox-shared = { version = "0.16.0", registry = "xinu" }
+letterbox-shared = { path = "../shared", version = "0.17.13", registry = "xinu" }
 linkify = "0.10.0"
-log = "0.4.17"
+log = "0.4.27"
-lol_html = "2.0.0"
+lol_html = "2.3.0"
-mailparse = "0.16.0"
+mailparse = "0.16.1"
 maplit = "1.0.2"
 memmap = "0.7.0"
 regex = "1.11.1"
-reqwest = { version = "0.12.7", features = ["blocking"] }
+reqwest = { version = "0.12.15", features = ["blocking"] }
-scraper = "0.23.0"
+scraper = "0.23.1"
-serde = { version = "1.0.147", features = ["derive"] }
+serde = { version = "1.0.219", features = ["derive"] }
-serde_json = "1.0.87"
+serde_json = "1.0.140"
-sqlx = { version = "0.8.2", features = ["postgres", "runtime-tokio", "time"] }
+sqlx = { version = "0.8.5", features = ["postgres", "runtime-tokio", "time"] }
-tantivy = { version = "0.24.0", optional = true }
+tantivy = { version = "0.24.1", optional = true }
-thiserror = "2.0.0"
+thiserror = "2.0.12"
-tokio = "1.26.0"
+tokio = "1.44.2"
 tower-http = { version = "0.6.2", features = ["trace"] }
 tracing = "0.1.41"
-url = "2.5.2"
+url = "2.5.4"
 urlencoding = "2.1.3"
 #xtracing = { git = "http://git-private.h.xinu.tv/wathiede/xtracing.git" }
 #xtracing = { path = "../../xtracing" }
-xtracing = { version = "0.3.0", registry = "xinu" }
+xtracing = { version = "0.3.2", registry = "xinu" }
 
 [build-dependencies]
 build-info-build = "0.0.40"

server/src/bin/letterbox-server.rs

@@ -21,7 +21,7 @@ use letterbox_notmuch::Notmuch;
 use letterbox_server::tantivy::TantivyConnection;
 use letterbox_server::{
     graphql::{compute_catchup_ids, Attachment, MutationRoot, QueryRoot, SubscriptionRoot},
-    nm::{attachment_bytes, cid_attachment_bytes},
+    nm::{attachment_bytes, cid_attachment_bytes, label_unprocessed},
     ws::ConnectionTracker,
 };
 use letterbox_shared::WebsocketMessage;
@@ -29,7 +29,7 @@ use serde::Deserialize;
 use sqlx::postgres::PgPool;
 use tokio::{net::TcpListener, sync::Mutex};
 use tower_http::trace::{DefaultMakeSpan, TraceLayer};
-use tracing::info;
+use tracing::{error, info};
 
 // Make our own error that wraps `ServerError`.
 struct AppError(letterbox_server::ServerError);
@@ -176,11 +176,15 @@ async fn start_ws(
 #[derive(Debug, Deserialize)]
 struct NotificationParams {
     delay_ms: Option<u64>,
+    num_unprocessed: Option<usize>,
 }
 
 async fn send_refresh_websocket_handler(
     State(AppState {
-        connection_tracker, ..
+        nm,
+        pool,
+        connection_tracker,
+        ..
     }): State<AppState>,
     params: Query<NotificationParams>,
 ) -> impl IntoResponse {
@@ -190,6 +194,15 @@ async fn send_refresh_websocket_handler(
         info!("sleeping {delay:?}");
         tokio::time::sleep(delay).await;
     }
+    let limit = match params.num_unprocessed {
+        Some(0) => None,
+        Some(limit) => Some(limit),
+        None => Some(10),
+    };
+
+    if let Err(err) = label_unprocessed(&nm, &pool, false, limit, "tag:unprocessed").await {
+        error!("Failed to label_unprocessed: {err:?}");
+    };
     connection_tracker
         .lock()
         .await
@@ -204,18 +217,33 @@ async fn watch_new(
     conn_tracker: Arc<Mutex<ConnectionTracker>>,
     poll_time: Duration,
 ) -> Result<(), async_graphql::Error> {
-    let mut old_ids = Vec::new();
+    async fn watch_new_iteration(
-    loop {
+        nm: &Notmuch,
+        pool: &PgPool,
+        conn_tracker: Arc<Mutex<ConnectionTracker>>,
+        old_ids: &[String],
+    ) -> Result<Vec<String>, async_graphql::Error> {
         let ids = compute_catchup_ids(&nm, &pool, "is:unread").await?;
+        info!("old_ids: {} ids: {}", old_ids.len(), ids.len());
         if old_ids != ids {
-            info!("old_ids: {old_ids:?}\n     ids: {ids:?}");
+            label_unprocessed(&nm, &pool, false, Some(100), "tag:unprocessed").await?;
             conn_tracker
                 .lock()
                 .await
                 .send_message_all(WebsocketMessage::RefreshMessages)
                 .await
         }
-        old_ids = ids;
+        Ok(ids)
+    }
+    let mut old_ids = Vec::new();
+    loop {
+        old_ids = match watch_new_iteration(&nm, &pool, conn_tracker.clone(), &old_ids).await {
+            Ok(old_ids) => old_ids,
+            Err(err) => {
+                error!("watch_new_iteration failed: {err:?}");
+                continue;
+            }
+        };
         tokio::time::sleep(poll_time).await;
     }
 }
@@ -223,6 +251,7 @@ async fn watch_new(
 #[derive(Clone)]
 struct AppState {
     nm: Notmuch,
+    pool: PgPool,
     connection_tracker: Arc<Mutex<ConnectionTracker>>,
 }
 
@@ -263,7 +292,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     let connection_tracker = Arc::new(Mutex::new(ConnectionTracker::default()));
     let ct = Arc::clone(&connection_tracker);
     let poll_time = Duration::from_secs(60);
-    let _h = tokio::spawn(watch_new(nm.clone(), pool, ct, poll_time));
+    let _h = tokio::spawn(watch_new(nm.clone(), pool.clone(), ct, poll_time));
 
     let api_routes = Router::new()
         .route(
@@ -288,6 +317,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
         .nest("/notification", notification_routes)
         .with_state(AppState {
             nm,
+            pool,
             connection_tracker,
         })
         .layer(

server/src/nm.rs

@@ -982,12 +982,15 @@ pub async fn label_unprocessed(
     } else {
         &ids[..]
     };
+    let mut add_mutations = HashMap::new();
+    let mut rm_mutations = HashMap::new();
     for id in ids {
         let id = format!("id:{id}");
         let files = nm.files(&id)?;
         // Only process the first file path is multiple files have the same id
         let path = files.iter().next().unwrap();
         let file = File::open(&path)?;
+        info!("mmaping {path}");
         let mmap = unsafe { MmapOptions::new().map(&file)? };
         let m = parse_mail(&mmap)?;
         let (matched_rule, add_tags) = find_tags(&rules, &m.headers);
@@ -1001,17 +1004,69 @@ pub async fn label_unprocessed(
                         .get_first_value("subject")
                         .expect("no subject header")
                 );
-            } else {
-                for t in &add_tags {
-                    nm.tag_add(t, &id)?;
-                }
-                if !add_tags.contains("inbox") {
-                    nm.tag_remove("inbox", &id)?;
-                }
-                nm.tag_remove("unprocessed", &id)?;
             }
+            for t in &add_tags {
+                //nm.tag_add(t, &id)?;
+                add_mutations
+                    .entry(t.to_string())
+                    .or_insert_with(|| Vec::new())
+                    .push(id.clone());
+            }
+            if add_tags.contains("spam") || add_tags.contains("Spam") {
+                //nm.tag_remove("unread", &id)?;
+                let t = "unread".to_string();
+                rm_mutations
+                    .entry(t)
+                    .or_insert_with(|| Vec::new())
+                    .push(id.clone());
+            }
+            if !add_tags.contains("inbox") {
+                //nm.tag_remove("inbox", &id)?;
+                let t = "inbox".to_string();
+                rm_mutations
+                    .entry(t)
+                    .or_insert_with(|| Vec::new())
+                    .push(id.clone());
+            }
+            //nm.tag_remove("unprocessed", &id)?;
+        } else {
+            if add_tags.is_empty() {
+                let t = "Grey".to_string();
+                add_mutations
+                    .entry(t)
+                    .or_insert_with(|| Vec::new())
+                    .push(id.clone());
+            }
+            let t = "unprocessed".to_string();
+            rm_mutations
+                .entry(t)
+                .or_insert_with(|| Vec::new())
+                .push(id.clone());
+            //nm.tag_remove("inbox", &id)?;
+            let t = "inbox".to_string();
+            rm_mutations
+                .entry(t)
+                .or_insert_with(|| Vec::new())
+                .push(id.clone());
         }
     }
+    info!("Adding {} distinct labels", add_mutations.len());
+    for (tag, ids) in add_mutations.iter() {
+        info!("  {tag}: {}", ids.len());
+        if !dryrun {
+            let ids: Vec<_> = ids.iter().map(|s| s.as_str()).collect();
+            nm.tags_add(tag, &ids)?;
+        }
+    }
+    info!("Removing {} distinct labels", rm_mutations.len());
+    for (tag, ids) in rm_mutations.iter() {
+        info!("  {tag}: {}", ids.len());
+        if !dryrun {
+            let ids: Vec<_> = ids.iter().map(|s| s.as_str()).collect();
+            nm.tags_remove(tag, &ids)?;
+        }
+    }
+
     Ok(())
 }
 fn find_tags<'a, 'b>(rules: &'a [Rule], headers: &'b [MailHeader]) -> (bool, HashSet<&'a str>) {

shared/Cargo.toml

@@ -12,9 +12,9 @@ version.workspace = true
 
 [dependencies]
 build-info = "0.0.40"
-letterbox-notmuch = { version = "0.16.0", registry = "xinu" }
+letterbox-notmuch = { path = "../notmuch", version = "0.17.13", registry = "xinu" }
 regex = "1.11.1"
-serde = { version = "1.0.147", features = ["derive"] }
+serde = { version = "1.0.219", features = ["derive"] }
 sqlx = "0.8.5"
 strum_macros = "0.27.1"
 tracing = "0.1.41"

web/Cargo.toml

@@ -12,30 +12,29 @@ version.workspace = true
 build-info-build = "0.0.40"
 
 [dev-dependencies]
-wasm-bindgen-test = "0.3.33"
+wasm-bindgen-test = "0.3.50"
 
 [dependencies]
 console_error_panic_hook = "0.1.7"
-log = "0.4.17"
+log = "0.4.27"
 seed = { version = "0.10.0", features = ["routing"] }
 #seed = "0.9.2"
-console_log = { version = "0.1.0", registry = "xinu" }
+console_log = { version = "0.1.4", registry = "xinu" }
-serde = { version = "1.0.147", features = ["derive"] }
+serde = { version = "1.0.219", features = ["derive"] }
 itertools = "0.14.0"
-serde_json = { version = "1.0.93", features = ["unbounded_depth"] }
+serde_json = { version = "1.0.140", features = ["unbounded_depth"] }
-chrono = "0.4.31"
+chrono = "0.4.40"
 graphql_client = "0.14.0"
-thiserror = "2.0.0"
+thiserror = "2.0.12"
 gloo-net = { version = "0.6.0", features = ["json", "serde_json"] }
 human_format = "1.1.0"
 build-info = "0.0.40"
 wasm-bindgen = "=0.2.100"
-uuid = { version = "1.13.1", features = [
+uuid = { version = "1.16.0", features = [
   "js",
 ] } # direct dep to set js feature, prevents Rng issues
-letterbox-shared = { version = "0.16.0", registry = "xinu" }
+letterbox-shared = { version = "0.17.9", registry = "xinu" }
-letterbox-notmuch = { version = "0.16.0", registry = "xinu" }
+seed_hooks = { version = "0.4.1", registry = "xinu" }
-seed_hooks = { version = "0.4.0", registry = "xinu" }
 strum_macros = "0.27.1"
 gloo-console = "0.3.0"
 [target.'cfg(target_arch = "wasm32")'.dependencies]
@@ -45,7 +44,7 @@ wasm-sockets = "1.0.0"
 wasm-opt = ['-Os']
 
 [dependencies.web-sys]
-version = "0.3.58"
+version = "0.3.77"
 features = [
   "Clipboard",
   "DomRect",