Side B fixes a real crash-causing bug (NameError from a missing GITHUB_API_BASE_URL) with a minimal, correct, targeted patch. Side A is a large feature/UI-refactor commit (fullscreen compare layout, edge-history sorting, morph tweaks) that is more churn-heavy and speculative with an ambiguous 'fullscreen?' message, though it does add some test coverage; but it lacks the clear necessity and precision of B's bugfix.
constitution · epochs · watch · epoch 3
comparison
c_477013996fa5 (tommy-mor) vs c_4ed2e2cca39b (tommy-mor)
download prompt · raw event · cmp_4d254ee69b37d2
council reasoning
A delivers lasting product value: chromeless fullscreen compare layout, correct left/right ratio orientation and strength-sorted edge history, working post-success morph of the ingest preview, CSS, and a unit test. B is a necessary but tiny fix—defining GITHUB_API_BASE_URL so OAuth stops NameErroring—valuable but narrow compared with A’s design and behavior changes.
Side A implements substantial functional improvements to the vote comparison flow: it adds a dedicated chromeless fullscreen layout, updates the POST success path to morph both the new vote preview and edge history, normalizes and sorts vote ratios relative to the displayed left/right order, and includes new tests covering the sorting behavior and browser interaction. Side B is a valuable but narrowly scoped bug fix that defines `GITHUB_API_BASE_URL` with a default to prevent a `NameError` when the OAuth callback references the GitHub API base URL.
sides
A — 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 omittedB — c_4ed2e2cca39b (tommy-mor)
message
[0d3270d1] Fix GitHub OAuth callback NameError on missing API base URL. Co-authored-by: Cursor <cursoragent@cursor.com>
diff preview
diff --git a/constitution.py b/constitution.py
index f819007252f435680b8356fb4da83469b21e33af..4dd5b9dfbba231d46289c490f91b1dd5b1018bcf 100644
--- a/constitution.py
+++ b/constitution.py
@@ -119,6 +119,9 @@ JSONL_PATH = pathlib.Path(os.environ.get("JSONL_PATH", "/data/ledger.jsonl"))
GITHUB_CLIENT_ID = os.environ.get("GITHUB_CLIENT_ID", "")
GITHUB_CLIENT_SECRET = os.environ.get("GITHUB_CLIENT_SECRET", "")
+GITHUB_API_BASE_URL = os.environ.get(
+ "GITHUB_API_BASE_URL", "https://api.github.com"
+).rstrip("/")
OPENROUTER_API_KEY = os.environ.get("OPENROUTER_API_KEY", "")
OPENROUTER_BASE_URL = os.environ.get("OPENROUTER_BASE_URL", "https://openrouter.ai").rstrip("/")
Hardlinks — judgments / attempts / prompt
judgments
attempts
Prompt text is loaded only by the download route.