{"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[40b975bf] nice\n\nSide A — unified diff (full patch):\ndiff --git a/Cargo.lock b/Cargo.lock\nindex 266e876bb7ccbe788beb1d5bd53ad5b45ee5825b..2cea973082716e761ef6f5dd5886acc08ff9aac0 100644\n--- a/Cargo.lock\n+++ b/Cargo.lock\n@@ -222,6 +222,12 @@ dependencies = [\n  \"syn\",\n ]\n \n+[[package]]\n+name = \"dotenvy\"\n+version = \"0.15.7\"\n+source = \"registry+https://github.com/rust-lang/crates.io-index\"\n+checksum = \"1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b\"\n+\n [[package]]\n name = \"encoding_rs\"\n version = \"0.8.35\"\n@@ -1238,6 +1244,7 @@ version = \"0.0.1\"\n dependencies = [\n  \"axum\",\n  \"axum-extra\",\n+ \"dotenvy\",\n  \"maud\",\n  \"reqwest\",\n  \"serde\",\ndiff --git a/server/Cargo.toml b/server/Cargo.toml\nindex 4677fedcb45292eebebe7e9cf6ce2f5738f18ddf..bd600138b613bd0f546bdec217a5334cdcb20aa5 100644\n--- a/server/Cargo.toml\n+++ b/server/Cargo.toml\n@@ -17,6 +17,7 @@ tower-http = { version = \"0.5\", features = [\"trace\"] }\n tracing = \"0.1\"\n tracing-subscriber = { version = \"0.3\", features = [\"env-filter\"] }\n reqwest = { version = \"0.12\", features = [\"json\"] }\n+dotenvy = \"0.15\"\n \n [dev-dependencies]\n reqwest = { version = \"0.12\", features = [\"json\"] }\ndiff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs\nindex d2024bd4582bcc8482b461b2ba4fedbd8bff7c66..b33a84e8bb5e817b26592868d88090e6d664d950 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::{input_panel, js_string_literal, ranking_panel, JsBuilder},\n+    html::{entity_section, input_panel, js_string_literal, ranking_panel, JsBuilder},\n     parser::parse_reddit_url,\n     path_types::ItemId,\n     reddit::ensure_partial_tree,\n@@ -87,6 +87,20 @@ pub async fn post_ui_html(\n                     .into_response()\n             }\n         },\n+        HtmlUiAction::FetchEntity { item } => {\n+            let id = parse_item_param(&item);\n+            if id.is_root() {\n+                return ui_js_warn(\"nothing to fetch for the root\").into_response();\n+            }\n+            state.queue_entity_fetch(id.clone());\n+            let tree = state.tree.read().await;\n+            let empty = crate::reducer::NodeState::default();\n+            let node = tree.get(&id).unwrap_or(&empty);\n+            let panel = entity_section(&id, node, true);\n+            JsBuilder::new()\n+                .morph_selector(\"#entity-section\", panel)\n+                .into_response()\n+        },\n     }\n }\n \ndiff --git a/server/src/events.rs b/server/src/events.rs\nindex ed5be6b13b9d46e838831d6ce0f96f569b401730..07ce24b5e56cf72b0b442c3c3241efbf6c3b006a 100644\n--- a/server/src/events.rs\n+++ b/server/src/events.rs\n@@ -1,4 +1,5 @@\n use serde::{Deserialize, Serialize};\n+use serde_json::Value;\n \n #[derive(Debug, Clone, Serialize, Deserialize)]\n #[serde(tag = \"type\", rename_all = \"snake_case\")]\n@@ -18,4 +19,10 @@ pub enum Event {\n     },\n     /// Register a node path in the fractal tree (no external fetch).\n     NodeEnsured { id: String },\n+    /// Full upstream API payload for a node (domain-specific view derived at replay/render time).\n+    EntityImported {\n+        id: String,\n+        ts: i64,\n+        payload: Value,\n+    },\n }\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex df6505021d9f446c2b453e20e3eb3cf696a111f9..caf1309c8d93b47104499c57f9cc35ee7631fbb9 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -10,6 +10,7 @@ use crate::{\n     form_template::template_json_compact,\n     path_types::ItemId,\n     ranking::{top_bottom, RankedItem},\n+    reddit::is_fetchable,\n     reducer::{GroupState, NodeState},\n     state::AppState,\n     ui_action::UI_RPC_FIELD,\n@@ -151,7 +152,7 @@ pub fn breadcrumb_path(item: &ItemId) -> Markup {\n fn entity_panel(node: &NodeState) -> Markup {\n     html! {\n         @if let Some(data) = &node.data {\n-            section id=\"entity-panel\" class=\"demo-panel entity-card\" {\n+            div id=\"entity-panel\" class=\"entity-card\" {\n                 h2 { (data.title) }\n                 @if let Some(author) = &data.author {\n                     p class=\"muted small\" { \"by \" (author) }\n@@ -164,6 +165,42 @@ fn entity_panel(node: &NodeState) -> Markup {\n     }\n }\n \n+/// Reddit/API import control — only shown on fetchable pages; never auto-fires.\n+pub fn fetch_entity_panel(item: &ItemId, has_data: bool, fetching: bool) -> Markup {\n+    if !is_fetchable(item) {\n+        return html! {};\n+    }\n+    let label = if fetching {\n+        \"Fetching…\"\n+    } else if has_data {\n+        \"Fetch more\"\n+    } else {\n+        \"Fetch from Reddit\"\n+    };\n+    let rpc = template_json_compact(&serde_json::json!({\n+        \"action\": \"fetch_entity\",\n+        \"item\": item.as_str(),\n+    }))\n+    .expect(\"fetch_entity rpc template\");\n+    html! {\n+        form method=\"post\" action=\"/ui\" id=\"fetch-entity-form\" class=\"fetch-entity-form\" {\n+            input type=\"hidden\" name=(UI_RPC_FIELD) value=(rpc);\n+            button type=\"submit\" class=\"btn-secondary\" disabled=(fetching) { (label) }\n+        }\n+    }\n+}\n+\n+/// Entity card + explicit fetch control (morphed as `#entity-section`).\n+pub fn entity_section(item: &ItemId, node: &NodeState, fetching: bool) -> Markup {\n+    let has_data = node.data.is_some();\n+    html! {\n+        section id=\"entity-section\" class=\"demo-panel\" {\n+            (entity_panel(node))\n+            (fetch_entity_panel(item, has_data, fetching))\n+        }\n+    }\n+}\n+\n fn rank_list(label: &str, items: &[RankedItem], start_rank: usize) -> Markup {\n     html! {\n         @if !items.is_empty() {\n@@ -260,7 +297,7 @@ async fn item_page(state: AppState, uri: Uri, item: ItemId) -> Markup {\n         h1 { \"sorter\" }\n         (input_panel(\"\", None))\n         (breadcrumb_path(&item))\n-        (entity_panel(node))\n+        (entity_section(&item, node, false))\n         (ranking_panel(&item, group))\n     };\n     layout(\"sorter2\", body, views)\n@@ -272,16 +309,5 @@ pub async fn home(State(state): State<AppState>, uri: Uri) -> impl IntoResponse\n \n pub async fn browse(State(state): State<AppState>, uri: Uri) -> impl IntoResponse {\n     let item = ItemId::from_browse_uri(uri.path()).unwrap_or(ItemId::root());\n-    if item.as_str().starts_with(\"reddit.com\") {\n-        let needs_fetch = {\n-            let tree = state.tree.read().await;\n-            tree.get(&item)\n-                .map(|n| n.data.is_none())\n-                .unwrap_or(true)\n-        };\n-        if needs_fetch {\n-            state.reddit.request_fetch(item.clone());\n-        }\n-    }\n     item_page(state, uri, item).await\n }\ndiff --git a/server/src/main.rs b/server/src/main.rs\nindex c22ec6c9f5358e5ec99fb83210dc351938505a93..1f0cddc39302b35b0cd6a6219f44c9d59202facf 100644\n--- a/server/src/main.rs\n+++ b/server/src/main.rs\n@@ -2,6 +2,10 @@ use sorter2_server::state::AppConfig;\n \n #[tokio::main]\n async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {\n+    if std::env::var(\"SORTER2_SKIP_DOTENV\").is_err() {\n+        let _ = dotenvy::dotenv();\n+    }\n+\n     tracing_subscriber::fmt()\n         .with_env_filter(\n             tracing_subscriber::EnvFilter::try_from_default_env()\ndiff --git a/server/src/reddit.rs b/server/src/reddit.rs\nindex 90053ad03b1d7c8e94f325dd4ee64c2b4f7da900..ff0f01e57b18af878eb5be3efc47204a7673589d 100644\n--- a/server/src/reddit.rs\n+++ b/server/src/reddit.rs\n@@ -6,11 +6,15 @@ use std::time::{Duration, Instant};\n \n use reqwest::{header, Client, StatusCode};\n use serde::Deserialize;\n+use serde_json::Value;\n use tokio::sync::{mpsc, RwLock};\n \n use crate::{\n+    event_log::EventLog,\n+    events::Event,\n+    html::now_ms,\n     path_types::ItemId,\n-    reducer::{EntityData, GlobalTree},\n+    reducer::GlobalTree,\n };\n \n /// Bootstrap blank nodes along a URL path so breadcrumbs and voting work before fetch.\n@@ -20,6 +24,8 @@ pub fn ensure_partial_tree(tree: &mut GlobalTree, id: &ItemId) {\n \n pub struct RedditCommand {\n     pub id: ItemId,\n+    /// User-initiated fetch bypasses the in-memory \"recently fetched\" cache.\n+    pub force: bool,\n }\n \n #[derive(Clone)]\n@@ -33,19 +39,31 @@ struct RedditCredentials {\n     client_secret: String,\n }\n \n+#[derive(Clone)]\n+pub struct RedditApiConfig {\n+    pub api_base: String,\n+    pub oauth_base: String,\n+    pub user_agent: String,\n+    creds: Option<RedditCredentials>,\n+}\n+\n struct OAuthToken {\n     access_token: String,\n     expires_at: Instant,\n }\n \n impl RedditBroker {\n-    pub fn spawn(tree: Arc<RwLock<GlobalTree>>, user_agent: &str) -> Self {\n+    pub fn spawn(\n+        tree: Arc<RwLock<GlobalTree>>,\n+        event_log: Arc<EventLog>,\n+        config: RedditApiConfig,\n+    ) -> Self {\n         let (tx, rx) = mpsc::channel(100);\n \n         let mut headers = header::HeaderMap::new();\n         headers.insert(\n             header::USER_AGENT,\n-            header::HeaderValue::from_str(user_agent).expect(\"valid user agent\"),\n+            header::HeaderValue::from_str(&config.user_agent).expect(\"valid user agent\"),\n         );\n \n         let client = Client::builder()\n@@ -54,22 +72,38 @@ impl RedditBroker {\n             .build()\n             .expect(\"reqwest client\");\n \n-        let creds = RedditCredentials::from_env();\n-        tokio::spawn(reddit_worker(rx, tree, client, creds));\n+        tokio::spawn(reddit_worker(rx, tree, event_log, client, config));\n \n         Self { tx }\n     }\n \n-    /// Fire-and-forget: queue a fetch; worker updates the tree when done.\n-    pub fn request_fetch(&self, id: ItemId) {\n-        let _ = self.tx.try_send(RedditCommand { id });\n+    /// Queue a fetch; drops when the channel is full (backpressure).\n+    pub fn request_fetch(&self, id: ItemId, force: bool) {\n+        let _ = self.tx.try_send(RedditCommand { id, force });\n+    }\n+}\n+\n+impl RedditApiConfig {\n+    pub fn from_env() -> Self {\n+        Self {\n+            api_base: reddit_api_base(),\n+            oauth_base: reddit_oauth_base(),\n+            user_agent: default_user_agent(),\n+            creds: RedditCredentials::from_env(),\n+        }\n     }\n }\n \n impl RedditCredentials {\n+    /// Reddit's OAuth docs call these \"client id\" and \"client secret\"; the app\n+    /// registration UI often labels them \"app id\" / \"app secret\" — same values.\n     fn from_env() -> Option<Self> {\n-        let client_id = std::env::var(\"REDDIT_CLIENT_ID\").ok()?;\n-        let client_secret = std::env::var(\"REDDIT_CLIENT_SECRET\").ok()?;\n+        let client_id = std::env::var(\"REDDIT_CLIENT_ID\")\n+            .or_else(|_| std::env::var(\"REDDIT_APP_ID\"))\n+            .ok()?;\n+        let client_secret = std::env::var(\"REDDIT_CLIENT_SECRET\")\n+            .or_else(|_| std::env::var(\"REDDIT_APP_SECRET\"))\n+            .ok()?;\n         if client_id.is_empty() || client_secret.is_empty() {\n             return None;\n         }\n@@ -80,29 +114,63 @@ impl RedditCredentials {\n     }\n }\n \n+pub fn reddit_api_base() -> String {\n+    std::env::var(\"REDDIT_API_BASE\").unwrap_or_else(|_| \"https://www.reddit.com\".into())\n+}\n+\n+pub fn reddit_oauth_base() -> String {\n+    std::env::var(\"REDDIT_OAUTH_BASE\").unwrap_or_else(|_| \"https://www.reddit.com\".into())\n+}\n+\n pub fn default_user_agent() -> String {\n     std::env::var(\"REDDIT_USER_AGENT\").unwrap_or_else(|_| {\n         \"web:sorter2.social:v0.0.1 (by /u/sorter2)\".to_string()\n     })\n }\n \n+/// True when this node can be loaded from the Reddit JSON API.\n+pub fn is_fetchable(id: &ItemId) -> bool {\n+    !map_item_to_reddit_api(id, \"https://example.com\").is_empty()\n+}\n+\n+/// Derive UI-facing fields from a stored payload (Reddit-specific when under reddit.com).\n+pub fn entity_view_from_payload(id: &ItemId, payload: &Value) -> Option<crate::reducer::EntityData> {\n+    if id.as_str().starts_with(\"reddit.com\") {\n+        return parse_reddit_view(id, payload);\n+    }\n+    None\n+}\n+\n+/// Apply a full API payload to the in-memory tree (view derived for known domains).\n+pub fn apply_entity_import(tree: &mut GlobalTree, id: &ItemId, payload: Value) {\n+    let view = entity_view_from_payload(id, &payload);\n+    tree.apply_entity_raw(id, payload, view);\n+}\n+\n async fn reddit_worker(\n     mut rx: mpsc::Receiver<RedditCommand>,\n     tree: Arc<RwLock<GlobalTree>>,\n+    event_log: Arc<EventLog>,\n     client: Client,\n-    creds: Option<RedditCredentials>,\n+    config: RedditApiConfig,\n ) {\n     let mut in_flight = HashSet::new();\n     let mut recently_fetched: HashMap<ItemId, Instant> = HashMap::new();\n     let mut current_delay = Duration::from_secs(1);\n     let mut oauth: Option<OAuthToken> = None;\n     let cache_ttl = Duration::from_secs(300);\n+    let creds = config.creds.clone();\n+    let api_base = config.api_base.clone();\n+    let oauth_base = config.oauth_base.clone();\n \n     while let Some(cmd) = rx.recv().await {\n         let now = Instant::now();\n         recently_fetched.retain(|_, t| now.duration_since(*t) < cache_ttl);\n \n-        if in_flight.contains(&cmd.id) || recently_fetched.contains_key(&cmd.id) {\n+        if in_flight.contains(&cmd.id) {\n+            continue;\n+        }\n+        if !cmd.force && recently_fetched.contains_key(&cmd.id) {\n             continue;\n         }\n \n@@ -112,18 +180,26 @@ async fn reddit_worker(\n         tokio::time::sleep(current_delay).await;\n \n         if let Some(c) = &creds {\n-            oauth = ensure_oauth_token(&client, c, oauth.take()).await;\n+            oauth = ensure_oauth_token(&client, &oauth_base, c, oauth.take()).await;\n         }\n \n         let token = oauth.as_ref().map(|t| t.access_token.as_str());\n-        let use_oauth = token.is_some();\n \n-        match do_fetch(&client, &fetch_id, use_oauth, token).await {\n-            Ok(FetchOutcome::Entity(data)) => {\n-                let mut w = tree.write().await;\n-                w.set_entity_data(&fetch_id, data);\n-                recently_fetched.insert(fetch_id.clone(), Instant::now());\n-                current_delay = Duration::from_millis(600);\n+        match do_fetch(&client, &api_base, &fetch_id, token).await {\n+            Ok(FetchOutcome::Payload(payload)) => {\n+                let ts = now_ms();\n+                let event = Event::EntityImported {\n+                    id: fetch_id.as_str().to_string(),\n+                    ts,\n+                    payload: payload.clone(),\n+                };\n+                if let Err(e) = event_log.append(&event).await {\n+                    tracing::warn!(\"event log append failed for {}: {}\", fetch_id, e);\n+                } else {\n+                    apply_entity_import(&mut *tree.write().await, &fetch_id, payload);\n+                    recently_fetched.insert(fetch_id.clone(), Instant::now());\n+                    current_delay = Duration::from_millis(600);\n+                }\n             }\n             Ok(FetchOutcome::NotFound) => {\n                 recently_fetched.insert(fetch_id.clone(), Instant::now());\n@@ -149,13 +225,14 @@ async fn reddit_worker(\n }\n \n enum FetchOutcome {\n-    Entity(EntityData),\n+    Payload(Value),\n     NotFound,\n     RateLimited { reset_secs: u64 },\n }\n \n async fn ensure_oauth_token(\n     client: &Client,\n+    oauth_base: &str,\n     creds: &RedditCredentials,\n     existing: Option<OAuthToken>,\n ) -> Option<OAuthToken> {\n@@ -165,8 +242,13 @@ async fn ensure_oauth_token(\n         }\n     }\n \n+    let url = format!(\n+        \"{}/api/v1/access_token\",\n+        oauth_base.trim_end_matches('/')\n+    );\n+\n     let resp = client\n-        .post(\"https://www.reddit.com/api/v1/access_token\")\n+        .post(&url)\n         .basic_auth(&creds.client_id, Some(&creds.client_secret))\n         .form(&[(\"grant_type\", \"client_credentials\")])\n         .send()\n@@ -207,11 +289,11 @@ async fn ensure_oauth_token(\n \n async fn do_fetch(\n     client: &Client,\n+    api_base: &str,\n     id: &ItemId,\n-    use_oauth: bool,\n     bearer: Option<&str>,\n ) -> Result<FetchOutcome, String> {\n-    let url = map_item_to_reddit_api(id, use_oauth);\n+    let url = map_item_to_reddit_api(id, api_base);\n     if url.is_empty() {\n         return Ok(FetchOutcome::NotFound);\n     }\n@@ -241,10 +323,8 @@ async fn do_fetch(\n         return Ok(FetchOutcome::RateLimited { reset_secs: reset });\n     }\n \n-    let bytes = resp.bytes().await.map_err(|e| e.to_string())?;\n-    Ok(parse_reddit_json(id, &bytes)\n-        .map(FetchOutcome::Entity)\n-        .unwrap_or(FetchOutcome::NotFound))\n+    let payload: Value = resp.json().await.map_err(|e| e.to_string())?;\n+    Ok(FetchOutcome::Payload(payload))\n }\n \n fn rate_limit_remaining(resp: &reqwest::Response) -> Option<u64> {\n@@ -264,18 +344,14 @@ fn rate_limit_reset_secs(resp: &reqwest::Response) -> u64 {\n         .unwrap_or(5)\n }\n \n-/// Map canonical item id to Reddit JSON API URL.\n-pub fn map_item_to_reddit_api(id: &ItemId, oauth: bool) -> String {\n+/// Map canonical item id to a Reddit JSON API URL under `api_base`.\n+pub fn map_item_to_reddit_api(id: &ItemId, api_base: &str) -> String {\n     let path = id.as_str();\n     if !path.starts_with(\"reddit.com/\") && path != \"reddit.com\" {\n         return String::new();\n     }\n \n-    let base = if oauth {\n-        \"https://oauth.reddit.com\"\n-    } else {\n-        \"https://www.reddit.com\"\n-    };\n+    let base = api_base.trim_end_matches('/');\n \n     let segments: Vec<&str> = path.split('/').collect();\n \n@@ -293,18 +369,17 @@ pub fn map_item_to_reddit_api(id: &ItemId, oauth: bool) -> String {\n     String::new()\n }\n \n-fn parse_reddit_json(id: &ItemId, bytes: &[u8]) -> Option<EntityData> {\n-    let v: serde_json::Value = serde_json::from_slice(bytes).ok()?;\n+fn parse_reddit_view(id: &ItemId, v: &Value) -> Option<crate::reducer::EntityData> {\n     let segments: Vec<&str> = id.as_str().split('/').collect();\n \n     if segments.iter().any(|&p| p == \"comments\") {\n-        parse_post_listing(&v)\n+        parse_post_listing(v)\n     } else {\n-        parse_subreddit_about(&v)\n+        parse_subreddit_about(v)\n     }\n }\n \n-fn parse_subreddit_about(v: &serde_json::Value) -> Option<EntityData> {\n+fn parse_subreddit_about(v: &Value) -> Option<crate::reducer::EntityData> {\n     let data = v.get(\"data\")?;\n     let title = data\n         .get(\"title\")\n@@ -323,7 +398,7 @@ fn parse_subreddit_about(v: &serde_json::Value) -> Option<EntityData> {\n         .filter(|s| !s.is_empty())\n         .map(|s| s.to_string());\n \n-    Some(EntityData {\n+    Some(crate::reducer::EntityData {\n         title,\n         author: None,\n         body_html,\n@@ -331,10 +406,9 @@ fn parse_subreddit_about(v: &serde_json::Value) -> Option<EntityData> {\n     })\n }\n \n-fn parse_post_listing(v: &serde_json::Value) -> Option<EntityData> {\n+fn parse_post_listing(v: &Value) -> Option<crate::reducer::EntityData> {\n     let listing = v.as_array()?.first()?;\n-    let child = listing\n-        .pointer(\"/data/children/0/data\")?;\n+    let child = listing.pointer(\"/data/children/0/data\")?;\n     let title = child.get(\"title\")?.as_str()?.to_string();\n     let author = child\n         .get(\"author\")\n@@ -352,7 +426,7 @@ fn parse_post_listing(v: &serde_json::Value) -> Option<EntityData> {\n         .filter(|s| s.starts_with(\"http\"))\n         .map(|s| s.to_string());\n \n-    Some(EntityData {\n+    Some(crate::reducer::EntityData {\n         title,\n         author,\n         body_html,\n@@ -368,48 +442,51 @@ mod tests {\n     fn map_subreddit_about_url() {\n         let id = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n         assert_eq!(\n-            map_item_to_reddit_api(&id, false),\n+            map_item_to_reddit_api(&id, \"https://www.reddit.com\"),\n             \"https://www.reddit.com/r/rust/about.json?raw_json=1\"\n         );\n         assert_eq!(\n-            map_item_to_reddit_api(&id, true),\n-            \"https://oauth.reddit.com/r/rust/about.json?raw_json=1\"\n+            map_item_to_reddit_api(&id, \"http://127.0.0.1:9999\"),\n+            \"http://127.0.0.1:9999/r/rust/about.json?raw_json=1\"\n         );\n     }\n \n     #[test]\n     fn map_post_url() {\n-        let id =\n-            ItemId::parse(\"reddit.com/r/amitheasshole/comments/1trnvdl\").unwrap();\n+        let id = ItemId::parse(\"reddit.com/r/amitheasshole/comments/1trnvdl\").unwrap();\n         assert_eq!(\n-            map_item_to_reddit_api(&id, false),\n+            map_item_to_reddit_api(&id, \"https://www.reddit.com\"),\n             \"https://www.reddit.com/r/amitheasshole/comments/1trnvdl.json?raw_json=1\"\n         );\n     }\n \n     #[test]\n-    fn map_non_reddit_empty() {\n-        let id = ItemId::opaque(\"example.com/foo\");\n-        assert!(map_item_to_reddit_api(&id, false).is_empty());\n+    fn is_fetchable_reddit_sub() {\n+        let id = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+        assert!(is_fetchable(&id));\n+        assert!(!is_fetchable(&ItemId::opaque(\"example.com/x\")));\n     }\n \n     #[test]\n     fn parse_subreddit_fixture() {\n-        let json = r#\"{\"kind\":\"t5\",\"data\":{\"title\":\"Rust\",\"display_name\":\"rust\",\"public_description\":\"systems\"}}\"#;\n-        let entity = parse_reddit_json(\n+        let json = include_str!(\"../../test/fixtures/reddit/r_rust_about.json\");\n+        let v: Value = serde_json::from_str(json).unwrap();\n+        let entity = entity_view_from_payload(\n             &ItemId::parse(\"reddit.com/r/rust\").unwrap(),\n-            json.as_bytes(),\n+            &v,\n         )\n         .unwrap();\n-        assert_eq!(entity.title, \"Rust\");\n+        assert_eq!(entity.title, \"The Rust Programming Language\");\n+        assert!(entity.body_html.as_ref().is_some_and(|b| b.contains(\"Rust\")));\n     }\n \n     #[test]\n     fn parse_post_fixture() {\n         let json = r#\"[{\"kind\":\"Listing\",\"data\":{\"children\":[{\"kind\":\"t3\",\"data\":{\"title\":\"AITA\",\"author\":\"op\",\"selftext_html\":\"&lt;p&gt;hi&lt;/p&gt;\",\"thumbnail\":\"https://b.thumbs.redditmedia.com/x.jpg\"}}]}}]\"#;\n-        let entity = parse_reddit_json(\n+        let v: Value = serde_json::from_str(json).unwrap();\n+        let entity = entity_view_from_payload(\n             &ItemId::parse(\"reddit.com/r/x/comments/abc\").unwrap(),\n-            json.as_bytes(),\n+            &v,\n         )\n         .unwrap();\n         assert_eq!(entity.title, \"AITA\");\ndiff --git a/server/src/reducer.rs b/server/src/reducer.rs\nindex 077f700bf00ddefe18ffd004bb5288bdc7c4adaf..60db81a562e3590775012573225a76ba82a14563 100644\n--- a/server/src/reducer.rs\n+++ b/server/src/reducer.rs\n@@ -1,6 +1,7 @@\n use std::collections::{HashMap, HashSet, VecDeque};\n \n use serde::{Deserialize, Serialize};\n+use serde_json::Value;\n \n use crate::path_types::ItemId;\n \n@@ -128,6 +129,9 @@ pub struct EntityData {\n #[derive(Debug, Clone, Default)]\n pub struct NodeState {\n     pub id: ItemId,\n+    /// Full imported API JSON (persisted in the event log).\n+    pub entity_raw: Option<Value>,\n+    /// Domain-specific view derived from `entity_raw` (e.g. Reddit title/author).\n     pub data: Option<EntityData>,\n     pub children: HashSet<ItemId>,\n     pub local_ranking: GroupState,\n@@ -197,10 +201,11 @@ impl GlobalTree {\n         }\n     }\n \n-    pub fn set_entity_data(&mut self, id: &ItemId, data: EntityData) {\n+    pub fn apply_entity_raw(&mut self, id: &ItemId, payload: Value, view: Option<EntityData>) {\n         self.ensure_path(id);\n         if let Some(node) = self.nodes.get_mut(id) {\n-            node.data = Some(data);\n+            node.entity_raw = Some(payload);\n+            node.data = view;\n         }\n     }\n }\ndiff --git a/server/src/state.rs b/server/src/state.rs\nindex 8c03aa60c15aee803a534439400b69935b1a3d84..d71d1079a8f486cdab15795384aef0b81b32544d 100644\n--- a/server/src/state.rs\n+++ b/server/src/state.rs\n@@ -7,7 +7,7 @@ use crate::{\n     events::Event,\n     journal::JournalClient,\n     path_types::ItemId,\n-    reddit::{default_user_agent, RedditBroker},\n+    reddit::{apply_entity_import, RedditApiConfig, RedditBroker},\n     reducer::{GlobalTree, VoteData},\n     views::ViewStore,\n };\n@@ -108,13 +108,18 @@ impl AppState {\n                             tree.ensure_path(&parsed);\n                         }\n                     }\n+                    Event::EntityImported { id, payload, .. } => {\n+                        if let Some(parsed) = ItemId::parse(&id).or_else(|| ItemId::from_url(&id)) {\n+                            apply_entity_import(&mut tree, &parsed, payload);\n+                        }\n+                    }\n                 }\n             }\n         }\n \n         let tree = Arc::new(RwLock::new(tree));\n         let journal = JournalClient::spawn(tree.clone(), event_log.clone());\n-        let reddit = RedditBroker::spawn(tree.clone(), &default_user_agent());\n+        let reddit = RedditBroker::spawn(tree.clone(), event_log.clone(), RedditApiConfig::from_env());\n \n         Self {\n             cfg: Arc::new(cfg),\n@@ -135,10 +140,14 @@ impl AppState {\n             let mut w = self.tree.write().await;\n             w.ensure_path(id);\n         }\n-        self.reddit.request_fetch(id.clone());\n         Ok(())\n     }\n \n+    /// User-initiated Reddit/API import (via \"Fetch more\" — never on paste or navigate).\n+    pub fn queue_entity_fetch(&self, id: ItemId) {\n+        self.reddit.request_fetch(id, true);\n+    }\n+\n     pub async fn record_vote(\n         &self,\n         parent: &ItemId,\n@@ -169,6 +178,44 @@ impl AppState {\n #[cfg(test)]\n mod tests {\n     use super::{normalize_scope, parse_item_param};\n+    use crate::{\n+        event_log::EventLog,\n+        events::Event,\n+        path_types::ItemId,\n+        reddit::apply_entity_import,\n+        reducer::GlobalTree,\n+    };\n+    use serde_json::json;\n+\n+    #[tokio::test]\n+    async fn replay_entity_imported_restores_view() {\n+        let tmp = tempfile::tempdir().unwrap();\n+        let log_path = tmp.path().join(\"events.jsonl\");\n+        let log = EventLog::new(log_path.to_string_lossy().into_owned());\n+        let payload = json!({\"kind\":\"t5\",\"data\":{\"title\":\"Rust\",\"display_name\":\"rust\"}});\n+        log.append(&Event::EntityImported {\n+            id: \"reddit.com/r/rust\".into(),\n+            ts: 1,\n+            payload: payload.clone(),\n+        })\n+        .await\n+        .unwrap();\n+\n+        let mut tree = GlobalTree::new();\n+        let (events, _) = log.load_all().await.unwrap();\n+        for ev in events {\n+            if let Event::EntityImported { id, payload, .. } = ev {\n+                let parsed = ItemId::parse(&id).unwrap();\n+                apply_entity_import(&mut tree, &parsed, payload);\n+            }\n+        }\n+        let node = tree.get(&ItemId::parse(\"reddit.com/r/rust\").unwrap()).unwrap();\n+        assert_eq!(node.data.as_ref().unwrap().title, \"Rust\");\n+        assert_eq!(\n+            node.entity_raw.as_ref().unwrap()[\"data\"][\"display_name\"],\n+            \"rust\"\n+        );\n+    }\n \n     #[test]\n     fn normalize_scope_strips_prefix_and_lowercases() {\ndiff --git a/server/src/ui_action.rs b/server/src/ui_action.rs\nindex d798874d1d94c0dfee59ec1ff703f9ee6ef432c0..3d6a49a2a3fb950752827efe1f5a049308f09baf 100644\n--- a/server/src/ui_action.rs\n+++ b/server/src/ui_action.rs\n@@ -26,6 +26,10 @@ pub enum HtmlUiAction {\n     ParseQuery {\n         query: String,\n     },\n+    /// Fetch upstream entity data for the current page (explicit user action only).\n+    FetchEntity {\n+        item: String,\n+    },\n }\n \n #[derive(Debug, Error)]\ndiff --git a/server/static/sorter.css b/server/static/sorter.css\nindex 36f68d415cea33c8562d5d02c0c9d4c5b225a782..1f9f5158414902d43a380dd899232c70d8cf5d63 100644\n--- a/server/static/sorter.css\n+++ b/server/static/sorter.css\n@@ -52,6 +52,25 @@ body {\n   filter: brightness(1.1);\n }\n \n+.btn-secondary {\n+  background: transparent;\n+  color: var(--accent);\n+  border: 1px solid var(--border);\n+  padding: 0.4rem 0.85rem;\n+  font-size: 0.9rem;\n+  cursor: pointer;\n+  margin-top: 0.75rem;\n+}\n+\n+.btn-secondary:disabled {\n+  opacity: 0.6;\n+  cursor: wait;\n+}\n+\n+.fetch-entity-form {\n+  margin-top: 0.5rem;\n+}\n+\n code {\n   font-size: 0.85em;\n   background: var(--bg);\ndiff --git a/test/fixtures/reddit/r_rust_about.json b/test/fixtures/reddit/r_rust_about.json\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..bb7fd74ab00d63356d9b672a775996ed155b984d\n--- /dev/null\n+++ b/test/fixtures/reddit/r_rust_about.json\n@@ -0,0 +1,21 @@\n+{\n+  \"kind\": \"t5\",\n+  \"data\": {\n+    \"user_flair_background_color\": null,\n+    \"submit_text_html\": null,\n+    \"banner_img\": \"\",\n+    \"user_is_banned\": null,\n+    \"wiki_enabled\": true,\n+    \"show_media\": true,\n+    \"id\": \"2qh0i\",\n+    \"display_name\": \"rust\",\n+    \"title\": \"The Rust Programming Language\",\n+    \"public_description\": \"A place for all things related to the Rust programming language.\",\n+    \"public_description_html\": \"&lt;!-- SC_OFF --&gt;&lt;div class=\\\"md\\\"&gt;&lt;p&gt;A place for all things related to the Rust programming language.&lt;/p&gt;\\n&lt;/div&gt;&lt;!-- SC_ON --&gt;\",\n+    \"icon_img\": \"https://styles.redditmedia.com/t5_2qh0i/styles/communityIcon_kfqpknb2j6j51.png\",\n+    \"community_icon\": \"https://styles.redditmedia.com/t5_2qh0i/styles/communityIcon_kfqpknb2j6j51.png\",\n+    \"subscribers\": 350000,\n+    \"active_user_count\": 1200,\n+    \"over18\": false\n+  }\n+}\ndiff --git a/test/reddit_import.clj b/test/reddit_import.clj\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..54edaedeef08718c8f184d6aa468d8e6415068c7\n--- /dev/null\n+++ b/test/reddit_import.clj\n@@ -0,0 +1,116 @@\n+(ns test.reddit-import\n+  (:require [babashka.process :as process]\n+            [clojure.java.io :as io]\n+            [clojure.string :as str]\n+            [clojure.test :refer [deftest is testing]])\n+  (:import [com.sun.net.httpserver HttpServer HttpHandler HttpExchange]\n+           [java.net InetSocketAddress]))\n+\n+(defn- repo-root []\n+  (.getCanonicalPath (io/file (System/getProperty \"user.dir\"))))\n+\n+(defn- pick-port []\n+  (with-open [s (java.net.ServerSocket. 0)]\n+    (.getLocalPort s)))\n+\n+(defn- start-mock-reddit [port fixtures-dir]\n+  (let [fixture (io/file fixtures-dir \"r_rust_about.json\")\n+        body (.getBytes (slurp fixture) \"UTF-8\")\n+        server (HttpServer/create (InetSocketAddress. \"127.0.0.1\" port) 0)\n+        handler\n+        (proxy [HttpHandler] []\n+          (handle [^HttpExchange exchange]\n+            (.sendResponseHeaders exchange 200 (alength body))\n+            (let [out (.getResponseBody exchange)]\n+              (.write out body)\n+              (.close out))))]\n+    (.createContext server \"/\" handler)\n+    (.setExecutor server nil)\n+    (.start server)\n+    (fn stop []\n+      (.stop server 0))))\n+\n+(defn- wait-health [base-url ms]\n+  (let [deadline (+ (System/currentTimeMillis) ms)\n+        url (str base-url \"/healthz\")]\n+    (loop []\n+      (let [resp (try\n+                   (process/shell {:out :string :err :string}\n+                                  \"curl\" \"-sf\" url)\n+                   (catch Exception _ nil))]\n+        (if (and resp (zero? (:exit resp)) (= \"ok\" (str/trim (:out resp \"\"))))\n+          true\n+          (if (< (System/currentTimeMillis) deadline)\n+            (do (Thread/sleep 200) (recur))\n+            false))))))\n+\n+(defn- curl-post-ui [base rpc-json]\n+  (process/shell {:out :string :err :string}\n+                 \"curl\" \"-sf\" \"-X\" \"POST\" (str base \"/ui\")\n+                 \"--data-urlencode\" (str \"__rpc__=\" rpc-json)))\n+\n+(defn- wait-event-log [path ms]\n+  (let [deadline (+ (System/currentTimeMillis) ms)]\n+    (loop []\n+      (if (.exists (io/file path))\n+        true\n+        (if (< (System/currentTimeMillis) deadline)\n+          (do (Thread/sleep 200) (recur))\n+          false)))))\n+\n+(deftest reddit-fetch-via-mock-api\n+  (testing \"Fetch more queues import; event log stores full payload; page shows title\"\n+    (let [root (repo-root)\n+          fixtures (str root \"/test/fixtures/reddit\")\n+          data-dir (.getAbsolutePath\n+                    (doto (io/file (System/getProperty \"java.io.tmpdir\")\n+                                   (str \"sorter2-reddit-\" (System/currentTimeMillis)))\n+                      (.mkdirs)))\n+          reddit-port (pick-port)\n+          app-port (pick-port)\n+          reddit-base (str \"http://127.0.0.1:\" reddit-port)\n+          app-base (str \"http://127.0.0.1:\" app-port)\n+          bin (str root \"/target/release/sorter2-server\")\n+          stop-mock (start-mock-reddit reddit-port fixtures)]\n+      (try\n+        (is (zero? (:exit (process/shell {:dir root}\n+                                         \"cargo\" \"build\" \"--release\" \"--package\" \"sorter2-server\")))\n+            \"release build succeeds\")\n+        (let [proc (process/process {:dir root\n+                                     :env (into (into {} (System/getenv))\n+                                                {\"SORTER2_SKIP_DOTENV\" \"1\"\n+                                                 \"SORTER2_DATA_DIR\" data-dir\n+                                                 \"SORTER2_EVENT_LOG\" (str data-dir \"/events.jsonl\")\n+                                                 \"PORT\" (str app-port)\n+                                                 \"REDDIT_API_BASE\" reddit-base\n+                                                 \"REDDIT_OAUTH_BASE\" reddit-base\n+                                                 \"REDDIT_CLIENT_ID\" \"\"\n+                                                 \"REDDIT_CLIENT_SECRET\" \"\"\n+                                                 \"REDDIT_APP_ID\" \"\"\n+                                                 \"REDDIT_APP_SECRET\" \"\"})\n+                                     :out :string\n+                                     :err :string}\n+                                    bin)]\n+          (try\n+            (is (wait-health app-base 20000) \"app healthz\")\n+            (let [browse-url (str app-base \"/~/https://reddit.com/r/rust\")\n+                  before (:out (process/shell {:out :string :err :string}\n+                                              \"curl\" \"-sf\" browse-url))]\n+              (is (str/includes? before \"Fetch from Reddit\"))\n+              (is (not (str/includes? before \"The Rust Programming Language\")))\n+              (let [rpc \"{\\\"action\\\":\\\"fetch_entity\\\",\\\"item\\\":\\\"reddit.com/r/rust\\\"}\"\n+                    post (curl-post-ui app-base rpc)\n+                    log-path (str data-dir \"/events.jsonl\")]\n+                (is (zero? (:exit post)) \"fetch_entity POST succeeds\")\n+                (is (wait-event-log log-path 10000) \"event log written\")\n+                (let [after (:out (process/shell {:out :string :err :string}\n+                                                 \"curl\" \"-sf\" browse-url))\n+                      log (slurp (io/file log-path))]\n+                  (is (str/includes? after \"The Rust Programming Language\"))\n+                  (is (str/includes? log \"\\\"type\\\":\\\"entity_imported\\\"\"))\n+                  (is (str/includes? log \"\\\"subscribers\\\":350000\"))\n+                  (is (str/includes? log \"\\\"display_name\\\":\\\"rust\\\"\")))))\n+            (finally\n+              (process/destroy proc))))\n+        (finally\n+          (stop-mock))))))\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[5db58b98] Improve vote pair selection for spanning trees and rank refinement.\n\nPrefer attaching unranked items to established components before comparing\nisolates, then zip down adjacent rank-centrality pairs once the pool is fully\nconnected, skipping pairs that already have votes.\n\nCo-authored-by: Cursor <cursoragent@cursor.com>\n\nSide B — unified diff (full patch):\ndiff --git a/server/src/pair.rs b/server/src/pair.rs\nindex 54b5d2417e9dba04ed8df422156e274c2b2f76b2..c14de4b0502c8b5a17cddf3746077739d56e03e0 100644\n--- a/server/src/pair.rs\n+++ b/server/src/pair.rs\n@@ -3,13 +3,21 @@\n //! Pair selection prefers **bridge** votes — comparisons between items in\n //! different connected components of the voted-pairs graph — so the pool\n //! merges into one ranking group before refining within it.\n+//!\n+//! Among unvoted bridges, prefer merging established voted components, then\n+//! attaching a never-voted child to an established component, and only then\n+//! comparing two never-voted children (so the voted graph grows as one tree).\n+//!\n+//! Once every pool child sits in one voted component, refinement **zips** down\n+//! the rank-centrality order: prefer 1 vs 2, then 2 vs 3, and so on, skipping\n+//! pairs that already have a vote.\n \n use rand::seq::SliceRandom;\n use std::collections::{HashMap, HashSet};\n \n use crate::{\n     path_types::ItemId,\n-    ranking::connected_components_from_voted_pairs,\n+    ranking::{connected_components_from_voted_pairs, ranked_items},\n     reducer::{GlobalTree, GroupState},\n };\n \n@@ -28,36 +36,77 @@ fn pair_is_voted(group: &GroupState, a: &ItemId, b: &ItemId) -> bool {\n     group.voted_pairs.contains(&(i, j))\n }\n \n-/// Component id per pool item: voted-pairs graph components plus one id per\n-/// never-voted child.\n-fn component_ids(group: &GroupState, pool: &[ItemId]) -> HashMap<ItemId, usize> {\n+/// Voted-pairs layout for pool items: component id per item plus which ids are\n+/// multi-node voted components (ranked groups in the UI).\n+struct ComponentLayout {\n+    ids: HashMap<ItemId, usize>,\n+    established: HashSet<usize>,\n+}\n+\n+fn component_layout(group: &GroupState, pool: &[ItemId]) -> ComponentLayout {\n     let n = group.idx_to_item.len();\n     let (comps, isolates) =\n         connected_components_from_voted_pairs(n, group.voted_pairs.iter().copied());\n \n-    let mut out: HashMap<ItemId, usize> = HashMap::new();\n+    let mut established = HashSet::new();\n+    let mut ids: HashMap<ItemId, usize> = HashMap::new();\n     for (comp_idx, comp) in comps.iter().enumerate() {\n+        if comp.len() >= 2 {\n+            established.insert(comp_idx);\n+        }\n         for &idx in comp {\n             if idx < n {\n-                out.insert(group.idx_to_item[idx].clone(), comp_idx);\n+                ids.insert(group.idx_to_item[idx].clone(), comp_idx);\n             }\n         }\n     }\n     let mut next = comps.len();\n     for &idx in &isolates {\n         if idx < n {\n-            out.insert(group.idx_to_item[idx].clone(), next);\n+            ids.insert(group.idx_to_item[idx].clone(), next);\n             next += 1;\n         }\n     }\n     for item in pool {\n-        out.entry(item.clone()).or_insert_with(|| {\n+        ids.entry(item.clone()).or_insert_with(|| {\n             let id = next;\n             next += 1;\n             id\n         });\n     }\n-    out\n+    ComponentLayout { ids, established }\n+}\n+\n+/// Every pool child shares one multi-node voted component (spanning tree phase done).\n+fn pool_fully_connected(layout: &ComponentLayout, pool: &[ItemId]) -> bool {\n+    if pool.len() < 2 {\n+        return false;\n+    }\n+    let mut comp_id = None;\n+    for item in pool {\n+        let Some(id) = layout.ids.get(item) else {\n+            return false;\n+        };\n+        if !layout.established.contains(id) {\n+            return false;\n+        }\n+        match comp_id {\n+            None => comp_id = Some(*id),\n+            Some(expected) if expected == *id => {}\n+            _ => return false,\n+        }\n+    }\n+    comp_id.is_some()\n+}\n+\n+/// Pool children that appear in `group`, sorted best rank first.\n+fn ranked_pool_order(group: &GroupState, pool: &[ItemId]) -> Vec<ItemId> {\n+    let pool_set: HashSet<_> = pool.iter().collect();\n+    ranked_items(group)\n+        .into_iter()\n+        .map(|r| r.item)\n+        .filter(|id| pool_set.contains(id))\n+        .collect()\n }\n \n #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]\n@@ -72,19 +121,108 @@ enum PairPriority {\n     WithinVoted = 3,\n }\n \n-fn pair_priority(\n+/// Tie-break among unvoted bridge pairs.\n+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]\n+enum BridgeSubPriority {\n+    /// Both endpoints lie in established (multi-node) voted components.\n+    MergeEstablished = 0,\n+    /// One established component member and one never-voted child.\n+    AttachIsolate = 1,\n+    /// Two never-voted children (separate singleton components).\n+    IsolatePair = 2,\n+}\n+\n+/// Tie-break among within-component pairs once the pool is one connected group.\n+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]\n+struct WithinSubPriority {\n+    /// 1 = adjacent ranks (i vs i+1); larger = farther apart in the order.\n+    rank_gap: usize,\n+    /// min rank index of the two — zip from the top (1 vs 2 before 2 vs 3).\n+    zip_index: usize,\n+}\n+\n+const WITHIN_SUB_WORST: WithinSubPriority = WithinSubPriority {\n+    rank_gap: usize::MAX,\n+    zip_index: usize::MAX,\n+};\n+\n+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]\n+struct PairSortKey {\n+    priority: PairPriority,\n+    bridge_sub: BridgeSubPriority,\n+    within_sub: WithinSubPriority,\n+}\n+\n+fn item_in_established(layout: &ComponentLayout, item: &ItemId) -> bool {\n+    layout\n+        .ids\n+        .get(item)\n+        .is_some_and(|id| layout.established.contains(id))\n+}\n+\n+fn bridge_sub_priority(layout: &ComponentLayout, a: &ItemId, b: &ItemId) -> BridgeSubPriority {\n+    let a_est = item_in_established(layout, a);\n+    let b_est = item_in_established(layout, b);\n+    match (a_est, b_est) {\n+        (true, true) => BridgeSubPriority::MergeEstablished,\n+        (true, false) | (false, true) => BridgeSubPriority::AttachIsolate,\n+        (false, false) => BridgeSubPriority::IsolatePair,\n+    }\n+}\n+\n+fn within_sub_priority(\n+    group: &GroupState,\n+    pool: &[ItemId],\n+    layout: &ComponentLayout,\n+    a: &ItemId,\n+    b: &ItemId,\n+) -> WithinSubPriority {\n+    if !pool_fully_connected(layout, pool) {\n+        return WITHIN_SUB_WORST;\n+    }\n+    let order = ranked_pool_order(group, pool);\n+    let (Some(i), Some(j)) = (order.iter().position(|x| x == a), order.iter().position(|x| x == b))\n+    else {\n+        return WITHIN_SUB_WORST;\n+    };\n+    WithinSubPriority {\n+        rank_gap: i.abs_diff(j),\n+        zip_index: i.min(j),\n+    }\n+}\n+\n+fn pair_sort_key(\n     group: &GroupState,\n-    components: &HashMap<ItemId, usize>,\n+    pool: &[ItemId],\n+    layout: &ComponentLayout,\n     a: &ItemId,\n     b: &ItemId,\n-) -> PairPriority {\n+) -> PairSortKey {\n     let voted = pair_is_voted(group, a, b);\n-    let bridge = components.get(a) != components.get(b);\n-    match (bridge, voted) {\n+    let bridge = layout.ids.get(a) != layout.ids.get(b);\n+    let priority = match (bridge, voted) {\n         (true, false) => PairPriority::BridgeUnvoted,\n         (false, false) => PairPriority::WithinUnvoted,\n         (true, true) => PairPriority::BridgeVoted,\n         (false, true) => PairPriority::WithinVoted,\n+    };\n+    let bridge_sub = if priority == PairPriority::BridgeUnvoted {\n+        bridge_sub_priority(layout, a, b)\n+    } else {\n+        BridgeSubPriority::MergeEstablished\n+    };\n+    let within_sub = if matches!(\n+        priority,\n+        PairPriority::WithinUnvoted | PairPriority::WithinVoted\n+    ) {\n+        within_sub_priority(group, pool, layout, a, b)\n+    } else {\n+        WITHIN_SUB_WORST\n+    };\n+    PairSortKey {\n+        priority,\n+        bridge_sub,\n+        within_sub,\n     }\n }\n \n@@ -109,9 +247,12 @@ fn candidate_pairs(pool: &[ItemId], exclude: Option<(&ItemId, &ItemId)>) -> Vec<\n \n /// Pick the next pair to vote on within `pool`.\n ///\n-/// 1. Prefer unvoted **bridge** pairs (connect separate ranking components).\n-/// 2. Then unvoted within-component pairs (refinement).\n-/// 3. Then already-voted pairs (re-compare).\n+/// 1. Prefer unvoted **bridge** pairs (connect separate ranking components),\n+///    with sub-priority: merge established components, attach an isolate to\n+///    established, then compare two isolates.\n+/// 2. Then unvoted within-component pairs; when the pool is one connected group,\n+///    prefer adjacent ranks (1 vs 2, 2 vs 3, …) in order, skipping voted pairs.\n+/// 3. Then already-voted pairs (re-compare), with the same zip ordering.\n pub fn suggest_next_pair_in_pool(\n     group: &GroupState,\n     pool: &[ItemId],\n@@ -121,15 +262,15 @@ pub fn suggest_next_pair_in_pool(\n     if candidates.is_empty() {\n         return None;\n     }\n-    let components = component_ids(group, pool);\n+    let layout = component_layout(group, pool);\n     let best = candidates\n         .iter()\n-        .map(|(a, b)| (pair_priority(group, &components, a, b), (a, b)))\n-        .min_by_key(|(p, _)| *p)?\n+        .map(|(a, b)| (pair_sort_key(group, pool, &layout, a, b), (a, b)))\n+        .min_by_key(|(k, _)| *k)?\n         .0;\n     let best_pairs: Vec<(ItemId, ItemId)> = candidates\n         .into_iter()\n-        .filter(|(a, b)| pair_priority(group, &components, a, b) == best)\n+        .filter(|(a, b)| pair_sort_key(group, pool, &layout, a, b) == best)\n         .collect();\n     best_pairs.choose(&mut rand::thread_rng()).cloned()\n }\n@@ -303,6 +444,38 @@ mod tests {\n         assert!(from_ab && from_cd, \"expected bridge pair, got {:?}\", chosen);\n     }\n \n+    #[test]\n+    fn suggest_prefers_attach_over_isolate_pair_among_many_unranked() {\n+        let parent = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+        let mut tree = seed_children(\n+            &parent,\n+            &[\n+                \"reddit.com/r/rust/a\",\n+                \"reddit.com/r/rust/b\",\n+                \"reddit.com/r/rust/c\",\n+                \"reddit.com/r/rust/d\",\n+                \"reddit.com/r/rust/e\",\n+            ],\n+        );\n+        let ab =\n+            VoteData::from_recorded(1, \"reddit.com/r/rust/a\", \"reddit.com/r/rust/b\", 2, 1).unwrap();\n+        tree.apply_vote(&parent, ab);\n+        let group = tree.get(&parent).unwrap().local_ranking.clone();\n+        let pool = children_of(&tree, &parent);\n+        let pair = suggest_next_pair_in_pool(&group, &pool, None).unwrap();\n+        let chosen = pair_set(&pair);\n+        let from_ab =\n+            chosen.contains(\"reddit.com/r/rust/a\") || chosen.contains(\"reddit.com/r/rust/b\");\n+        let from_cde = chosen.contains(\"reddit.com/r/rust/c\")\n+            || chosen.contains(\"reddit.com/r/rust/d\")\n+            || chosen.contains(\"reddit.com/r/rust/e\");\n+        assert!(\n+            from_ab && from_cde,\n+            \"expected ranked+unranked attach, got {:?}\",\n+            chosen\n+        );\n+    }\n+\n     #[test]\n     fn suggest_connects_isolate_to_existing_component() {\n         let parent = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n@@ -325,6 +498,65 @@ mod tests {\n         assert!(chosen.contains(\"reddit.com/r/rust/a\") || chosen.contains(\"reddit.com/r/rust/b\"));\n     }\n \n+    #[test]\n+    fn suggest_zips_adjacent_ranks_when_tree_complete() {\n+        let parent = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+        let mut tree = seed_children(\n+            &parent,\n+            &[\n+                \"reddit.com/r/rust/a\",\n+                \"reddit.com/r/rust/b\",\n+                \"reddit.com/r/rust/c\",\n+            ],\n+        );\n+        // Star at a connects all three; b-c is the only unvoted adjacent pair left.\n+        for (a, b, l, r) in [\n+            (\"reddit.com/r/rust/a\", \"reddit.com/r/rust/b\", 3, 1),\n+            (\"reddit.com/r/rust/a\", \"reddit.com/r/rust/c\", 2, 1),\n+        ] {\n+            let v = VoteData::from_recorded(1, a, b, l, r).unwrap();\n+            tree.apply_vote(&parent, v);\n+        }\n+        let group = tree.get(&parent).unwrap().local_ranking.clone();\n+        let pool = children_of(&tree, &parent);\n+        let pair = suggest_next_pair_in_pool(&group, &pool, None).unwrap();\n+        let chosen = pair_set(&pair);\n+        // a-b and a-c voted; b-c is the only unvoted adjacent pair in rank order.\n+        assert!(chosen.contains(\"reddit.com/r/rust/b\"));\n+        assert!(chosen.contains(\"reddit.com/r/rust/c\"));\n+    }\n+\n+    #[test]\n+    fn suggest_zip_prefers_1v2_before_2v3_when_both_unvoted() {\n+        let parent = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n+        let mut tree = seed_children(\n+            &parent,\n+            &[\n+                \"reddit.com/r/rust/a\",\n+                \"reddit.com/r/rust/b\",\n+                \"reddit.com/r/rust/c\",\n+                \"reddit.com/r/rust/d\",\n+            ],\n+        );\n+        // Hub at c connects all four; leave rank-adjacent a-b and b-c unvoted.\n+        for (a, b, l, r) in [\n+            (\"reddit.com/r/rust/c\", \"reddit.com/r/rust/d\", 3, 1),\n+            (\"reddit.com/r/rust/b\", \"reddit.com/r/rust/c\", 2, 1),\n+            (\"reddit.com/r/rust/a\", \"reddit.com/r/rust/c\", 2, 1),\n+        ] {\n+            let v = VoteData::from_recorded(1, a, b, l, r).unwrap();\n+            tree.apply_vote(&parent, v);\n+        }\n+        let group = tree.get(&parent).unwrap().local_ranking.clone();\n+        let pool = children_of(&tree, &parent);\n+        assert!(pool_fully_connected(&component_layout(&group, &pool), &pool));\n+        let pair = suggest_next_pair_in_pool(&group, &pool, None).unwrap();\n+        let chosen = pair_set(&pair);\n+        // Top adjacent unvoted edge should be a-b (zip index 0), not b-c (index 1).\n+        assert!(chosen.contains(\"reddit.com/r/rust/a\"));\n+        assert!(chosen.contains(\"reddit.com/r/rust/b\"));\n+    }\n+\n     #[test]\n     fn resolve_pair_picks_from_pool() {\n         let parent = ItemId::parse(\"reddit.com/r/rust\").unwrap();\n","role":"user"}],"model":"~x-ai/grok-latest"}