{"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[9e20d06c] Add sorterc dev tool for offline DSL compile and JSONL lint.\n\nIntroduce a workspace-only binary that validates .sorter files into ranking JSON and scans events.jsonl for corrupt or unreplayable ingests.\n\nCo-authored-by: Cursor \n\nSide A — unified diff (full patch):\ndiff --git a/Cargo.lock b/Cargo.lock\nindex bf8153d9c723af97122c9ffdd4a7cfe82e853bb6..a07734f089b466440c3ae6fc1087ce85fc24ce62 100644\n--- a/Cargo.lock\n+++ b/Cargo.lock\n@@ -1826,6 +1826,17 @@ dependencies = [\n \"windows-sys 0.60.2\",\n ]\n \n+[[package]]\n+name = \"sorterc\"\n+version = \"0.0.1\"\n+dependencies = [\n+ \"anyhow\",\n+ \"clap\",\n+ \"serde\",\n+ \"serde_json\",\n+ \"slugsocial-server\",\n+]\n+\n [[package]]\n name = \"spin\"\n version = \"0.9.8\"\ndiff --git a/Cargo.toml b/Cargo.toml\nindex 149cbf07901eab57c593184ff8719a75d530f1da..25337acdd61e44b20f354c78fed4a88caf896280 100644\n--- a/Cargo.toml\n+++ b/Cargo.toml\n@@ -1,5 +1,5 @@\n [workspace]\n-members = [\"server\", \"cli\"]\n+members = [\"server\", \"cli\", \"sorterc\"]\n resolver = \"2\"\n \n \ndiff --git a/agents.md b/agents.md\nindex d8b801e454fdf37e7ac6038b91a69f83b0746d59..ce646ed3cd7123be4732dccec4a6800467e651e7 100644\n--- a/agents.md\n+++ b/agents.md\n@@ -93,6 +93,17 @@ SLUG_GOOGLE_CLIENT_SECRET=mock\n \n After OAuth completes, the pending-session poll returns a `slug_…` bearer token for API calls.\n \n+### Dev-only offline tooling\n+\n+**`sorterc`** — workspace binary, not published via npm. Compiles `.sorter` files and lints `events.jsonl` without a server:\n+\n+```\n+cargo run -p sorterc -- compile path/to/doc.sorter [--base events.jsonl] [--room public] [--pretty]\n+cargo run -p sorterc -- scan path/to/events.jsonl [--pretty]\n+```\n+\n+`compile` validates DSL, simulates ingest against empty (or `--base`) reducer state, and prints JSON rankings. `scan` reports corrupt JSONL lines and ingests that fail DSL replay.\n+\n ### Testing\n \n - **Rust tests:** `cargo nextest run --workspace` (163 tests; requires `cargo-nextest`)\ndiff --git a/server/src/lib.rs b/server/src/lib.rs\nindex c1d477d21aea03aff00e6f0689b0b4379d0d68d2..ad8e31099c807fb5844acb16cd5086a2f19327a7 100644\n--- a/server/src/lib.rs\n+++ b/server/src/lib.rs\n@@ -10,6 +10,7 @@ pub mod form_template;\n pub mod html;\n pub mod identity;\n pub mod middleware;\n+pub mod offline;\n pub mod path_types;\n pub mod ranking;\n pub mod reducer;\ndiff --git a/server/src/offline.rs b/server/src/offline.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..54ad0ded096a305ef8454ab2cdd1c3af71b14f5d\n--- /dev/null\n+++ b/server/src/offline.rs\n@@ -0,0 +1,333 @@\n+//! Offline `.sorter` compilation and JSONL diagnostics (no network, no auth).\n+\n+use std::collections::HashSet;\n+use std::path::Path;\n+\n+use serde::Serialize;\n+use slug_types::{CheckScopeRanking, RankComponent, RankRow, paths::GardenItemUrl};\n+\n+use crate::{\n+ api::{resolve_item, validate_ingest_document},\n+ dsl,\n+ events::{Event, Ingest},\n+ path_types::ItemId,\n+ reducer::{ReducerState, ScopeId, scope_from_room_wire},\n+ scope_rank::build_children_rankings,\n+};\n+\n+#[derive(Debug, Clone, Serialize)]\n+pub struct CompileStats {\n+ pub items: usize,\n+ pub votes: usize,\n+ pub prose_blocks: usize,\n+}\n+\n+#[derive(Debug, Serialize)]\n+pub struct CompileResult {\n+ pub ok: bool,\n+ pub threads: Vec,\n+ pub rankings: Vec,\n+ pub stats: CompileStats,\n+}\n+\n+#[derive(Debug, Clone, Serialize)]\n+pub struct CompileError {\n+ pub ok: bool,\n+ pub error: String,\n+ #[serde(skip_serializing_if = \"Option::is_none\")]\n+ pub hint: Option,\n+}\n+\n+#[derive(Debug, Clone, Serialize)]\n+pub struct BadJsonLine {\n+ pub line: usize,\n+ pub message: String,\n+}\n+\n+#[derive(Debug, Clone, Serialize)]\n+pub struct MalformedIngest {\n+ pub line: usize,\n+ pub id: String,\n+ pub room_id: String,\n+ pub thread_tag: String,\n+ pub reason: String,\n+}\n+\n+#[derive(Debug, Clone, Serialize)]\n+pub struct ScanResult {\n+ pub ok: bool,\n+ pub path: String,\n+ pub total_lines: usize,\n+ pub parsed_events: usize,\n+ pub bad_json_lines: Vec,\n+ pub malformed_ingests: Vec,\n+ pub skipped_ingests: usize,\n+}\n+\n+fn document_stats(doc: &dsl::Document) -> CompileStats {\n+ let mut items = 0usize;\n+ let mut votes = 0usize;\n+ let mut prose_blocks = 0usize;\n+ for stmt in &doc.statements {\n+ match stmt {\n+ dsl::Stmt::Item { .. } => items += 1,\n+ dsl::Stmt::Vote { .. } => votes += 1,\n+ dsl::Stmt::Prose { .. } => prose_blocks += 1,\n+ }\n+ }\n+ CompileStats {\n+ items,\n+ votes,\n+ prose_blocks,\n+ }\n+}\n+\n+fn threads_in_document(text: &str) -> Vec {\n+ let mut out = HashSet::new();\n+ for line in text.lines() {\n+ let trimmed = line.trim();\n+ if !trimmed.starts_with('#') {\n+ continue;\n+ }\n+ let rest = trimmed.trim_start_matches('#').trim();\n+ if rest.is_empty() {\n+ continue;\n+ }\n+ let tag = rest.split_whitespace().next().unwrap_or(rest);\n+ let tag = tag.split(':').next().unwrap_or(tag).trim();\n+ if tag.is_empty() {\n+ continue;\n+ }\n+ out.insert(format!(\"#{}\", crate::canonical_path::canonicalize_tag(tag)));\n+ }\n+ let mut tags: Vec = out.into_iter().collect();\n+ tags.sort();\n+ tags\n+}\n+\n+fn voted_parent_scopes(doc: &dsl::Document) -> Vec {\n+ let mut parents = HashSet::new();\n+ for stmt in &doc.statements {\n+ if let dsl::Stmt::Vote { item1, item2, .. } = stmt {\n+ if let (Ok(a), Ok(b)) = (resolve_item(item1), resolve_item(item2)) {\n+ if let Some(p) = a.parent() {\n+ parents.insert(p);\n+ }\n+ if let Some(p) = b.parent() {\n+ parents.insert(p);\n+ }\n+ }\n+ }\n+ }\n+ let mut out: Vec = parents.into_iter().collect();\n+ out.sort();\n+ out\n+}\n+\n+fn rankings_for_simulated(\n+ simulated: &ReducerState,\n+ scope: &ScopeId,\n+ room_wire: &str,\n+ doc: &dsl::Document,\n+) -> Vec {\n+ voted_parent_scopes(doc)\n+ .iter()\n+ .map(|parent| {\n+ let scoped_content = simulated\n+ .content_for_scope(&scope)\n+ .unwrap_or_else(|| simulated.public());\n+ let scoped = build_children_rankings(scoped_content, parent);\n+ let components: Vec = scoped\n+ .component_rankings\n+ .into_iter()\n+ .map(|comp| RankComponent {\n+ pairs: comp.pairs,\n+ ranking: comp\n+ .ranked\n+ .into_iter()\n+ .map(|r| RankRow {\n+ item: GardenItemUrl::from_stored(&r.item, room_wire),\n+ score: r.score,\n+ percent: None,\n+ })\n+ .collect(),\n+ })\n+ .collect();\n+ CheckScopeRanking {\n+ parent: GardenItemUrl::from_stored(parent, room_wire).into_inner(),\n+ components,\n+ unranked_items: scoped\n+ .unranked_items\n+ .into_iter()\n+ .map(|it| GardenItemUrl::from_stored(&it, room_wire))\n+ .collect(),\n+ }\n+ })\n+ .collect()\n+}\n+\n+/// Validate and simulate one `.sorter` document against optional base reducer state.\n+pub fn compile_document(\n+ base: &ReducerState,\n+ room: &str,\n+ text: &str,\n+) -> Result {\n+ let room_key = room.trim();\n+ let scope = scope_from_room_wire(room_key);\n+ let validated = validate_ingest_document(base, text, &scope).map_err(|(_, message, hint)| {\n+ CompileError {\n+ ok: false,\n+ error: message,\n+ hint,\n+ }\n+ })?;\n+\n+ let event = Event::Ingest(Ingest {\n+ ts: validated.ts,\n+ id: uuid::Uuid::new_v4().to_string(),\n+ raw: validated.raw_text.clone(),\n+ principal: \"offline\".to_string(),\n+ delegate: None,\n+ room_id: room_key.to_string(),\n+ thread_tag: \"offline\".to_string(),\n+ });\n+\n+ let mut simulated = base.clone();\n+ simulated.apply_event(event);\n+\n+ Ok(CompileResult {\n+ ok: true,\n+ threads: threads_in_document(text),\n+ rankings: rankings_for_simulated(&simulated, &scope, room_key, &validated.doc),\n+ stats: document_stats(&validated.doc),\n+ })\n+}\n+\n+fn ingest_parse_error(raw: &str) -> Option {\n+ dsl::parse_full(raw).err().map(|e| e.to_string())\n+}\n+\n+fn load_events_from_jsonl(path: &Path) -> Result<(Vec<(usize, Event)>, Vec), std::io::Error> {\n+ let text = std::fs::read_to_string(path)?;\n+ let mut events = Vec::new();\n+ let mut bad_json_lines = Vec::new();\n+ for (idx, line) in text.lines().enumerate() {\n+ let line_no = idx + 1;\n+ let trimmed = line.trim();\n+ if trimmed.is_empty() {\n+ continue;\n+ }\n+ match serde_json::from_str::(trimmed) {\n+ Ok(ev) => events.push((line_no, ev)),\n+ Err(e) => bad_json_lines.push(BadJsonLine {\n+ line: line_no,\n+ message: e.to_string(),\n+ }),\n+ }\n+ }\n+ Ok((events, bad_json_lines))\n+}\n+\n+/// Replay a JSONL event log into reducer state (same rules as server boot).\n+pub fn load_reducer_from_jsonl(path: &Path) -> Result<(ReducerState, Vec), std::io::Error> {\n+ let (events, bad_json_lines) = load_events_from_jsonl(path)?;\n+ let mut state = ReducerState::default();\n+ for (_line_no, ev) in events {\n+ state.apply_event(ev);\n+ }\n+ Ok((state, bad_json_lines))\n+}\n+\n+/// Scan an events.jsonl for corrupt JSON lines and ingests that fail DSL replay.\n+pub fn scan_jsonl(path: &Path) -> Result {\n+ let text = std::fs::read_to_string(path)?;\n+ let total_lines = text.lines().count();\n+ let (events, bad_json_lines) = load_events_from_jsonl(path)?;\n+\n+ let mut malformed_ingests = Vec::new();\n+ let mut skipped_ingests = 0usize;\n+ let mut state = ReducerState::default();\n+ let parsed_events = events.len();\n+\n+ for (line_no, ev) in events {\n+ if let Event::Ingest(ref ing) = ev {\n+ if let Some(reason) = ingest_parse_error(&ing.raw) {\n+ malformed_ingests.push(MalformedIngest {\n+ line: line_no,\n+ id: ing.id.clone(),\n+ room_id: ing.room_id.clone(),\n+ thread_tag: ing.thread_tag.clone(),\n+ reason,\n+ });\n+ }\n+ let before = state.ingests_by_id.len();\n+ state.apply_event(ev);\n+ if state.ingests_by_id.len() == before {\n+ skipped_ingests += 1;\n+ }\n+ } else {\n+ state.apply_event(ev);\n+ }\n+ }\n+\n+ let ok = bad_json_lines.is_empty() && malformed_ingests.is_empty() && skipped_ingests == 0;\n+\n+ Ok(ScanResult {\n+ ok,\n+ path: path.display().to_string(),\n+ total_lines,\n+ parsed_events,\n+ bad_json_lines,\n+ malformed_ingests,\n+ skipped_ingests,\n+ })\n+}\n+\n+#[cfg(test)]\n+mod tests {\n+ use super::*;\n+\n+ const TUTORIAL: &str = include_str!(\"../tests/fixtures/tutorial.sorter\");\n+\n+ #[test]\n+ fn compile_tutorial_fixture_emits_rankings() {\n+ let result = compile_document(&ReducerState::default(), \"public\", TUTORIAL).unwrap();\n+ assert!(result.ok);\n+ assert!(!result.threads.is_empty());\n+ assert!(result.stats.items >= 6);\n+ assert!(result.stats.votes >= 6);\n+ assert!(!result.rankings.is_empty());\n+ }\n+\n+ #[test]\n+ fn compile_rejects_vote_on_missing_item() {\n+ let err = compile_document(\n+ &ReducerState::default(),\n+ \"public\",\n+ \"{ reason }\\n~/missing/a 2:1 ~/missing/b\",\n+ )\n+ .unwrap_err();\n+ assert!(!err.ok);\n+ assert!(err.error.contains(\"undefined\"));\n+ }\n+\n+ #[test]\n+ fn scan_empty_jsonl_is_ok() {\n+ let dir = tempfile::tempdir().unwrap();\n+ let path = dir.path().join(\"events.jsonl\");\n+ std::fs::write(&path, \"\").unwrap();\n+ let report = scan_jsonl(&path).unwrap();\n+ assert!(report.ok);\n+ assert!(report.bad_json_lines.is_empty());\n+ }\n+\n+ #[test]\n+ fn scan_reports_bad_json_line() {\n+ let dir = tempfile::tempdir().unwrap();\n+ let path = dir.path().join(\"events.jsonl\");\n+ std::fs::write(&path, \"{not json}\\n\").unwrap();\n+ let report = scan_jsonl(&path).unwrap();\n+ assert!(!report.ok);\n+ assert_eq!(report.bad_json_lines.len(), 1);\n+ }\n+}\ndiff --git a/sorterc/Cargo.toml b/sorterc/Cargo.toml\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..92d477aff9b53291fb1a266db83065c1c800791d\n--- /dev/null\n+++ b/sorterc/Cargo.toml\n@@ -0,0 +1,18 @@\n+[package]\n+name = \"sorterc\"\n+version = \"0.0.1\"\n+edition = \"2021\"\n+license = \"MIT\"\n+publish = false\n+description = \"Offline .sorter compiler and events.jsonl linter (dev only)\"\n+\n+[[bin]]\n+name = \"sorterc\"\n+path = \"src/main.rs\"\n+\n+[dependencies]\n+anyhow = \"1\"\n+clap = { version = \"4\", features = [\"derive\"] }\n+serde = { version = \"1\", features = [\"derive\"] }\n+serde_json = \"1\"\n+slugsocial-server = { path = \"../server\" }\ndiff --git a/sorterc/readme.md b/sorterc/readme.md\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..1ebcc3fc935541ea9e47e0458ec67a750fe19fff\n--- /dev/null\n+++ b/sorterc/readme.md\n@@ -0,0 +1,92 @@\n+# sorterc\n+\n+Dev-only offline tooling for the slug `.sorter` DSL and `events.jsonl` event log.\n+\n+`sorterc` is **not** published via npm and does not talk to slug.social. It reuses the same parser, validator, and ranking code as the server, but runs entirely on local files.\n+\n+## Build\n+\n+From the repo root:\n+\n+```bash\n+cargo build -p sorterc\n+cargo run -p sorterc -- --help\n+```\n+\n+## Commands\n+\n+### `compile` — evaluate a `.sorter` document\n+\n+Reads a `.sorter` file (or `-` for stdin), validates the DSL, simulates one ingest against reducer state, and prints JSON rankings to stdout.\n+\n+```bash\n+cargo run -p sorterc -- compile path/to/doc.sorter\n+cargo run -p sorterc -- compile path/to/doc.sorter --pretty\n+cargo run -p sorterc -- compile - --pretty # stdin\n+cargo run -p sorterc -- compile doc.sorter --base events.jsonl # seed garden from log\n+cargo run -p sorterc -- compile doc.sorter --room public # default room\n+```\n+\n+**Flags**\n+\n+| Flag | Description |\n+|------|-------------|\n+| `--base PATH` | Replay an `events.jsonl` first, then compile against that garden state |\n+| `--room ID` | Room wire id (`public` or private room id). Default: `public` |\n+| `--pretty` | Pretty-print JSON |\n+\n+**Success output** (shape):\n+\n+```json\n+{\n+ \"ok\": true,\n+ \"threads\": [\"#my-thread\"],\n+ \"rankings\": [ … ],\n+ \"stats\": { \"items\": 3, \"votes\": 2, \"prose_blocks\": 5 }\n+}\n+```\n+\n+Rankings use the same structure as the server's dry-run check: parent scope, connected components, scores, unranked items.\n+\n+**Error output** exits with code 1:\n+\n+```json\n+{\n+ \"ok\": false,\n+ \"error\": \"parse error\",\n+ \"hint\": \"…\"\n+}\n+```\n+\n+### `scan` — lint an `events.jsonl`\n+\n+Reads a JSONL event log and reports problems without starting a server.\n+\n+```bash\n+cargo run -p sorterc -- scan events.jsonl\n+cargo run -p sorterc -- scan events.jsonl --pretty\n+```\n+\n+Reports:\n+\n+- **bad JSON lines** — lines that are not valid JSON\n+- **malformed ingests** — ingest events whose `raw` DSL fails to parse\n+- **skipped ingests** — ingests dropped during replay (same behavior as server boot)\n+\n+Exits 0 when clean, 1 when any issue is found.\n+\n+## Typical uses\n+\n+- Iterate on `.sorter` files in an editor and pipe through `compile` to see rankings instantly\n+- Verify a downloaded or edited `events.jsonl` before uploading to Fly\n+- Debug \"malformed ingest\" warnings from production boot logs\n+- CI or pre-commit checks on fixture docs (no OAuth, no network)\n+\n+## What it does not do\n+\n+- Post to slug.social or append to a live log\n+- Authenticate users or bind agents\n+- Run browser/UI tests\n+- Replace `slugsocial public check` for operators who want the full RPC path against a running server\n+\n+For live server dry-run against current garden state, use `npx slugsocial public check` or `POST /try/check` in the browser.\ndiff --git a/sorterc/src/main.rs b/sorterc/src/main.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..71382c180085cb0ad71043c852f8db5d3a48a284\n--- /dev/null\n+++ b/sorterc/src/main.rs\n@@ -0,0 +1,117 @@\n+use std::path::{Path, PathBuf};\n+\n+use anyhow::{bail, Context, Result};\n+use clap::{Parser, Subcommand};\n+use slugsocial_server::{\n+ offline::{self, CompileError, CompileResult, ScanResult},\n+ reducer::ReducerState,\n+};\n+\n+#[derive(Parser)]\n+#[command(\n+ name = \"sorterc\",\n+ about = \"Offline .sorter compiler and events.jsonl linter (dev only)\",\n+ version\n+)]\n+struct Cli {\n+ #[command(subcommand)]\n+ cmd: Command,\n+}\n+\n+#[derive(Subcommand)]\n+enum Command {\n+ /// Parse and simulate a .sorter document; emit ranking JSON to stdout.\n+ Compile {\n+ /// `.sorter` file, or `-` for stdin.\n+ file: PathBuf,\n+ /// Room wire id (`public` or private room id).\n+ #[arg(long, default_value = \"public\")]\n+ room: String,\n+ /// Optional events.jsonl to replay before compiling (seed garden state).\n+ #[arg(long)]\n+ base: Option,\n+ /// Pretty-print JSON.\n+ #[arg(long)]\n+ pretty: bool,\n+ },\n+ /// Scan an events.jsonl for corrupt JSON lines and malformed ingests.\n+ Scan {\n+ file: PathBuf,\n+ #[arg(long)]\n+ pretty: bool,\n+ },\n+}\n+\n+fn read_input(path: &Path) -> Result {\n+ if path.as_os_str() == \"-\" {\n+ use std::io::Read;\n+ let mut buf = String::new();\n+ std::io::stdin().read_to_string(&mut buf)?;\n+ Ok(buf)\n+ } else {\n+ std::fs::read_to_string(path)\n+ .with_context(|| format!(\"read {}\", path.display()))\n+ }\n+}\n+\n+fn load_base_state(base: Option<&Path>) -> Result {\n+ let Some(path) = base else {\n+ return Ok(ReducerState::default());\n+ };\n+ let (state, bad_lines) = offline::load_reducer_from_jsonl(path)\n+ .with_context(|| format!(\"load base jsonl {}\", path.display()))?;\n+ if !bad_lines.is_empty() {\n+ bail!(\n+ \"base jsonl has {} corrupt line(s); fix or omit --base\",\n+ bad_lines.len()\n+ );\n+ }\n+ Ok(state)\n+}\n+\n+fn print_json(value: &T, pretty: bool) -> Result<()> {\n+ if pretty {\n+ println!(\"{}\", serde_json::to_string_pretty(value)?);\n+ } else {\n+ println!(\"{}\", serde_json::to_string(value)?);\n+ }\n+ Ok(())\n+}\n+\n+fn run_compile(file: PathBuf, room: String, base: Option, pretty: bool) -> Result<()> {\n+ let text = read_input(&file)?;\n+ let base_state = load_base_state(base.as_deref())?;\n+ match offline::compile_document(&base_state, &room, &text) {\n+ Ok(result) => {\n+ print_json::(&result, pretty)?;\n+ Ok(())\n+ }\n+ Err(err) => {\n+ print_json::(&err, pretty)?;\n+ std::process::exit(1);\n+ }\n+ }\n+}\n+\n+fn run_scan(file: PathBuf, pretty: bool) -> Result<()> {\n+ let report = offline::scan_jsonl(&file)\n+ .with_context(|| format!(\"scan {}\", file.display()))?;\n+ print_json::(&report, pretty)?;\n+ if !report.ok {\n+ std::process::exit(1);\n+ }\n+ Ok(())\n+}\n+\n+fn main() -> Result<()> {\n+ let cli = Cli::parse();\n+ match cli.cmd {\n+ Command::Compile {\n+ file,\n+ room,\n+ base,\n+ pretty,\n+ } => run_compile(file, room, base, pretty),\n+ Command::Scan { file, pretty } => run_scan(file, pretty),\n+ }\n+}\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[075d4d37] Fix OAuth test mocks so Clojure E2E auth flows work again.\n\nHttpServer handlers were crashing on query parsing and token POSTs, which broke Playwright login; also read alias/history via real CSS selectors.\n\nCo-authored-by: Cursor \n\nSide B — unified diff (full patch):\ndiff --git a/test/auth_login.clj b/test/auth_login.clj\nindex 6f2f00d7aa7340e63d1ac465b0a2234cec7a983f..aa63b66ccb2471b710ba3d168d0461252b39fc10 100644\n--- a/test/auth_login.clj\n+++ b/test/auth_login.clj\n@@ -14,27 +14,27 @@\n (defn- type-alias! [pg text]\n (page/evaluate pg\n (.replace\n- \"(() => { const i = document.getElementById('alias-input'); const f = document.getElementById('alias-check-form'); if (!i || !f) return;\n+ \"(() => { const i = document.getElementById('alias-input'); const f = document.getElementById('alias-check-form'); if (!i || !f) return Promise.resolve('missing-form');\n i.value = __TEXT__;\n const cf = document.getElementById('alias-claim-field'); if (cf) cf.value = i.value;\n return fetch(f.action, { method: 'POST', credentials: 'same-origin',\n headers: { 'Content-Type': 'application/x-www-form-urlencoded' },\n body: new URLSearchParams(new FormData(f)).toString() })\n .then(function (r) { return r.text(); })\n- .then(function (t) { eval(t); }); })()\"\n+ .then(function (t) { eval(t); return document.getElementById('alias-status')?.textContent || ''; }); })()\"\n \"__TEXT__\"\n- (pr-str text)))\n- (Thread/sleep 400))\n+ (pr-str text))))\n \n-(defn- element-text [pg test-id]\n+(defn- element-text [pg selector]\n (let [raw (page/evaluate pg\n- (str \"document.querySelector('[data-testid=\\\"\" test-id \"\\\"]')?.textContent || ''\"))]\n+ (str \"document.querySelector(\" (pr-str selector) \")?.textContent || ''\"))]\n (when (string? raw) (str/trim raw))))\n \n (defn- wait-for-text [pg test-id text timeout-ms]\n- (let [deadline (+ (System/currentTimeMillis) timeout-ms)]\n+ (let [deadline (+ (System/currentTimeMillis) timeout-ms)\n+ selector (str \"[data-testid=\\\"\" test-id \"\\\"]\")]\n (loop []\n- (let [got (or (element-text pg test-id) \"\")]\n+ (let [got (or (element-text pg selector) \"\")]\n (cond\n (= got text) got\n (< (System/currentTimeMillis) deadline) (do (Thread/sleep 200) (recur))\ndiff --git a/test/support/mock_oauth.clj b/test/support/mock_oauth.clj\nindex 5ba7e9be3cf6d2226648e9609a09ed45f306930f..333fe08d56cb06bac2a338cad1c73894d54c4495 100644\n--- a/test/support/mock_oauth.clj\n+++ b/test/support/mock_oauth.clj\n@@ -7,7 +7,7 @@\n (defn- query-param [query key]\n (when query\n (some (fn [pair]\n- (let [[k v] (str/split pair \"=\" 2)]\n+ (let [[k v] (str/split pair #\"=\" 2)]\n (when (= k key)\n (URLDecoder/decode (or v \"\") \"UTF-8\"))))\n (str/split query #\"&\"))))\n@@ -31,11 +31,11 @@\n \n (defn- send-redirect [^HttpExchange ex location]\n (.set (.getResponseHeaders ex) \"Location\" location)\n- (.sendResponseHeaders ex 302 -1)\n+ (.sendResponseHeaders ex 302 0)\n (.close (.getResponseBody ex)))\n \n (defn- read-form [^HttpExchange ex]\n- (let [body (slurp (.getInputStream ex))]\n+ (let [body (slurp (.getRequestBody ex))]\n {:code (query-param body \"code\")\n :grant (query-param body \"grant_type\")}))\n \n@@ -45,7 +45,7 @@\n (str/replace #\"^[Bb]earer \" \"\")))\n \n (defn- parse-token-user [token]\n- (when (str/starts-with? token \"mock:\")\n+ (when (and token (str/starts-with? token \"mock:\"))\n (parse-mock-user (subs token 5))))\n \n (defn- authorize-redirect [exchange query]\n@@ -55,7 +55,7 @@\n user (parse-mock-user mock-user)\n code (str \"mock:\" (:id user) \":\" (:login user))\n loc (str redirect-uri \"?code=\" (java.net.URLEncoder/encode code \"UTF-8\")\n- \"&state=\" (java.net.URLEncoder/encode state \"UTF-8\"))]\n+ \"&state=\" (java.net.URLEncoder/encode (or state \"\") \"UTF-8\"))]\n (send-redirect exchange loc)))\n \n (defn start-mock-oauth\n@@ -65,49 +65,56 @@\n handler\n (proxy [HttpHandler] []\n (handle [^HttpExchange exchange]\n- (let [uri (.getRequestURI exchange)\n- path (.getPath uri)\n- query (.getQuery uri)\n- method (.getRequestMethod exchange)]\n- (cond\n- ;; GitHub authorize\n- (str/ends-with? path \"/login/oauth/authorize\")\n- (authorize-redirect exchange query)\n+ (try\n+ (let [uri (.getRequestURI exchange)\n+ path (.getPath uri)\n+ query (.getQuery uri)\n+ method (.getRequestMethod exchange)]\n+ (cond\n+ ;; GitHub authorize\n+ (str/ends-with? path \"/login/oauth/authorize\")\n+ (authorize-redirect exchange query)\n \n- ;; Reddit authorize\n- (str/ends-with? path \"/api/v1/authorize\")\n- (authorize-redirect exchange query)\n+ ;; Reddit authorize\n+ (str/ends-with? path \"/api/v1/authorize\")\n+ (authorize-redirect exchange query)\n \n- ;; GitHub token\n- (and (= method \"POST\") (str/ends-with? path \"/login/oauth/access_token\"))\n- (let [code (or (:code (read-form exchange)) \"mock:1002:newbie\")]\n- (send-json exchange 200 (str \"{\\\"access_token\\\":\\\"\" code \"\\\",\\\"token_type\\\":\\\"bearer\\\"}\")))\n+ ;; GitHub token\n+ (and (= method \"POST\") (str/ends-with? path \"/login/oauth/access_token\"))\n+ (let [code (or (:code (read-form exchange)) \"mock:1002:newbie\")]\n+ (send-json exchange 200 (str \"{\\\"access_token\\\":\\\"\" code \"\\\",\\\"token_type\\\":\\\"bearer\\\"}\")))\n \n- ;; Reddit token (client_credentials for import + authorization_code for login)\n- (and (= method \"POST\") (str/ends-with? path \"/api/v1/access_token\"))\n- (let [form (read-form exchange)\n- grant (or (:grant form) \"\")\n- code (or (:code form) \"mock:t2_test:redditor\")]\n- (if (= grant \"client_credentials\")\n- (send-json exchange 200 \"{\\\"access_token\\\":\\\"app-token\\\",\\\"token_type\\\":\\\"bearer\\\",\\\"expires_in\\\":3600}\")\n- (send-json exchange 200 (str \"{\\\"access_token\\\":\\\"\" code \"\\\",\\\"token_type\\\":\\\"bearer\\\",\\\"expires_in\\\":3600}\"))))\n+ ;; Reddit token (client_credentials for import + authorization_code for login)\n+ (and (= method \"POST\") (str/ends-with? path \"/api/v1/access_token\"))\n+ (let [form (read-form exchange)\n+ grant (or (:grant form) \"\")\n+ code (or (:code form) \"mock:t2_test:redditor\")]\n+ (if (= grant \"client_credentials\")\n+ (send-json exchange 200 \"{\\\"access_token\\\":\\\"app-token\\\",\\\"token_type\\\":\\\"bearer\\\",\\\"expires_in\\\":3600}\")\n+ (send-json exchange 200 (str \"{\\\"access_token\\\":\\\"\" code \"\\\",\\\"token_type\\\":\\\"bearer\\\",\\\"expires_in\\\":3600}\"))))\n \n- ;; GitHub user\n- (= path \"/user\")\n- (let [token (bearer-token exchange)\n- user (or (parse-token-user token) {:id \"1002\" :login \"newbie\" :numeric? true})]\n- (send-json exchange 200\n- (str \"{\\\"id\\\":\" (:id user) \",\\\"login\\\":\\\"\" (:login user) \"\\\"}\")))\n+ ;; GitHub user\n+ (= path \"/user\")\n+ (let [token (bearer-token exchange)\n+ user (or (parse-token-user token) {:id \"1002\" :login \"newbie\" :numeric? true})]\n+ (send-json exchange 200\n+ (str \"{\\\"id\\\":\" (:id user) \",\\\"login\\\":\\\"\" (:login user) \"\\\"}\")))\n \n- ;; Reddit /api/v1/me\n- (str/ends-with? path \"/api/v1/me\")\n- (let [token (bearer-token exchange)\n- user (or (parse-token-user token) {:id \"t2_test\" :login \"redditor\"})]\n- (send-json exchange 200\n- (str \"{\\\"id\\\":\\\"\" (:id user) \"\\\",\\\"name\\\":\\\"\" (:login user) \"\\\"}\")))\n+ ;; Reddit /api/v1/me\n+ (str/ends-with? path \"/api/v1/me\")\n+ (let [token (bearer-token exchange)\n+ user (or (parse-token-user token) {:id \"t2_test\" :login \"redditor\"})]\n+ (send-json exchange 200\n+ (str \"{\\\"id\\\":\\\"\" (:id user) \"\\\",\\\"name\\\":\\\"\" (:login user) \"\\\"}\")))\n \n- :else\n- (send-json exchange 404 \"{\\\"error\\\":\\\"not found\\\"}\")))))]\n+ :else\n+ (send-json exchange 404 \"{\\\"error\\\":\\\"not found\\\"}\")))\n+ (catch Throwable t\n+ (binding [*out* *err*]\n+ (println \"mock-oauth handler error:\" t))\n+ (try\n+ (send-json exchange 500 \"{\\\"error\\\":\\\"mock-oauth internal\\\"}\")\n+ (catch Throwable _))))))]\n (.createContext server \"/\" handler)\n (.setExecutor server nil)\n (.start server)\ndiff --git a/test/support/mock_reddit.clj b/test/support/mock_reddit.clj\nindex a630cf0938722193e9af88382d60e777ff371be4..faa27945b6394363914c853627a0bad1e819a5f9 100644\n--- a/test/support/mock_reddit.clj\n+++ b/test/support/mock_reddit.clj\n@@ -12,7 +12,7 @@\n (defn- query-param [query key]\n (when query\n (some (fn [pair]\n- (let [[k v] (str/split pair \"=\" 2)]\n+ (let [[k v] (str/split pair #\"=\" 2)]\n (when (= k key)\n (URLDecoder/decode (or v \"\") \"UTF-8\"))))\n (str/split query #\"&\"))))\n@@ -34,11 +34,11 @@\n \n (defn- send-redirect [^HttpExchange ex location]\n (.set (.getResponseHeaders ex) \"Location\" location)\n- (.sendResponseHeaders ex 302 -1)\n+ (.sendResponseHeaders ex 302 0)\n (.close (.getResponseBody ex)))\n \n (defn- read-form [^HttpExchange ex]\n- (let [body (slurp (.getInputStream ex))]\n+ (let [body (slurp (.getRequestBody ex))]\n {:code (query-param body \"code\")\n :grant (query-param body \"grant_type\")}))\n \n@@ -48,7 +48,7 @@\n (str/replace #\"^[Bb]earer \" \"\")))\n \n (defn- parse-token-user [token]\n- (when (str/starts-with? token \"mock:\")\n+ (when (and token (str/starts-with? token \"mock:\"))\n (parse-mock-user (subs token 5))))\n \n (defn start-mock-reddit\n@@ -72,7 +72,7 @@\n user (parse-mock-user (query-param query \"mock_user\"))\n code (str \"mock:\" (:id user) \":\" (:login user))\n loc (str redirect-uri \"?code=\" (java.net.URLEncoder/encode code \"UTF-8\")\n- \"&state=\" (java.net.URLEncoder/encode state \"UTF-8\"))]\n+ \"&state=\" (java.net.URLEncoder/encode (or state \"\") \"UTF-8\"))]\n (send-redirect exchange loc))\n \n (and (= method \"POST\") (str/ends-with? path \"/api/v1/access_token\"))\n","role":"user"}],"model":"~x-ai/grok-latest"}