{"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[8dab9b80] nice\n\nSide A — unified diff (full patch):\ndiff --git a/server/src/fetch/html.rs b/server/src/fetch/html.rs\nindex 3e0309ff1c2ac1b17923922d2340ba6710e0f9d1..dadf050515f0473943dad97df5d318032c8cb385 100644\n--- a/server/src/fetch/html.rs\n+++ b/server/src/fetch/html.rs\n@@ -10,13 +10,18 @@ use crate::{\n ui_action::UI_RPC_FIELD,\n };\n \n-fn entity_panel(node: &NodeState) -> Markup {\n+/// CSS selector for Idiomorph / SSE updates of one entity block.\n+pub fn entity_section_selector(item: &ItemId) -> String {\n+ format!(r#\"[data-entity-section=\"{}\"]\"#, item.as_str())\n+}\n+\n+pub fn entity_panel(node: &NodeState) -> Markup {\n if let Some(markup) = crate::render::reddit::entity_markup(node) {\n return markup;\n }\n html! {\n @if let Some(data) = &node.data {\n- div id=\"entity-panel\" class=\"entity-card\" {\n+ div class=\"entity-card\" {\n h2 { (data.title) }\n @if let Some(author) = &data.author {\n p class=\"muted small\" { \"by \" (author) }\n@@ -76,11 +81,11 @@ pub fn fetch_entity_panel(item: &ItemId, has_data: bool, fetching: bool) -> Mark\n }\n }\n \n-/// Entity card + fetch control (target `#entity-section` for Idiomorph / SSE).\n+/// Entity card + fetch control (morph target [`entity_section_selector`]).\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+ section class=\"entity-section demo-panel\" data-entity-section=(item.as_str()) {\n (entity_panel(node))\n (fetch_entity_panel(item, has_data, fetching))\n }\ndiff --git a/server/src/fetch/mod.rs b/server/src/fetch/mod.rs\nindex 35f968c21c69ca557bab7951413e3cfbbccfebfd..f5759a34a1afe4069805441cefde6474a6403550 100644\n--- a/server/src/fetch/mod.rs\n+++ b/server/src/fetch/mod.rs\n@@ -77,8 +77,9 @@ pub fn fetch_entity_stream(\n let tree = state.tree.read().await;\n let empty = NodeState::default();\n let node = tree.get(&id).unwrap_or(&empty);\n+ let sel = html::entity_section_selector(&id);\n JsBuilder::new()\n- .morph_selector(\"#entity-section\", html::entity_section(&id, node, true))\n+ .morph_selector(&sel, html::entity_section(&id, node, true))\n .build()\n };\n yield Ok(js_event(fetching_js));\n@@ -100,12 +101,13 @@ pub fn fetch_entity_stream(\n FetchJobResult::Imported(_)\n | FetchJobResult::NotFound\n | FetchJobResult::SkippedCached\n- | FetchJobResult::SkippedDuplicate => {\n+ | FetchJobResult::SkippedDuplicate => {\n let tree = state.tree.read().await;\n let empty = NodeState::default();\n let node = tree.get(&id).unwrap_or(&empty);\n+ let sel = html::entity_section_selector(&id);\n let mut b = JsBuilder::new()\n- .morph_selector(\"#entity-section\", html::entity_section(&id, node, false));\n+ .morph_selector(&sel, html::entity_section(&id, node, false));\n if kind == FetchKind::Children {\n b = b.morph_selector(\"#ranking-panel\", ranking_panel(&id, node, &tree));\n }\n@@ -115,8 +117,9 @@ pub fn fetch_entity_stream(\n let tree = state.tree.read().await;\n let empty = NodeState::default();\n let node = tree.get(&id).unwrap_or(&empty);\n+ let sel = html::entity_section_selector(&id);\n let js = JsBuilder::new()\n- .morph_selector(\"#entity-section\", html::entity_section(&id, node, false))\n+ .morph_selector(&sel, html::entity_section(&id, node, false))\n .raw(&error_js(&format!(\"Reddit rate limit — retry in {reset_secs}s.\")))\n .build();\n yield Ok(js_event(js));\n@@ -125,8 +128,9 @@ pub fn fetch_entity_stream(\n let tree = state.tree.read().await;\n let empty = NodeState::default();\n let node = tree.get(&id).unwrap_or(&empty);\n+ let sel = html::entity_section_selector(&id);\n let js = JsBuilder::new()\n- .morph_selector(\"#entity-section\", html::entity_section(&id, node, false))\n+ .morph_selector(&sel, html::entity_section(&id, node, false))\n .raw(&error_js(&format!(\"Fetch failed: {msg}\")))\n .build();\n yield Ok(js_event(js));\ndiff --git a/server/src/html/vote.rs b/server/src/html/vote.rs\nindex 89ed621ad861214e147add2062224fc4137ff8ad..48752f4d78d4762d1badc44e8df008bf5a45bab4 100644\n--- a/server/src/html/vote.rs\n+++ b/server/src/html/vote.rs\n@@ -8,6 +8,7 @@ use maud::{html, Markup};\n use serde::Deserialize;\n \n use crate::{\n+ fetch::html::entity_section,\n form_template::template_json_compact,\n html::JsBuilder,\n pair::{children_of, resolve_pair, suggest_next_pair_in_pool},\n@@ -169,37 +170,13 @@ pub(crate) fn vote_recorded_morph(\n }\n \n fn vote_compare_item_card(tree: &GlobalTree, item: &ItemId, side_class: &str) -> Markup {\n- let href = item_href(item);\n- let title = child_title(tree, item);\n+ let node = tree.get(item).cloned().unwrap_or_else(|| NodeState {\n+ id: item.clone(),\n+ ..Default::default()\n+ });\n html! {\n div class=(format!(\"vote-compare-side {side_class}\")) {\n- a class=(format!(\"vote-compare-item {side_class}\")) href=(href) {\n- @if let Some(row) = crate::render::reddit::child_row_markup(tree, item, &href) {\n- (row)\n- } @else {\n- strong { (title) }\n- }\n- }\n- @if let Some(node) = tree.get(item) {\n- @if crate::render::reddit::is_reddit_post(item) {\n- @if let Some(data) = &node.data {\n- @if let Some(src) = data.image_url.as_ref().or(data.thumb_url.as_ref()) {\n- figure class=\"vote-compare-figure\" {\n- img class=\"vote-compare-image\" src=(src) alt=\"\" loading=\"lazy\";\n- }\n- }\n- @if let Some(author) = &data.author {\n- p class=\"muted small\" { \"by \" (author) }\n- }\n- }\n- } @else if let Some(data) = &node.data {\n- @if let Some(body) = &data.body_html {\n- div class=\"vote-compare-item-body\" {\n- (maud::PreEscaped(body))\n- }\n- }\n- }\n- }\n+ (entity_section(item, &node, false))\n }\n }\n }\n@@ -270,9 +247,6 @@ pub async fn vote_page(\n (vote_compare_item_card(&tree, &right, \"vote-compare-right\"))\n }\n (vote_back_nav(&parent))\n- div id=\"vote-edge-history-region\" {\n- (edge_history)\n- }\n form id=\"vote-compare-form\" method=\"POST\" action=\"/ui\" {\n input type=\"hidden\" name=(UI_RPC_FIELD) value=(rpc_json);\n input type=\"hidden\" name=\"ratio_left\" id=\"vote-ratio-left\" value=\"50\";\n@@ -285,6 +259,9 @@ pub async fn vote_page(\n }\n (vote_compare_actions(&parent, next_pair.as_ref()))\n }\n+ div id=\"vote-edge-history-region\" {\n+ (edge_history)\n+ }\n }\n };\n \ndiff --git a/server/src/render/reddit.rs b/server/src/render/reddit.rs\nindex 4a18de93cf57d8395ded3caa373a708f39b3f43f..c4f98fc760c32ce1b41a91bd41e97908bd198937 100644\n--- a/server/src/render/reddit.rs\n+++ b/server/src/render/reddit.rs\n@@ -11,7 +11,7 @@ pub fn is_reddit_post(id: &ItemId) -> bool {\n id.as_str().starts_with(\"reddit.com/\") && id.as_str().contains(\"/comments/\")\n }\n \n-/// Post detail card (`#entity-panel`).\n+/// Post detail card (inside [`crate::fetch::html::entity_panel`]).\n pub fn entity_markup(node: &NodeState) -> Option {\n if !is_reddit_post(&node.id) {\n return None;\n@@ -41,7 +41,7 @@ pub fn child_row_markup(tree: &GlobalTree, id: &ItemId, href: &str) -> Option Markup {\n let image = data.image_url.as_ref().or(data.thumb_url.as_ref());\n html! {\n- div id=\"entity-panel\" class=\"entity-card reddit-post\" {\n+ div class=\"entity-card reddit-post\" {\n h2 { (data.title) }\n @if let Some(author) = &data.author {\n p class=\"muted small\" { \"by \" (author) }\ndiff --git a/server/static/sorter.css b/server/static/sorter.css\nindex b95718ce463b200a5667d3014dac2119836a0bef..9379c5f41dedbd41fd8951099a118de1da2a62f4 100644\n--- a/server/static/sorter.css\n+++ b/server/static/sorter.css\n@@ -254,38 +254,11 @@ h1 {\n }\n \n .vote-compare-side {\n- background: var(--panel);\n- border: 1px solid var(--border);\n- border-radius: 8px;\n- padding: 1rem;\n min-height: 120px;\n }\n \n-.vote-compare-item {\n- color: var(--accent);\n- text-decoration: none;\n- display: block;\n-}\n-\n-.vote-compare-item:hover {\n- text-decoration: underline;\n-}\n-\n-.vote-compare-figure {\n- margin: 0.75rem 0 0;\n-}\n-\n-.vote-compare-image {\n- display: block;\n- max-width: 100%;\n- height: auto;\n- border-radius: 6px;\n- border: 1px solid var(--border);\n-}\n-\n-.vote-compare-item-body {\n- margin-top: 0.75rem;\n- font-size: 0.9rem;\n+.vote-compare-side .entity-section {\n+ margin: 0;\n }\n \n .vote-compare-nav {\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[9ecc4e2e] nice\n\nSide B — unified diff (full patch):\ndiff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs\nindex 5675dcd2e28062acbe3c037b94b77c33adf32474..a18241f3ed7b4a248748fcefc799f9801ca62461 100644\n--- a/server/src/api/rpc.rs\n+++ b/server/src/api/rpc.rs\n@@ -936,7 +936,15 @@ pub async fn handle_rpc_batch(\n line_ok(RpcResult::ForumThreads(rpc_list_forum_threads(&reduced, &room)))\n }\n RpcCommand::RoomCreate { slug, visibility } => {\n- match verify_bearer_principal(&headers, &*state.reduced.read().await) {\n+ // Scope the first read so its guard drops before any nested `read().await` / `write().await`.\n+ // A guard from `match verify(..., &*state.reduced.read().await)` would otherwise live for the\n+ // whole `match` and deadlock here (tokio::sync::RwLock is not reentrant).\n+ let principal = {\n+ let reduced = state.reduced.read().await;\n+ verify_bearer_principal(&headers, &*reduced)\n+ };\n+ match principal {\n+ Err((_, m)) => line_err(m, None),\n Ok(principal) => {\n let slug = slug.trim().to_lowercase();\n if slug.is_empty() || slug.len() > 64 {\n@@ -994,7 +1002,6 @@ pub async fn handle_rpc_batch(\n }\n }\n }\n- Err((_, m)) => line_err(m, None),\n }\n }\n RpcCommand::RoomGrant {\n@@ -1002,17 +1009,28 @@ pub async fn handle_rpc_batch(\n username,\n capability,\n } => {\n- match verify_bearer_principal(&headers, &*state.reduced.read().await) {\n+ let principal = {\n+ let reduced = state.reduced.read().await;\n+ verify_bearer_principal(&headers, &*reduced)\n+ };\n+ match principal {\n Err((_, m)) => line_err(m, None),\n Ok(principal) => {\n- let reduced = state.reduced.read().await;\n- if !reduced.user_has_cap(&room, &principal, ThreadCapability::Manage) {\n+ let can_manage = {\n+ let reduced = state.reduced.read().await;\n+ reduced.user_has_cap(&room, &principal, ThreadCapability::Manage)\n+ };\n+ if !can_manage {\n line_err(\"requires Manage capability\", None)\n } else {\n match parse_username(&username) {\n Err(msg) => line_err(\"invalid username\", Some(msg)),\n Ok(target) => {\n- if !reduced.users_by_provider.values().any(|u| u == &target) {\n+ let user_exists = {\n+ let reduced = state.reduced.read().await;\n+ reduced.users_by_provider.values().any(|u| u == &target)\n+ };\n+ if !user_exists {\n line_err(format!(\"user @{target} not found\"), None)\n } else {\n match parse_capability(&capability) {\ndiff --git a/server/tests/integration.rs b/server/tests/integration.rs\nindex 9162bd5bee84035e3908bfb9c8e201b7878ca339..b930120da09fe7d307f0411b84fb639fb8bd0b15 100644\n--- a/server/tests/integration.rs\n+++ b/server/tests/integration.rs\n@@ -95,6 +95,23 @@ async fn test_healthz() {\n assert_eq!(response.text().await.unwrap(), \"ok\");\n }\n \n+#[tokio::test]\n+async fn test_room_create_private_rpc() {\n+ let (addr, _tmp, _log, _handle) = create_test_server().await;\n+ let client = reqwest::Client::new();\n+ let batch = serde_json::json!([{\n+ \"RoomCreate\": { \"slug\": \"secret-project\", \"visibility\": \"private\" }\n+ }]);\n+ let body = rpc_batch(&client, addr, Some(&test_bearer()), batch).await;\n+ let line = &body[\"results\"][0];\n+ assert_eq!(line[\"ok\"], true, \"room create: {:?}\", line);\n+ let room_id = line[\"result\"][\"RoomCreated\"][\"room_id\"].as_str().unwrap();\n+ assert!(\n+ room_id.contains(\"/secret-project\"),\n+ \"expected room_id to contain slug, got {room_id}\"\n+ );\n+}\n+\n #[tokio::test]\n async fn test_index_page() {\n // HTML routes are offline during the auth-v3 refactor.\ndiff --git a/test/auth.bb b/test/auth.bb\nindex 611e04f1806ef81d678a91f499597fe55f691dd7..a67cc1de763434176d2f68e419dd37a8cd328395 100644\n--- a/test/auth.bb\n+++ b/test/auth.bb\n@@ -176,7 +176,7 @@\n (assert! (= 200 (:status poll)) \"pending-session poll returns 200\")\n (let [poll-json (json/parse-string (:body poll) true)]\n (assert! (:complete poll-json) \"pending session complete=true\")\n- (assert! (= \"@bbuser\" (:user poll-json)) \"poll returns @bbuser\")\n+ (assert! (= \"bbuser\" (:user poll-json)) \"poll returns stored username bbuser\")\n (assert! (clojure.string/starts-with? (:token poll-json) \"slug_\") \"poll returns bearer token\")\n \n (println \"\\nwhoami…\")\n@@ -184,7 +184,7 @@\n :headers {\"Authorization\" (str \"Bearer \" (:token poll-json))})]\n (assert! (= 200 (:status who)) \"whoami returns 200\")\n (let [who-json (json/parse-string (:body who) true)]\n- (assert! (= \"@bbuser\" (:user who-json)) \"whoami user is @bbuser\"))))))\n+ (assert! (= \"bbuser\" (:user who-json)) \"whoami user is bbuser (stored form)\"))))))\n \n (println \"\\nCLI: identity start → OAuth → identity poll → whoami…\")\n (let [cli-home (str tmp-dir \"/cli-home\")\n@@ -208,7 +208,7 @@\n (str \"identity poll exits 0 (stderr: \" (:err poll-proc) \")\"))\n (let [poll-cli (json/parse-string (:out poll-proc) true)]\n (assert! (= \"complete\" (:phase poll-cli)) \"identity poll --json phase\")\n- (assert! (= \"@cliuser\" (:user poll-cli)) \"CLI poll user\")\n+ (assert! (= \"cliuser\" (:user poll-cli)) \"CLI poll user (stored form)\")\n (assert! (clojure.string/starts-with? (:token poll-cli) \"slug_\") \"CLI poll token\")\n (let [token-path (str cli-home \"/.config/slugsocial/token\")]\n (assert! (fs/exists? token-path) \"token written under isolated HOME\")\n@@ -219,7 +219,7 @@\n (assert! (zero? (:exit who-proc))\n (str \"whoami exits 0 (stderr: \" (:err who-proc) \")\"))\n (let [who-cli (json/parse-string (:out who-proc) true)]\n- (assert! (= \"@cliuser\" (:user who-cli)) \"CLI whoami uses saved token\"))))))))\n+ (assert! (= \"cliuser\" (:user who-cli)) \"CLI whoami uses saved token\"))))))))\n \n (finally\n (when-some [s @!server] (common/kill-server s))\ndiff --git a/test/common.bb b/test/common.bb\nindex ebb16c615a8b40e8830b5d5765d1e935a45538d0..4ed450377cdbb020f5ff164a812dfbbfc23c0f47 100644\n--- a/test/common.bb\n+++ b/test/common.bb\n@@ -78,9 +78,20 @@\n \n (defn start-server\n \"Start the slugsocial-server binary with the given env map.\n- Returns the babashka.process map.\"\n- [server-bin env-map]\n- (p/process [server-bin] {:out :inherit :err :inherit :env env-map}))\n+ Returns the babashka.process map.\n+\n+ When `log-file` (string path) is provided, stdout and stderr are appended there\n+ instead of inheriting the parent descriptors. Inheriting shared pipes while the\n+ parent blocks on HTTP I/O can fill the pipe buffer and deadlock the server on log writes.\"\n+ ([server-bin env-map]\n+ (start-server server-bin env-map nil))\n+ ([server-bin env-map log-file]\n+ (p/process [server-bin]\n+ (if log-file\n+ ;; Two string paths (same file): babashka.process can deref the process cleanly.\n+ ;; :err :out + ProcessBuilder$Redirect breaks stream copying in deref/kill-server.\n+ {:env env-map :out log-file :err log-file}\n+ {:out :inherit :err :inherit :env env-map}))))\n \n (defn kill-server\n \"Forcibly kill a server process (babashka.process map) and wait for it to exit.\"\ndiff --git a/test/grants.bb b/test/grants.bb\nindex 7066c1f2a57f39a362052f8524206dccf37bb7b1..793ba216f2de76a77eb20a76d08403db07ff411b 100644\n--- a/test/grants.bb\n+++ b/test/grants.bb\n@@ -35,13 +35,14 @@\n (defn- http-client []\n (-> (java.net.http.HttpClient/newBuilder)\n (.followRedirects java.net.http.HttpClient$Redirect/ALWAYS)\n+ (.connectTimeout (java.time.Duration/ofSeconds 15))\n (.build)))\n \n (defn- http-get [url & {:keys [headers]}]\n (let [b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n (doseq [[k v] (or headers {})]\n (.header b k v))\n- (let [req (-> b (.GET) (.build))\n+ (let [req (-> b (.timeout (java.time.Duration/ofSeconds 60)) (.GET) (.build))\n resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n {:status (.statusCode resp) :body (.body resp)})))\n \n@@ -52,6 +53,7 @@\n (doseq [[k v] (or headers {})]\n (.header b k v))\n (let [req (-> b\n+ (.timeout (java.time.Duration/ofSeconds 60))\n (.POST (java.net.http.HttpRequest$BodyPublishers/ofString body))\n (.build))\n resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n@@ -67,6 +69,7 @@\n b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n (.header b \"Content-Type\" \"application/x-www-form-urlencoded\")\n (let [req (-> b\n+ (.timeout (java.time.Duration/ofSeconds 60))\n (.POST (java.net.http.HttpRequest$BodyPublishers/ofString pairs))\n (.build))\n resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n","role":"user"}],"model":"openai/gpt-chat-latest"}