You are a constitutional council ranking individual git commits for ownership allocation. Compare these two commits. Decide which contributed more lasting value to the project. Judge substance, not spectacle: - Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise. - Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one. - Do not favor a side merely because its patch is longer or noisier. - Weight what the change does for the project, not the contributor's name. Return ONLY a JSON object: {"winner": "A" or "B", "ratio": "N:M", "explanation": "..."} The explanation must cite concrete differences in the patches (1-3 sentences). Side A — contributor: tommy-mor Side A — commit message: [798c764d] feat(html): grouped cli_panel with hover-to-copy and JS-safe asserts Single bordered panel for multiple commands; rows copy on click without a separate copy control. Assert CLI strings contain no chars that would break single-quoted onclick JS. Made-with: Cursor Side A — unified diff (full patch): diff --git a/server/src/html/forum.rs b/server/src/html/forum.rs index f6e45b05bb92126966e304619f80ef1d45be7a4b..075860914a6ce18bb0dfa73dc5651ef1a6318b67 100644 --- a/server/src/html/forum.rs +++ b/server/src/html/forum.rs @@ -718,7 +718,7 @@ pub async fn home( } div id="public-new-thread-ui-slot" {} (render_thread_feed(Some(&nav), "thread-feed", &public_rows, now)) - (cli_panel("npx slugsocial public forum list")) + (cli_panel(&["npx slugsocial public forum list"])) }, None, theme_from_jar(&jar), @@ -868,7 +868,7 @@ async fn thread_view_inner( div id="thread-live-region" { (compose_form(&nav, &tag, show_compose)) } - (cli_panel(&cli)) + (cli_panel(std::slice::from_ref(&cli))) }, None, theme_from_jar(&jar), @@ -984,9 +984,7 @@ pub async fn room_page( (new_thread_form_for_room(&nav, true, false)) } } - (cli_panel(&forum_cli)) - (cli_panel(&garden_cli)) - (cli_panel(&audit_cli)) + (cli_panel(&[forum_cli, garden_cli, audit_cli])) }, None, theme_from_jar(&jar), @@ -1409,7 +1407,7 @@ pub async fn user_profile_page( } } } - (cli_panel(&format!("npx slugsocial public forum list"))) + (cli_panel(&[format!("npx slugsocial public forum list")])) }, None, theme_from_jar(&jar), diff --git a/server/src/html/garden.rs b/server/src/html/garden.rs index 9b4789a79c3e293cbfc5f033a0eac8650320d94d..c8ce7de450f7d14e04020511e7eb7323bd487deb 100644 --- a/server/src/html/garden.rs +++ b/server/src/html/garden.rs @@ -139,7 +139,7 @@ pub async fn garden_index( } } } - (cli_panel("npx slugsocial garden tree")) + (cli_panel(&["npx slugsocial garden tree"])) }, None, theme_from_jar(&jar), @@ -542,7 +542,7 @@ async fn render_scope_view( ScopeId::Public => format!("npx slugsocial public garden body {}", path.as_str().trim_start_matches("https://slug.social/~/")), ScopeId::Room(room_id) => format!("npx slugsocial private {room_id} garden body {}", path.as_str().trim_start_matches("https://slug.social/~/")), }; - (cli_panel(&cli)) + (cli_panel(std::slice::from_ref(&cli))) }, None, theme_from_jar(&jar), diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs index e7f5bfb7a4b2dee2adf96447224c58d641092124..6617781a2e8e86c2e2693788ea7cd0eb0e3659a2 100644 --- a/server/src/html/mod.rs +++ b/server/src/html/mod.rs @@ -599,18 +599,38 @@ pub(super) fn render_linkified_with_embeds_in_scope(raw: &str, garden_prefix: &s } } -/// Small CLI hint panel showing how to look up this page from the terminal. -pub(super) fn cli_panel(cmd: &str) -> Markup { +/// CLI strings are embedded in a single-quoted JS literal; they must never need escaping. +fn assert_cli_panel_cmd_js_single_quote_safe(s: &str) { + assert!( + !s.contains('\\') + && !s.contains('\'') + && !s.contains('\n') + && !s.contains('\r'), + "cli_panel cmd must not contain `\\`, `'`, or newlines (got {s:?})" + ); +} + +/// Small CLI hint panel: one border and title; each line is hover-highlighted and copies on click. +pub(super) fn cli_panel>(cmds: &[I]) -> Markup { + if cmds.is_empty() { + return html! {}; + } + for cmd in cmds { + assert_cli_panel_cmd_js_single_quote_safe(cmd.as_ref()); + } html! { div class="cli-panel" { span class="cli-panel-label muted" { "cli" } - code class="cli-panel-cmd" { (cmd) } - button - class="cli-panel-copy" - title="Copy to clipboard" - onclick=(format!(r#"navigator.clipboard.writeText('{}'); this.textContent='✓'; setTimeout(() => this.textContent='copy', 2000);"#, cmd.replace("'", "\\'"))) - { - "copy" + div class="cli-panel-cmds" { + @for cmd in cmds { + @let s = cmd.as_ref(); + button type="button" class="cli-panel-row" title="Copy command" onclick=(format!( + r#"navigator.clipboard.writeText('{}');"#, + s + )) { + code class="cli-panel-cmd" { (s) } + } + } } } } diff --git a/server/src/html/search.rs b/server/src/html/search.rs index 28ceaa53c3fcac6777311535e95fb771b19438f5..43e6ebf36cf0fe72c96f0f9d850bea51ac094c43 100644 --- a/server/src/html/search.rs +++ b/server/src/html/search.rs @@ -418,7 +418,7 @@ pub async fn search_page( value=(query) autocomplete="off" autofocus; } (render_search_results(&results, &query)) - (cli_panel("npx slugsocial search ")) + (cli_panel(&["npx slugsocial search "])) }, None, theme_from_jar(&jar), diff --git a/server/static/theme_default.css b/server/static/theme_default.css index e024a5c8b74139ae8be37b2a1bd17e4c3abe9324..764b66c8208e91e6138b83c534387cf43c85b8b5 100644 --- a/server/static/theme_default.css +++ b/server/static/theme_default.css @@ -610,7 +610,7 @@ code { CLI PANEL — how to view this page from the terminal ---------------------------------------------------------------- */ div.cli-panel { - align-items: baseline; + align-items: flex-start; background: var(--g1); border: var(--bv) solid; border-color: var(--lo) var(--hi) var(--hi) var(--lo); /* inset */ @@ -621,11 +621,34 @@ div.cli-panel { width: fit-content; max-width: 100%; } +.cli-panel-cmds { + display: flex; + flex-direction: column; + gap: 4px; + flex: 1; + min-width: 0; +} +button.cli-panel-row { + background: transparent; + border: none; + color: inherit; + cursor: pointer; + display: block; + font: inherit; + margin: 0; + padding: 2px 4px; + text-align: left; + width: 100%; +} +button.cli-panel-row:hover { + background: var(--g3); +} .cli-panel-label { font-size: 11px; letter-spacing: 0.08em; text-transform: uppercase; flex-shrink: 0; + padding-top: 2px; } .cli-panel-cmd { background: none; diff --git a/server/static/theme_retro_craft.css b/server/static/theme_retro_craft.css index 00714575bfa533d1d9c66653b9089642e2b0a6ca..f89ecbc3a18eb9b2b27d1f7764330f6bd6987552 100644 --- a/server/static/theme_retro_craft.css +++ b/server/static/theme_retro_craft.css @@ -306,19 +306,41 @@ a.post-nav-btn:hover { } div.cli-panel { - align-items: baseline; + align-items: flex-start; border: 1px dashed var(--line); display: flex; - flex-wrap: wrap; gap: 0.5rem; margin: 0.65rem 0; padding: 0.45rem 0.65rem; } +.cli-panel-cmds { + display: flex; + flex-direction: column; + gap: 0.25rem; + flex: 1; + min-width: 0; +} +button.cli-panel-row { + background: transparent; + border: none; + color: inherit; + cursor: pointer; + display: block; + font: inherit; + margin: 0; + padding: 0.1rem 0.2rem; + text-align: left; + width: 100%; +} +button.cli-panel-row:hover { + background: color-mix(in srgb, var(--accent) 14%, transparent); +} .cli-panel-label { color: var(--ink-dim); font-size: 0.72rem; letter-spacing: 0.12em; text-transform: uppercase; + padding-top: 0.12rem; } .cli-panel-cmd { color: var(--accent); Side B — contributor: tommy-mor Side B — commit message: [a45842df] better dev iteration script Side B — unified diff (full patch): diff --git a/.gitignore b/.gitignore index 9cd2eaece834481bee87639cd7cb6be77f33e302..b70cf5b97cd3556e061233d8b0aefd333568a991 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ target/ repomix-output.xml psalms_kjv.txt dev-data/ +fixture-data/ .worktrees/ .specstory/ .specstory/ diff --git a/bb.edn b/bb.edn index 5d1d642d75d03f70879d7673e7ad95360336a8b1..4680e82d4227057d2eea6041dc5647beb759131d 100644 --- a/bb.edn +++ b/bb.edn @@ -47,7 +47,7 @@ "RUST_LOG" "info"})})))} fixture - {:doc "Run local server + mock OAuth + seeded walkthrough data for manual browser demos" + {:doc "Run local server via cargo-watch + mock OAuth + seeded walkthrough data (persistent ./fixture-data/, prefers PORT 8080). Requires cargo-watch." :requires ([test.walkthrough-fixture :as walkthrough-fixture]) :task (walkthrough-fixture/run-fixture)} diff --git a/server/src/html/forum.rs b/server/src/html/forum.rs index e00e7110e2ad778d63b3d00b0cc4ffe20ba2e0d4..815fc6529062b103553644fc15e516334aec2b88 100644 --- a/server/src/html/forum.rs +++ b/server/src/html/forum.rs @@ -976,12 +976,6 @@ pub async fn room_page( html! { (strip) nav class="breadcrumb" { (bc_room(&nav, slug_display, None)) } - h2 { (slug_display) } - p class="muted" { (room_id) } - p class="muted room-links" { - "room garden · " - a href=(nav.garden_root_url()) { "~" } - } (room_members_section_markup(&reduced, &room_id, false)) h3 { "threads" } (render_thread_feed(Some(&nav), "room-thread-feed", &rows, now)) diff --git a/test/common.clj b/test/common.clj index 76a3e99fdb67c10bcb5c2f53d8bcd0917398af50..c6deba0d90995b0e3f9c4b8ad66a516ed19b870e 100644 --- a/test/common.clj +++ b/test/common.clj @@ -107,6 +107,16 @@ (.close ss) port)) +(defn pick-port-prefer + "Use `preferred` if it can be bound, otherwise an ephemeral port (same as `pick-port`)." + [preferred] + (try + (let [ss (java.net.ServerSocket. preferred)] + (.close ss) + preferred) + (catch java.io.IOException _ + (pick-port)))) + (defn wait-for-server "Poll /healthz until it returns 'ok', up to `timeout-ms`." [base-url timeout-ms] diff --git a/test/walkthrough_fixture.clj b/test/walkthrough_fixture.clj index 4b814822029c913e38151ca53848d1c64fb58373..a487ff1ef8548580577914fb33f321586859c9af 100644 --- a/test/walkthrough_fixture.clj +++ b/test/walkthrough_fixture.clj @@ -1,11 +1,18 @@ (ns test.walkthrough-fixture "Launch a local slug server with mock OAuth and seed browser-friendly demo data." (:require [babashka.fs :as fs] + [babashka.process :as p] [cheshire.core :as json] [clojure.string :as str] [test.common :as common] [test.oauth :as oauth])) +(def ^:private fixture-data-dir "fixture-data") +;; Prefer the same port as `bb dev` / `bb watch`; fall back if something else is listening. +(def ^:private preferred-slug-port 8080) +;; First `cargo watch` compile can exceed a release-binary startup; allow several minutes. +(def ^:private health-wait-ms 300000) + (defn- assert! [pred msg] (when-not pred (throw (ex-info msg {})))) @@ -85,49 +92,87 @@ :thread_url (str base-url "/r/" room-short "/" room-slug "/t/walkthrough-thread") :garden_url (str base-url "/r/" room-short "/" room-slug "/~/secret/item")}})) +(defn- rebase-fixture-summary [saved current-base-url current-google-url current-data-dir] + (let [inner (:summary saved) + room (:room inner) + rs (:short room) + lg (:slug room)] + (assoc saved + :base_url current-base-url + :mock_google_url current-google-url + :data_dir (str current-data-dir) + :summary (assoc inner + :room (assoc room + :url (str current-base-url "/r/" rs "/" lg) + :thread_url (str current-base-url "/r/" rs "/" lg "/t/walkthrough-thread") + :garden_url (str current-base-url "/r/" rs "/" lg "/~/secret/item")))))) + +(defn- fixture-log-present? [data-dir] + (let [p (fs/path data-dir "events.jsonl")] + (and (fs/exists? p) (pos? (fs/size p))))) + +(defn- load-or-seed-summary! + [base-url google-url data-dir summary-path] + (if (and (fixture-log-present? data-dir) (fs/exists? summary-path)) + (let [saved (json/parse-string (slurp summary-path) true) + rebased (rebase-fixture-summary saved base-url google-url data-dir)] + (spit summary-path (json/generate-string rebased {:pretty true})) + (println "") + (println "reusing fixture-data/ (delete the directory for a fresh seed)") + rebased) + (let [seeded (seed-demo! base-url) + s {:base_url base-url + :mock_google_url google-url + :data_dir (str data-dir) + :summary seeded}] + (spit summary-path (json/generate-string s {:pretty true})) + s))) + (defn run-fixture [& _args] - (let [build (common/run-cargo-build-release! ["slugsocial-server"]) - _ (assert! (zero? (:exit build)) "cargo build --release failed") - server-bin "target/release/slugsocial-server" - tmp-dir (str (fs/create-temp-dir {:prefix "slug-walkthrough-"})) - slug-port (common/pick-port) + (let [data-dir (str (fs/absolutize (fs/path (fs/cwd) fixture-data-dir))) + slug-port (common/pick-port-prefer preferred-slug-port) google-port (common/pick-port) base-url (str "http://127.0.0.1:" slug-port) google-url (str "http://127.0.0.1:" google-port) - stable-dir "/tmp/slug-walkthrough-fixture" - summary-path (str stable-dir "/summary.json") + summary-path (str (fs/path data-dir "summary.json")) !server (atom nil) !google (atom nil) - server-env (common/slug-server-env tmp-dir base-url google-url slug-port)] + server-env (merge (common/slug-server-env data-dir base-url google-url slug-port) + {"RUST_LOG" "info"}) + watch-cmd [(common/cargo-bin) "watch" + "-x" "run -p slugsocial-server" + "-w" "server/src" + "-w" "server/static" + "-w" "types/src"]] (try - (fs/create-dirs stable-dir) + (fs/create-dirs data-dir) (reset! !google (oauth/start-mock-google google-port :google-users ["google-user-alice" "google-user-bob"])) - (reset! !server (common/start-server server-bin server-env)) - (assert! (common/wait-for-server base-url 10000) "server did not become healthy") - (let [seeded (seed-demo! base-url) - summary {:base_url base-url - :mock_google_url google-url - :data_dir tmp-dir - :summary seeded}] - (spit summary-path (json/generate-string summary {:pretty true})) + (println "") + (println "starting cargo-watch (first compile may take a while)…") + (flush) + (reset! !server (p/process watch-cmd {:inherit true :env server-env})) + (assert! (common/wait-for-server base-url health-wait-ms) "server did not become healthy") + (let [summary (load-or-seed-summary! base-url google-url data-dir summary-path)] (println "") (println "walkthrough fixture ready") (println (str " base url: " base-url)) (println (str " room page: " (get-in summary [:summary :room :url]))) (println (str " thread page: " (get-in summary [:summary :room :thread_url]))) (println (str " garden page: " (get-in summary [:summary :room :garden_url]))) + (println (str " data dir: " data-dir)) (println (str " summary json: " summary-path)) (println "") (println "seeded users") (println " alice / bob via mock OAuth") (println "") + (println "editing server/src or server/static reloads the server; data persists in fixture-data/") + (println "") (println "press Ctrl-C to stop") (flush) (while true (Thread/sleep 1000))) (finally (when-some [s @!server] (common/kill-server s)) - (when-some [g @!google] ((:stop-fn g))) - (fs/delete-tree tmp-dir))))) + (when-some [g @!google] ((:stop-fn g)))))))