Side B implements a real, non-trivial feature slice (fullscreen compare layout, new vote-preview morphing with post_id lookup, ratio-based sorting of edge history, plus tests and CSS across three themes), producing lasting product functionality. Side A is a useful but narrow test-infrastructure bugfix (correct regex split, request body reading, redirect codes, exception handling in a mock server) that only fixes CI/test flakiness rather than adding product capability.
constitution · epochs · watch · epoch 3
comparison
c_597d3f736194 (tommy-mor) vs c_477013996fa5 (tommy-mor)
download prompt · raw event · cmp_d7b538d98870f1
council reasoning
A fixes real crashes in the OAuth/Reddit HttpServer mocks (string vs regex split, getRequestBody, nil-safe tokens/state, 302 body length, handler try/catch) that had broken Playwright auth E2E, plus selector/wait hardening—directly restoring critical test infrastructure. B is solid product work (chromeless fullscreen layout, left-oriented edge sorting, preview morph, CSS/docs/tests) but is enhancement of one UI flow rather than unblocking core auth verification.
Side A fixes concrete failures that broke end-to-end OAuth login tests by correcting mock server behavior (request body reading, redirect responses, query parsing, null-safe token parsing, exception handling) and improving test synchronization and selector handling. Side B adds a substantial UI enhancement for the vote-compare page (fullscreen layout, preview morphing, history sorting, styling, and tests), but it is primarily feature work and presentation rather than restoring core functionality that had regressed.
sides
A — c_597d3f736194 (tommy-mor)
message
[075d4d37] Fix OAuth test mocks so Clojure E2E auth flows work again. HttpServer handlers were crashing on query parsing and token POSTs, which broke Playwright login; also read alias/history via real CSS selectors. Co-authored-by: Cursor <cursoragent@cursor.com>
diff preview
diff --git a/test/auth_login.clj b/test/auth_login.clj
index 6f2f00d7aa7340e63d1ac465b0a2234cec7a983f..aa63b66ccb2471b710ba3d168d0461252b39fc10 100644
--- a/test/auth_login.clj
+++ b/test/auth_login.clj
@@ -14,27 +14,27 @@
(defn- type-alias! [pg text]
(page/evaluate pg
(.replace
- "(() => { const i = document.getElementById('alias-input'); const f = document.getElementById('alias-check-form'); if (!i || !f) return;
+ "(() => { const i = document.getElementById('alias-input'); const f = document.getElementById('alias-check-form'); if (!i || !f) return Promise.resolve('missing-form');
i.value = __TEXT__;
const cf = document.getElementById('alias-claim-field'); if (cf) cf.value = i.value;
return fetch(f.action, { method: 'POST', credentials: 'same-origin',
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
body: new URLSearchParams(new FormData(f)).toString() })
.then(function (r) { return r.text(); })
- .then(function (t) { eval(t); }); })()"
+ .then(function (t) { eval(t); return document.getElementById('alias-status')?.textContent || ''; }); })()"
"__TEXT__"
- (pr-str text)))
- (Thread/sleep 400))
+ (pr-str text))))
-(defn- element-text [pg test-id]
+(defn- element-text [pg selector]
(let [raw (page/evaluate pg
- (str "document.querySelector('[data-testid=\"" test-id "\"]')?.textContent || ''"))]
+ (str "document.querySelector(" (pr-str selector) ")?.textContent || ''"))]
(when (string? raw) (str/trim raw))))
(defn- wait-for-text [pg test-id text timeout-ms]
- (let [deadline (+ (System/currentTimeMillis) timeout-ms)]
+ (let [deadline (+ (System/currentTimeMillis) timeout-ms)
+ selector (str "[data-testid=\"" test-id "\"]")]
(loop []
- (let [got (or (element-text pg test-id) "")]
+ (let [got (or (element-text pg selector) "")]
(cond
(= got text) got
(< (System/currentTimeMillis) deadline) (do (Thread/sleep 200) (recur))
diff --git a/test/support/mock_oauth.clj b/test/support/mock_oauth.clj
index 5ba7e9be3cf6d2226648e9609a09ed45f306930f..333fe08d56cb06bac2a338cad1c73894d54c4495 100644
--- a/test/support/mock_oauth.clj
+++ b/test/support/mock_oauth.clj
@@ -7,7 +7,7 @@
(defn- query-param [query key]
(when query
(some (fn [pair]
- (let [[k v] (str/split pair "=" 2)]
+ (let [[k v] (str/split pair #"=" 2)]
(when (= k key)
(URLDecoder/decode (or v "") "UTF-8"))))
(str/split query #"&"))))
@@ -31,11 +31,11 @@
(defn- send-redirect [^HttpExchange ex location]
(.set (.getResponseHeaders ex) "Location" location)
- (.sendResponseHeaders ex 302 -1)
+ (.sendResponseHeaders ex 302 0)
(.close (.getResponseBody ex)))
(defn- read-form [^HttpExchange ex]
- (let [body (slurp (.getInputStream ex))]
+ (let [body (slurp (.getRequestBody ex))]
{:code (query-param body "code")
:grant (query-param body "grant_type")}))
@@ -45,7 +45,7 @@
(str/replace #"^[Bb]earer " "")))
(defn- parse-token-user [token]
- (when (str/starts-with? token "mock:")
+ (when (and token (str/starts-with? token "mock:"))
(parse-mock-user (subs token 5))))
(defn- authorize-redirect [exchange query]
@@ -55,7 +55,7 @@
user (parse-mock-user mock-user)
code (str "mock:" (:id user) ":" (:login user))
loc (str redirect-uri "?code=" (java.net.URLEncoder/encode code "UTF-8")
- "&state=" (java.net.URLEncoder/encode state "UTF-8"))]
+ "&state=" (java.net.URLEncoder/encode (or state "") "UTF-8"))]
(send-redirect exchange loc)))
(defn start-mock-oauth
@@ -65,49 +65,56 @@
handler
(proxy [HttpHandler] []
(handle [^HttpExchange exchange]
- (let [uri (.getRequestURI exchange)
- path (.getPath uri)
- query (.getQuery uri)
- method (.getRequestMethod exchange)]
- (cond
- ;; GitHub authorize
- (str/ends-with? path "/login/oauth/authorize")
- (authorize-redirect exchange query)
+ (try
+ (let [uri (.getRequestURI exchange)
+ path (.getPath uri)
+ query (.getQuery uri)
+ method (.getRequestMethod exchange)]
+ (cond
+ ;; GitHub authorize
+ (str/ends-with? path "/login/oauth/authorize")
+ (authorize-redirect exchange query)
- ;; Reddit authorize
- (str/ends-with? path "/api/v1/authorize")
- (authorize-redirect exchange query)
+ ;; Reddit authorize
+ (str/ends-with? path "/api/v1/authorize")
+ (authorize-redirect exchange query)
- ;; GitHub token
- (and (= method "POST") (str/ends-with? path "/login/oauth/access_token"))
- (let [code (or (:code (read-form exchange)) "mock:1002:newbie")]
- (send-json exchange 200 (str "{\"access_token\":\"" code "\",\"token_type\":\"bearer\"}")))
+ ;; GitHub token
+ (and (= method "POST") (str/ends-with? path "/login/oauth/access_token"))
+ (let [code (or (:code (read-form exchange)) "mock:1002:newbie")]
+ (send-json exchange 200 (str "{\"access_token\":\"" code "\",\"token_type\":\"bearer\"}")))
- ;; Reddit token (client_credentials for import + authorization_code for login)
- (and (= method "POST") (str/ends-with? path "/api/v1/access_token"))
- (let [form (read-form exchange)
- grant (or (:grant form) "")
- code (or (:code form) "mock:t2_test:redditor")]
- (if (= grant "client_credentials")
- (send-json exchange 200 "{\"access_token\":\"app-token\",\"token_type\":\"bearer\",\"expires_in\":3600}")
- (send-json exchange 200 (str "{\"access_token\":\"" code "\",\"token_type\":\"bearer\",\"expires_in\":3600}"))))
+ ;; Reddit token (client_credentials for import + authorization_code for login)
+ (and (= method "POST") (str/ends-with? path "/api/v1/access_token"))
+ (let [form (read-form exchange)
+ grant (or (:grant form) "")
+ code (or (:code form) "mock:t2_test:redditor")]
+ (if (= grant "client_credentials")
+ (send-json exchange 200 "{\"access_token\":\"app-token\",\"token_type\":\"bearer\",\"expires_in\":3600}")
+ (send-json exchange 200 (str "{\"access_token\":\"" code "\",\"token_type\":\"bearer\",\"expires_in\":3600}"))))
- ;; GitHub user
- (= path "/user")
- (let [token (bearer-token exchange)
- user (or (parse-token-user token) {:id "1002" :login "newbie" :numeric? true})]
- (send-json exchange 200
- (str "{\"id\":" (:id user) ",\"login\":\"" (:login user) "\"}")))
+ ;; GitHub user
+ (= path "/user")
+ (let [token (bearer-token exchange)
+ user (or (parse-token-user token) {:id "1002" :login "newbie" :numeric? true})]
+ (send-json exchange 200
+ (str "{\"id\":" (:id user) ",\"login\":\"" (:login user) "\"}")))
- ;; Reddit /api/v1/me
- (str/ends-with? path "/api/v1/me")
- (let [token (bearer-token exchange)
- user (or (parse-token-user token) {:id "t2_test" :login "redditor"})]
- (send-json exchange 200
- (str "{\"id\":\"" (:id user) "\",\"name\":\"" (:login user) "\"}")))
+ ;; Reddit /api/v1/me
+ (str/ends-with? path "/api/v1/me")
+ (let [token (bearer-token exchange)
+ user (or (parse-token-user token) {:id "t2_test" :login "redditor"})]
+ (send-json exchange 200
+ (str "{\"id\":\"" (:id user) "\",\"name\":\"" (:login user) "\"}")))
- :else
- (send-json exchange 404 "{\"error\":\"not found\"}")))))]
+ :else
+ (send-json exchange 404 "{\"error\":\"not found\"}")))
+ (catch Throwable t
+ (binding [*out* *err*]
+ (println "mock-oauth handler error:" t))
+ (try
+ (send-json exchange 500 "{\"error\":\"mock-oauth internal\"}")
+ (catch Throwable _))))))]
(.createContext server "/" handler)
(.setExecutor server nil)
(.start server)
diff --git a/test/support/mock_reddit.clj b/test/support/mock_reddit.clj
index a630cf0938722193e9af88382d60e777ff371be4..faa27945b6394363914c853627a0bad1e819a5f9 100644
--- a/test/support/mock_reddit.clj
+++ b/test/support/mock_reddit.clj
@@ -12,7 +12,7 @@
(defn- query-param [query key]
(when query
(some (fn [pair]
- (let [[k v] (str/split pair "=" 2)]
+ (let [[k v] (str/split pair #"=" 2)]
(when (= k key)
(URLDecoder/decode (or v "") "UTF-8"))))
(str/split query #"&"))))
@@ -34,11 +34,11 @@
(defn- send-redirect [^HttpExchange ex location]
(.set (.getResponseHeaders ex) "Location" location)
- (.sendResponseHeaders ex 302 -1)
+ (.sendResponseHeaders ex 302 0)
(.close (.getResponseBody ex)))
(defn- read-form [^HttpExchange ex]
- (let [body (slurp (.getInputStream ex))]
+ (let [body (slurp (.getRequestBody ex))]
{:code (query-param body "code")
:grant (query-param body "grant_type")}))
@@ -48,7 +48,7 @@
(str/replace #"^[Bb]earer " "")))
(defn- parse-token-user [token]
- (when (str/starts-with? token "mock:")
+ (when (and token (str/starts-with? token "mock:"))
(parse-mock-user (subs token 5))))
(defn start-mock-reddit
@@ -72,7 +72,7 @@
user (parse-mock-user (query-param query "mock_user"))
code (str "mock:" (:id user) ":" (:login user))
loc (str redirect-uri "?code=" (java.net.URLEncoder/encode code "UTF-8")
- "&state=" (java.net.URLEncoder/encode state "UTF-8"))]
+ "&state=" (java.net.URLEncoder/encode (or state "") "UTF-8"))]
(send-redirect exchange loc))
(and (= method "POST") (str/ends-with? path "/api/v1/access_token"))
B — c_477013996fa5 (tommy-mor)
message
[893a2007] fullscreen?
diff preview
diff --git a/agents.md b/agents.md
index d9a924d2f77c444d9b112bbf37a480b963ace4f0..1f66ddbeddd1e40310947c7eb474c1ac4858bc42 100644
--- a/agents.md
+++ b/agents.md
@@ -37,9 +37,9 @@ Strict **CSP** that blocks `eval` would break the current app. Other projects ma
- **Non-morph `POST /ui` responses:** **`SetGardenPin`** returns **`303 See Other`** and **`Set-Cookie`** (same as **`POST /theme`**). Garden pin/unpin is a normal **`<form method="POST" action="/ui" data-navigate="full">`** — browser navigation applies cookies reliably (see **`test/browser_garden_pin.clj`**). Each **`__rpc__`** payload includes **`form_action: "/ui"`**; **`post_ui_html`** rejects mismatches to bind tokens to the UI endpoint.
-- **`VoteComparePost`:** On success returns **`text/javascript`** that **morphs** **`#vote-compare-preview`** (new ingest card) and **`#vote-edge-history-region`** (recomputed edge list). Uses **`RpcResult::PostOk`**’s **`post_id`** / **`post_index`** for the card. **`__rpc__`** carries **`form_action: "/ui"`**; **`thread_tag`** and ratio fields come from the same form as **`$form`** holes.
+- **`VoteComparePost`:** On success returns **`text/javascript`** that **morphs** **`#vote-compare-preview`** (new ingest card), **`#vote-edge-history-region`** (recomputed **`<ul>`** — ratios match **`left`/`right`** query order, bullets, sorted by strength toward **`left`** then newer). The compare **`GET`** page uses **`layout_full_bleed_chromeless`** (no breadcrumbs, no **`#controls`**, no **`slug-pin-hud`**; **`view-vote-compare-fullscreen`** full-width **`body`**). **`__rpc__`** carries **`form_action: "/ui"`**; **`thread_tag`** and ratio fields come from the same form as **`$form`** holes.
-- **Garden pin / compare voting:** Cookie **`slug_garden_pin`** via **`set_garden_pin`**. Pairwise UI: **`GET /vote/compare?…`** / **`GET /r/:room_key/vote/compare?…`**. HUD: **`#slug-pin-hud`** when **`layout`** passes garden metadata on **`body`**; the label is **`POST /ui`** **`set_garden_pin`** **`clear:true`** (**`slug_ui.js`**), not a permalink to the item.
+- **Garden pin / compare voting:** Cookie **`slug_garden_pin`** via **`set_garden_pin`**. Pairwise UI: **`GET /vote/compare?…`** / **`GET /r/:room_key/vote/compare?…`** (fullscreen **`GET`** page: no HUD; other garden pages). HUD (**`#slug-pin-hud`**): only when **`layout`** passes garden metadata on **`body`**; the label is **`POST /ui`** **`set_garden_pin`** **`clear:true`** (**`slug_ui.js`**), not a permalink to the item.
**Rule of thumb:** New **CLI or API** verbs → `RpcCommand`. New **in-page morph or form-driven** behavior that only makes sense in the browser → `HtmlUiAction`. If both need the same operation, implement the real work once (e.g. call shared RPC helpers from `post_ui_html`) and keep the wire shapes separate.
diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs
index 5aa6a86326ba3545d261322c010e02fe86ee1c57..696e7b3605e2e68aee0351116c494c2958506add 100644
--- a/server/src/api/ui_html.rs
+++ b/server/src/api/ui_html.rs
@@ -254,7 +254,17 @@ async fn dispatch_ui_action(
};
n
};
- let js = vote_compare_post_success_js(state, &nav, &left_id, &right_id).await;
+ let js = vote_compare_post_success_js(
+ state,
+ &nav,
+ &room,
+ &thread_tag,
+ &left_id,
+ &right_id,
+ pid.as_str(),
+ post_index,
+ )
+ .await;
Response::builder()
.status(StatusCode::OK)
.header(header::CONTENT_TYPE, "text/javascript; charset=utf-8")
diff --git a/server/src/html/garden.rs b/server/src/html/garden.rs
index 121d9498e8cb93d4d001dc1bbce23d74fbb958f5..41f9e9c64a80a55a9d3ece2a6a1f592cf5e8d8dd 100644
--- a/server/src/html/garden.rs
+++ b/server/src/html/garden.rs
@@ -22,17 +22,17 @@ use crate::{
},
events::ThreadCapability,
path_types::ItemId,
- reducer::{ContentState, ReducerState, ScopeId},
+ reducer::{scope_from_room_wire, ContentState, ReducerState, ScopeId},
scope_rank::{build_children_rankings, ChildrenRankings},
state::AppState,
timeago,
};
use super::{
- bc_path, bc_path_external, bc_segment, cli_panel, layout, now_ms, ratio_pct,
- render_linkified_with_embeds_in_scope, theme_from_jar, theme_next_from_uri,
+ bc_path, bc_path_external, bc_segment, cli_panel, layout, layout_full_bleed_chromeless, now_ms,
+ ratio_pct, render_linkified_with_embeds_in_scope, theme_from_jar, theme_next_from_uri,
breadcrumb_path::{ExternalOntologyPath, OntologyPath},
- forum::{ThreadNav},
+ forum::{ingest_entry_markup, ThreadNav},
};
/// `GET /vote/compare` — pairs `left` / `right` query params with optional `thread`.
@@ -89,25 +89,62 @@ fn canonical_edge_items(a: &ItemId, b: &ItemId) -> (ItemId, ItemId) {
}
}
-/// Votes whose endpoints are exactly this unordered pair, oldest first.
-fn votes_for_edge(content: &ContentState, a: &ItemId, b: &ItemId) -> Vec<crate::reducer::VoteData> {
+/// All votes whose endpoints are exactly this unordered pair (unsorted).
+fn edge_vote_entries_for_pair(content: &ContentState, a: &ItemId, b: &ItemId) -> Vec<crate::reducer::VoteData> {
let (lo, hi) = canonical_edge_items(a, b);
let lo_s = lo.as_str();
let hi_s = hi.as_str();
- let mut out: Vec<crate::reducer::VoteData> = content
+ content
.item_votes
.get(&lo)
.into_iter()
.flat_map(|q| q.iter())
.filter(|v| {
- let touches = (v.a.as_str() == lo_s && v.b.as_str() == hi_s)
- || (v.a.as_str() == hi_s && v.b.as_str() == lo_s);
- touches
+ (v.a.as_str() == lo_s && v.b.as_str() == hi_s)
+ || (v.a.as_str() == hi_s && v.b.as_str() == lo_s)
})
.cloned()
- .collect();
- out.sort_by_key(|v| v.ts);
- out
+ .collect()
+}
+
+fn ratios_for_compare_page(v: &crate::reducer::VoteData, page_left: &ItemId, page_right: &ItemId) -> (i32, i32) {
+ let pl = page_left.as_str();
+ let pr = page_right.as_str();
+ match (v.a.as_str(), v.b.as_str()) {
+ (a, b) if a == pl && b == pr => (v.ratio_left, v.ratio_right),
+ (a, b) if a == pr && b == pl => (v.ratio_right, v.ratio_left),
+ _ => (v.ratio_left, v.ratio_right),
+ }
+}
+
+fn left_share_normalized(ratio_left: i32, ratio_right: i32) -> f64 {
+ let l = ratio_left.max(0) as f64;
+ let r = ratio_right.max(0) as f64;
+ let sum = l + r;
+ if sum <= 0.0 {
+ 0.5
+ } else {
+ l / sum
+ }
+}
+
+/// Stronger preference for **`page_left` first**; ties **newer first**.
+fn sort_votes_for_compare_display(
+ mut votes: Vec<crate::reducer::VoteData>,
+ page_left: &ItemId,
+ page_right: &ItemId,
+) -> Vec<crate::reducer::VoteData> {
+ votes.sort_by(|va, vb| {
+ let (ratio_left_a, ratio_right_a) = ratios_for_compare_page(va, page_left, page_right);
+ let (ratio_left_b, ratio_right_b) = ratios_for_compare_page(vb, page_left, page_right);
+ let sa = left_share_normalized(ratio_left_a, ratio_right_a);
+ let sb = left_share_normalized(ratio_left_b, ratio_right_b);
+ match sb.partial_cmp(&sa).unwrap_or(std::cmp::Ordering::Equal) {
+ std::cmp::Ordering::Equal => vb.ts.cmp(&va.ts),
+ o => o,
+ }
+ });
+ votes
}
/// Number of vote ingests recorded for this unordered pair in `content` (same scope as ranking).
@@ -144,39 +181,40 @@ fn vote_edge_history_markup(
content: &ContentState,
left: &ItemId,
right: &ItemId,
- nav: &ThreadNav,
) -> maud::Markup {
- let votes = votes_for_edge(content, left, right);
- let (lo, hi) = canonical_edge_items(left, right);
+ let votes = edge_vote_entries_for_pair(content, left, right);
+ let votes = sort_votes_for_compare_display(votes, left, right);
+ let legend_left = item_display_path(left.as_str());
+ let legend_right = item_display_path(right.as_str());
html! {
@if votes.is_empty() {
p class="muted vote-edge-empty" { "no votes on this pair in this scope yet" }
} @else {
- h3 class="vote-edge-history-title" { "votes on this edge" }
- ol class="vote-edge-history" {
+ h3 class="vote-edge-history-title" {
+ "votes on this edge"
+ span class="vote-edge-history-axis muted" { " · " (legend_left) " : " (legend_right) }
+ }
+ ul class="vote-edge-history" {
@for v in &votes {
- @let (ratio_lo, ratio_hi) = if v.a == lo && v.b == hi {
- (v.ratio_left, v.ratio_right)
- } else {
- (v.ratio_right, v.ratio_left)
- };
- @let pct = ratio_pct(ratio_lo, ratio_hi);
- @let left_class = if lo.as_str() == left.as_str() { "ratio-left current" } else { "ratio-left" };
- @let right_class = if hi.as_str() == left.as_str() { "ratio-right current" } else { "ratio-right" };
- li class="vote-edge-history-row" {
+ @let (r_left, r_right) = ratios_for_compare_page(v, left, right);
+ @let pct = ratio_pct(r_left, r_right);
+ @let row_tip = format!(
+ "{}:{} counts toward {} (left of bar) vs {} (right of bar); #{} · @{}",
+ r_left,
+ r_right,
+ legend_left,
+ legend_right,
+ v.thread_tag,
+ v.principal,
+ );
+ li class="vote-edge-history-row" title=(row_tip) {
div class="vote-edge-meta" {
- a href=(nav.garden_item_href(&lo)) {
- code { (item_display_path(lo.as_str())) }
- }
- span class="vote-edge-ratio" { (format!("{}:{}", ratio_lo, ratio_hi)) }
- a href=(nav.garden_item_href(&hi)) {
- code { (item_display_path(hi.as_str())) }
- }
+ span class="vote-edge-ratio" { (format!("{}:{}", r_left, r_right)) }
span class="muted" { " · #" (v.thread_tag) " · @" (v.principal) }
}
- div class="ratio-bar vote-edge-bar" {
- div class=(left_class) style={(format!("width: {:.3}%;", pct))} {}
- div class=(right_class) style={(format!("width: {:.3}%;", 100.0 - pct))} {}
+ div class="ratio-bar vote-edge-bar" aria-hidden="true" {
+ div class="ratio-left" style={(format!("width: {:.3}%;", pct))} {}
+ div class="ratio-right" style={(format!("width: {:.3}%;", 100.0 - pct))} {}
}
@if !v.body.trim().is_empty() {
div class="vote-edge-reason muted" { (v.body.trim()) }
@@ -192,14 +230,33 @@ fn vote_edge_history_markup(
pub(crate) async fn vote_compare_post_success_js(
state: &AppState,
nav: &ThreadNav,
+ room_wire: &str,
+ thread_tag: &str,
left: &ItemId,
right: &ItemId,
+ post_id: &str,
+ post_idx: Option<usize>,
) -> String {
let reduced = state.reduced.read().await;
+ let scope = scope_from_room_wire(room_wire);
+ let Some(ing) = reduced.ingests_by_id.get(post_id).cloned() else {
+ drop(reduced);
+ return "console.warn('vo
… preview truncated; 11,546 characters omittedHardlinks — judgments / attempts / prompt
judgments
attempts
Prompt text is loaded only by the download route.