{"messages":[{"content":"You are a constitutional council ranking individual git commits for ownership allocation.\n\nCompare these two commits. Decide which contributed more lasting value to the project.\n\nJudge substance, not spectacle:\n- Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise.\n- Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one.\n- Do not favor a side merely because its patch is longer or noisier.\n- Weight what the change does for the project, not the contributor's name.\n\nReturn ONLY a JSON object: {\"winner\": \"A\" or \"B\", \"ratio\": \"N:M\", \"explanation\": \"...\"}\nThe explanation must cite concrete differences in the patches (1-3 sentences).\n\nSide A — contributor: tommy-mor\nSide A — commit message:\n[bf118bdf] Sanitize Reddit entity body HTML before rendering.\n\nUse ammonia at render time so untrusted selftext_html cannot execute scripts in our origin.\n\nCo-authored-by: Cursor <cursoragent@cursor.com>\n\nSide A — unified diff (full patch):\ndiff --git a/Cargo.lock b/Cargo.lock\nindex 3dec7cb72a182dc654a37dca8ba0b49d77504daa..0dd4fce5fb6400ae153cca4e3dbf5a5158e6d8b4 100644\n--- a/Cargo.lock\n+++ b/Cargo.lock\n@@ -11,6 +11,19 @@ dependencies = [\n  \"memchr\",\n ]\n \n+[[package]]\n+name = \"ammonia\"\n+version = \"4.1.2\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"17e913097e1a2124b46746c980134e8c954bc17a6a59bb3fde96f088d126dde6\"\n+dependencies = [\n+ \"cssparser\",\n+ \"html5ever\",\n+ \"maplit\",\n+ \"tendril\",\n+ \"url\",\n+]\n+\n [[package]]\n name = \"anyhow\"\n version = \"1.0.102\"\n@@ -355,6 +368,29 @@ version = \"0.2.4\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5\"\n \n+[[package]]\n+name = \"cssparser\"\n+version = \"0.35.0\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"4e901edd733a1472f944a45116df3f846f54d37e67e68640ac8bb69689aca2aa\"\n+dependencies = [\n+ \"cssparser-macros\",\n+ \"dtoa-short\",\n+ \"itoa\",\n+ \"phf\",\n+ \"smallvec\",\n+]\n+\n+[[package]]\n+name = \"cssparser-macros\"\n+version = \"0.6.1\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331\"\n+dependencies = [\n+ \"quote\",\n+ \"syn\",\n+]\n+\n [[package]]\n name = \"deranged\"\n version = \"0.5.8\"\n@@ -381,6 +417,21 @@ version = \"0.15.7\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b\"\n \n+[[package]]\n+name = \"dtoa\"\n+version = \"1.0.11\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"4c3cf4824e2d5f025c7b531afcb2325364084a16806f6d47fbc1f5fbd9960590\"\n+\n+[[package]]\n+name = \"dtoa-short\"\n+version = \"0.3.5\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87\"\n+dependencies = [\n+ \"dtoa\",\n+]\n+\n [[package]]\n name = \"durable\"\n version = \"0.2.0\"\n@@ -482,6 +533,16 @@ dependencies = [\n  \"percent-encoding\",\n ]\n \n+[[package]]\n+name = \"futf\"\n+version = \"0.1.5\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843\"\n+dependencies = [\n+ \"mac\",\n+ \"new_debug_unreachable\",\n+]\n+\n [[package]]\n name = \"futures-channel\"\n version = \"0.3.32\"\n@@ -614,6 +675,17 @@ version = \"0.5.0\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea\"\n \n+[[package]]\n+name = \"html5ever\"\n+version = \"0.35.0\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"55d958c2f74b664487a2035fe1dadb032c48718a03b63f3ab0b8537db8549ed4\"\n+dependencies = [\n+ \"log\",\n+ \"markup5ever\",\n+ \"match_token\",\n+]\n+\n [[package]]\n name = \"http\"\n version = \"1.4.1\"\n@@ -974,6 +1046,15 @@ version = \"0.8.2\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0\"\n \n+[[package]]\n+name = \"lock_api\"\n+version = \"0.4.14\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965\"\n+dependencies = [\n+ \"scopeguard\",\n+]\n+\n [[package]]\n name = \"log\"\n version = \"0.4.30\"\n@@ -990,6 +1071,40 @@ dependencies = [\n  \"libc\",\n ]\n \n+[[package]]\n+name = \"mac\"\n+version = \"0.1.1\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4\"\n+\n+[[package]]\n+name = \"maplit\"\n+version = \"1.0.2\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d\"\n+\n+[[package]]\n+name = \"markup5ever\"\n+version = \"0.35.0\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"311fe69c934650f8f19652b3946075f0fc41ad8757dbb68f1ca14e7900ecc1c3\"\n+dependencies = [\n+ \"log\",\n+ \"tendril\",\n+ \"web_atoms\",\n+]\n+\n+[[package]]\n+name = \"match_token\"\n+version = \"0.35.0\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"ac84fd3f360fcc43dc5f5d186f02a94192761a080e8bc58621ad4d12296a58cf\"\n+dependencies = [\n+ \"proc-macro2\",\n+ \"quote\",\n+ \"syn\",\n+]\n+\n [[package]]\n name = \"matchers\"\n version = \"0.2.0\"\n@@ -1092,6 +1207,12 @@ dependencies = [\n  \"tempfile\",\n ]\n \n+[[package]]\n+name = \"new_debug_unreachable\"\n+version = \"1.0.6\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086\"\n+\n [[package]]\n name = \"nom\"\n version = \"7.1.3\"\n@@ -1175,6 +1296,29 @@ dependencies = [\n  \"vcpkg\",\n ]\n \n+[[package]]\n+name = \"parking_lot\"\n+version = \"0.12.5\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a\"\n+dependencies = [\n+ \"lock_api\",\n+ \"parking_lot_core\",\n+]\n+\n+[[package]]\n+name = \"parking_lot_core\"\n+version = \"0.9.12\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1\"\n+dependencies = [\n+ \"cfg-if\",\n+ \"libc\",\n+ \"redox_syscall\",\n+ \"smallvec\",\n+ \"windows-link\",\n+]\n+\n [[package]]\n name = \"peeking_take_while\"\n version = \"0.1.2\"\n@@ -1187,6 +1331,58 @@ version = \"2.3.2\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220\"\n \n+[[package]]\n+name = \"phf\"\n+version = \"0.11.3\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078\"\n+dependencies = [\n+ \"phf_macros\",\n+ \"phf_shared\",\n+]\n+\n+[[package]]\n+name = \"phf_codegen\"\n+version = \"0.11.3\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a\"\n+dependencies = [\n+ \"phf_generator\",\n+ \"phf_shared\",\n+]\n+\n+[[package]]\n+name = \"phf_generator\"\n+version = \"0.11.3\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d\"\n+dependencies = [\n+ \"phf_shared\",\n+ \"rand 0.8.6\",\n+]\n+\n+[[package]]\n+name = \"phf_macros\"\n+version = \"0.11.3\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216\"\n+dependencies = [\n+ \"phf_generator\",\n+ \"phf_shared\",\n+ \"proc-macro2\",\n+ \"quote\",\n+ \"syn\",\n+]\n+\n+[[package]]\n+name = \"phf_shared\"\n+version = \"0.11.3\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5\"\n+dependencies = [\n+ \"siphasher\",\n+]\n+\n [[package]]\n name = \"pin-project-lite\"\n version = \"0.2.17\"\n@@ -1223,6 +1419,12 @@ dependencies = [\n  \"zerocopy\",\n ]\n \n+[[package]]\n+name = \"precomputed-hash\"\n+version = \"0.1.1\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c\"\n+\n [[package]]\n name = \"prettyplease\"\n version = \"0.2.37\"\n@@ -1379,6 +1581,15 @@ dependencies = [\n  \"rand_core 0.9.5\",\n ]\n \n+[[package]]\n+name = \"redox_syscall\"\n+version = \"0.5.18\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d\"\n+dependencies = [\n+ \"bitflags 2.11.1\",\n+]\n+\n [[package]]\n name = \"regex\"\n version = \"1.12.3\"\n@@ -1563,6 +1774,12 @@ dependencies = [\n  \"windows-sys 0.61.2\",\n ]\n \n+[[package]]\n+name = \"scopeguard\"\n+version = \"1.2.0\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49\"\n+\n [[package]]\n name = \"security-framework\"\n version = \"3.7.0\"\n@@ -1683,6 +1900,12 @@ dependencies = [\n  \"libc\",\n ]\n \n+[[package]]\n+name = \"siphasher\"\n+version = \"1.0.3\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649\"\n+\n [[package]]\n name = \"slab\"\n version = \"0.4.12\"\n@@ -1709,6 +1932,7 @@ dependencies = [\n name = \"sorter2-server\"\n version = \"0.0.1\"\n dependencies = [\n+ \"ammonia\",\n  \"async-stream\",\n  \"axum\",\n  \"axum-extra\",\n@@ -1742,6 +1966,31 @@ version = \"1.2.1\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596\"\n \n+[[package]]\n+name = \"string_cache\"\n+version = \"0.8.9\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f\"\n+dependencies = [\n+ \"new_debug_unreachable\",\n+ \"parking_lot\",\n+ \"phf_shared\",\n+ \"precomputed-hash\",\n+ \"serde\",\n+]\n+\n+[[package]]\n+name = \"string_cache_codegen\"\n+version = \"0.5.4\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0\"\n+dependencies = [\n+ \"phf_generator\",\n+ \"phf_shared\",\n+ \"proc-macro2\",\n+ \"quote\",\n+]\n+\n [[package]]\n name = \"subtle\"\n version = \"2.6.1\"\n@@ -1813,6 +2062,17 @@ dependencies = [\n  \"windows-sys 0.61.2\",\n ]\n \n+[[package]]\n+name = \"tendril\"\n+version = \"0.4.3\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0\"\n+dependencies = [\n+ \"futf\",\n+ \"mac\",\n+ \"utf-8\",\n+]\n+\n [[package]]\n name = \"thiserror\"\n version = \"1.0.69\"\n@@ -2116,6 +2376,12 @@ version = \"2.1.3\"\n source = \"registry+https://github.com/rust-lang/crates.io-index\"\n checksum = \"daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da\"\n \n+[[package]]\n+name = \"utf-8\"\n+version = \"0.7.6\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9\"\n+\n [[package]]\n name = \"utf8_iter\"\n version = \"1.0.4\"\n@@ -2281,6 +2547,18 @@ dependencies = [\n  \"wasm-bindgen\",\n ]\n \n+[[package]]\n+name = \"web_atoms\"\n+version = \"0.1.3\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"57ffde1dc01240bdf9992e3205668b235e59421fd085e8a317ed98da0178d414\"\n+dependencies = [\n+ \"phf\",\n+ \"phf_codegen\",\n+ \"string_cache\",\n+ \"string_cache_codegen\",\n+]\n+\n [[package]]\n name = \"windows-link\"\n version = \"0.2.1\"\ndiff --git a/server/Cargo.toml b/server/Cargo.toml\nindex 47659ff82fbfb50972eb2b87575e80f66e572ba4..27f552c20b97ef28cdde4cb6b1a4980375135111 100644\n--- a/server/Cargo.toml\n+++ b/server/Cargo.toml\n@@ -13,6 +13,7 @@ serde = { version = \"1\", features = [\"derive\"] }\n serde_json = \"1\"\n thiserror = \"1\"\n maud = { version = \"0.26\", features = [\"axum\"] }\n+ammonia = \"4.1\"\n tower = \"0.5\"\n tower-http = { version = \"0.5\", features = [\"trace\"] }\n tracing = \"0.1\"\ndiff --git a/server/src/fetch/html.rs b/server/src/fetch/html.rs\nindex dadf050515f0473943dad97df5d318032c8cb385..5b160c6b8bd216dfaf80149854aec0566cd00460 100644\n--- a/server/src/fetch/html.rs\n+++ b/server/src/fetch/html.rs\n@@ -4,6 +4,7 @@ use maud::{html, Markup};\n \n use crate::{\n     form_template::template_json_compact,\n+    html::sanitize::entity_body_html,\n     path_types::ItemId,\n     reddit::{is_children_fetchable, is_fetchable},\n     reducer::NodeState,\n@@ -27,7 +28,7 @@ pub fn entity_panel(node: &NodeState) -> Markup {\n                     p class=\"muted small\" { \"by \" (author) }\n                 }\n                 @if let Some(body) = &data.body_html {\n-                    div class=\"entity-body\" { (maud::PreEscaped(body)) }\n+                    div class=\"entity-body\" { (maud::PreEscaped(entity_body_html(body))) }\n                 }\n             }\n         }\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex e180a0ca542a33e2300c0a4809e6b9cfee07ecfe..a58cbbee3490a08a625cb06df06848c59a615d65 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -20,6 +20,7 @@ use crate::{\n     ui_action::UI_RPC_FIELD,\n };\n \n+pub mod sanitize;\n pub mod vote;\n \n const SORTER_CSS: &str = include_str!(\"../../static/sorter.css\");\ndiff --git a/server/src/html/sanitize.rs b/server/src/html/sanitize.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..6685ed2535281b9fd5d65b042cbc5a11c5d4df37\n--- /dev/null\n+++ b/server/src/html/sanitize.rs\n@@ -0,0 +1,39 @@\n+//! Whitelist sanitization for untrusted HTML fragments (e.g. Reddit `selftext_html`).\n+\n+use std::sync::LazyLock;\n+\n+use ammonia::Builder;\n+\n+static ENTITY_BODY: LazyLock<Builder<'static>> = LazyLock::new(|| {\n+    let mut b = Builder::default();\n+    b.strip_comments(true);\n+    b.link_rel(Some(\"noopener noreferrer\"));\n+    b\n+});\n+\n+/// Sanitize HTML safe for embedding in our pages via [`maud::PreEscaped`].\n+pub fn entity_body_html(raw: &str) -> String {\n+    ENTITY_BODY.clean(raw).to_string()\n+}\n+\n+#[cfg(test)]\n+mod tests {\n+    use super::entity_body_html;\n+\n+    #[test]\n+    fn keeps_benign_markup() {\n+        assert_eq!(\n+            entity_body_html(\"<p>release notes</p>\"),\n+            \"<p>release notes</p>\"\n+        );\n+    }\n+\n+    #[test]\n+    fn strips_scripts_and_event_handlers() {\n+        let raw = \"<p>ok</p><script>alert(1)</script><img src=x onerror=alert(1)>\";\n+        let clean = entity_body_html(raw);\n+        assert!(!clean.contains(\"<script\"));\n+        assert!(!clean.contains(\"onerror\"));\n+        assert!(clean.contains(\"<p>ok</p>\"));\n+    }\n+}\ndiff --git a/server/src/render/reddit.rs b/server/src/render/reddit.rs\nindex c4f98fc760c32ce1b41a91bd41e97908bd198937..7f840aa33b734a31d8cf3341a0581c8bcb9bbcf3 100644\n--- a/server/src/render/reddit.rs\n+++ b/server/src/render/reddit.rs\n@@ -3,6 +3,7 @@\n use maud::{html, Markup};\n \n use crate::{\n+    html::sanitize::entity_body_html,\n     path_types::ItemId,\n     reducer::{EntityData, GlobalTree, NodeState},\n };\n@@ -57,7 +58,7 @@ fn post_entity_card(data: &EntityData) -> Markup {\n                 }\n             }\n             @if let Some(body) = &data.body_html {\n-                div class=\"entity-body\" { (maud::PreEscaped(body)) }\n+                div class=\"entity-body\" { (maud::PreEscaped(entity_body_html(body))) }\n             }\n         }\n     }\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[8f69c309] Require Reddit OAuth when credentials are set and refresh on 401/403.\n\nAvoid falling back to the public www.reddit.com API from cloud IPs, which\nreturns Reddit's network-security block page. Also pin SORTER2_BASE_URL in fly.toml.\n\nCo-authored-by: Cursor <cursoragent@cursor.com>\n\nSide B — unified diff (full patch):\ndiff --git a/fly.toml b/fly.toml\nindex f0c6a39f643c204987debc177234d95a8ef44b65..ca7e0088a7efd7d58d29d808f8d89080b2bff233 100644\n--- a/fly.toml\n+++ b/fly.toml\n@@ -5,6 +5,7 @@ primary_region = \"iad\"\n   dockerfile = \"Dockerfile\"\n \n [env]\n+  SORTER2_BASE_URL = \"https://reddit.sorter.social\"\n   SORTER2_DATA_DIR = \"/data\"\n   SORTER2_EVENT_LOG = \"/data/events.jsonl\"\n   PORT = \"8080\"\ndiff --git a/server/src/reddit.rs b/server/src/reddit.rs\nindex a874814f8927192ee62cab2d0db1efd27dcd57b7..f409764c1e1f36216f1b08107043c2eab905694c 100644\n--- a/server/src/reddit.rs\n+++ b/server/src/reddit.rs\n@@ -283,26 +283,35 @@ async fn reddit_worker(\n         );\n         tokio::time::sleep(current_delay).await;\n \n-        if let Some(c) = &creds {\n-            oauth = ensure_oauth_token(&client, &oauth_token_base, c, oauth.take()).await;\n-        }\n-\n-        let token = oauth.as_ref().map(|t| t.access_token.as_str());\n-        let fetch_base = if token.is_some() {\n-            tracing::debug!(\n-                item = %fetch_id,\n-                base = %oauth_api_base,\n-                \"reddit fetch using OAuth bearer\"\n-            );\n-            &oauth_api_base\n-        } else {\n-            &api_base\n-        };\n-        let url = match kind {\n-            FetchKind::SelfEntity => map_item_to_reddit_api(&fetch_id, fetch_base),\n-            FetchKind::Children => map_children_url(&fetch_id, fetch_base),\n+        let outcome = match &creds {\n+            Some(c) => {\n+                // OAuth is required when credentials are configured — never fall\n+                // back to the public www.reddit.com JSON endpoints (cloud IPs\n+                // get blocked with a 403 HTML interstitial).\n+                fetch_with_oauth(\n+                    &client,\n+                    &oauth_token_base,\n+                    &oauth_api_base,\n+                    c,\n+                    &mut oauth,\n+                    &fetch_id,\n+                    kind,\n+                )\n+                .await\n+            }\n+            None => {\n+                let url = match kind {\n+                    FetchKind::SelfEntity => map_item_to_reddit_api(&fetch_id, &api_base),\n+                    FetchKind::Children => map_children_url(&fetch_id, &api_base),\n+                };\n+                match do_fetch(&client, &url, &fetch_id, None).await {\n+                    Ok(FetchOutcome::AuthRejected { status, detail }) => {\n+                        Err(format!(\"Reddit API {status}: {detail}\"))\n+                    }\n+                    other => other,\n+                }\n+            }\n         };\n-        let outcome = do_fetch(&client, &url, &fetch_id, token).await;\n \n         match outcome {\n             Ok(FetchOutcome::Payload(payload)) => {\n@@ -342,6 +351,12 @@ async fn reddit_worker(\n                 current_delay = (current_delay * 2).min(Duration::from_secs(60));\n                 notify(done, FetchJobResult::RateLimited { reset_secs });\n             }\n+            Ok(FetchOutcome::AuthRejected { status, detail }) => {\n+                let e = format!(\"Reddit API {status}: {detail}\");\n+                tracing::warn!(item = %fetch_id, err = %e, \"reddit fetch auth rejected\");\n+                current_delay = (current_delay * 2).min(Duration::from_secs(60));\n+                notify(done, FetchJobResult::Failed(e));\n+            }\n             Err(e) => {\n                 tracing::warn!(item = %fetch_id, err = %e, \"reddit fetch failed\");\n                 current_delay = (current_delay * 2).min(Duration::from_secs(60));\n@@ -357,6 +372,60 @@ enum FetchOutcome {\n     Payload(Value),\n     NotFound,\n     RateLimited { reset_secs: u64 },\n+    /// Bearer rejected — caller should drop the cached token and retry once.\n+    AuthRejected { status: StatusCode, detail: String },\n+}\n+\n+async fn fetch_with_oauth(\n+    client: &Client,\n+    oauth_token_base: &str,\n+    oauth_api_base: &str,\n+    creds: &RedditCredentials,\n+    oauth: &mut Option<OAuthToken>,\n+    fetch_id: &ItemId,\n+    kind: FetchKind,\n+) -> Result<FetchOutcome, String> {\n+    for attempt in 0..2 {\n+        let force_refresh = attempt > 0;\n+        *oauth = Some(\n+            ensure_oauth_token(client, oauth_token_base, creds, oauth.take(), force_refresh)\n+                .await?,\n+        );\n+        let token = oauth\n+            .as_ref()\n+            .expect(\"token set above\")\n+            .access_token\n+            .clone();\n+\n+        tracing::debug!(\n+            item = %fetch_id,\n+            base = %oauth_api_base,\n+            attempt,\n+            \"reddit fetch using OAuth bearer\"\n+        );\n+\n+        let url = match kind {\n+            FetchKind::SelfEntity => map_item_to_reddit_api(fetch_id, oauth_api_base),\n+            FetchKind::Children => map_children_url(fetch_id, oauth_api_base),\n+        };\n+        match do_fetch(client, &url, fetch_id, Some(&token)).await? {\n+            FetchOutcome::AuthRejected { status, detail } if attempt == 0 => {\n+                tracing::warn!(\n+                    item = %fetch_id,\n+                    %status,\n+                    %detail,\n+                    \"reddit OAuth rejected; refreshing token and retrying\"\n+                );\n+                *oauth = None;\n+                continue;\n+            }\n+            FetchOutcome::AuthRejected { status, detail } => {\n+                return Err(format!(\"Reddit API {status}: {detail}\"));\n+            }\n+            other => return Ok(other),\n+        }\n+    }\n+    unreachable!(\"loop always returns\")\n }\n \n async fn ensure_oauth_token(\n@@ -364,35 +433,35 @@ async fn ensure_oauth_token(\n     oauth_base: &str,\n     creds: &RedditCredentials,\n     existing: Option<OAuthToken>,\n-) -> Option<OAuthToken> {\n-    if let Some(t) = existing {\n-        if Instant::now() < t.expires_at - Duration::from_secs(60) {\n-            tracing::debug!(\"reddit OAuth token still valid\");\n-            return Some(t);\n+    force_refresh: bool,\n+) -> Result<OAuthToken, String> {\n+    if !force_refresh {\n+        if let Some(t) = existing {\n+            if Instant::now() < t.expires_at - Duration::from_secs(60) {\n+                tracing::debug!(\"reddit OAuth token still valid\");\n+                return Ok(t);\n+            }\n         }\n     }\n \n     let url = format!(\"{}/api/v1/access_token\", oauth_base.trim_end_matches('/'));\n-    tracing::debug!(%url, \"reddit OAuth token request\");\n+    tracing::debug!(%url, force_refresh, \"reddit OAuth token request\");\n \n     let resp = client\n         .post(&url)\n         .basic_auth(&creds.client_id, Some(&creds.client_secret))\n         .form(&[(\"grant_type\", \"client_credentials\")])\n         .send()\n-        .await;\n-\n-    let resp = match resp {\n-        Ok(r) => r,\n-        Err(e) => {\n-            tracing::warn!(\"reddit OAuth token request failed: {e}\");\n-            return None;\n-        }\n-    };\n+        .await\n+        .map_err(|e| format!(\"Reddit OAuth token request failed: {e}\"))?;\n \n     if !resp.status().is_success() {\n-        tracing::warn!(\"reddit OAuth token HTTP {}\", resp.status());\n-        return None;\n+        let status = resp.status();\n+        let body = resp.text().await.unwrap_or_default();\n+        return Err(format!(\n+            \"Reddit OAuth token HTTP {status}: {}\",\n+            truncate_for_error(&body)\n+        ));\n     }\n \n     #[derive(Deserialize)]\n@@ -401,21 +470,40 @@ async fn ensure_oauth_token(\n         expires_in: u64,\n     }\n \n-    let body: TokenResponse = match resp.json().await {\n-        Ok(b) => b,\n-        Err(e) => {\n-            tracing::warn!(\"reddit OAuth token parse failed: {e}\");\n-            return None;\n-        }\n-    };\n+    let body: TokenResponse = resp\n+        .json()\n+        .await\n+        .map_err(|e| format!(\"Reddit OAuth token parse failed: {e}\"))?;\n \n-    tracing::debug!(expires_in = body.expires_in, \"reddit OAuth token acquired\");\n-    Some(OAuthToken {\n+    tracing::info!(expires_in = body.expires_in, \"reddit OAuth token acquired\");\n+    Ok(OAuthToken {\n         access_token: body.access_token,\n         expires_at: Instant::now() + Duration::from_secs(body.expires_in),\n     })\n }\n \n+fn truncate_for_error(body: &str) -> String {\n+    let compact: String = body.split_whitespace().collect::<Vec<_>>().join(\" \");\n+    if compact.is_empty() {\n+        return \"(empty body)\".into();\n+    }\n+    // Prefer the human-readable block message over dumping Reddit's CSS.\n+    if let Some(idx) = compact.find(\"You've been blocked\") {\n+        let slice: String = compact.chars().skip(idx).take(160).collect();\n+        return if compact.chars().count() > idx + 160 {\n+            format!(\"{slice}…\")\n+        } else {\n+            slice\n+        };\n+    }\n+    let chars: String = compact.chars().take(200).collect();\n+    if compact.chars().count() > 200 {\n+        format!(\"{chars}…\")\n+    } else {\n+        chars\n+    }\n+}\n+\n async fn do_fetch(\n     client: &Client,\n     url: &str,\n@@ -460,15 +548,16 @@ async fn do_fetch(\n \n     if !status.is_success() {\n         let body = resp.text().await.unwrap_or_default();\n+        let detail = truncate_for_error(&body);\n         tracing::debug!(\n             item = %id,\n             %status,\n             body_len = body.len(),\n-            body_prefix = %body.chars().take(240).collect::<String>(),\n+            %detail,\n             \"reddit non-success body\"\n         );\n         if status == StatusCode::FORBIDDEN || status == StatusCode::UNAUTHORIZED {\n-            return Err(format!(\"Reddit API {status}: {body}\"));\n+            return Ok(FetchOutcome::AuthRejected { status, detail });\n         }\n         return Ok(FetchOutcome::NotFound);\n     }\n@@ -716,6 +805,15 @@ fn reddit_direct_image_url(url: &str) -> bool {\n mod tests {\n     use super::*;\n \n+    #[test]\n+    fn truncate_error_prefers_block_message() {\n+        let html = r#\"<style>.x{color:red}</style><div>You've been blocked by network security. To continue, log in</div>\"#;\n+        let msg = truncate_for_error(html);\n+        assert!(msg.starts_with(\"You've been blocked\"));\n+        assert!(msg.len() < 200);\n+        assert!(!msg.contains(\".x{color\"));\n+    }\n+\n     #[test]\n     fn map_subreddit_about_url() {\n         let id = ItemId::from_url(\"https://reddit.com/r/rust\").unwrap();\n","role":"user"}],"model":"openai/gpt-chat-latest"}