{"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[07715165] nice\n\nSide A — unified diff (full patch):\ndiff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs\nindex c3c62a76f424010d77a6090c84dd0b82098f573e..da2536112faea313352624cf2ce0ddd0ab3377c1 100644\n--- a/server/src/api/ui_html.rs\n+++ b/server/src/api/ui_html.rs\n@@ -6,7 +6,7 @@ use axum::{\n use std::collections::HashMap;\n \n use crate::{\n- html::{demo_counter_panel, js_string_literal, ranking_panel, JsBuilder},\n+ html::{js_string_literal, ranking_panel, JsBuilder},\n parser::parse_reddit_url,\n parser_render::parser_panel_morph,\n state::AppState,\n@@ -35,13 +35,6 @@ pub async fn post_ui_html(\n };\n \n match action {\n- HtmlUiAction::BumpDemoCounter => {\n- let count = state.bump_demo_counter().await;\n- let panel = demo_counter_panel(count, state.event_log.path().to_string_lossy().as_ref());\n- JsBuilder::new()\n- .morph_selector(\"#demo-counter-panel\", panel)\n- .into_response()\n- }\n HtmlUiAction::RecordVote {\n a,\n b,\n@@ -54,8 +47,8 @@ pub async fn post_ui_html(\n {\n return ui_js_warn(&e).into_response();\n }\n- let mut group = state.group.write().await;\n- let panel = ranking_panel(&mut group);\n+ let group = state.group.read().await;\n+ let panel = ranking_panel(&group);\n JsBuilder::new()\n .morph_selector(\"#ranking-panel\", panel)\n .into_response()\n@@ -87,20 +80,6 @@ mod tests {\n assert!(matches!(err, HtmlUiParseError::MissingRpc));\n }\n \n- #[test]\n- fn bump_action_deserializes() {\n- let template = serde_json::json!({ \"action\": \"bump_demo_counter\" });\n- let mut form = HashMap::new();\n- form.insert(\n- UI_RPC_FIELD.to_string(),\n- serde_json::to_string(&template).unwrap(),\n- );\n- assert_eq!(\n- parse_html_ui_from_form(&form).unwrap(),\n- HtmlUiAction::BumpDemoCounter\n- );\n- }\n-\n #[test]\n fn record_vote_action_deserializes() {\n let template = serde_json::json!({\ndiff --git a/server/src/events.rs b/server/src/events.rs\nindex b969242534e184d4f0a689543a479670b08a18df..eff80aef0257f706d2341f666e63d6a3d921bf6e 100644\n--- a/server/src/events.rs\n+++ b/server/src/events.rs\n@@ -5,8 +5,6 @@ use serde::{Deserialize, Serialize};\n pub enum Event {\n /// Page view recorded (path → counter in views.json).\n ViewRecorded { path: String, ts: i64 },\n- /// Demo counter bump from `POST /ui` (persisted in the single JSONL log).\n- DemoCounterBumped { ts: i64, value: u64 },\n /// Pairwise comparison vote (replayed into [`crate::reducer::GroupState`] on boot).\n VoteRecorded {\n ts: i64,\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex 5b1d0b5a887d89e7e80796aa7a6c8ed5baaf2782..d69ed962b5c8625bc83c933b1825f2cc1d0868e2 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -13,7 +13,7 @@ use crate::{\n form_template::template_json_compact,\n parser_action::ParserAction,\n parser_render::parser_panel,\n- ranking::ranked_items,\n+ ranking::ranked_items_cached,\n reducer::GroupState,\n state::AppState,\n ui_action::UI_RPC_FIELD,\n@@ -199,10 +199,8 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str)\n }\n }\n \n-pub fn ranking_panel(group: &mut GroupState) -> Markup {\n- const MAX_ITERS: usize = 10_000;\n- const TOL: f64 = 1e-8;\n- let items = ranked_items(group, MAX_ITERS, TOL);\n+pub fn ranking_panel(group: &GroupState) -> Markup {\n+ let items = ranked_items_cached(group);\n html! {\n section id=\"ranking-panel\" class=\"demo-panel\" {\n h2 { \"Ranking\" }\n@@ -260,35 +258,6 @@ pub fn vote_panel() -> Markup {\n }\n \n \n-pub fn demo_counter_panel(count: u64, event_log_path: &str) -> Markup {\n- let rpc = template_json_compact(&serde_json::json!({ \"action\": \"bump_demo_counter\" }))\n- .expect(\"rpc json\");\n- html! {\n- section id=\"demo-counter-panel\" class=\"demo-panel\" {\n- h1 { \"sorter2\" }\n- p class=\"muted\" {\n- \"Pairwise ranking scaffold — votes persist to JSONL and replay on boot.\"\n- }\n- p class=\"demo-count\" {\n- strong { \"Counter: \" }\n- span id=\"demo-count-value\" { (count) }\n- }\n- p class=\"muted small\" {\n- \"Event log: \" code { (event_log_path) }\n- }\n- form method=\"post\" action=\"/ui\" id=\"demo-bump-form\" {\n- input type=\"hidden\" name=(UI_RPC_FIELD) value=(rpc);\n- button type=\"submit\" class=\"btn-primary\" { \"Bump (POST /ui → eval JS)\" }\n- }\n- p class=\"muted small\" {\n- \"Uses hidden \"\n- code { \"__rpc__\" }\n- \" JSON + Idiomorph morph — no full page reload.\"\n- }\n- }\n- }\n-}\n-\n pub async fn home(\n State(state): State,\n jar: CookieJar,\n@@ -297,16 +266,15 @@ pub async fn home(\n let path = uri.path().to_string();\n state.views.increment(path.clone());\n let views = state.views.get_views(&path);\n- let count = *state.demo_counter.read().await;\n let theme = theme_from_jar(&jar);\n let theme_next = theme_next_from_uri(&uri);\n- let mut group = state.group.write().await;\n+ let group = state.group.read().await;\n let empty_action = ParserAction::suggest(String::new(), None);\n let body = html! {\n+ h1 { \"sorter2\" }\n (parser_panel(\"\", &empty_action))\n (vote_panel())\n- (ranking_panel(&mut group))\n- (demo_counter_panel(count, state.event_log.path().to_string_lossy().as_ref()))\n+ (ranking_panel(&group))\n };\n layout(\"sorter2\", body, views, theme, &theme_next)\n }\ndiff --git a/server/src/lib.rs b/server/src/lib.rs\nindex 6716c5b282e7980a7a0f03d63ad8b25eda61cc55..fa423640d598f4ba97a5885d228e78d7b97f7a22 100644\n--- a/server/src/lib.rs\n+++ b/server/src/lib.rs\n@@ -9,6 +9,7 @@ pub mod parser_render;\n pub mod path_types;\n pub mod ranking;\n pub mod reducer;\n+pub mod settlement;\n pub mod state;\n pub mod ui_action;\n pub mod views;\ndiff --git a/server/src/ranking.rs b/server/src/ranking.rs\nindex 89d3280126a8d8f841721ce8cb63ff735d68752a..2d706762792ba9239bb3f1c2e4974a2fde908013 100644\n--- a/server/src/ranking.rs\n+++ b/server/src/ranking.rs\n@@ -91,6 +91,11 @@ pub fn compute_group_ranking(group: &mut GroupState, max_iters: usize, tol: f64)\n \n pub fn ranked_items(group: &mut GroupState, max_iters: usize, tol: f64) -> Vec {\n compute_group_ranking(group, max_iters, tol);\n+ ranked_items_cached(group)\n+}\n+\n+/// Read cached scores without recomputing (HTTP fast path).\n+pub fn ranked_items_cached(group: &GroupState) -> Vec {\n let mut items: Vec = group\n .idx_to_item\n .iter()\n@@ -105,7 +110,12 @@ pub fn ranked_items(group: &mut GroupState, max_iters: usize, tol: f64) -> Vec, max_iters: usize, tol: f64) -> Vec {\n+pub fn compute_scores_from_edges(\n+ n: usize,\n+ edges: impl Iterator,\n+ max_iters: usize,\n+ tol: f64,\n+) -> Vec {\n if n == 0 {\n return vec![];\n }\ndiff --git a/server/src/settlement.rs b/server/src/settlement.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..1f722ceaea62cda22c28ab71551f259fbf049b81\n--- /dev/null\n+++ b/server/src/settlement.rs\n@@ -0,0 +1,114 @@\n+use std::sync::Arc;\n+\n+use tokio::sync::{mpsc, oneshot, RwLock};\n+\n+use crate::{\n+ event_log::EventLog,\n+ events::Event,\n+ ranking::compute_scores_from_edges,\n+ reducer::{GroupState, VoteData},\n+};\n+\n+const MAX_ITERS: usize = 10_000;\n+const TOL: f64 = 1e-8;\n+\n+pub struct SettlementCommand {\n+ pub vote: VoteData,\n+ pub event: Event,\n+ pub reply: oneshot::Sender>,\n+}\n+\n+#[derive(Clone)]\n+pub struct SettlementClient {\n+ tx: mpsc::Sender,\n+}\n+\n+impl SettlementClient {\n+ pub fn spawn(group: Arc>, event_log: Arc) -> Self {\n+ let (tx, rx) = mpsc::channel(64);\n+ tokio::spawn(settlement_worker(rx, group, event_log));\n+ Self { tx }\n+ }\n+\n+ pub async fn record_vote(&self, vote: VoteData, event: Event) -> Result<(), String> {\n+ let (reply, rx) = oneshot::channel();\n+ self.tx\n+ .send(SettlementCommand {\n+ vote,\n+ event,\n+ reply,\n+ })\n+ .await\n+ .map_err(|_| \"settlement worker stopped\".to_string())?;\n+ rx.await\n+ .map_err(|_| \"settlement worker stopped\".to_string())?\n+ }\n+}\n+\n+async fn settlement_worker(\n+ mut rx: mpsc::Receiver,\n+ group: Arc>,\n+ event_log: Arc,\n+) {\n+ while let Some(first) = rx.recv().await {\n+ let mut batch = vec![first];\n+ while let Ok(more) = rx.try_recv() {\n+ batch.push(more);\n+ }\n+\n+ let mut disk_err: Option = None;\n+ for cmd in &batch {\n+ if let Err(e) = event_log.append(&cmd.event).await {\n+ disk_err = Some(e.to_string());\n+ break;\n+ }\n+ }\n+\n+ if let Some(err) = disk_err {\n+ for cmd in batch {\n+ let _ = cmd.reply.send(Err(err.clone()));\n+ }\n+ continue;\n+ }\n+\n+ let (edges, n) = {\n+ let mut w = group.write().await;\n+ for cmd in &batch {\n+ w.apply_vote(cmd.vote.clone());\n+ }\n+ (w.edges.clone(), w.idx_to_item.len())\n+ };\n+\n+ let new_scores = compute_scores_from_edges(\n+ n,\n+ edges.iter().map(|(&k, &v)| (k, v)),\n+ MAX_ITERS,\n+ TOL,\n+ );\n+\n+ {\n+ let mut w = group.write().await;\n+ w.cached_scores = new_scores;\n+ w.dirty = false;\n+ }\n+\n+ for cmd in batch {\n+ let _ = cmd.reply.send(Ok(()));\n+ }\n+ }\n+}\n+\n+/// Compute ranking cache from current in-memory edges (startup replay only).\n+pub fn warm_ranking_cache(group: &mut GroupState) {\n+ if !group.dirty {\n+ return;\n+ }\n+ let n = group.idx_to_item.len();\n+ group.cached_scores = compute_scores_from_edges(\n+ n,\n+ group.edges.iter().map(|(&k, &v)| (k, v)),\n+ MAX_ITERS,\n+ TOL,\n+ );\n+ group.dirty = false;\n+}\ndiff --git a/server/src/state.rs b/server/src/state.rs\nindex 8ec9902e2ecc31cf8208f7ad6365891dc5537eed..1922541a4064c2de1df2d993a461cae783320e05 100644\n--- a/server/src/state.rs\n+++ b/server/src/state.rs\n@@ -6,6 +6,7 @@ use crate::{\n event_log::EventLog,\n events::Event,\n reducer::{GroupState, VoteData},\n+ settlement::{warm_ranking_cache, SettlementClient},\n views::ViewStore,\n };\n \n@@ -38,8 +39,8 @@ pub struct AppState {\n pub cfg: Arc,\n pub event_log: Arc,\n pub views: ViewStore,\n- pub demo_counter: Arc>,\n pub group: Arc>,\n+ settlement: SettlementClient,\n }\n \n impl AppState {\n@@ -48,14 +49,10 @@ impl AppState {\n let views_path = format!(\"{}/views.json\", cfg.data_dir);\n let views = ViewStore::new(&views_path);\n \n- let mut demo_counter: u64 = 0;\n let mut group = GroupState::new();\n if let Ok((events, _)) = event_log.load_all().await {\n for ev in events {\n match ev {\n- Event::DemoCounterBumped { value, .. } => {\n- demo_counter = demo_counter.max(value);\n- }\n Event::VoteRecorded {\n ts,\n a,\n@@ -74,30 +71,20 @@ impl AppState {\n }\n }\n \n+ warm_ranking_cache(&mut group);\n+\n+ let group = Arc::new(RwLock::new(group));\n+ let settlement = SettlementClient::spawn(group.clone(), event_log.clone());\n+\n Self {\n cfg: Arc::new(cfg),\n event_log,\n views,\n- demo_counter: Arc::new(RwLock::new(demo_counter)),\n- group: Arc::new(RwLock::new(group)),\n+ group,\n+ settlement,\n }\n }\n \n- pub async fn bump_demo_counter(&self) -> u64 {\n- let mut guard = self.demo_counter.write().await;\n- *guard += 1;\n- let value = *guard;\n- drop(guard);\n-\n- let ts = crate::html::now_ms();\n- let _ = self\n- .event_log\n- .append(&Event::DemoCounterBumped { ts, value })\n- .await;\n-\n- value\n- }\n-\n pub async fn record_vote(\n &self,\n a: &str,\n@@ -109,23 +96,14 @@ impl AppState {\n let vote = VoteData::from_recorded(ts, a, b, ratio_left, ratio_right)\n .ok_or_else(|| \"invalid vote: need two distinct non-empty items\".to_string())?;\n \n- {\n- let mut group = self.group.write().await;\n- group.apply_vote(vote.clone());\n- }\n-\n- let _ = self\n- .event_log\n- .append(&Event::VoteRecorded {\n- ts,\n- a: vote.a.as_str().to_string(),\n- b: vote.b.as_str().to_string(),\n- ratio_left: vote.ratio_left,\n- ratio_right: vote.ratio_right,\n- })\n- .await\n- .map_err(|e| e.to_string())?;\n+ let event = Event::VoteRecorded {\n+ ts,\n+ a: vote.a.as_str().to_string(),\n+ b: vote.b.as_str().to_string(),\n+ ratio_left: vote.ratio_left,\n+ ratio_right: vote.ratio_right,\n+ };\n \n- Ok(())\n+ self.settlement.record_vote(vote, event).await\n }\n }\ndiff --git a/server/src/ui_action.rs b/server/src/ui_action.rs\nindex 1d488e1ad1d8fd81bd9d016d69255adfe9b22fc8..5d94c84113607b3bcd8d31d03ef5b8e1b87b67a7 100644\n--- a/server/src/ui_action.rs\n+++ b/server/src/ui_action.rs\n@@ -12,8 +12,6 @@ pub const UI_RPC_FIELD: &str = \"__rpc__\";\n #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]\n #[serde(tag = \"action\", rename_all = \"snake_case\")]\n pub enum HtmlUiAction {\n- /// Demo: morph `#demo-counter-panel` after bumping the persisted counter.\n- BumpDemoCounter,\n /// Record a pairwise vote and morph `#ranking-panel`.\n RecordVote {\n a: String,\n@@ -52,18 +50,6 @@ pub fn parse_html_ui_from_form(\n mod tests {\n use super::*;\n \n- #[test]\n- fn bump_demo_counter_round_trip() {\n- let template = serde_json::json!({ \"action\": \"bump_demo_counter\" });\n- let mut form = HashMap::new();\n- form.insert(\n- UI_RPC_FIELD.to_string(),\n- serde_json::to_string(&template).unwrap(),\n- );\n- let a = parse_html_ui_from_form(&form).unwrap();\n- assert_eq!(a, HtmlUiAction::BumpDemoCounter);\n- }\n-\n #[test]\n fn record_vote_round_trip_with_form_holes() {\n let template = serde_json::json!({\ndiff --git a/server/tests/integration_health.rs b/server/tests/integration_health.rs\nindex 8a58bc14aac68c779e7ce4ffa57d27b3220e9953..1d816e008b9bf629967e3b3c786c41afefc284e3 100644\n--- a/server/tests/integration_health.rs\n+++ b/server/tests/integration_health.rs\n@@ -38,7 +38,7 @@ async fn healthz_ok() {\n }\n \n #[tokio::test]\n-async fn home_has_demo_panel() {\n+async fn home_has_main_panels() {\n let (addr, _tmp) = start_test_server().await;\n let client = reqwest::Client::new();\n let html = client\ndiff --git a/server/tests/integration_ui.rs b/server/tests/integration_ui.rs\nindex bee79407dec120699a083f1a75adf9291e207fc7..7ede46d681fefbe25b1d98fc33520a185515eb1c 100644\n--- a/server/tests/integration_ui.rs\n+++ b/server/tests/integration_ui.rs\n@@ -25,33 +25,6 @@ async fn start_test_server() -> (SocketAddr, TempDir) {\n (addr, tmp)\n }\n \n-#[tokio::test]\n-async fn post_ui_bump_returns_javascript_morph() {\n- let (addr, tmp) = start_test_server().await;\n- let rpc = serde_json::json!({ \"action\": \"bump_demo_counter\" }).to_string();\n- let mut form = HashMap::new();\n- form.insert(UI_RPC_FIELD.to_string(), rpc);\n-\n- let client = reqwest::Client::new();\n- let body = client\n- .post(format!(\"http://{addr}/ui\"))\n- .form(&form)\n- .send()\n- .await\n- .unwrap()\n- .text()\n- .await\n- .unwrap();\n-\n- assert!(body.contains(\"Idiomorph.morph\"));\n- assert!(body.contains(\"demo-counter-panel\"));\n- assert!(body.contains(\"Counter:\"));\n-\n- let log_path = tmp.path().join(\"events.jsonl\");\n- let log = std::fs::read_to_string(log_path).unwrap();\n- assert!(log.contains(\"demo_counter_bumped\"));\n-}\n-\n #[tokio::test]\n async fn post_ui_record_vote_morphs_ranking_and_persists() {\n let (addr, tmp) = start_test_server().await;\n@@ -90,8 +63,8 @@ async fn post_ui_record_vote_morphs_ranking_and_persists() {\n port: 0,\n };\n let state = create_app_state(cfg).await;\n- let mut group = state.group.write().await;\n- let ranked = sorter2_server::ranking::ranked_items(&mut group, 10_000, 1e-8);\n+ let group = state.group.read().await;\n+ let ranked = sorter2_server::ranking::ranked_items_cached(&group);\n assert_eq!(ranked.len(), 2);\n assert_eq!(ranked[0].item.as_str(), \"alpha\");\n }\ndiff --git a/test/smoke.clj b/test/smoke.clj\nindex b332324743b58baf3fe96d7477353749f137feae..11887c48282088e140d823a88ba616f6325835b3 100644\n--- a/test/smoke.clj\n+++ b/test/smoke.clj\n@@ -26,7 +26,7 @@\n false))))))\n \n (deftest http-smoke-against-running-server\n- (testing \"build, start, healthz, home contains RPC demo\"\n+ (testing \"build, start, healthz, home contains main panels\"\n (let [root (repo-root)\n data-dir (.getAbsolutePath (doto (io/file (System/getProperty \"java.io.tmpdir\")\n (str \"sorter2-smoke-\" (System/currentTimeMillis)))\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 \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,\n+ fetch_id: &ItemId,\n+ kind: FetchKind,\n+) -> Result {\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,\n-) -> Option {\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 {\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::>().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::(),\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#\"
You've been blocked by network security. To continue, log in
\"#;\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":"~x-ai/grok-latest"}