{"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[798c764d] feat(html): grouped cli_panel with hover-to-copy and JS-safe asserts\n\nSingle bordered panel for multiple commands; rows copy on click without a\nseparate copy control. Assert CLI strings contain no chars that would break\nsingle-quoted onclick JS.\n\nMade-with: Cursor\n\nSide A — unified diff (full patch):\ndiff --git a/server/src/html/forum.rs b/server/src/html/forum.rs\nindex f6e45b05bb92126966e304619f80ef1d45be7a4b..075860914a6ce18bb0dfa73dc5651ef1a6318b67 100644\n--- a/server/src/html/forum.rs\n+++ b/server/src/html/forum.rs\n@@ -718,7 +718,7 @@ pub async fn home(\n             }\n             div id=\"public-new-thread-ui-slot\" {}\n             (render_thread_feed(Some(&nav), \"thread-feed\", &public_rows, now))\n-            (cli_panel(\"npx slugsocial public forum list\"))\n+            (cli_panel(&[\"npx slugsocial public forum list\"]))\n         },\n         None,\n         theme_from_jar(&jar),\n@@ -868,7 +868,7 @@ async fn thread_view_inner(\n             div id=\"thread-live-region\" {\n                 (compose_form(&nav, &tag, show_compose))\n             }\n-            (cli_panel(&cli))\n+            (cli_panel(std::slice::from_ref(&cli)))\n         },\n         None,\n         theme_from_jar(&jar),\n@@ -984,9 +984,7 @@ pub async fn room_page(\n                     (new_thread_form_for_room(&nav, true, false))\n                 }\n             }\n-            (cli_panel(&forum_cli))\n-            (cli_panel(&garden_cli))\n-            (cli_panel(&audit_cli))\n+            (cli_panel(&[forum_cli, garden_cli, audit_cli]))\n         },\n         None,\n         theme_from_jar(&jar),\n@@ -1409,7 +1407,7 @@ pub async fn user_profile_page(\n                     }\n                 }\n             }\n-            (cli_panel(&format!(\"npx slugsocial public forum list\")))\n+            (cli_panel(&[format!(\"npx slugsocial public forum list\")]))\n         },\n         None,\n         theme_from_jar(&jar),\ndiff --git a/server/src/html/garden.rs b/server/src/html/garden.rs\nindex 9b4789a79c3e293cbfc5f033a0eac8650320d94d..c8ce7de450f7d14e04020511e7eb7323bd487deb 100644\n--- a/server/src/html/garden.rs\n+++ b/server/src/html/garden.rs\n@@ -139,7 +139,7 @@ pub async fn garden_index(\n                     }\n                 }\n             }\n-            (cli_panel(\"npx slugsocial garden tree\"))\n+            (cli_panel(&[\"npx slugsocial garden tree\"]))\n         },\n         None,\n         theme_from_jar(&jar),\n@@ -542,7 +542,7 @@ async fn render_scope_view(\n                 ScopeId::Public => format!(\"npx slugsocial public garden body {}\", path.as_str().trim_start_matches(\"https://slug.social/~/\")),\n                 ScopeId::Room(room_id) => format!(\"npx slugsocial private {room_id} garden body {}\", path.as_str().trim_start_matches(\"https://slug.social/~/\")),\n             };\n-            (cli_panel(&cli))\n+            (cli_panel(std::slice::from_ref(&cli)))\n         },\n         None,\n         theme_from_jar(&jar),\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex e7f5bfb7a4b2dee2adf96447224c58d641092124..6617781a2e8e86c2e2693788ea7cd0eb0e3659a2 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -599,18 +599,38 @@ pub(super) fn render_linkified_with_embeds_in_scope(raw: &str, garden_prefix: &s\n     }\n }\n \n-/// Small CLI hint panel showing how to look up this page from the terminal.\n-pub(super) fn cli_panel(cmd: &str) -> Markup {\n+/// CLI strings are embedded in a single-quoted JS literal; they must never need escaping.\n+fn assert_cli_panel_cmd_js_single_quote_safe(s: &str) {\n+    assert!(\n+        !s.contains('\\\\')\n+            && !s.contains('\\'')\n+            && !s.contains('\\n')\n+            && !s.contains('\\r'),\n+        \"cli_panel cmd must not contain `\\\\`, `'`, or newlines (got {s:?})\"\n+    );\n+}\n+\n+/// Small CLI hint panel: one border and title; each line is hover-highlighted and copies on click.\n+pub(super) fn cli_panel<I: AsRef<str>>(cmds: &[I]) -> Markup {\n+    if cmds.is_empty() {\n+        return html! {};\n+    }\n+    for cmd in cmds {\n+        assert_cli_panel_cmd_js_single_quote_safe(cmd.as_ref());\n+    }\n     html! {\n         div class=\"cli-panel\" {\n             span class=\"cli-panel-label muted\" { \"cli\" }\n-            code class=\"cli-panel-cmd\" { (cmd) }\n-            button\n-                class=\"cli-panel-copy\"\n-                title=\"Copy to clipboard\"\n-                onclick=(format!(r#\"navigator.clipboard.writeText('{}'); this.textContent='✓'; setTimeout(() => this.textContent='copy', 2000);\"#, cmd.replace(\"'\", \"\\\\'\")))\n-            {\n-                \"copy\"\n+            div class=\"cli-panel-cmds\" {\n+                @for cmd in cmds {\n+                    @let s = cmd.as_ref();\n+                    button type=\"button\" class=\"cli-panel-row\" title=\"Copy command\" onclick=(format!(\n+                        r#\"navigator.clipboard.writeText('{}');\"#,\n+                        s\n+                    )) {\n+                        code class=\"cli-panel-cmd\" { (s) }\n+                    }\n+                }\n             }\n         }\n     }\ndiff --git a/server/src/html/search.rs b/server/src/html/search.rs\nindex 28ceaa53c3fcac6777311535e95fb771b19438f5..43e6ebf36cf0fe72c96f0f9d850bea51ac094c43 100644\n--- a/server/src/html/search.rs\n+++ b/server/src/html/search.rs\n@@ -418,7 +418,7 @@ pub async fn search_page(\n                     value=(query) autocomplete=\"off\" autofocus;\n             }\n             (render_search_results(&results, &query))\n-            (cli_panel(\"npx slugsocial search <query>\"))\n+            (cli_panel(&[\"npx slugsocial search <query>\"]))\n         },\n         None,\n         theme_from_jar(&jar),\ndiff --git a/server/static/theme_default.css b/server/static/theme_default.css\nindex e024a5c8b74139ae8be37b2a1bd17e4c3abe9324..764b66c8208e91e6138b83c534387cf43c85b8b5 100644\n--- a/server/static/theme_default.css\n+++ b/server/static/theme_default.css\n@@ -610,7 +610,7 @@ code {\n    CLI PANEL — how to view this page from the terminal\n    ---------------------------------------------------------------- */\n div.cli-panel {\n-  align-items: baseline;\n+  align-items: flex-start;\n   background: var(--g1);\n   border: var(--bv) solid;\n   border-color: var(--lo) var(--hi) var(--hi) var(--lo); /* inset */\n@@ -621,11 +621,34 @@ div.cli-panel {\n   width: fit-content;\n   max-width: 100%;\n }\n+.cli-panel-cmds {\n+  display: flex;\n+  flex-direction: column;\n+  gap: 4px;\n+  flex: 1;\n+  min-width: 0;\n+}\n+button.cli-panel-row {\n+  background: transparent;\n+  border: none;\n+  color: inherit;\n+  cursor: pointer;\n+  display: block;\n+  font: inherit;\n+  margin: 0;\n+  padding: 2px 4px;\n+  text-align: left;\n+  width: 100%;\n+}\n+button.cli-panel-row:hover {\n+  background: var(--g3);\n+}\n .cli-panel-label {\n   font-size: 11px;\n   letter-spacing: 0.08em;\n   text-transform: uppercase;\n   flex-shrink: 0;\n+  padding-top: 2px;\n }\n .cli-panel-cmd {\n   background: none;\ndiff --git a/server/static/theme_retro_craft.css b/server/static/theme_retro_craft.css\nindex 00714575bfa533d1d9c66653b9089642e2b0a6ca..f89ecbc3a18eb9b2b27d1f7764330f6bd6987552 100644\n--- a/server/static/theme_retro_craft.css\n+++ b/server/static/theme_retro_craft.css\n@@ -306,19 +306,41 @@ a.post-nav-btn:hover {\n }\n \n div.cli-panel {\n-  align-items: baseline;\n+  align-items: flex-start;\n   border: 1px dashed var(--line);\n   display: flex;\n-  flex-wrap: wrap;\n   gap: 0.5rem;\n   margin: 0.65rem 0;\n   padding: 0.45rem 0.65rem;\n }\n+.cli-panel-cmds {\n+  display: flex;\n+  flex-direction: column;\n+  gap: 0.25rem;\n+  flex: 1;\n+  min-width: 0;\n+}\n+button.cli-panel-row {\n+  background: transparent;\n+  border: none;\n+  color: inherit;\n+  cursor: pointer;\n+  display: block;\n+  font: inherit;\n+  margin: 0;\n+  padding: 0.1rem 0.2rem;\n+  text-align: left;\n+  width: 100%;\n+}\n+button.cli-panel-row:hover {\n+  background: color-mix(in srgb, var(--accent) 14%, transparent);\n+}\n .cli-panel-label {\n   color: var(--ink-dim);\n   font-size: 0.72rem;\n   letter-spacing: 0.12em;\n   text-transform: uppercase;\n+  padding-top: 0.12rem;\n }\n .cli-panel-cmd {\n   color: var(--accent);\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":"~x-ai/grok-latest"}