You are a constitutional council ranking individual git commits for ownership allocation. Compare these two commits. Decide which contributed more lasting value to the project. Judge substance, not spectacle: - Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise. - Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one. - Do not favor a side merely because its patch is longer or noisier. - Weight what the change does for the project, not the contributor's name. Return ONLY a JSON object: {"winner": "A" or "B", "ratio": "N:M", "explanation": "..."} The explanation must cite concrete differences in the patches (1-3 sentences). Side A — contributor: tommy-mor Side A — commit 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 Side A — unified diff (full patch): 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_id), - ("oid", oid), - ("contributor", contributor), + ("oid", p.get("oid", "")), + ("contributor", p.get("contributor", "")), ("patch_sha256", p.get("patch_sha256")), ("patch_identity", p.get("patch_identity")), ("committer_timestamp_ms", p.get("committer_timestamp_ms")), ("evidence_event", _a(_evidence_path("event", ev.event_id), ev.event_id)), ("epoch", _a(_evidence_path("epoch", str(epoch)), str(epoch))), - ]) - legacy_note = None - else: - assert legacy_row is not None and discovery is not None - epoch = discovery.epoch - oid = legacy_row.get("oid", "") - contributor = legacy_row.get("contributor", "") - message = legacy_row.get("message") or "" - patch = legacy_row.get("patch") or "" - meta = _dl_rows([ - ("commit_id", commit_id), - ("oid", oid), - ("contributor", contributor), - ("patch_sha256", legacy_row.get("patch_sha256")), - ("patch_identity", legacy_row.get("patch_identity")), - ("committer_timestamp_ms", legacy_row.get("committer_timestamp_ms")), - ("epoch", _a(_evidence_path("epoch", str(epoch)), str(epoch))), - ("source", "legacy GitDiscovery projection"), - ]) - legacy_note = ["p.note", "Projected from GitDiscovery — Evidence envelope absent."] - 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], - *([legacy_note] if legacy_note else []), - meta, + ]), ["p", _a(f"/commits/{commit_id}/patch", "download patch")], ["h2", "message"], - _pre_blob(message), + _pre_blob(_blob_text(p.get("message"))), ["h2", "patch"], - _pre_blob(patch), + _pre_blob(_blob_text(p.get("patch"))), ]) @app.get("/commits/{commit_id}/patch") async def commit_patch_download(commit_id: str): ev = find_evidence_payload("git.commit", "commit_id", commit_id) - if ev: - raw = _decode_blob(ev.payload.get("patch")) or _blob_text(ev.payload.get("patch")).encode() - else: - _, row = _legacy_commit_row(commit_id) - if not row: - return PlainTextResponse("not found", status_code=404) - raw = (row.get("patch") or "").encode("utf-8") + if not ev: + return PlainTextResponse("not found", status_code=404) + raw = _decode_blob(ev.payload.get("patch")) or _blob_text(ev.payload.get("patch")).encode() return Response( content=raw, media_type="text/plain; charset=utf-8", @@ -3226,7 +3141,9 @@ async def watch(): ["div.controls", ["button#play", {"type": "button", "disabled": "true"}, "▶ Play live feed"], ["button#pause", {"type": "button"}, "Ⅱ Pause feed"], - ["span.note", "Pause stops local updates; the constitutional process continues."], + ["span.note", + "Play/pause only affect this browser feed — they do not run or stop emission. " + "The server emits at each epoch boundary; status above is that process."], ], ], ["section.panel", diff --git a/tests/integration.clj b/tests/integration.clj index 204b0fedfbad57846205cb140c4ed9406b5f8e0e..11140e95a8cd86768a661a30e6b29a3ddfc95fcc 100644 --- a/tests/integration.clj +++ b/tests/integration.clj @@ -247,7 +247,10 @@ :decay_rate "0.003253356063468" :distributions {"alice" "381.4282558872" "bob" "190.7141279436"} :ranking {"alice" "0.6666" "bob" "0.3334"} - :models_used ["mock/chat-v1" "mock/chat-v2"]}] + :models_used ["mock/chat-v1" "mock/chat-v2"] + :evidence_schema_version 2 + :ranking_run_id "seed-rank" + :ranking_event_id "seed-rank-ev"}] (spit path (str (json/generate-string entry) "\n")))) ;; --------------------------------------------------------------------------- diff --git a/tests/test_evidence.py b/tests/test_evidence.py index 76adcd343eec3a65dec58fda93b068356fb1adcd..7cb74fd7fb1bcd0ab17d2cbe2e6ca7e61e164221 100644 --- a/tests/test_evidence.py +++ b/tests/test_evidence.py @@ -1,4 +1,4 @@ -"""HTML evidence graph: byte fidelity, resume, legacy projection, private ack.""" +"""HTML evidence graph: byte fidelity, resume, and Evidence-only pages.""" from __future__ import annotations @@ -86,55 +86,10 @@ def test_html_evidence_pages_escape_and_link(evidence_store): assert patch_resp.headers["content-disposition"].startswith("attachment") -def test_legacy_epoch_projects_from_gitdiscovery_without_evidence(evidence_store): - oid = "sha1:" + "b" * 40 - discovery = c.GitDiscovery( - schema_version=1, - epoch=3, - snapshot_id="legacy-snap", - timestamp_ms=1, - config_digest="d", - initial_snapshot=True, - configuration={"repositories": [], "contributors": {}}, - repositories=[], - observations=[{ - "oid": oid, - "eligible": False, - "exclusion_reason": "before_genesis", - "first_sources": [], - }, { - "oid": "sha1:" + "c" * 40, - "eligible": True, - "exclusion_reason": None, - "first_sources": [], - }], - commits=[{ - "oid": "sha1:" + "c" * 40, - "contributor": "tommy-mor", - "message": "eligible", - "patch": "diff --git a/x b/x\n", - }], - ) - emission = c.Emission( - epoch=3, - timestamp_ms=2, - pool_before="1", - total_emitted="0.1", - pool_after="0.9", - decay_rate="0.1", - distributions={"tommy-mor": "0.1"}, - ranking={"tommy-mor": "1"}, - models_used=[], - discovery_snapshot_id="legacy-snap", - ) - asyncio.run(c.store.append(discovery)) - asyncio.run(c.store.append(emission)) - html = asyncio.run(c.epoch_detail(3)).body.decode() - assert "legacy" in html.lower() - assert "Single-contributor" in html or "no LLM" in html - excluded_id = c.commit_id_for_oid(oid) - excluded_html = asyncio.run(c.commit_detail(excluded_id)).body.decode() - assert "legacy evidence unavailable" in excluded_html.lower() +def test_commit_without_evidence_is_not_found(evidence_store): + html = asyncio.run(c.commit_detail("c_missing")).body.decode() + assert "commit not found" in html + assert "legacy" not in html.lower() def test_ranking_resume_skips_duplicate_provider_calls(evidence_store, monkeypatch): @@ -202,6 +157,10 @@ def test_epochs_index_lists_epochs(evidence_store): distributions={}, ranking={}, models_used=[], + discovery_snapshot_id="snap", + evidence_schema_version=c.EVIDENCE_SCHEMA_VERSION, + ranking_run_id="r", + ranking_event_id="e", ))) html = asyncio.run(c.epochs_index()).body.decode() assert "/epochs/3" in html Side B — contributor: tommy-mor Side B — commit message: [0d3270d1] Fix GitHub OAuth callback NameError on missing API base URL. Co-authored-by: Cursor Side B — unified diff (full patch): 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("/")