Side B fixes a real, deployable bug (hardcoded staging URLs breaking OAuth callbacks and redirects on custom hosts) by consolidating logic into a single util.get-base-url and using window.location.origin, unifying six duplicated hostname-detection functions and correcting the deploy workflow trigger. Side A is a substantial but purely internal refactor (removing legacy projection code and adjusting evidence-page rendering) that improves code cleanliness but has no external-facing bugfix impact and mostly shifts complexity rather than eliminating real defects.
constitution · epochs · watch · epoch 3
comparison
c_6f04dcb2e38c (tommy-mor) vs c_c25451965a7f (tommy-mor)
download prompt · raw event · cmp_105a2f26c6a377
council reasoning
A removes dual-path legacy GitDiscovery projection from epoch/commit pages, deletes _legacy_* helpers, and makes Emission evidence fields required—enforcing a single lasting Evidence-envelope model with updated tests. B usefully consolidates hardcoded OAuth/redirect base URLs behind HOSTNAME/window.location.origin and flips Fly deploy to staging, but that is incremental host/deploy hygiene versus A’s core schema and read-path simplification.
Side A removes the legacy GitDiscovery projection path and makes the application consistently evidence-driven: it deletes fallback lookup code, simplifies epoch/commit pages to require Evidence envelopes, makes Emission evidence metadata required, and updates tests to enforce the new behavior. Side B is a useful infrastructure/configuration cleanup that centralizes base URL generation via a shared utility, uses the current browser origin for frontend redirects, and adjusts deployment to the staging branch, but its impact is narrower and primarily configuration-oriented.
sides
A — c_6f04dcb2e38c (tommy-mor)
message
[bda5f8aa] Remove legacy evidence projection; Evidence envelopes only. Epoch and commit pages no longer invent history from bare GitDiscovery rows. Production ledger will be wiped to re-emit under the current schema. Co-authored-by: Cursor <cursoragent@cursor.com>
diff preview
diff --git a/constitution.py b/constitution.py
index 4dd5b9dfbba231d46289c490f91b1dd5b1018bcf..26ba130e885e0e69fb7874ca5c3f07f42100a150 100644
--- a/constitution.py
+++ b/constitution.py
@@ -210,10 +210,10 @@ class Emission:
distributions: dict # author -> amount str
ranking: dict # author -> score str
models_used: list
- discovery_snapshot_id: str = "" # empty only for pre-discovery ledger history
- evidence_schema_version: int = 1
- ranking_run_id: str = ""
- ranking_event_id: str = ""
+ discovery_snapshot_id: str
+ evidence_schema_version: int
+ ranking_run_id: str
+ ranking_event_id: str
@event
@@ -502,26 +502,6 @@ def _epochs_in_ledger() -> list[int]:
return sorted(epochs)
-def _legacy_commit_row(commit_id: str) -> tuple[GitDiscovery | None, dict | None]:
- for discovery in store.read():
- if not isinstance(discovery, GitDiscovery):
- continue
- for commit in discovery.commits:
- if commit_id_for_oid(commit["oid"]) == commit_id:
- return discovery, commit
- return None, None
-
-
-def _legacy_observation(commit_id: str) -> tuple[GitDiscovery | None, dict | None]:
- for discovery in store.read():
- if not isinstance(discovery, GitDiscovery):
- continue
- for obs in discovery.observations:
- if commit_id_for_oid(obs["oid"]) == commit_id:
- return discovery, obs
- return None, None
-
-
def build_pairwise_prompt(side_a: dict, side_b: dict) -> str:
return f"""You are ranking contributions to an open source project.
Compare these two sides (each may be one or more commits). Decide which side contributed more.
@@ -2040,7 +2020,7 @@ def _strip_heavy_fields(obj: dict) -> dict:
@app.get("/api/ledger")
async def get_ledger(offset: int = 0, limit: int = 100, full: int = 0):
- """List of ledger dicts (backward-compatible). Heavy blobs stripped unless full=1."""
+ """List of ledger dicts. Heavy blobs stripped unless full=1."""
limit = max(1, min(limit, 500))
rows = []
for e in store.read()[offset:offset + limit]:
@@ -2274,23 +2254,25 @@ async def epochs_index():
epochs = _epochs_in_ledger()
rows = []
for epoch in epochs:
- discovery = _discovery_for_epoch(epoch)
emission = _emission_for_epoch(epoch)
- evidence_n = sum(
- 1 for e in evidence_by_kind() if e.epoch == epoch
+ evidence_n = sum(1 for e in evidence_by_kind() if e.epoch == epoch)
+ disc = next(
+ (
+ e for e in evidence_by_kind("git.discovery_completed")
+ if e.epoch == epoch
+ ),
+ None,
)
detail = []
- if discovery:
+ if disc:
detail.append(
- f"{len(discovery.commits)} eligible / "
- f"{len(discovery.observations)} observed"
+ f"{disc.payload.get('eligible_count', 0)} eligible / "
+ f"{disc.payload.get('observation_count', 0)} observed"
)
if emission:
detail.append(f"emitted {emission.total_emitted}")
if evidence_n:
detail.append(f"{evidence_n} evidence events")
- elif discovery or emission:
- detail.append("legacy (no Evidence envelopes)")
rows.append(["li",
_a(_evidence_path("epoch", str(epoch)), f"epoch {epoch}"),
" — ",
@@ -2307,37 +2289,37 @@ async def epochs_index():
@app.get("/epochs/{epoch}")
async def epoch_detail(epoch: int):
- discovery = _discovery_for_epoch(epoch)
emission = _emission_for_epoch(epoch)
evidence_rows = [e for e in evidence_by_kind() if e.epoch == epoch]
+ if not evidence_rows and emission is None:
+ return _evidence_page(f"epoch {epoch}", [
+ _evidence_nav(),
+ ["h1", f"epoch {epoch}"],
+ ["p.note", "No evidence for this epoch."],
+ ])
+
commit_evs = [e for e in evidence_rows if e.kind == "git.commit"]
comparison_evs = [e for e in evidence_rows if e.kind == "comparison.input"]
judgment_evs = [e for e in evidence_rows if e.kind == "llm.judgment"]
+ discovery_ev = next(
+ (e for e in evidence_rows if e.kind == "git.discovery_completed"), None
+ )
ranking_started = next(
(e for e in evidence_rows if e.kind == "ranking.started"), None
)
ranking_completed = next(
(e for e in evidence_rows if e.kind == "ranking.completed"), None
)
- legacy = not evidence_rows and (discovery is not None or emission is not None)
-
- commit_links: list[tuple[str, str]] = []
- if commit_evs:
- for e in commit_evs:
- cid = e.payload.get("commit_id") or ""
- label = (
- f"{e.payload.get('oid', cid)[:24]} "
- f"({e.payload.get('contributor', '?')})"
- )
- commit_links.append((label, _evidence_path("commit", cid)))
- elif discovery:
- for c in discovery.commits:
- cid = commit_id_for_oid(c["oid"])
- commit_links.append((
- f"{c['oid'][:24]} ({c.get('contributor', '?')})",
- _evidence_path("commit", cid),
- ))
+ commit_links = [
+ (
+ f"{e.payload.get('oid', e.payload.get('commit_id', ''))[:24]} "
+ f"({e.payload.get('contributor', '?')})",
+ _evidence_path("commit", e.payload["commit_id"]),
+ )
+ for e in commit_evs
+ if e.payload.get("commit_id")
+ ]
comparison_links = [
(
e.payload.get("summary") or e.payload.get("comparison_id", e.event_id),
@@ -2360,16 +2342,13 @@ async def epoch_detail(epoch: int):
]
excluded = []
- if discovery:
- for obs in discovery.observations:
+ if discovery_ev:
+ for obs in discovery_ev.payload.get("observations") or []:
if obs.get("eligible"):
continue
oid = obs.get("oid", "?")
reason = obs.get("exclusion_reason") or "excluded"
- excluded.append(["li",
- f"{oid[:28]} — {reason} — ",
- ["span.note", "legacy evidence unavailable"],
- ])
+ excluded.append(["li", f"{oid[:28]} — {reason}"])
ranking_nodes: list = []
if ranking_completed:
@@ -2388,21 +2367,10 @@ async def epoch_detail(epoch: int):
indent=2, sort_keys=True,
)],
]
- elif emission:
- if legacy and len(emission.ranking or {}) <= 1:
- ranking_nodes.append(["p.note",
- "Single-contributor epoch — no LLM judgments."
- ])
- ranking_nodes.extend([
- ["p", "Projected from Emission (no ranking Evidence event)."],
- ["pre.blob", json.dumps(emission.ranking, indent=2, sort_keys=True)],
- ])
+ elif ranking_started:
+ ranking_nodes = [["p.note", f"Ranking started: {ranking_started.event_id}"]]
else:
- ranking_nodes = [["p.note", "No ranking recorded."]]
- if ranking_started and not ranking_completed:
- ranking_nodes.insert(0, ["p.note",
- f"Ranking started: {ranking_started.event_id}"
- ])
+ ranking_nodes = [["p.note", "No ranking evidence."]]
if emission:
emission_node = _dl_rows([
@@ -2411,44 +2379,41 @@ async def epoch_detail(epoch: int):
("pool_after", emission.pool_after),
("discovery_snapshot_id", emission.discovery_snapshot_id),
("ranking_run_id", emission.ranking_run_id or None),
+ ("ranking_event_id", emission.ranking_event_id or None),
("models_used", ", ".join(emission.models_used or [])),
("distributions", json.dumps(emission.distributions, sort_keys=True)),
])
else:
emission_node = ["p.note", "No emission for this epoch."]
- single_contributor = False
- if discovery:
- single_contributor = len({c.get("contributor") for c in discovery.commits}) <= 1
- elif emission:
- single_contributor = len(emission.ranking or {}) <= 1
+ contributors = {
+ e.payload.get("contributor")
+ for e in commit_evs
+ if e.payload.get("contributor")
+ }
+ no_comparisons_note = "No comparisons."
+ if len(contributors) <= 1:
+ no_comparisons_note += " Single-contributor — no LLM judgments."
body = [
_evidence_nav(),
["div.eyebrow", f"epoch {epoch}"],
["h1", f"epoch {epoch}"],
]
- if legacy:
- body.append(["p.note",
- "Legacy epoch: projected from GitDiscovery/Emission without Evidence "
- "envelopes. Eligible commits use discovery patches; discarded observation "
- "metadata is marked legacy evidence unavailable. Single-contributor "
- "epochs have no LLM judgments."
- ])
- if discovery:
+ if discovery_ev:
body.extend([
["h2", "discovery"],
_dl_rows([
- ("snapshot_id", discovery.snapshot_id),
- ("config_digest", discovery.config_digest),
- ("initial_snapshot", discovery.initial_snapshot),
- ("observations", len(discovery.observations)),
- ("eligible", len(discovery.commits)),
+ ("snapshot_id", discovery_ev.payload.get("snapshot_id")),
+ ("config_digest", discovery_ev.payload.get("config_digest")),
+ ("observations", discovery_ev.payload.get("observation_count")),
+ ("eligible", discovery_ev.payload.get("eligible_count")),
+ ("event", _a(
+ _evidence_path("event", discovery_ev.event_id),
+ discovery_ev.event_id,
+ )),
]),
])
- no_comparisons_note = "No comparisons."
- if single_contributor:
- no_comparisons_note += " Single-contributor — no LLM judgments."
body.extend([
["h2", "commits"],
_link_list(commit_links),
@@ -2471,92 +2436,42 @@ async def epoch_detail(epoch: int):
@app.get("/commits/{commit_id}")
async def commit_detail(commit_id: str):
ev = find_evidence_payload("git.commit", "commit_id", commit_id)
- discovery, legacy_row = (None, None)
if not ev:
- discovery, legacy_row = _legacy_commit_row(commit_id)
- if not ev and not legacy_row:
- discovery, obs = _legacy_observation(commit_id)
- if obs is not None:
- epoch = discovery.epoch if discovery else "?"
- return _evidence_page(f"commit {commit_id[:24]}", [
- _evidence_nav(
- _a(_evidence_path("epoch", str(epoch)), f"epoch {epoch}")
- ),
- ["div.eyebrow", "commit"],
- ["h1", commit_id],
- ["p.note", "legacy evidence unavailable"],
- _dl_rows([
- ("oid", obs.get("oid")),
- ("eligible", obs.get("eligible")),
- ("exclusion_reason", obs.get("exclusion_reason")),
- ("epoch", str(epoch)),
- ]),
- ])
return _evidence_page("commit not found", [
_evidence_nav(),
["h1", "commit not found"],
["p", commit_id],
])
- if ev:
- p = ev.payload
- epoch = ev.epoch
- oid = p.get("oid", "")
- contributor = p.get("contributor", "")
- message = _blob_text(p.get("message"))
- patch = _blob_text(p.get("patch"))
- meta = _dl_rows([
+ p = ev.payload
+ epoch = ev.epoch
+ return _evidence_page(f"commit {commit_id[:24]}", [
+ _evidence_nav(_a(_evidence_path("epoch", str(epoch)), f"epoch {epoch}")),
+ ["div.eyebrow", "commit"],
+ ["h1", commit_id],
+ _dl_rows([
("commit_id", commit
… preview truncated; 7,279 characters omittedB — c_c25451965a7f (tommy-mor)
message
[6120bd96] fix redirect urls for custom hosts and deploy from staging Use HOSTNAME and window.location.origin instead of hardcoded staging.sorter.social, and trigger fly deploys on pushes to staging. Co-authored-by: Cursor <cursoragent@cursor.com>
diff preview
diff --git a/.github/workflows/fly-deploy.yml b/.github/workflows/fly-deploy.yml
index 3e693915fe6f99a5c2221b2921bf8ebc305180fc..5e11e5c312f62bed34d8cc68bd4a5538f52476b9 100644
--- a/.github/workflows/fly-deploy.yml
+++ b/.github/workflows/fly-deploy.yml
@@ -3,11 +3,11 @@ name: deploy to fly.io
on:
push:
branches:
- - main
+ - staging
workflow_dispatch:
concurrency:
- group: fly-deploy-main
+ group: fly-deploy-staging
cancel-in-progress: true
jobs:
diff --git a/borter/src/app/linear.clj b/borter/src/app/linear.clj
index f77d8a974e0cf05f9c33233bb625bdb190d2007b..5ef0e34cf1d543826675c6facb66aec079b40561 100644
--- a/borter/src/app/linear.clj
+++ b/borter/src/app/linear.clj
@@ -6,6 +6,7 @@
[ring.util.response :as response]
[app.database :as db]
[app.permissions :as perms]
+ [app.util :as util]
[honey.sql.helpers :as h]
[sluj.core :refer [sluj]]))
@@ -13,9 +14,7 @@
(def client-secret (System/getenv "BORTER_LINEAR_CLIENT_SECRET"))
(defn get-hostname []
- (case (.getCanonicalHostName (java.net.InetAddress/getLocalHost))
- "sorter.social" "https://sorter.social/api/linear/callback"
- "http://localhost:3000/api/linear/callback"))
+ (str (util/get-base-url) "/api/linear/callback"))
(defn code->token [code]
(def code code)
diff --git a/borter/src/app/login.clj b/borter/src/app/login.clj
index 5d545db9bef7765ba8b3fe7d00261c8ce84e9e1a..86817f8e94bc174e5b108859cc0b342953ab7acb 100644
--- a/borter/src/app/login.clj
+++ b/borter/src/app/login.clj
@@ -1,6 +1,7 @@
(ns app.login
(:require [crypto.password.bcrypt :as password]
[app.database :as db]
+ [app.util :as util]
[honey.sql.helpers :as h]
[hato.client :as hc]
[clojure.data.json :as json]
@@ -12,10 +13,7 @@
(def environment (or (System/getenv "ENVIRONMENT") "development"))
(defn get-base-url []
- (case environment
- "production" "https://sorter.social"
- "staging" "https://staging.sorter.social"
- "development" "http://localhost:3000")) ; fallback for development
+ (util/get-base-url))
(defn create-email-content
"Creates a standardized email structure with customizable content"
diff --git a/borter/src/app/oauth.clj b/borter/src/app/oauth.clj
index 1166f2ee30c9e813840711c72d1ad8f1c62e1ffe..2cd0c62f1fe267f7f5f725a97bc3ba0d0889517f 100644
--- a/borter/src/app/oauth.clj
+++ b/borter/src/app/oauth.clj
@@ -3,6 +3,7 @@
[clojure.data.json :as json]
[hato.client :as hc]
[app.database :as db]
+ [app.util :as util]
[honey.sql.helpers :as h]
[ring.util.codec :as codec])
(:import [java.util Base64]))
@@ -13,12 +14,7 @@
encoded-bytes))
(defn get-hostname []
- (let [env (System/getenv "ENVIRONMENT")]
- (println "Current environment:" env)
- (case env
- "production" "https://sorter.social"
- "staging" "https://staging.sorter.social"
- "http://localhost:3000")))
+ (util/get-base-url))
(defn get-origin-hostname [req]
(let [origin (get-in req [:headers "origin"])
diff --git a/borter/src/app/spotify.clj b/borter/src/app/spotify.clj
index 3e11713119141812fa2707ec956fb7ed612ee69a..b38d734351a1d4f1e142d93d4435ffe7bd20c02d 100644
--- a/borter/src/app/spotify.clj
+++ b/borter/src/app/spotify.clj
@@ -1,5 +1,6 @@
(ns app.spotify
(:require [app.oauth :as oauth]
+ [app.util :as util]
[hato.client :as hc]
[clojure.data.json :as json]
[ring.util.codec :as codec]
@@ -47,10 +48,7 @@
(defn get-hostname []
- (case (System/getenv "ENVIRONMENT")
- "production" "https://sorter.social"
- "staging" "https://staging.sorter.social"
- "http://localhost:3000"))
+ (util/get-base-url))
(defn create-spotify-tag
"Creates a tag for a Spotify entity (artist, album, track) if it doesn't exist"
diff --git a/borter/src/app/twitter.clj b/borter/src/app/twitter.clj
index ef7b18fa1fcb82bb944b3035ffed44499181237f..b9a3fdccc15d13918a4d11d8c0443de94fd172b4 100644
--- a/borter/src/app/twitter.clj
+++ b/borter/src/app/twitter.clj
@@ -1,6 +1,7 @@
(ns app.twitter
(:require [app.database :as db]
[app.permissions :as perms]
+ [app.util :as util]
[honey.sql.helpers :as h]
[hato.client :as hc]
[clojure.data.json :as json]
@@ -37,9 +38,7 @@
(clojure.string/join "&" (map (fn [[k v]] (str (name k) "=" v)) params)))
(defn get-hostname []
- (case (.getCanonicalHostName (java.net.InetAddress/getLocalHost))
- "sorter.isnt.online" "https://sorter.isnt.online/api/twitter/callback"
- "http://localhost:3000/api/twitter/callback"))
+ (str (util/get-base-url) "/api/twitter/callback"))
(defn encode-b64 [s]
(.encodeToString (java.util.Base64/getEncoder) (.getBytes s)))
diff --git a/borter/src/app/util.clj b/borter/src/app/util.clj
index 384a64306c84aa8288ec44cd5de57edc248a826d..6a8aa0875accb28dc81bf57e645e3961b0a3ace5 100644
--- a/borter/src/app/util.clj
+++ b/borter/src/app/util.clj
@@ -2,6 +2,18 @@
(:require [clojure.string :as string])
(:import [java.net URLEncoder]))
+(defn get-base-url
+ "Public site base URL for redirects and oauth callbacks."
+ []
+ (if-let [hostname (not-empty (System/getenv "HOSTNAME"))]
+ (if (string/starts-with? hostname "http")
+ (string/replace hostname #"/$" "")
+ (str "https://" (string/replace hostname #"/$" "")))
+ (case (or (System/getenv "ENVIRONMENT") "development")
+ "production" "https://sorter.social"
+ "staging" "https://staging.sorter.social"
+ "http://localhost:3000")))
+
(defn urlencode-params [params]
(clojure.string/join "&" (map (fn [[k v]] (str k "=" (URLEncoder/encode (str v) "UTF-8"))) params)))
diff --git a/borter/src/app/youtube.clj b/borter/src/app/youtube.clj
index 647ef7c6d4f2503a63a7c074d46dc815b2a23547..fc9a2f5ed516692f19e06b4c0221f510547cf8c0 100644
--- a/borter/src/app/youtube.clj
+++ b/borter/src/app/youtube.clj
@@ -6,6 +6,7 @@
[ring.util.response :as response]
[app.database :as db]
[app.permissions :as perms]
+ [app.util :as util]
[honey.sql.helpers :as h]
[sluj.core :refer [sluj]]))
@@ -32,9 +33,7 @@
:body (json/read-str {:key-fn keyword})))
(defn get-hostname []
- (case (.getCanonicalHostName (java.net.InetAddress/getLocalHost))
- "localhost" "http://localhost:3000/api/youtube/callback"
- "https://sorter.isnt.online/api/youtube/callback"))
+ (str (util/get-base-url) "/api/youtube/callback"))
diff --git a/forter/src/utils/authUtils.js b/forter/src/utils/authUtils.js
index 145e5db7ad6f7a6439d68c63beb4d07d31b2de08..98ed7fa671f9887f44dc1479d85569951eb4773e 100644
--- a/forter/src/utils/authUtils.js
+++ b/forter/src/utils/authUtils.js
@@ -5,8 +5,11 @@ import { current_session, fetchSession } from "../session";
let lastSyncTime = 0;
const SYNC_THROTTLE_MS = 5000; // Only sync once every 5 seconds
-// Get base URL based on Vite's mode
+// Get base URL based on current origin, with build-mode fallbacks for SSR/build
const getBaseUrl = () => {
+ if (typeof window !== 'undefined' && window.location?.origin) {
+ return window.location.origin;
+ }
switch (import.meta.env.MODE) {
case 'production':
return 'https://sorter.social';
Hardlinks — judgments / attempts / prompt
judgments
attempts
Prompt text is loaded only by the download route.