Side B is a substantial architectural refactor (settlement -> journal, flat scope map -> hierarchical GlobalTree, ItemId path parsing/canonicalization, breadcrumb UI, entity data) with corresponding tests and real feature capability additions. Side A is a small, useful but minor kaocha config simplification (two suites -> one glob pattern) with no code or behavioral change beyond test discovery.
constitution · epochs · watch · epoch 3
comparison
c_28dfd8015c8a (tommy-mor) vs c_509fc5155034 (tommy-mor)
download prompt · raw event · cmp_348d08281e67a1
council reasoning
B replaces flat string scopes with a hierarchical ItemId/GlobalTree model (path canonicalization, breadcrumbs, journaled votes, NodeEnsured events, UI/entity panels)—core lasting domain architecture. A only collapses hand-listed kaocha suites into one ns-pattern in tests.edn, a useful but narrow test-runner convenience.
Side B implements a substantial architectural shift from flat subreddit scopes to a hierarchical `ItemId`/`GlobalTree` model, updating vote recording, event replay, URL parsing, UI navigation (breadcrumbs, entity panels, links), and persistence with new journal and tree infrastructure. Side A improves maintainability by replacing manually enumerated Kaocha test namespaces with automatic `^test\..+` discovery, but it is limited to test configuration rather than core project behavior or architecture.
sides
A — c_28dfd8015c8a (tommy-mor)
message
[0bebe819] Unify kaocha test discovery to one auto-discovered suite. Replace the two hand-enumerated suites (:http-integration, :browser) with a single :all suite that picks up every test.* namespace under test/. New test files now run automatically without touching tests.edn — needed for the test.ranking namespace added alongside the #146 fix, and for any future tests. Both ./TEST.sh and CI (.github/workflows/ci.yml) invoke `clojure -M:kaocha`, so both pick up the new suite without changes. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
diff preview
diff --git a/tests.edn b/tests.edn
index 5e2b0433a66c51806d08ef38d691259cfccd1fe0..e51ffcc81eeae6f41c85d1bfc5ba32f592cc5818 100644
--- a/tests.edn
+++ b/tests.edn
@@ -1,30 +1,14 @@
#kaocha/v1
-{:tests
- [{:id :http-integration
- :test-paths ["test"]
- :source-paths ["."]
- :ns-patterns ["^test\\.integration$"
- "^test\\.auth$"
- "^test\\.grants$"
- "^test\\.invites$"
- "^test\\.room-list$"]
- :kaocha.filter/skip-meta [:skip]
- :parallel? false}
- {:id :browser
- :test-paths ["test"]
- :source-paths ["."]
- :ns-patterns ["^test\\.browser-sse$"
- "^test\\.browser-ui-morph$"
- "^test\\.browser-post-redact$"
- "^test\\.browser-room-delete$"
- "^test\\.browser-public-garden$"
- "^test\\.browser-redact-thread-index$"
- "^test\\.browser-garden-pin$"
- "^test\\.browser-vote-compare$"
- "^test\\.browser-github-resolver$"]
- :kaocha.filter/skip-meta [:skip]
- :parallel? false}]
- :plugins [:kaocha.plugin/junit-xml]
- :kaocha.plugin.junit-xml/target-file "target/kaocha-junit.xml"
- :kaocha.plugin.junit-xml/add-location-metadata? true
- :reporter kaocha.report.progress/report}
+ {:tests
+ [{:id :all
+ :test-paths ["test"]
+ :source-paths ["."]
+ ;; Pick up every test.* namespace under test/. New files don't need to be
+ ;; enumerated here — drop them in test/ with `(ns test.foo …)` and they run.
+ :ns-patterns ["^test\\..+"]
+ :kaocha.filter/skip-meta [:skip]
+ :parallel? false}]
+ :plugins [:kaocha.plugin/junit-xml]
+ :kaocha.plugin.junit-xml/target-file "target/kaocha-junit.xml"
+ :kaocha.plugin.junit-xml/add-location-metadata? true
+ :reporter kaocha.report.progress/report}
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.