Commit A is a small, precise, verifiable bugfix that closes a real correctness gap (ghost items/pairs being registered before the zero-ratio guard) and updates the test to assert the corrected behavior. Commit B is a large speculative refactor ('reconfigure') introducing a whole new tree/journal/reddit-import architecture with no tests demonstrating it fixes a real bug, higher risk of regressions, and no clear necessity established beyond feature expansion.
constitution · epochs · watch · epoch 3
comparison
c_abd68b5e771a (tommy-mor) vs c_509fc5155034 (tommy-mor)
download prompt · raw event · cmp_a5be611213c238
council reasoning
B lands lasting core design: hierarchical ItemId/GlobalTree, path canonicalization, journaled tree votes, and UI (breadcrumbs/entity panel) that replace flat string scopes—foundational product capability. A is a correct, necessary ordering fix (zero-ratio return before ensure_item/voted_pairs) with tight tests, but it is a localized guard versus B’s structural model change.
Side A fixes a real correctness bug by moving the zero-ratio early return before `ensure_item` and `voted_pairs.insert`, preventing ghost items and incorrectly marked voted pairs. It also updates the test to verify that no items, edges, or voted pairs are registered, whereas Side B is a large architectural reconfiguration with broad feature changes but no clearly demonstrated targeted bug fix or validated lasting correctness improvement in the patch itself.
sides
A — c_abd68b5e771a (tommy-mor)
message
[81de487b] Fix zero-ratio guard in reducer to drop before registering items or pair. Previously the early-return for zero-weight votes happened after ensure_item and voted_pairs.insert, leaving ghost items in the index and the pair incorrectly marked as voted. Move the check to before any side effects. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
diff preview
diff --git a/server/src/reducer.rs b/server/src/reducer.rs
index 6841d35cfc9de2389f340a22b8a45acb335e36c3..0e36979abe0f051493038ff7e652efc7f7a0ac80 100644
--- a/server/src/reducer.rs
+++ b/server/src/reducer.rs
@@ -112,6 +112,10 @@ impl GroupState {
if vote.ratio_right < 0 {
vote.ratio_right = 0;
}
+ if vote.ratio_left == 0 || vote.ratio_right == 0 {
+ // Zero on either side produces no valid edge; drop before registering items or pair.
+ return;
+ }
let a_idx = self.ensure_item(&vote.a);
let b_idx = self.ensure_item(&vote.b);
@@ -121,10 +125,6 @@ impl GroupState {
let w_a = vote.ratio_left as f64;
let w_b = vote.ratio_right as f64;
- if w_a == 0.0 || w_b == 0.0 {
- // Zero on either side produces no valid edge; drop the vote.
- return;
- }
self.add_edge_weight(b_idx, a_idx, w_a);
self.add_edge_weight(a_idx, b_idx, w_b);
diff --git a/server/tests/basic.rs b/server/tests/basic.rs
index cc8c1a0d139f3722ba6ecd13dd001c65be835b67..08159f4a7f0850fd165817a4a1af4f31ced2ad76 100644
--- a/server/tests/basic.rs
+++ b/server/tests/basic.rs
@@ -546,12 +546,10 @@ fn reducer_negative_ratio_clamped_to_zero() {
delegate: Some("00000000-0000-0000-0000-000000000000:test:local/test".to_string()),
thread_tag: "t".to_string(),
});
- // Items are registered, but the zero-clamped vote produces no edges.
- assert_eq!(group.idx_to_item.len(), 2);
- let a_idx = group.item_to_idx[&item_id("https://slug.social/~/t/a")];
- let b_idx = group.item_to_idx[&item_id("https://slug.social/~/t/b")];
- assert!(!group.edges.contains_key(&(a_idx, b_idx)));
- assert!(!group.edges.contains_key(&(b_idx, a_idx)));
+ // Nothing registered: zero-clamped vote is dropped before ensure_item.
+ assert!(group.idx_to_item.is_empty());
+ assert!(group.edges.is_empty());
+ assert!(group.voted_pairs.is_empty());
}
B — c_509fc5155034 (tommy-mor)
message
[88577c56] reconfigure
diff preview
diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs
index c4ab9d65c7b3cd42a5b4d093ba429993c101e9a8..82b2aa51d21ada1d0d849d3ddfc3a81e4241d861 100644
--- a/server/src/api/ui_html.rs
+++ b/server/src/api/ui_html.rs
@@ -9,7 +9,9 @@ use crate::{
html::{js_string_literal, ranking_panel, JsBuilder},
parser::parse_reddit_url,
parser_render::navigate_panel,
- state::AppState,
+ path_types::ItemId,
+ reddit::ensure_partial_tree,
+ state::{parse_item_param, AppState},
ui_action::{parse_html_ui_from_form, HtmlUiAction},
};
@@ -25,6 +27,10 @@ fn ui_js_warn(msg: &str) -> Response {
.unwrap()
}
+fn parent_from_scope(scope: &str) -> ItemId {
+ parse_item_param(scope)
+}
+
pub async fn post_ui_html(
State(state): State<AppState>,
Form(form): Form<HashMap<String, String>>,
@@ -42,24 +48,36 @@ pub async fn post_ui_html(
ratio_right,
scope,
} => {
+ let parent = parent_from_scope(&scope);
if let Err(e) = state
- .record_vote(&scope, &a, &b, ratio_left, ratio_right)
+ .record_vote(&parent, &a, &b, ratio_left, ratio_right)
.await
{
return ui_js_warn(&e).into_response();
}
- let scope = crate::state::normalize_scope(&scope);
- let groups = state.groups.read().await;
+ let tree = state.tree.read().await;
let empty = crate::reducer::GroupState::new();
- let group = groups.get(&scope).unwrap_or(&empty);
- let panel = ranking_panel(&scope, group);
+ let group = tree
+ .get(&parent)
+ .map(|n| &n.local_ranking)
+ .unwrap_or(&empty);
+ let panel = ranking_panel(&parent, group);
JsBuilder::new()
.morph_selector("#ranking-panel", panel)
.into_response()
}
HtmlUiAction::ParseQuery { query } => match parse_reddit_url(&query) {
- Ok(subreddit) => {
- let dest = format!("/?sub={subreddit}");
+ Ok(item) => {
+ {
+ let mut tree = state.tree.write().await;
+ ensure_partial_tree(&mut tree, &item);
+ }
+ let _ = state.ensure_node(&item).await;
+ let dest = if item.is_root() {
+ "/".to_string()
+ } else {
+ format!("/?item={}", item.as_str())
+ };
JsBuilder::new()
.raw(&format!(
"window.location.href={};",
diff --git a/server/src/events.rs b/server/src/events.rs
index a862370fc840ffe02184a11c578e18239cc9474d..ed5be6b13b9d46e838831d6ce0f96f569b401730 100644
--- a/server/src/events.rs
+++ b/server/src/events.rs
@@ -5,8 +5,8 @@ use serde::{Deserialize, Serialize};
pub enum Event {
/// Page view recorded (path → counter in views.json).
ViewRecorded { path: String, ts: i64 },
- /// Pairwise comparison vote (replayed into the scope's [`crate::reducer::GroupState`] on boot).
- /// `scope` is the ranking subject (e.g. a subreddit); empty string is the default/global scope.
+ /// Pairwise comparison vote (replayed into the parent node's [`crate::reducer::GroupState`] on boot).
+ /// `scope` is the parent [`crate::path_types::ItemId`] string; empty string is the tree root.
VoteRecorded {
ts: i64,
a: String,
@@ -16,4 +16,6 @@ pub enum Event {
#[serde(default)]
scope: String,
},
+ /// Register a node path in the fractal tree (no external fetch).
+ NodeEnsured { id: String },
}
diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs
index 9650d333d29c4ac94ceb407aee3ee00399c7f40b..c973cb718ac74b95570dabea76e24459417790b9 100644
--- a/server/src/html/mod.rs
+++ b/server/src/html/mod.rs
@@ -12,9 +12,10 @@ use serde::Deserialize;
use crate::{
form_template::template_json_compact,
parser_render::navigate_panel,
+ path_types::ItemId,
ranking::{top_bottom, RankedItem},
- reducer::GroupState,
- state::{normalize_scope, AppState},
+ reducer::{GroupState, NodeState},
+ state::{parse_item_param, AppState},
ui_action::UI_RPC_FIELD,
};
@@ -216,6 +217,48 @@ fn layout(title: &str, body: Markup, views: u64, theme: &str, theme_next: &str)
}
}
+fn item_href(id: &ItemId) -> String {
+ if id.is_root() {
+ "/".to_string()
+ } else {
+ format!("/?item={}", id.as_str())
+ }
+}
+
+fn segment_label(seg: &str) -> &str {
+ seg
+}
+
+/// Generic breadcrumb trail from an [`ItemId`] path.
+pub fn breadcrumb_path(item: &ItemId) -> Markup {
+ html! {
+ nav class="breadcrumbs" aria-label="Breadcrumb" {
+ a href="/" { "Internet" }
+ @for path in item.breadcrumb_paths() {
+ @let seg = path.segments().last().map_or("", |v| *v);
+ span class="separator" { " / " }
+ a href=(item_href(&path)) { (segment_label(seg)) }
+ }
+ }
+ }
+}
+
+fn entity_panel(node: &NodeState) -> Markup {
+ html! {
+ @if let Some(data) = &node.data {
+ section id="entity-panel" class="demo-panel entity-card" {
+ h2 { (data.title) }
+ @if let Some(author) = &data.author {
+ p class="muted small" { "by " (author) }
+ }
+ @if let Some(body) = &data.body_html {
+ div class="entity-body" { (maud::PreEscaped(body)) }
+ }
+ }
+ }
+ }
+}
+
fn rank_list(label: &str, items: &[RankedItem], start_rank: usize) -> Markup {
html! {
@if !items.is_empty() {
@@ -224,7 +267,9 @@ fn rank_list(label: &str, items: &[RankedItem], start_rank: usize) -> Markup {
@for (i, r) in items.iter().enumerate() {
li {
span class="rank-num" { (start_rank + i) ". " }
- strong { (r.item.as_str()) }
+ a href=(item_href(&r.item)) {
+ strong { (display_label(&r.item)) }
+ }
span class="muted" {
" — "
({ format!("{:.1}%", r.score * 100.0) })
@@ -236,23 +281,30 @@ fn rank_list(label: &str, items: &[RankedItem], start_rank: usize) -> Markup {
}
}
-pub fn ranking_panel(scope: &str, group: &GroupState) -> Markup {
+fn display_label(id: &ItemId) -> String {
+ id.segments()
+ .last()
+ .map_or("Internet", |v| *v)
+ .to_string()
+}
+
+pub fn ranking_panel(item: &ItemId, group: &GroupState) -> Markup {
let total = group.idx_to_item.len();
let (top, bottom) = top_bottom(group, 8);
html! {
section id="ranking-panel" class="demo-panel" {
h2 {
"Ranking"
- @if !scope.is_empty() {
- " — " span class="scope-name" { "r/" (scope) }
+ @if !item.is_root() {
+ " — " span class="scope-name" { (item.as_str()) }
}
}
@if total == 0 {
p class="muted" {
- @if scope.is_empty() {
+ @if item.is_root() {
"No votes yet — compare two items below."
} @else {
- "No votes yet for r/" (scope) " — compare two items below to start the ranking."
+ "No votes yet for " (item.as_str()) " — compare two items below to start the ranking."
}
}
} @else {
@@ -266,7 +318,8 @@ pub fn ranking_panel(scope: &str, group: &GroupState) -> Markup {
}
}
-pub fn vote_panel(scope: &str) -> Markup {
+pub fn vote_panel(parent: &ItemId) -> Markup {
+ let parent_str = parent.as_str();
let rpc = template_json_compact(&serde_json::json!({
"action": "record_vote",
"a": {"$form": "item_a"},
@@ -280,16 +333,17 @@ pub fn vote_panel(scope: &str) -> Markup {
section id="vote-panel" class="demo-panel" {
h2 { "Compare" }
p class="muted small" {
- @if scope.is_empty() {
+ @if parent.is_root() {
"Left item wins at 2:1. Votes append to the JSONL log and update rank centrality."
} @else {
- "Ranking " span class="scope-name" { "r/" (scope) }
+ "Ranking children of "
+ span class="scope-name" { (parent_str) }
". Left item wins at 2:1; each vote updates this ranking."
}
}
form method="post" action="/ui" id="vote-form" {
input type="hidden" name=(UI_RPC_FIELD) value=(rpc);
- input type="hidden" name="scope" value=(scope);
+ input type="hidden" name="scope" value=(parent_str);
div class="vote-fields" {
label {
"Left (wins) "
@@ -329,17 +383,30 @@ pub async fn home(
let views = state.views.get_views(&path);
let theme = theme_from_jar(&jar);
let theme_next = theme_next_from_uri(&uri);
- let scope = normalize_scope(&query_param(&uri, "sub").unwrap_or_default());
- let groups = state.groups.read().await;
- let empty = GroupState::new();
- let group = groups.get(&scope).unwrap_or(&empty);
+ let item_raw = query_param(&uri, "item")
+ .or_else(|| query_param(&uri, "sub").map(|sub| {
+ if sub.is_empty() {
+ String::new()
+ } else {
+ format!("reddit.com/r/{sub}")
+ }
+ }))
+ .unwrap_or_default();
+ let item = parse_item_param(&item_raw);
+
+ let tree = state.tree.read().await;
+ let empty_node = NodeState::default();
+ let node = tree.get(&item).unwrap_or(&empty_node);
+ let group = &node.local_ranking;
let body = html! {
h1 { "sorter2" }
+ (breadcrumb_path(&item))
(navigate_panel("", None))
- (vote_panel(&scope))
- (ranking_panel(&scope, group))
+ (entity_panel(node))
+ (vote_panel(&item))
+ (ranking_panel(&item, group))
};
layout("sorter2", body, views, theme, &theme_next)
}
diff --git a/server/src/journal.rs b/server/src/journal.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b02ca025683621470ffdf8cd85cf9b85c56d024d
--- /dev/null
+++ b/server/src/journal.rs
@@ -0,0 +1,89 @@
+use std::sync::Arc;
+
+use tokio::sync::{mpsc, oneshot, RwLock};
+
+use crate::{
+ event_log::EventLog,
+ events::Event,
+ path_types::ItemId,
+ reducer::{GlobalTree, VoteData},
+};
+
+pub struct JournalCommand {
+ pub parent: ItemId,
+ pub vote: VoteData,
+ pub event: Event,
+ pub reply: oneshot::Sender<Result<(), String>>,
+}
+
+#[derive(Clone)]
+pub struct JournalClient {
+ tx: mpsc::Sender<JournalCommand>,
+}
+
+impl JournalClient {
+ pub fn spawn(tree: Arc<RwLock<GlobalTree>>, event_log: Arc<EventLog>) -> Self {
+ let (tx, rx) = mpsc::channel(64);
+ tokio::spawn(journal_worker(rx, tree, event_log));
+ Self { tx }
+ }
+
+ pub async fn record_vote(
+ &self,
+ parent: ItemId,
+ vote: VoteData,
+ event: Event,
+ ) -> Result<(), String> {
+ let (reply, rx) = oneshot::channel();
+ self.tx
+ .send(JournalCommand {
+ parent,
+ vote,
+ event,
+ reply,
+ })
+ .await
+ .map_err(|_| "journal worker stopped".to_string())?;
+ rx.await
+ .map_err(|_| "journal worker stopped".to_string())?
+ }
+}
+
+async fn journal_worker(
+
… preview truncated; 29,088 characters omittedHardlinks — judgments / attempts / prompt
judgments
attempts
Prompt text is loaded only by the download route.