{"messages":[{"content":"You are a constitutional council ranking individual git commits for ownership allocation.\n\nCompare these two commits. Decide which contributed more lasting value to the project.\n\nJudge substance, not spectacle:\n- Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise.\n- Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one.\n- Do not favor a side merely because its patch is longer or noisier.\n- Weight what the change does for the project, not the contributor's name.\n\nReturn ONLY a JSON object: {\"winner\": \"A\" or \"B\", \"ratio\": \"N:M\", \"explanation\": \"...\"}\nThe explanation must cite concrete differences in the patches (1-3 sentences).\n\nSide A — contributor: tommy-mor\nSide A — commit message:\n[6120bd96] fix redirect urls for custom hosts and deploy from staging\n\nUse HOSTNAME and window.location.origin instead of hardcoded staging.sorter.social, and trigger fly deploys on pushes to staging.\n\nCo-authored-by: Cursor \n\nSide A — unified diff (full patch):\ndiff --git a/.github/workflows/fly-deploy.yml b/.github/workflows/fly-deploy.yml\nindex 3e693915fe6f99a5c2221b2921bf8ebc305180fc..5e11e5c312f62bed34d8cc68bd4a5538f52476b9 100644\n--- a/.github/workflows/fly-deploy.yml\n+++ b/.github/workflows/fly-deploy.yml\n@@ -3,11 +3,11 @@ name: deploy to fly.io\n on:\n push:\n branches:\n- - main\n+ - staging\n workflow_dispatch:\n \n concurrency:\n- group: fly-deploy-main\n+ group: fly-deploy-staging\n cancel-in-progress: true\n \n jobs:\ndiff --git a/borter/src/app/linear.clj b/borter/src/app/linear.clj\nindex f77d8a974e0cf05f9c33233bb625bdb190d2007b..5ef0e34cf1d543826675c6facb66aec079b40561 100644\n--- a/borter/src/app/linear.clj\n+++ b/borter/src/app/linear.clj\n@@ -6,6 +6,7 @@\n [ring.util.response :as response]\n [app.database :as db]\n [app.permissions :as perms]\n+ [app.util :as util]\n [honey.sql.helpers :as h]\n [sluj.core :refer [sluj]]))\n \n@@ -13,9 +14,7 @@\n (def client-secret (System/getenv \"BORTER_LINEAR_CLIENT_SECRET\"))\n \n (defn get-hostname []\n- (case (.getCanonicalHostName (java.net.InetAddress/getLocalHost))\n- \"sorter.social\" \"https://sorter.social/api/linear/callback\"\n- \"http://localhost:3000/api/linear/callback\"))\n+ (str (util/get-base-url) \"/api/linear/callback\"))\n \n (defn code->token [code]\n (def code code)\ndiff --git a/borter/src/app/login.clj b/borter/src/app/login.clj\nindex 5d545db9bef7765ba8b3fe7d00261c8ce84e9e1a..86817f8e94bc174e5b108859cc0b342953ab7acb 100644\n--- a/borter/src/app/login.clj\n+++ b/borter/src/app/login.clj\n@@ -1,6 +1,7 @@\n (ns app.login\n (:require [crypto.password.bcrypt :as password]\n [app.database :as db]\n+ [app.util :as util]\n [honey.sql.helpers :as h]\n [hato.client :as hc]\n [clojure.data.json :as json]\n@@ -12,10 +13,7 @@\n (def environment (or (System/getenv \"ENVIRONMENT\") \"development\"))\n \n (defn get-base-url []\n- (case environment\n- \"production\" \"https://sorter.social\"\n- \"staging\" \"https://staging.sorter.social\"\n- \"development\" \"http://localhost:3000\")) ; fallback for development\n+ (util/get-base-url))\n \n (defn create-email-content\n \"Creates a standardized email structure with customizable content\"\ndiff --git a/borter/src/app/oauth.clj b/borter/src/app/oauth.clj\nindex 1166f2ee30c9e813840711c72d1ad8f1c62e1ffe..2cd0c62f1fe267f7f5f725a97bc3ba0d0889517f 100644\n--- a/borter/src/app/oauth.clj\n+++ b/borter/src/app/oauth.clj\n@@ -3,6 +3,7 @@\n [clojure.data.json :as json]\n [hato.client :as hc]\n [app.database :as db]\n+ [app.util :as util]\n [honey.sql.helpers :as h]\n [ring.util.codec :as codec])\n (:import [java.util Base64]))\n@@ -13,12 +14,7 @@\n encoded-bytes))\n \n (defn get-hostname []\n- (let [env (System/getenv \"ENVIRONMENT\")]\n- (println \"Current environment:\" env)\n- (case env\n- \"production\" \"https://sorter.social\"\n- \"staging\" \"https://staging.sorter.social\"\n- \"http://localhost:3000\")))\n+ (util/get-base-url))\n \n (defn get-origin-hostname [req]\n (let [origin (get-in req [:headers \"origin\"])\ndiff --git a/borter/src/app/spotify.clj b/borter/src/app/spotify.clj\nindex 3e11713119141812fa2707ec956fb7ed612ee69a..b38d734351a1d4f1e142d93d4435ffe7bd20c02d 100644\n--- a/borter/src/app/spotify.clj\n+++ b/borter/src/app/spotify.clj\n@@ -1,5 +1,6 @@\n (ns app.spotify\n (:require [app.oauth :as oauth]\n+ [app.util :as util]\n [hato.client :as hc]\n [clojure.data.json :as json]\n [ring.util.codec :as codec]\n@@ -47,10 +48,7 @@\n \n \n (defn get-hostname []\n- (case (System/getenv \"ENVIRONMENT\")\n- \"production\" \"https://sorter.social\"\n- \"staging\" \"https://staging.sorter.social\"\n- \"http://localhost:3000\"))\n+ (util/get-base-url))\n \n (defn create-spotify-tag\n \"Creates a tag for a Spotify entity (artist, album, track) if it doesn't exist\"\ndiff --git a/borter/src/app/twitter.clj b/borter/src/app/twitter.clj\nindex ef7b18fa1fcb82bb944b3035ffed44499181237f..b9a3fdccc15d13918a4d11d8c0443de94fd172b4 100644\n--- a/borter/src/app/twitter.clj\n+++ b/borter/src/app/twitter.clj\n@@ -1,6 +1,7 @@\n (ns app.twitter\n (:require [app.database :as db]\n [app.permissions :as perms]\n+ [app.util :as util]\n [honey.sql.helpers :as h]\n [hato.client :as hc]\n [clojure.data.json :as json]\n@@ -37,9 +38,7 @@\n (clojure.string/join \"&\" (map (fn [[k v]] (str (name k) \"=\" v)) params)))\n \n (defn get-hostname []\n- (case (.getCanonicalHostName (java.net.InetAddress/getLocalHost))\n- \"sorter.isnt.online\" \"https://sorter.isnt.online/api/twitter/callback\"\n- \"http://localhost:3000/api/twitter/callback\"))\n+ (str (util/get-base-url) \"/api/twitter/callback\"))\n \n (defn encode-b64 [s]\n (.encodeToString (java.util.Base64/getEncoder) (.getBytes s)))\ndiff --git a/borter/src/app/util.clj b/borter/src/app/util.clj\nindex 384a64306c84aa8288ec44cd5de57edc248a826d..6a8aa0875accb28dc81bf57e645e3961b0a3ace5 100644\n--- a/borter/src/app/util.clj\n+++ b/borter/src/app/util.clj\n@@ -2,6 +2,18 @@\n (:require [clojure.string :as string])\n (:import [java.net URLEncoder]))\n \n+(defn get-base-url\n+ \"Public site base URL for redirects and oauth callbacks.\"\n+ []\n+ (if-let [hostname (not-empty (System/getenv \"HOSTNAME\"))]\n+ (if (string/starts-with? hostname \"http\")\n+ (string/replace hostname #\"/$\" \"\")\n+ (str \"https://\" (string/replace hostname #\"/$\" \"\")))\n+ (case (or (System/getenv \"ENVIRONMENT\") \"development\")\n+ \"production\" \"https://sorter.social\"\n+ \"staging\" \"https://staging.sorter.social\"\n+ \"http://localhost:3000\")))\n+\n (defn urlencode-params [params]\n (clojure.string/join \"&\" (map (fn [[k v]] (str k \"=\" (URLEncoder/encode (str v) \"UTF-8\"))) params)))\n \ndiff --git a/borter/src/app/youtube.clj b/borter/src/app/youtube.clj\nindex 647ef7c6d4f2503a63a7c074d46dc815b2a23547..fc9a2f5ed516692f19e06b4c0221f510547cf8c0 100644\n--- a/borter/src/app/youtube.clj\n+++ b/borter/src/app/youtube.clj\n@@ -6,6 +6,7 @@\n [ring.util.response :as response]\n [app.database :as db]\n [app.permissions :as perms]\n+ [app.util :as util]\n [honey.sql.helpers :as h]\n [sluj.core :refer [sluj]]))\n \n@@ -32,9 +33,7 @@\n :body (json/read-str {:key-fn keyword})))\n \n (defn get-hostname []\n- (case (.getCanonicalHostName (java.net.InetAddress/getLocalHost))\n- \"localhost\" \"http://localhost:3000/api/youtube/callback\"\n- \"https://sorter.isnt.online/api/youtube/callback\"))\n+ (str (util/get-base-url) \"/api/youtube/callback\"))\n \n \n \ndiff --git a/forter/src/utils/authUtils.js b/forter/src/utils/authUtils.js\nindex 145e5db7ad6f7a6439d68c63beb4d07d31b2de08..98ed7fa671f9887f44dc1479d85569951eb4773e 100644\n--- a/forter/src/utils/authUtils.js\n+++ b/forter/src/utils/authUtils.js\n@@ -5,8 +5,11 @@ import { current_session, fetchSession } from \"../session\";\n let lastSyncTime = 0;\n const SYNC_THROTTLE_MS = 5000; // Only sync once every 5 seconds\n \n-// Get base URL based on Vite's mode\n+// Get base URL based on current origin, with build-mode fallbacks for SSR/build\n const getBaseUrl = () => {\n+ if (typeof window !== 'undefined' && window.location?.origin) {\n+ return window.location.origin;\n+ }\n switch (import.meta.env.MODE) {\n case 'production':\n return 'https://sorter.social';\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[993d359c] Fix Reddit children import wiring and unranked child labels.\n\nListing imports attach posts directly under the subreddit without ensure_path\npulling comment-path segments in, and the ranking panel shows imported titles.\nUpdate integration tests for JS SSE morphs and children fetch.\n\nCo-authored-by: Cursor \n\nSide B — unified diff (full patch):\ndiff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs\nindex d1defd28242fd2ca3b886adc91a7070bef75e653..e649a7d192feade465e19ce6187a829f6ec74372 100644\n--- a/server/src/api/ui_html.rs\n+++ b/server/src/api/ui_html.rs\n@@ -58,7 +58,7 @@ pub async fn post_ui_html(\n let tree = state.tree.read().await;\n let empty = crate::reducer::NodeState::default();\n let node = tree.get(&parent).unwrap_or(&empty);\n- let panel = ranking_panel(&parent, node);\n+ let panel = ranking_panel(&parent, node, &tree);\n JsBuilder::new()\n .morph_selector(\"#ranking-panel\", panel)\n .into_response()\ndiff --git a/server/src/fetch/mod.rs b/server/src/fetch/mod.rs\nindex 0177bb161cea1b72a100b52efdfc5e710271c9eb..35f968c21c69ca557bab7951413e3cfbbccfebfd 100644\n--- a/server/src/fetch/mod.rs\n+++ b/server/src/fetch/mod.rs\n@@ -107,7 +107,7 @@ pub fn fetch_entity_stream(\n let mut b = JsBuilder::new()\n .morph_selector(\"#entity-section\", html::entity_section(&id, node, false));\n if kind == FetchKind::Children {\n- b = b.morph_selector(\"#ranking-panel\", ranking_panel(&id, node));\n+ b = b.morph_selector(\"#ranking-panel\", ranking_panel(&id, node, &tree));\n }\n yield Ok(js_event(b.build()));\n }\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex 27ce9118c73ec5643e04363ab1a36cf5da6101bf..e88cc43ddc9d8100f7994be6f5960ec4d8f22c55 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -15,7 +15,7 @@ use crate::{\n ranking::{\n connected_components_from_voted_pairs, ranked_items_subset, RankedItem, MAX_ITERS, TOL,\n },\n- reducer::NodeState,\n+ reducer::{GlobalTree, NodeState},\n state::AppState,\n ui_action::UI_RPC_FIELD,\n };\n@@ -182,8 +182,15 @@ fn display_label(id: &ItemId) -> String {\n .to_string()\n }\n \n+fn child_label(tree: &GlobalTree, id: &ItemId) -> String {\n+ tree.get(id)\n+ .and_then(|n| n.data.as_ref())\n+ .map(|d| d.title.clone())\n+ .unwrap_or_else(|| display_label(id))\n+}\n+\n /// Plain (unscored) list of children that have no votes yet.\n-fn unranked_list(label: &str, items: &[ItemId]) -> Markup {\n+fn unranked_list(label: &str, items: &[ItemId], tree: &GlobalTree) -> Markup {\n html! {\n @if !items.is_empty() {\n h3 class=\"rank-heading muted small\" { (label) }\n@@ -191,7 +198,7 @@ fn unranked_list(label: &str, items: &[ItemId]) -> Markup {\n @for it in items {\n li {\n a href=(item_href(it)) {\n- strong { (display_label(it)) }\n+ strong { (child_label(tree, it)) }\n }\n }\n }\n@@ -200,7 +207,7 @@ fn unranked_list(label: &str, items: &[ItemId]) -> Markup {\n }\n }\n \n-pub fn ranking_panel(item: &ItemId, node: &NodeState) -> Markup {\n+pub fn ranking_panel(item: &ItemId, node: &NodeState, tree: &GlobalTree) -> Markup {\n let group = &node.local_ranking;\n let n = group.idx_to_item.len();\n let (comps, _isolates) =\n@@ -248,7 +255,7 @@ pub fn ranking_panel(item: &ItemId, node: &NodeState) -> Markup {\n @let label = if multi { format!(\"Ranking group {}\", gi + 1) } else { \"Ranking\".to_string() };\n (rank_list(&label, ranked, 1))\n }\n- (unranked_list(\"Unranked\", &unranked))\n+ (unranked_list(\"Unranked\", &unranked, tree))\n }\n }\n }\n@@ -297,7 +304,7 @@ async fn item_page(state: AppState, uri: Uri, item: ItemId) -> Markup {\n (input_panel(\"\", None))\n (breadcrumb_path(&item))\n (entity_section(&item, node, false))\n- (ranking_panel(&item, node))\n+ (ranking_panel(&item, node, &tree))\n };\n layout(\"sorter2\", body, views)\n }\ndiff --git a/server/src/reddit.rs b/server/src/reddit.rs\nindex a0eb688709478ee0185b953b41a5d26cc354764d..69d979bc7e4a1cb078f70114dc539bdc1986b574 100644\n--- a/server/src/reddit.rs\n+++ b/server/src/reddit.rs\n@@ -300,9 +300,16 @@ async fn reddit_worker(\n }\n {\n let mut tree = tree.write().await;\n- apply_entity_import(&mut tree, &child_id, child_payload);\n if kind == FetchKind::Children {\n- tree.link_child(&fetch_id, &child_id);\n+ let view = entity_view_from_payload(&child_id, &child_payload);\n+ tree.apply_entity_under_parent(\n+ &fetch_id,\n+ &child_id,\n+ child_payload,\n+ view,\n+ );\n+ } else {\n+ apply_entity_import(&mut tree, &child_id, child_payload);\n }\n }\n written += 1;\ndiff --git a/server/src/reducer.rs b/server/src/reducer.rs\nindex a36cd5c9287d61536f9f4a3f6b0df2342388857a..4e42d0369dab50bb2f8ca664aa69b628292f6c07 100644\n--- a/server/src/reducer.rs\n+++ b/server/src/reducer.rs\n@@ -209,14 +209,24 @@ impl GlobalTree {\n }\n }\n \n- /// Directly attach `child` under `parent`, bypassing path-based nesting.\n- /// Used for imported listings (e.g. a subreddit's posts) so they show up\n- /// as children of the subreddit rather than a deep `…/comments/` path.\n- pub fn link_child(&mut self, parent: &ItemId, child: &ItemId) {\n+ /// Import entity data for `id` and attach it as a direct child of `parent`\n+ /// without running [`Self::ensure_path`] on `id` (avoids Reddit `/comments/`\n+ /// parent rules pulling intermediate path segments into the subreddit).\n+ pub fn apply_entity_under_parent(\n+ &mut self,\n+ parent: &ItemId,\n+ id: &ItemId,\n+ payload: Value,\n+ view: Option,\n+ ) {\n self.ensure_path(parent);\n- self.ensure_path(child);\n+ self.ensure_node(id);\n+ if let Some(node) = self.nodes.get_mut(id) {\n+ node.entity_raw = Some(payload);\n+ node.data = view;\n+ }\n if let Some(p) = self.nodes.get_mut(parent) {\n- p.children.insert(child.clone());\n+ p.children.insert(id.clone());\n }\n }\n }\ndiff --git a/test/reddit_import.clj b/test/reddit_import.clj\nindex 84cbdcf7965e50290313cbce2243a16b583d2097..45a2a19f20799d77e84d8aa64735ab5e7e45f97c 100644\n--- a/test/reddit_import.clj\n+++ b/test/reddit_import.clj\n@@ -67,6 +67,36 @@\n (do (Thread/sleep 200) (recur))\n false)))))\n \n+(defn- run-reddit-fetch-assertions [app-base data-dir]\n+ (let [browse-url (str app-base \"/~/https://reddit.com/r/rust\")\n+ log-path (str data-dir \"/events.jsonl\")\n+ before (:out (process/shell {:out :string :err :string}\n+ \"curl\" \"-sf\" browse-url))]\n+ (is (str/includes? before \"Fetch from Reddit\"))\n+ (is (not (str/includes? before \"The Rust Programming Language\")))\n+ (let [sse (curl-fetch-ui-sse app-base \"reddit.com/r/rust\" \"self\")]\n+ (is (zero? (:exit sse)) \"POST /ui fetch_entity (self) SSE succeeds\")\n+ (is (str/includes? (:out sse) \"Idiomorph.morph\"))\n+ (is (str/includes? (:out sse) \"The Rust Programming Language\"))\n+ (is (wait-event-log log-path 2000) \"event log written\"))\n+ (let [after (:out (process/shell {:out :string :err :string}\n+ \"curl\" \"-sf\" browse-url))\n+ log (slurp (io/file log-path))]\n+ (is (str/includes? after \"The Rust Programming Language\"))\n+ (is (str/includes? log \"\\\"type\\\":\\\"entity_imported\\\"\"))\n+ (is (str/includes? log \"\\\"subscribers\\\":350000\"))\n+ (is (str/includes? log \"\\\"display_name\\\":\\\"rust\\\"\")))\n+ (let [children-sse (curl-fetch-ui-sse app-base \"reddit.com/r/rust\" \"children\")]\n+ (is (zero? (:exit children-sse)) \"POST /ui fetch_entity (children) SSE succeeds\")\n+ (is (str/includes? (:out children-sse) \"Idiomorph.morph\"))\n+ (is (str/includes? (:out children-sse) \"Announcing Rust 1.99\")))\n+ (let [after-children (:out (process/shell {:out :string :err :string}\n+ \"curl\" \"-sf\" browse-url))\n+ log2 (slurp (io/file log-path))]\n+ (is (str/includes? after-children \"Announcing Rust 1.99\"))\n+ (is (str/includes? after-children \"Unranked\"))\n+ (is (str/includes? log2 \"announcing_rust_199\")))))\n+\n (deftest reddit-fetch-via-mock-api\n (testing \"Fetch more queues import; event log stores full payload; page shows title\"\n (let [root (repo-root)\n@@ -102,24 +132,7 @@\n bin)]\n (try\n (is (wait-health app-base 20000) \"app healthz\")\n- (let [browse-url (str app-base \"/~/https://reddit.com/r/rust\")\n- before (:out (process/shell {:out :string :err :string}\n- \"curl\" \"-sf\" browse-url))]\n- (is (str/includes? before \"Fetch from Reddit\"))\n- (is (not (str/includes? before \"The Rust Programming Language\")))\n- (let [log-path (str data-dir \"/events.jsonl\")\n- sse (curl-fetch-ui-sse app-base \"reddit.com/r/rust\")]\n- (is (zero? (:exit sse)) \"POST /ui fetch_entity SSE succeeds\")\n- (is (str/includes? (:out sse) \"event: complete\"))\n- (is (str/includes? (:out sse) \"The Rust Programming Language\"))\n- (is (wait-event-log log-path 2000) \"event log written\")\n- (let [after (:out (process/shell {:out :string :err :string}\n- \"curl\" \"-sf\" browse-url))\n- log (slurp (io/file log-path))]\n- (is (str/includes? after \"The Rust Programming Language\"))\n- (is (str/includes? log \"\\\"type\\\":\\\"entity_imported\\\"\"))\n- (is (str/includes? log \"\\\"subscribers\\\":350000\"))\n- (is (str/includes? log \"\\\"display_name\\\":\\\"rust\\\"\")))))\n+ (run-reddit-fetch-assertions app-base data-dir)\n (finally\n (process/destroy proc))))\n (finally\ndiff --git a/test/smoke.clj b/test/smoke.clj\nindex 11887c48282088e140d823a88ba616f6325835b3..ce9f958c84b9a89ae55e215ab519f1df6435e24b 100644\n--- a/test/smoke.clj\n+++ b/test/smoke.clj\n@@ -49,7 +49,7 @@\n (is (wait-health base 15000) \"server responds to /healthz\")\n (let [home (:out (process/shell {:out :string :err :string}\n \"curl\" \"-sf\" (str base \"/\")))]\n- (is (str/includes? home \"vote-panel\"))\n+ (is (str/includes? home \"entity-section\"))\n (is (str/includes? home \"ranking-panel\"))\n (is (str/includes? home \"parser-panel\"))\n (is (str/includes? home \"__rpc__\")))\n","role":"user"}],"model":"~anthropic/claude-sonnet-latest"}