{"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[7bb7145d] url stuff\n\nSide A — unified diff (full patch):\ndiff --git a/AGENTS.md b/AGENTS.md\nindex e60b9ba6012593361ef10e8fdd9439cd9932e09b..babb889d6fbfb1fa7176c9e6b7544ae17b61dd2e 100644\n--- a/AGENTS.md\n+++ b/AGENTS.md\n@@ -58,4 +58,4 @@ Use **tmux** for `cargo run --package sorter2-server` (dev server). Rebuild afte\n \n - First `cargo test` / `cargo build --release` is slow; Clojure smoke test always does a release build.\n - `legacy/` and `ideas/` are not part of the workspace build.\n-- **ItemId** for web URLs is a canonical full URL (`https://reddit.com/r/rust`). Rules live in [`server/src/url_rules/`](server/src/url_rules/) (composable Rust, not a config DSL). After changing canonicalization rules, rebuild the projection: `cargo run --package sorter2-server -- replay-index`.\n+- **ItemId** for web URLs is a canonical full URL (`https://reddit.com/r/rust`). Rules live in [`server/src/url_rules/graph.rs`](server/src/url_rules/graph.rs): a semantic graph (DFA on host + path, query params in `Context`) with a generic internet fallback for unknown sites. After changing rules, rebuild the projection: `cargo run --package sorter2-server -- replay-index`.\ndiff --git a/server/src/url_rules/engine.rs b/server/src/url_rules/engine.rs\ndeleted file mode 100644\nindex e29b6b48c08deb7bffe031b1e542b1e25a7bef15..0000000000000000000000000000000000000000\n--- a/server/src/url_rules/engine.rs\n+++ /dev/null\n@@ -1,187 +0,0 @@\n-//! Composable URL normalization primitives.\n-\n-use std::collections::HashMap;\n-\n-use url::Url;\n-\n-/// Mutable URL view used by rule combinators before serializing to a canonical string.\n-#[derive(Debug, Clone)]\n-pub struct ParsedUrl {\n-    pub scheme: String,\n-    pub host: String,\n-    pub path_segments: Vec<String>,\n-    pub query: HashMap<String, String>,\n-    pub fragment: Option<String>,\n-}\n-\n-impl ParsedUrl {\n-    pub fn parse(raw: &str) -> Option<Self> {\n-        let trimmed = raw.trim();\n-        if trimmed.is_empty() {\n-            return None;\n-        }\n-\n-        let with_scheme = if trimmed.contains(\"://\") {\n-            trimmed.to_string()\n-        } else if trimmed.starts_with(\"r/\") || trimmed.starts_with(\"/r/\") {\n-            let rest = trimmed.trim_start_matches('/').trim_start_matches(\"r/\");\n-            format!(\"https://reddit.com/r/{rest}\")\n-        } else if trimmed.contains('.') && !trimmed.starts_with('/') {\n-            format!(\"https://{trimmed}\")\n-        } else {\n-            trimmed.to_string()\n-        };\n-\n-        let url = Url::parse(&with_scheme).ok()?;\n-        let host = url.host_str()?.to_string();\n-        let path_segments: Vec<String> = url\n-            .path_segments()\n-            .map(|segs| segs.filter(|s| !s.is_empty()).map(str::to_string).collect())\n-            .unwrap_or_default();\n-\n-        let mut query = HashMap::new();\n-        for (k, v) in url.query_pairs() {\n-            query.insert(k.into_owned(), v.into_owned());\n-        }\n-\n-        Some(Self {\n-            scheme: url.scheme().to_string(),\n-            path_segments,\n-            query,\n-            fragment: url.fragment().map(str::to_string),\n-            host,\n-        })\n-    }\n-\n-    pub fn with_path_segments(&self, segments: &[String]) -> Self {\n-        let mut u = self.clone();\n-        u.path_segments = segments.to_vec();\n-        u\n-    }\n-\n-    pub fn to_url(&self) -> Option<Url> {\n-        let mut url = if self.path_segments.is_empty() {\n-            Url::parse(&format!(\"{}://{}\", self.scheme, self.host)).ok()?\n-        } else {\n-            let path = format!(\"/{}\", self.path_segments.join(\"/\"));\n-            Url::parse(&format!(\"{}://{}{}\", self.scheme, self.host, path)).ok()?\n-        };\n-        if !self.query.is_empty() {\n-            let mut pairs: Vec<_> = self.query.iter().collect();\n-            pairs.sort_by(|a, b| a.0.cmp(b.0));\n-            url.query_pairs_mut().clear();\n-            for (k, v) in pairs {\n-                url.query_pairs_mut().append_pair(k, v);\n-            }\n-        }\n-        if let Some(ref frag) = self.fragment {\n-            url.set_fragment(Some(frag));\n-        }\n-        Some(url)\n-    }\n-\n-    pub fn canonical_string(&self) -> Option<String> {\n-        let url = self.to_url()?;\n-        let mut s = url.to_string();\n-        if self.path_segments.is_empty() {\n-            s = s.trim_end_matches('/').to_string();\n-        }\n-        Some(s)\n-    }\n-}\n-\n-pub fn force_https(u: &mut ParsedUrl) {\n-    if u.scheme == \"http\" {\n-        u.scheme = \"https\".to_string();\n-    }\n-}\n-\n-pub fn drop_fragment(u: &mut ParsedUrl) {\n-    u.fragment = None;\n-}\n-\n-pub fn strip_www(u: &mut ParsedUrl) {\n-    if u.host.starts_with(\"www.\") {\n-        u.host = u.host[4..].to_string();\n-    }\n-}\n-\n-pub fn lowercase_host(u: &mut ParsedUrl) {\n-    u.host = u.host.to_ascii_lowercase();\n-}\n-\n-pub fn lowercase_path(u: &mut ParsedUrl) {\n-    for seg in &mut u.path_segments {\n-        *seg = seg.to_ascii_lowercase();\n-    }\n-}\n-\n-pub fn clear_query(u: &mut ParsedUrl) {\n-    u.query.clear();\n-}\n-\n-pub fn keep_only_query(u: &mut ParsedUrl, keys: &[&str]) {\n-    u.query\n-        .retain(|k, _| keys.iter().any(|want| want == &k.as_str()));\n-}\n-\n-pub fn strip_tracking_params(u: &mut ParsedUrl) {\n-    u.query.retain(|k, _| {\n-        let lower = k.to_ascii_lowercase();\n-        !(lower.starts_with(\"utm_\")\n-            || matches!(\n-                lower.as_str(),\n-                \"fbclid\" | \"gclid\" | \"ref\" | \"ref_src\" | \"ref_source\" | \"mc_cid\" | \"mc_eid\"\n-            ))\n-    });\n-}\n-\n-pub fn truncate_after_segment(u: &mut ParsedUrl, name: &str, keep: usize) {\n-    if let Some(i) = u.path_segments.iter().position(|s| s == name) {\n-        let end = (i + 1 + keep).min(u.path_segments.len());\n-        u.path_segments.truncate(end);\n-    }\n-}\n-\n-pub fn drop_listing_suffix(u: &mut ParsedUrl, suffixes: &[&str]) {\n-    if u.path_segments.len() >= 3 && u.path_segments.first().map(String::as_str) == Some(\"r\") {\n-        if let Some(last) = u.path_segments.last() {\n-            if suffixes.iter().any(|s| *s == last.as_str()) {\n-                u.path_segments.pop();\n-            }\n-        }\n-    }\n-}\n-\n-pub fn normalize_reddit_host(u: &mut ParsedUrl) {\n-    if matches!(\n-        u.host.as_str(),\n-        \"old.reddit.com\" | \"new.reddit.com\" | \"www.reddit.com\"\n-    ) {\n-        u.host = \"reddit.com\".to_string();\n-    }\n-}\n-\n-pub fn rewrite_youtu_be(u: &mut ParsedUrl) {\n-    if u.host == \"youtu.be\" && u.path_segments.len() == 1 {\n-        let id = u.path_segments[0].clone();\n-        u.host = \"youtube.com\".to_string();\n-        u.path_segments = vec![\"watch\".to_string()];\n-        u.query.insert(\"v\".to_string(), id);\n-    }\n-}\n-\n-pub fn rewrite_youtube_shorts(u: &mut ParsedUrl) {\n-    if u.host == \"youtube.com\" && u.path_segments.first().map(String::as_str) == Some(\"shorts\") {\n-        if let Some(id) = u.path_segments.get(1).cloned() {\n-            u.path_segments = vec![\"watch\".to_string()];\n-            u.query.insert(\"v\".to_string(), id);\n-        }\n-    }\n-}\n-\n-pub fn normalize_youtube_host(u: &mut ParsedUrl) {\n-    if matches!(u.host.as_str(), \"m.youtube.com\" | \"www.youtube.com\") {\n-        u.host = \"youtube.com\".to_string();\n-    }\n-}\ndiff --git a/server/src/url_rules/mod.rs b/server/src/url_rules/mod.rs\nindex 03d53bd3e82d704a01ba3fd8dd02b7d31422c0de..9e1445346ce77a49dd6a7e7713bf9c57aef353cc 100644\n--- a/server/src/url_rules/mod.rs\n+++ b/server/src/url_rules/mod.rs\n@@ -1,8 +1,12 @@\n-//! URL canonicalization and hierarchy rules for [`crate::path_types::ItemId`].\n+//! URL canonicalization and hierarchy via a semantic graph (DFA + generic fallback).\n \n-mod engine;\n+mod graph;\n+mod parse;\n mod registry;\n \n+#[cfg(test)]\n+mod registry_tests;\n+\n pub use registry::{\n     canonicalize_raw, looks_like_url, navigable_breadcrumbs, parent_url, resolve_id, CanonicalResult,\n };\ndiff --git a/server/src/url_rules/registry.rs b/server/src/url_rules/registry.rs\nindex 14514e9af8385fb2b9b2f35eb9ee14d453d4b97c..8e6c012ea1fc74b864307bdacdf5a0f5db5259fc 100644\n--- a/server/src/url_rules/registry.rs\n+++ b/server/src/url_rules/registry.rs\n@@ -1,12 +1,7 @@\n-//! Per-domain canonicalization and hierarchy rules.\n+//! Public API: canonical identity and hierarchy via the URL graph.\n \n-use std::collections::HashSet;\n-\n-use super::engine::{\n-    clear_query, drop_fragment, drop_listing_suffix, force_https, keep_only_query, lowercase_host,\n-    lowercase_path, normalize_reddit_host, normalize_youtube_host, rewrite_youtu_be,\n-    rewrite_youtube_shorts, strip_tracking_params, strip_www, truncate_after_segment, ParsedUrl,\n-};\n+use super::graph::graph;\n+use super::parse::UrlParts;\n \n /// Result of canonicalizing a raw URL string.\n #[derive(Debug, Clone, PartialEq, Eq)]\n@@ -16,71 +11,16 @@ pub struct CanonicalResult {\n     pub alias_of: Option<String>,\n }\n \n-fn apply_global(u: &mut ParsedUrl) {\n-    force_https(u);\n-    drop_fragment(u);\n-    strip_www(u);\n-    lowercase_host(u);\n-    strip_tracking_params(u);\n-}\n-\n-fn normalize_reddit(u: &mut ParsedUrl) {\n-    normalize_reddit_host(u);\n-    lowercase_path(u);\n-    truncate_after_segment(u, \"comments\", 1);\n-    drop_listing_suffix(u, &[\"hot\", \"top\", \"new\", \"rising\", \"controversial\"]);\n-    clear_query(u);\n-}\n-\n-fn normalize_youtube(u: &mut ParsedUrl) {\n-    rewrite_youtu_be(u);\n-    normalize_youtube_host(u);\n-    rewrite_youtube_shorts(u);\n-    keep_only_query(u, &[\"v\", \"list\"]);\n-}\n-\n-fn normalize_default(_u: &mut ParsedUrl) {\n-    // Global rules only.\n-}\n-\n-fn domain_key(host: &str) -> &'static str {\n-    if host == \"reddit.com\" || host.ends_with(\".reddit.com\") {\n-        \"reddit.com\"\n-    } else if host == \"youtube.com\" || host == \"youtu.be\" {\n-        \"youtube.com\"\n-    } else {\n-        \"default\"\n-    }\n-}\n-\n-fn normalize_for_host(u: &mut ParsedUrl) {\n-    apply_global(u);\n-    match domain_key(&u.host) {\n-        \"reddit.com\" => normalize_reddit(u),\n-        \"youtube.com\" => normalize_youtube(u),\n-        _ => normalize_default(u),\n-    }\n-}\n-\n-/// Structural path segments that must not become standalone tree nodes when more path follows.\n-fn structural_trailing(host: &str) -> &'static [&'static str] {\n-    match domain_key(host) {\n-        \"reddit.com\" => &[\"comments\"],\n-        _ => &[],\n-    }\n-}\n-\n /// Canonicalize a raw URL. Returns `None` if the input is not URL-like.\n pub fn canonicalize_raw(raw: &str) -> Option<CanonicalResult> {\n     let trimmed = raw.trim();\n     if trimmed.is_empty() {\n         return None;\n     }\n-    let mut u = ParsedUrl::parse(trimmed)?;\n-    let input_snapshot = u.canonical_string()?;\n-    normalize_for_host(&mut u);\n-    let canonical = u.canonical_string()?;\n-    let alias_of = if input_snapshot != canonical {\n+    let parts = UrlParts::parse(trimmed)?;\n+    let g = graph();\n+    let canonical = g.resolve_canonical(&parts)?;\n+    let alias_of = if trimmed != canonical {\n         Some(trimmed.to_string())\n     } else {\n         None\n@@ -98,35 +38,14 @@ pub fn resolve_id(raw: &str) -> Option<String> {\n \n /// Navigable ancestor URLs from domain root up to and including `canonical` (full URLs).\n pub fn navigable_breadcrumbs(canonical: &str) -> Vec<String> {\n-    let Some(u) = ParsedUrl::parse(canonical) else {\n-        return vec![canonical.to_string()];\n+    let parts = match UrlParts::parse(canonical) {\n+        Some(p) => p,\n+        None => return vec![canonical.to_string()],\n     };\n-    let structural: HashSet<&str> = structural_trailing(&u.host).iter().copied().collect();\n-    let n = u.path_segments.len();\n-    let mut out = Vec::new();\n-\n-    // Domain root (no path segments).\n-    if let Some(base) = u.with_path_segments(&[]).canonical_string() {\n-        out.push(base);\n-    }\n-\n-    for i in 0..n {\n-        let segs: Vec<String> = u.path_segments[..=i].to_vec();\n-        let is_last = i == n - 1;\n-        let seg = u.path_segments[i].as_str();\n-        if structural.contains(seg) && !is_last {\n-            continue;\n-        }\n-        if let Some(url) = u.with_path_segments(&segs).canonical_string() {\n-            if out.last() != Some(&url) {\n-                out.push(url);\n-            }\n-        }\n-    }\n-    out\n+    graph().breadcrumbs(&parts)\n }\n \n-/// Immediate parent scope URL, or `None` for tree root / opaque single-segment ids.\n+/// Immediate parent scope URL, or `None` for tree root.\n pub fn parent_url(canonical: &str) -> Option<String> {\n     let crumbs = navigable_breadcrumbs(canonical);\n     if crumbs.len() <= 1 {\n@@ -148,88 +67,3 @@ pub fn looks_like_url(raw: &str) -> bool {\n         || t.starts_with(\"youtu.be/\")\n }\n \n-#[cfg(test)]\n-mod tests {\n-    use super::*;\n-\n-    #[test]\n-    fn reddit_post_drops_slug_and_normalizes_host() {\n-        let r = canonicalize_raw(\n-            \"https://old.reddit.com/r/AmItheAsshole/comments/1trnvdl/aita_for_cancelling/\",\n-        )\n-        .unwrap();\n-        assert_eq!(\n-            r.canonical,\n-            \"https://reddit.com/r/amitheasshole/comments/1trnvdl\"\n-        );\n-    }\n-\n-    #[test]\n-    fn reddit_strips_query_and_listing() {\n-        assert_eq!(\n-            canonicalize_raw(\"https://www.reddit.com/r/rust/?sort=top\")\n-                .unwrap()\n-                .canonical,\n-            \"https://reddit.com/r/rust\"\n-        );\n-        assert_eq!(\n-            canonicalize_raw(\"https://www.reddit.com/r/programming/hot\")\n-                .unwrap()\n-                .canonical,\n-            \"https://reddit.com/r/programming\"\n-        );\n-    }\n-\n-    #[test]\n-    fn reddit_short_path() {\n-        assert_eq!(\n-            canonicalize_raw(\"r/rust\").unwrap().canonical,\n-            \"https://reddit.com/r/rust\"\n-        );\n-    }\n-\n-    #[test]\n-    fn reddit_breadcrumbs_skip_phantom_comments() {\n-        let post = \"https://reddit.com/r/aww/comments/1trnvdl\";\n-        let crumbs = navigable_breadcrumbs(post);\n-        assert!(!crumbs.iter().any(|c| c.ends_with(\"/comments\")));\n-        assert_eq!(\n-            crumbs.last().map(String::as_str),\n-            Some(post)\n-        );\n-        assert!(crumbs.contains(&\"https://reddit.com/r/aww\".to_string()));\n-    }\n-\n-    #[test]\n-    fn reddit_parent_of_post_is_subreddit() {\n-        assert_eq!(\n-            parent_url(\"https://reddit.com/r/aww/comments/1trnvdl\").as_deref(),\n-            Some(\"https://reddit.com/r/aww\")\n-        );\n-    }\n-\n-    #[test]\n-    fn youtube_youtu_be_and_watch_same_canonical() {\n-        let a = canonicalize_raw(\"https://youtu.be/dQw4w9WgXcQ\").unwrap().canonical;\n-        let b = canonicalize_raw(\"https://www.youtube.com/watch?v=dQw4w9WgXcQ&t=10\").unwrap();\n-        assert_eq!(a, b.canonical);\n-        assert_eq!(a, \"https://youtube.com/watch?v=dQw4w9WgXcQ\");\n-    }\n-\n-    #[test]\n-    fn legacy_schemeless_upgrades() {\n-        assert_eq!(\n-            canonicalize_raw(\"reddit.com/r/rust/comments/aaa/announcing_rust_199\")\n-                .unwrap()\n-                .canonical,\n-            \"https://reddit.com/r/rust/comments/aaa\"\n-        );\n-    }\n-\n-    #[test]\n-    fn alias_recorded_when_input_differs() {\n-        let r = canonicalize_raw(\"https://youtu.be/abc123\").unwrap();\n-        assert_eq!(r.canonical, \"https://youtube.com/watch?v=abc123\");\n-        assert!(r.alias_of.is_some());\n-    }\n-}\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[b32c92f2] consolidated shared functions in tests (composer 2 fast)\n\nSide B — unified diff (full patch):\ndiff --git a/test/auth.bb b/test/auth.bb\nindex a67cc1de763434176d2f68e419dd37a8cd328395..78cffc875ffe83f512bca253f4a7489227311da4 100644\n--- a/test/auth.bb\n+++ b/test/auth.bb\n@@ -3,113 +3,14 @@\n   (:require [babashka.process :as p]\n             [babashka.fs :as fs]\n             [cheshire.core :as json]\n-            [org.httpkit.server :as http]\n-            [test.common :as common]))\n+            [clojure.string :as str]\n+            [test.common :as common]\n+            [test.oauth :as oauth]))\n \n-(def ^:private ansi-green \"\\033[32m\")\n-(def ^:private ansi-red   \"\\033[31m\")\n-(def ^:private ansi-reset \"\\033[0m\")\n (def ^:private counts (atom {:pass 0 :fail 0}))\n \n-(defn- pass [msg]\n-  (swap! counts update :pass inc)\n-  (println (str ansi-green \"  ✓ \" ansi-reset msg)))\n-\n-(defn- fail [msg]\n-  (swap! counts update :fail inc)\n-  (println (str ansi-red \"  ✗ \" ansi-reset msg)))\n-\n (defn- assert! [pred msg]\n-  (if pred\n-    (pass msg)\n-    (do (fail msg)\n-        (throw (ex-info (str \"FAIL: \" msg) {})))))\n-\n-(defn- http-client []\n-  (-> (java.net.http.HttpClient/newBuilder)\n-      (.followRedirects java.net.http.HttpClient$Redirect/ALWAYS)\n-      (.build)))\n-\n-(defn- http-get [url & {:keys [headers]}]\n-  (let [b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n-    (doseq [[k v] (or headers {})]\n-      (.header b k v))\n-    (let [req (-> b (.GET) (.build))\n-          resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n-      {:status (.statusCode resp) :body (.body resp) :headers (.map (.headers resp))})))\n-\n-(defn- http-post-json [url data & {:keys [headers]}]\n-  (let [body (json/generate-string data)\n-        b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n-    (.header b \"Content-Type\" \"application/json\")\n-    (doseq [[k v] (or headers {})]\n-      (.header b k v))\n-    (let [req (-> b\n-                  (.POST (java.net.http.HttpRequest$BodyPublishers/ofString body))\n-                  (.build))\n-          resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n-      {:status (.statusCode resp) :body (.body resp) :headers (.map (.headers resp))})))\n-\n-(defn- http-post-form [url form]\n-  (let [pairs (->> form\n-                   (map (fn [[k v]]\n-                          (str (java.net.URLEncoder/encode (name k) \"UTF-8\")\n-                               \"=\"\n-                               (java.net.URLEncoder/encode (str v) \"UTF-8\"))))\n-                   (clojure.string/join \"&\"))\n-        b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n-    (.header b \"Content-Type\" \"application/x-www-form-urlencoded\")\n-    (let [req (-> b\n-                  (.POST (java.net.http.HttpRequest$BodyPublishers/ofString pairs))\n-                  (.build))\n-          resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n-      {:status (.statusCode resp) :body (.body resp) :headers (.map (.headers resp))})))\n-\n-(defn- parse-query [s]\n-  (into {}\n-        (for [part (clojure.string/split (or s \"\") #\"&\")\n-              :when (not (clojure.string/blank? part))]\n-          (let [[k v] (clojure.string/split part #\"=\" 2)]\n-            [(keyword (java.net.URLDecoder/decode k \"UTF-8\"))\n-             (some-> v (java.net.URLDecoder/decode \"UTF-8\"))]))))\n-\n-(defn- b64url [s]\n-  (-> (java.util.Base64/getUrlEncoder)\n-      (.withoutPadding)\n-      (.encodeToString (.getBytes s \"UTF-8\"))))\n-\n-(defn- make-id-token [sub]\n-  (str (b64url \"{\\\"alg\\\":\\\"RS256\\\",\\\"typ\\\":\\\"JWT\\\"}\")\n-       \".\"\n-       (b64url (json/generate-string {:sub sub}))\n-       \".fakesig\"))\n-\n-(defn- start-mock-google [port]\n-  (let [google-users [\"google-user-1\" \"google-user-2\"]\n-        !call-count (atom 0)\n-        handler\n-        (fn [req]\n-          (cond\n-            (and (= :get (:request-method req))\n-                 (= \"/o/oauth2/v2/auth\" (:uri req)))\n-            (let [q (parse-query (:query-string req))\n-                  redirect-uri (:redirect_uri q)\n-                  state (:state q)\n-                  loc (str redirect-uri \"?code=mockcode&state=\" state)]\n-              {:status 302 :headers {\"Location\" loc} :body \"\"})\n-\n-            (and (= :post (:request-method req))\n-                 (= \"/token\" (:uri req)))\n-            (let [n   (swap! !call-count inc)\n-                  sub (nth google-users (mod (dec n) (count google-users)))]\n-              {:status 200\n-               :headers {\"Content-Type\" \"application/json\"}\n-               :body (json/generate-string {:id_token (make-id-token sub)})})\n-\n-            :else\n-            {:status 404 :body \"not found\"}))\n-        stop-fn (http/run-server handler {:port port})]\n-    {:stop-fn stop-fn :port port}))\n+  (common/test-assert! counts pred msg))\n \n (defn auth-test [& _args]\n   (println \"\\n━━━ auth v3 integration check ━━━\\n\")\n@@ -117,8 +18,7 @@\n \n   (println \"building server + CLI binaries…\")\n   (common/letlocals\n-   (bind build @(p/process [(common/cargo-bin) \"build\" \"--release\" \"-p\" \"slugsocial-server\" \"-p\" \"slugsocial\"]\n-                           {:inherit true :env common/base-env}))\n+   (bind build (common/run-cargo-build-release! [\"slugsocial-server\" \"slugsocial\"]))\n    (assert! (zero? (:exit build)) \"cargo build succeeds\")\n    (bind server-bin \"target/release/slugsocial-server\")\n    (bind cli-bin \"target/release/slugsocial\")\n@@ -134,19 +34,10 @@\n    (bind !server (atom nil))\n    (bind !google (atom nil))\n \n-   (bind server-env (merge common/base-env\n-                           {\"SLUG_DATA_DIR\" tmp-dir\n-                            \"SLUG_KEYS\"     \"test:test\"\n-                            \"PORT\"          (str slug-port)\n-                            \"RUST_LOG\"      \"warn\"\n-                            \"SLUG_PUBLIC_URL\" base-url\n-                            \"SLUG_GOOGLE_AUTH_URL\" (str google-url \"/o/oauth2/v2/auth\")\n-                            \"SLUG_GOOGLE_TOKEN_URL\" (str google-url \"/token\")\n-                            \"SLUG_GOOGLE_CLIENT_ID\" \"mock\"\n-                            \"SLUG_GOOGLE_CLIENT_SECRET\" \"mock\"}))\n+   (bind server-env (common/slug-server-env tmp-dir base-url google-url slug-port))\n    (try\n      (println (str \"\\nstarting mock google on :\" google-port))\n-     (reset! !google (start-mock-google google-port))\n+     (reset! !google (oauth/start-mock-google google-port :google-users [\"google-user-1\" \"google-user-2\"]))\n      (assert! (some? (:stop-fn @!google)) \"mock google started\")\n \n      (println (str \"starting server on :\" slug-port))\n@@ -154,34 +45,33 @@\n      (assert! (common/wait-for-server base-url 10000) \"server responds to /healthz\")\n \n      (println \"\\nstarting pending session…\")\n-     (let [start-resp (http-post-json (str base-url \"/api/v0/pending-session\")\n-                                      {:agent \"00000000-0000-0000-0000-000000000000:bb:local/dev\"})\n+     (let [start-resp (oauth/http-post-json (str base-url \"/api/v0/pending-session\")\n+                                            {:agent \"00000000-0000-0000-0000-000000000000:bb:local/dev\"})\n            _ (assert! (= 200 (:status start-resp)) \"pending-session start returns 200\")\n            start-json (json/parse-string (:body start-resp) true)]\n-       (assert! (clojure.string/starts-with? (:session start-json) \"p_\") \"session id has p_ prefix\")\n-       (assert! (clojure.string/includes? (:login_url start-json) \"/auth/login\") \"login_url provided\")\n+       (assert! (str/starts-with? (:session start-json) \"p_\") \"session id has p_ prefix\")\n+       (assert! (str/includes? (:login_url start-json) \"/auth/login\") \"login_url provided\")\n \n        (println \"\\nsimulating browser oauth redirects…\")\n-       ;; This will follow redirects: /auth/login -> mock google -> /auth/callback -> /auth/choose-username\n-       (let [login-get (http-get (:login_url start-json))]\n+       (let [login-get (oauth/http-get (:login_url start-json))]\n          (assert! (= 200 (:status login-get)) \"choose-username page reachable after oauth callback\"))\n \n        (println \"\\nchoosing username…\")\n-       (let [choose (http-post-form (str base-url \"/auth/choose-username\")\n-                                    {:session (:session start-json) :username \"bbuser\"})]\n+       (let [choose (oauth/http-post-form (str base-url \"/auth/choose-username\")\n+                                          {:session (:session start-json) :username \"bbuser\"})]\n          (assert! (= 200 (:status choose)) \"choose-username POST returns 200\"))\n \n        (println \"\\npolling pending session…\")\n-       (let [poll (http-get (str base-url \"/api/v0/pending-session/\" (:session start-json)))]\n+       (let [poll (oauth/http-get (str base-url \"/api/v0/pending-session/\" (:session start-json)))]\n          (assert! (= 200 (:status poll)) \"pending-session poll returns 200\")\n          (let [poll-json (json/parse-string (:body poll) true)]\n            (assert! (:complete poll-json) \"pending session complete=true\")\n            (assert! (= \"bbuser\" (:user poll-json)) \"poll returns stored username bbuser\")\n-           (assert! (clojure.string/starts-with? (:token poll-json) \"slug_\") \"poll returns bearer token\")\n+           (assert! (str/starts-with? (:token poll-json) \"slug_\") \"poll returns bearer token\")\n \n            (println \"\\nwhoami…\")\n-           (let [who (http-get (str base-url \"/api/v0/whoami\")\n-                               :headers {\"Authorization\" (str \"Bearer \" (:token poll-json))})]\n+           (let [who (oauth/http-get (str base-url \"/api/v0/whoami\")\n+                                     :headers {\"Authorization\" (str \"Bearer \" (:token poll-json))})]\n              (assert! (= 200 (:status who)) \"whoami returns 200\")\n              (let [who-json (json/parse-string (:body who) true)]\n                (assert! (= \"bbuser\" (:user who-json)) \"whoami user is bbuser (stored form)\"))))))\n@@ -195,11 +85,11 @@\n                   (str \"identity start exits 0 (stderr: \" (:err start-proc) \")\"))\n          (let [start-cli (json/parse-string (:out start-proc) true)]\n            (assert! (= \"present_oauth_url_to_user\" (:phase start-cli)) \"identity start --json phase\")\n-           (assert! (clojure.string/starts-with? (:session start-cli) \"p_\") \"CLI start session id\")\n-           (let [login-get (http-get (:login_url start-cli))]\n+           (assert! (str/starts-with? (:session start-cli) \"p_\") \"CLI start session id\")\n+           (let [login-get (oauth/http-get (:login_url start-cli))]\n              (assert! (= 200 (:status login-get)) \"CLI login_url redirect chain succeeds\"))\n-           (let [choose (http-post-form (str base-url \"/auth/choose-username\")\n-                                        {:session (:session start-cli) :username \"cliuser\"})]\n+           (let [choose (oauth/http-post-form (str base-url \"/auth/choose-username\")\n+                                              {:session (:session start-cli) :username \"cliuser\"})]\n              (assert! (= 200 (:status choose)) \"choose-username for cliuser\"))\n            (let [poll-proc @(p/process [cli-bin \"identity\" \"poll\" (:session start-cli)\n                                         \"--poll-interval-ms\" \"100\" \"--max-wait-secs\" \"30\" \"--json\"]\n@@ -209,10 +99,10 @@\n              (let [poll-cli (json/parse-string (:out poll-proc) true)]\n                (assert! (= \"complete\" (:phase poll-cli)) \"identity poll --json phase\")\n                (assert! (= \"cliuser\" (:user poll-cli)) \"CLI poll user (stored form)\")\n-               (assert! (clojure.string/starts-with? (:token poll-cli) \"slug_\") \"CLI poll token\")\n+               (assert! (str/starts-with? (:token poll-cli) \"slug_\") \"CLI poll token\")\n                (let [token-path (str cli-home \"/.config/slugsocial/token\")]\n                  (assert! (fs/exists? token-path) \"token written under isolated HOME\")\n-                 (assert! (= (clojure.string/trim (slurp token-path)) (:token poll-cli))\n+                 (assert! (= (str/trim (slurp token-path)) (:token poll-cli))\n                           \"token file matches poll JSON\"))\n                (let [who-proc @(p/process [cli-bin \"whoami\" \"--json\"]\n                                           {:out :string :err :string :env cli-env})]\n@@ -227,5 +117,4 @@\n        (fs/delete-tree tmp-dir)))\n \n    (bind {pass :pass} @counts)\n-   (println (str \"\\n\" ansi-green \"━━━ \" pass \" auth checks passed ━━━\" ansi-reset \"\\n\"))))\n-\n+   (println (str \"\\n\" common/ansi-green \"━━━ \" pass \" auth checks passed ━━━\" common/ansi-reset \"\\n\"))))\ndiff --git a/test/common.bb b/test/common.bb\nindex 4ed450377cdbb020f5ff164a812dfbbfc23c0f47..0b855ea5fc6cc513df065a221a28eae6e0848edc 100644\n--- a/test/common.bb\n+++ b/test/common.bb\n@@ -1,6 +1,7 @@\n (ns test.common\n   \"Shared utilities for slug test rigs: port allocation, server lifecycle,\n-   environment helpers, CLI runner, and the letlocals macro.\"\n+   environment helpers, CLI runner, test harness (ANSI + pass/fail counts),\n+   standard server env for bb suites, and the letlocals macro.\"\n   (:require [babashka.process :as p]\n             [clojure.string :as str]\n             [babashka.fs :as fs]))\n@@ -43,6 +44,42 @@\n               env\n               (assoc env \"PATH\" (str cargo-home \":\" (get env \"PATH\" \"\")))))))\n \n+;; ---------------------------------------------------------------------------\n+;; test harness (ANSI + counters)\n+;; ---------------------------------------------------------------------------\n+\n+(def ansi-green \"\\033[32m\")\n+(def ansi-red   \"\\033[31m\")\n+(def ansi-reset \"\\033[0m\")\n+\n+(defn test-pass! [counts-atom msg]\n+  (swap! counts-atom update :pass inc)\n+  (println (str ansi-green \"  ✓ \" ansi-reset msg)))\n+\n+(defn test-fail! [counts-atom msg]\n+  (swap! counts-atom update :fail inc)\n+  (println (str ansi-red \"  ✗ \" ansi-reset msg)))\n+\n+(defn test-assert! [counts-atom pred msg]\n+  (if pred\n+    (test-pass! counts-atom msg)\n+    (do (test-fail! counts-atom msg)\n+        (throw (ex-info (str \"FAIL: \" msg) {})))))\n+\n+(defn slug-server-env\n+  \"Env map for `slugsocial-server` in bb integration tests (mock Google URLs, data dir, keys).\"\n+  [tmp-dir base-url google-base-url slug-port]\n+  (merge base-env\n+         {\"SLUG_DATA_DIR\" tmp-dir\n+          \"SLUG_KEYS\"     \"test:test\"\n+          \"PORT\"          (str slug-port)\n+          \"RUST_LOG\"      \"warn\"\n+          \"SLUG_PUBLIC_URL\" base-url\n+          \"SLUG_GOOGLE_AUTH_URL\" (str google-base-url \"/o/oauth2/v2/auth\")\n+          \"SLUG_GOOGLE_TOKEN_URL\" (str google-base-url \"/token\")\n+          \"SLUG_GOOGLE_CLIENT_ID\" \"mock\"\n+          \"SLUG_GOOGLE_CLIENT_SECRET\" \"mock\"}))\n+\n (defn cargo-bin\n   \"Resolve cargo, preferring ~/.cargo/bin if not on PATH.\"\n   []\n@@ -50,6 +87,13 @@\n     (str cargo-home \"/cargo\")\n     \"cargo\"))\n \n+(defn run-cargo-build-release!\n+  \"`cargo build --release` for each package name in `packages` (e.g. [\\\"slugsocial-server\\\"]).\"\n+  [packages]\n+  @(p/process (into [(cargo-bin) \"build\" \"--release\"]\n+                    (mapcat (fn [p] [\"-p\" p]) packages))\n+              {:inherit true :env base-env}))\n+\n ;; ---------------------------------------------------------------------------\n ;; port / server utilities\n ;; ---------------------------------------------------------------------------\ndiff --git a/test/grants.bb b/test/grants.bb\nindex 793ba216f2de76a77eb20a76d08403db07ff411b..10ef0f08ce1c3945e5f1634314e6aebcf6810cd2 100644\n--- a/test/grants.bb\n+++ b/test/grants.bb\n@@ -7,145 +7,20 @@\n   - user with View + Post -> ok=true for prose\n   - user with View + Post but no Vote -> ok=false for vote\n   - user with View + Post + Vote -> ok=true for vote\"\n-  (:require [babashka.process :as p]\n-            [babashka.fs :as fs]\n+  (:require [babashka.fs :as fs]\n             [cheshire.core :as json]\n-            [org.httpkit.server :as http]\n-            [test.common :as common]))\n+            [test.common :as common]\n+            [test.oauth :as oauth]))\n \n-(def ^:private ansi-green \"\\033[32m\")\n-(def ^:private ansi-red   \"\\033[31m\")\n-(def ^:private ansi-reset \"\\033[0m\")\n (def ^:private counts (atom {:pass 0 :fail 0}))\n \n-(defn- pass [msg]\n-  (swap! counts update :pass inc)\n-  (println (str ansi-green \"  ✓ \" ansi-reset msg)))\n-\n-(defn- fail [msg]\n-  (swap! counts update :fail inc)\n-  (println (str ansi-red \"  ✗ \" ansi-reset msg)))\n-\n (defn- assert! [pred msg]\n-  (if pred\n-    (pass msg)\n-    (do (fail msg)\n-        (throw (ex-info (str \"FAIL: \" msg) {})))))\n-\n-(defn- http-client []\n-  (-> (java.net.http.HttpClient/newBuilder)\n-      (.followRedirects java.net.http.HttpClient$Redirect/ALWAYS)\n-      (.connectTimeout (java.time.Duration/ofSeconds 15))\n-      (.build)))\n-\n-(defn- http-get [url & {:keys [headers]}]\n-  (let [b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n-    (doseq [[k v] (or headers {})]\n-      (.header b k v))\n-    (let [req (-> b (.timeout (java.time.Duration/ofSeconds 60)) (.GET) (.build))\n-          resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n-      {:status (.statusCode resp) :body (.body resp)})))\n-\n-(defn- http-post-json [url data & {:keys [headers]}]\n-  (let [body (json/generate-string data)\n-        b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n-    (.header b \"Content-Type\" \"application/json\")\n-    (doseq [[k v] (or headers {})]\n-      (.header b k v))\n-    (let [req (-> b\n-                  (.timeout (java.time.Duration/ofSeconds 60))\n-                  (.POST (java.net.http.HttpRequest$BodyPublishers/ofString body))\n-                  (.build))\n-          resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n-      {:status (.statusCode resp) :body (.body resp)})))\n-\n-(defn- http-post-form [url form]\n-  (let [pairs (->> form\n-                   (map (fn [[k v]]\n-                          (str (java.net.URLEncoder/encode (name k) \"UTF-8\")\n-                               \"=\"\n-                               (java.net.URLEncoder/encode (str v) \"UTF-8\"))))\n-                   (clojure.string/join \"&\"))\n-        b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n-    (.header b \"Content-Type\" \"application/x-www-form-urlencoded\")\n-    (let [req (-> b\n-                  (.timeout (java.time.Duration/ofSeconds 60))\n-                  (.POST (java.net.http.HttpRequest$BodyPublishers/ofString pairs))\n-                  (.build))\n-          resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n-      {:status (.statusCode resp) :body (.body resp)})))\n-\n-(defn- parse-query [s]\n-  (into {}\n-        (for [part (clojure.string/split (or s \"\") #\"&\")\n-              :when (not (clojure.string/blank? part))]\n-          (let [[k v] (clojure.string/split part #\"=\" 2)]\n-            [(keyword (java.net.URLDecoder/decode k \"UTF-8\"))\n-             (some-> v (java.net.URLDecoder/decode \"UTF-8\"))]))))\n-\n-(defn- b64url [s]\n-  (-> (java.util.Base64/getUrlEncoder)\n-      (.withoutPadding)\n-      (.encodeToString (.getBytes s \"UTF-8\"))))\n-\n-(defn- make-id-token [sub]\n-  (str (b64url \"{\\\"alg\\\":\\\"RS256\\\",\\\"typ\\\":\\\"JWT\\\"}\")\n-       \".\"\n-       (b64url (json/generate-string {:sub sub}))\n-       \".fakesig\"))\n-\n-;; Stateful mock: each /token call returns the next user in the list.\n-;; This lets us register two distinct users in one test run.\n-(defn- start-mock-google [port]\n-  (let [google-users [\"google-user-alice\" \"google-user-bob\"]\n-        !call-count (atom 0)\n-        handler\n-        (fn [req]\n-          (cond\n-            (and (= :get (:request-method req))\n-                 (= \"/o/oauth2/v2/auth\" (:uri req)))\n-            (let [q (parse-query (:query-string req))\n-                  redirect-uri (:redirect_uri q)\n-                  state (:state q)\n-                  loc (str redirect-uri \"?code=mockcode&state=\" state)]\n-              {:status 302 :headers {\"Location\" loc} :body \"\"})\n-\n-            (and (= :post (:request-method req))\n-                 (= \"/token\" (:uri req)))\n-            (let [n   (swap! !call-count inc)\n-                  sub (nth google-users (mod (dec n) (count google-users)))]\n-              {:status 200\n-               :headers {\"Content-Type\" \"application/json\"}\n-               :body (json/generate-string {:id_token (make-id-token sub)})})\n-\n-            :else\n-            {:status 404 :body \"not found\"}))\n-        stop-fn (http/run-server handler {:port port})]\n-    {:stop-fn stop-fn :port port}))\n-\n-(defn- register-user\n-  \"Walk the full OAuth flow for one user. Returns the bearer token.\"\n-  [base-url session-agent username]\n-  (let [start-resp (http-post-json (str base-url \"/api/v0/pending-session\")\n-                                   {:agent session-agent})\n-        _ (assert! (= 200 (:status start-resp))\n-                   (str \"pending-session for \" username \" returns 200\"))\n-        start-json (json/parse-string (:body start-resp) true)\n-        _login (http-get (:login_url start-json))\n-        _choose (http-post-form (str base-url \"/auth/choose-username\")\n-                                {:session (:session start-json) :username username})\n-        _ (assert! (= 200 (:status _choose))\n-                   (str \"choose-username for \" username \" returns 200\"))\n-        poll (http-get (str base-url \"/api/v0/pending-session/\" (:session start-json)))\n-        poll-json (json/parse-string (:body poll) true)\n-        _ (assert! (:complete poll-json)\n-                   (str \"pending session complete for \" username))]\n-    (:token poll-json)))\n+  (common/test-assert! counts pred msg))\n \n (defn- bearer [token] {\"Authorization\" (str \"Bearer \" token)})\n \n (defn- rpc-batch! [base-url token cmds]\n-  (let [resp (http-post-json (str base-url \"/api/v0/rpc\") cmds :headers (bearer token))]\n+  (let [resp (oauth/http-post-json (str base-url \"/api/v0/rpc\") cmds :headers (bearer token))]\n     {:status (:status resp)\n      :parsed (json/parse-string (:body resp) false)}))\n \n@@ -160,14 +35,19 @@\n                         \"text\" text\n                         \"return_rank_diff\" false}}]))\n \n+(defn- register-user! [base-url session-agent username]\n+  (oauth/complete-registration! base-url\n+                                :agent session-agent\n+                                :username username\n+                                :assert! (fn [pred msg] (assert! pred msg))))\n+\n (defn grants-test [& _args]\n   (println \"\\n━━━ grants enforcement integration check ━━━\\n\")\n   (reset! counts {:pass 0 :fail 0})\n \n   (println \"building server binary…\")\n   (common/letlocals\n-   (bind build @(p/process [(common/cargo-bin) \"build\" \"--release\" \"-p\" \"slugsocial-server\"]\n-                           {:inherit true :env common/base-env}))\n+   (bind build (common/run-cargo-build-release! [\"slugsocial-server\"]))\n    (assert! (zero? (:exit build)) \"cargo build succeeds\")\n    (bind server-bin \"target/release/slugsocial-server\")\n \n@@ -180,33 +60,24 @@\n    (bind !server (atom nil))\n    (bind !google (atom nil))\n \n-   (bind server-env (merge common/base-env\n-                           {\"SLUG_DATA_DIR\" tmp-dir\n-                            \"SLUG_KEYS\"     \"test:test\"\n-                            \"PORT\"          (str slug-port)\n-                            \"RUST_LOG\"      \"warn\"\n-                            \"SLUG_PUBLIC_URL\" base-url\n-                            \"SLUG_GOOGLE_AUTH_URL\" (str google-url \"/o/oauth2/v2/auth\")\n-                            \"SLUG_GOOGLE_TOKEN_URL\" (str google-url \"/token\")\n-                            \"SLUG_GOOGLE_CLIENT_ID\" \"mock\"\n-                            \"SLUG_GOOGLE_CLIENT_SECRET\" \"mock\"}))\n+   (bind server-env (common/slug-server-env tmp-dir base-url google-url slug-port))\n    (try\n      (println (str \"starting mock google on :\" google-port))\n-     (reset! !google (start-mock-google google-port))\n+     (reset! !google (oauth/start-mock-google google-port\n+                                              :google-users [\"google-user-alice\" \"google-user-bob\"]))\n \n      (println (str \"starting server on :\" slug-port))\n      (reset! !server (common/start-server server-bin server-env))\n      (assert! (common/wait-for-server base-url 10000) \"server responds to /healthz\")\n \n-     ;; Register two users. The mock google cycles through google-user-alice then google-user-bob.\n      (println \"\\nregistering alice…\")\n-     (let [alice-token (register-user base-url\n-                                      \"00000000-0000-0000-0000-000000000001:test:local/dev\"\n-                                      \"alice\")\n+     (let [alice-token (register-user! base-url\n+                                       \"00000000-0000-0000-0000-000000000001:test:local/dev\"\n+                                       \"alice\")\n            _ (println \"registering bob…\")\n-           bob-token   (register-user base-url\n-                                      \"00000000-0000-0000-0000-000000000002:test:local/dev\"\n-                                      \"bob\")\n+           bob-token   (register-user! base-url\n+                                       \"00000000-0000-0000-0000-000000000002:test:local/dev\"\n+                                       \"bob\")\n \n            ;; Alice creates a private room.\n            _ (println \"\\nalice creates private room…\")\n@@ -288,6 +159,6 @@\n \n    (bind {pass :pass fail :fail} @counts)\n    (if (zero? fail)\n-     (println (str \"\\n\" ansi-green \"━━━ \" pass \" grant checks passed ━━━\" ansi-reset \"\\n\"))\n-     (do (println (str \"\\n\" ansi-red \"━━━ \" fail \" grant checks FAILED ━━━\" ansi-reset \"\\n\"))\n+     (println (str \"\\n\" common/ansi-green \"━━━ \" pass \" grant checks passed ━━━\" common/ansi-reset \"\\n\"))\n+     (do (println (str \"\\n\" common/ansi-red \"━━━ \" fail \" grant checks FAILED ━━━\" common/ansi-reset \"\\n\"))\n          (System/exit 1)))))\ndiff --git a/test/integration.bb b/test/integration.bb\nindex 07c9851e5e112f644556a847302d00b5e0f6acb4..c9af7afb3942ffb509a7d053b903c36cdbf1691b 100644\n--- a/test/integration.bb\n+++ b/test/integration.bb\n@@ -2,8 +2,7 @@\n   \"End-to-end integration check: DSL → CLI → HTTP → JSONL → materialized view → CLI query.\n    Boots a server, ingests via CLI, queries back, kills server, restarts from\n    the same JSONL, and queries again to prove replay determinism.\"\n-  (:require [babashka.process :as p]\n-            [clojure.string :as str]\n+  (:require [clojure.string :as str]\n             [babashka.fs :as fs]\n             [cheshire.core :as json]\n             [test.common :as common]\n@@ -13,25 +12,10 @@\n ;; helpers\n ;; ---------------------------------------------------------------------------\n \n-(def ^:private ansi-green \"\\033[32m\")\n-(def ^:private ansi-red   \"\\033[31m\")\n-(def ^:private ansi-reset \"\\033[0m\")\n-\n (def ^:private counts (atom {:pass 0 :fail 0}))\n \n-(defn- pass [msg]\n-  (swap! counts update :pass inc)\n-  (println (str ansi-green \"  ✓ \" ansi-reset msg)))\n-\n-(defn- fail [msg]\n-  (swap! counts update :fail inc)\n-  (println (str ansi-red \"  ✗ \" ansi-reset msg)))\n-\n (defn- assert! [pred msg]\n-  (if pred\n-    (pass msg)\n-    (do (fail msg)\n-        (throw (ex-info (str \"FAIL: \" msg) {})))))\n+  (common/test-assert! counts pred msg))\n \n ;; ---------------------------------------------------------------------------\n ;; letlocals unit tests\n@@ -102,8 +86,7 @@\n   (println \"\\nbuilding binaries…\")\n   (common/letlocals\n     ;; 1. build\n-   (bind build      @(p/process [(common/cargo-bin) \"build\" \"--release\" \"-p\" \"slugsocial-server\" \"-p\" \"slugsocial\"]\n-                                {:inherit true :env common/base-env}))\n+   (bind build (common/run-cargo-build-release! [\"slugsocial-server\" \"slugsocial\"]))\n    (assert! (zero? (:exit build)) \"cargo build succeeds\")\n \n    (bind server-bin \"target/release/slugsocial-server\")\n@@ -120,16 +103,7 @@\n    (bind !server    (atom nil))\n    (bind !server2   (atom nil))\n    (bind !google    (atom nil))\n-   (bind server-env (merge common/base-env\n-                           {\"SLUG_DATA_DIR\" tmp-dir\n-                            \"SLUG_KEYS\"     \"test:test\"\n-                            \"PORT\"          (str port)\n-                            \"RUST_LOG\"      \"warn\"\n-                            \"SLUG_PUBLIC_URL\" base-url\n-                            \"SLUG_GOOGLE_AUTH_URL\" (str google-url \"/o/oauth2/v2/auth\")\n-                            \"SLUG_GOOGLE_TOKEN_URL\" (str google-url \"/token\")\n-                            \"SLUG_GOOGLE_CLIENT_ID\" \"mock\"\n-                            \"SLUG_GOOGLE_CLIENT_SECRET\" \"mock\"}))\n+   (bind server-env (common/slug-server-env tmp-dir base-url google-url port))\n \n    (try\n      (common/letlocals\n@@ -291,4 +265,4 @@\n        (fs/delete-tree tmp-dir)))\n \n    (bind {pass :pass} @counts)\n-   (println (str \"\\n\" ansi-green \"━━━ \" pass \" checks passed ━━━\" ansi-reset \"\\n\"))))\n+   (println (str \"\\n\" common/ansi-green \"━━━ \" pass \" checks passed ━━━\" common/ansi-reset \"\\n\"))))\ndiff --git a/test/oauth.bb b/test/oauth.bb\nindex 84679e1a4adbe100dfe7e7d64a2c6270b023d275..b69459acd17c23c023170d8dd93fe45bb49c8d88 100644\n--- a/test/oauth.bb\n+++ b/test/oauth.bb\n@@ -1,18 +1,23 @@\n (ns test.oauth\n   \"Shared Babashka HTTP helpers + mock Google OAuth + token handoff for integration tests.\"\n   (:require [cheshire.core :as json]\n+            [clojure.string :as str]\n             [org.httpkit.server :as http]))\n \n+(def ^:private connect-timeout (java.time.Duration/ofSeconds 15))\n+(def ^:private request-timeout (java.time.Duration/ofSeconds 60))\n+\n (defn http-client []\n   (-> (java.net.http.HttpClient/newBuilder)\n       (.followRedirects java.net.http.HttpClient$Redirect/ALWAYS)\n+      (.connectTimeout connect-timeout)\n       (.build)))\n \n (defn http-get [url & {:keys [headers]}]\n   (let [b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n     (doseq [[k v] (or headers {})]\n       (.header b k v))\n-    (let [req (-> b (.GET) (.build))\n+    (let [req (-> b (.timeout request-timeout) (.GET) (.build))\n           resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n       {:status (.statusCode resp) :body (.body resp) :headers (.map (.headers resp))})))\n \n@@ -23,6 +28,7 @@\n     (doseq [[k v] (or headers {})]\n       (.header b k v))\n     (let [req (-> b\n+                  (.timeout request-timeout)\n                   (.POST (java.net.http.HttpRequest$BodyPublishers/ofString body))\n                   (.build))\n           resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n@@ -34,10 +40,11 @@\n                           (str (java.net.URLEncoder/encode (name k) \"UTF-8\")\n                                \"=\"\n                                (java.net.URLEncoder/encode (str v) \"UTF-8\"))))\n-                   (clojure.string/join \"&\"))\n+                   (str/join \"&\"))\n         b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n     (.header b \"Content-Type\" \"application/x-www-form-urlencoded\")\n     (let [req (-> b\n+                  (.timeout request-timeout)\n                   (.POST (java.net.http.HttpRequest$BodyPublishers/ofString pairs))\n                   (.build))\n           resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n@@ -45,9 +52,9 @@\n \n (defn parse-query [s]\n   (into {}\n-        (for [part (clojure.string/split (or s \"\") #\"&\")\n-              :when (not (clojure.string/blank? part))]\n-          (let [[k v] (clojure.string/split part #\"=\" 2)]\n+        (for [part (str/split (or s \"\") #\"&\")\n+              :when (not (str/blank? part))]\n+          (let [[k v] (str/split part #\"=\" 2)]\n             [(keyword (java.net.URLDecoder/decode k \"UTF-8\"))\n              (some-> v (java.net.URLDecoder/decode \"UTF-8\"))]))))\n \n@@ -62,8 +69,14 @@\n        (b64url (json/generate-string {:sub sub}))\n        \".fakesig\"))\n \n-(defn start-mock-google [port]\n-  (let [handler\n+(defn start-mock-google\n+  \"Minimal Google OAuth stub. With multiple `google-users`, each `/token` call returns the next\n+   `sub` in order (wraps), so several registrations get distinct Google identities.\"\n+  [port & {:keys [google-users] :or {google-users [\"google-user-1\"]}}]\n+  (let [users (vec google-users)\n+        multi? (> (count users) 1)\n+        !call-count (when multi? (atom 0))\n+        handler\n         (fn [req]\n           (cond\n             (and (= :get (:request-method req))\n@@ -76,9 +89,13 @@\n \n             (and (= :post (:request-method req))\n                  (= \"/token\" (:uri req)))\n-            {:status 200\n-             :headers {\"Content-Type\" \"application/json\"}\n-             :body (json/generate-string {:id_token (make-id-token \"google-user-1\")})}\n+            (let [sub (if multi?\n+                        (let [n (swap! !call-count inc)]\n+                          (nth users (mod (dec n) (count users))))\n+                        (first users))]\n+              {:status 200\n+               :headers {\"Content-Type\" \"application/json\"}\n+               :body (json/generate-string {:id_token (make-id-token sub)})})\n \n             :else\n             {:status 404 :body \"not found\"}))\n@@ -87,28 +104,46 @@\n \n (def ^:private default-agent \"00000000-0000-0000-0000-000000000000:cli:local/dev\")\n \n+(defn complete-registration!\n+  \"Run pending-session → login redirect → choose-username → poll; return bearer token string.\n+   With `assert!`, use `(fn [pred msg] …)` for test-style checks; without it, throw `ex-info` on failure.\"\n+  [base-url & {:keys [username agent assert!]\n+               :or {username \"user\" agent default-agent}}]\n+  (let [check! (fn [pred msg resp]\n+                 (if assert!\n+                   (assert! pred msg)\n+                   (when-not pred\n+                     (throw (ex-info msg {:resp resp})))))]\n+    (let [start-resp (http-post-json (str base-url \"/api/v0/pending-session\")\n+                                     {:agent agent})]\n+      (check! (= 200 (:status start-resp))\n+              (str \"pending-session for \" username \" returns 200\")\n+              start-resp)\n+      (let [start-json (json/parse-string (:body start-resp) true)\n+            login-get (http-get (:login_url start-json))]\n+        (check! (= 200 (:status login-get))\n+                (str \"login redirect chain for \" username)\n+                login-get)\n+        (let [choose (http-post-form (str base-url \"/auth/choose-username\")\n+                                     {:session (:session start-json) :username username})]\n+          (check! (= 200 (:status choose))\n+                  (str \"choose-username for \" username \" returns 200\")\n+                  choose)\n+          (let [poll (http-get (str base-url \"/api/v0/pending-session/\" (:session start-json)))]\n+            (check! (= 200 (:status poll))\n+                    (str \"pending-session poll for \" username \" returns 200\")\n+                    poll)\n+            (let [poll-json (json/parse-string (:body poll) true)]\n+              (check! (:complete poll-json)\n+                      (str \"pending session complete for \" username)\n+                      poll)\n+              (:token poll-json))))))))\n+\n (defn fetch-bearer-token!\n   \"Simulate browser OAuth + username choice; returns `slug_…` bearer token.\n    Ingest `--delegate` must match this agent string for `AgentBound` on first write.\"\n   [base-url & {:keys [username agent] :or {username \"intuser\" agent default-agent}}]\n-  (let [start-resp (http-post-json (str base-url \"/api/v0/pending-session\")\n-                                   {:agent agent})]\n-    (when-not (= 200 (:status start-resp))\n-      (throw (ex-info \"pending-session start failed\" {:resp start-resp})))\n-    (let [start-json (json/parse-string (:body start-resp) true)\n-          login-get (http-get (:login_url start-json))]\n-      (when-not (= 200 (:status login-get))\n-        (throw (ex-info \"login redirect chain failed\" {:resp login-get})))\n-      (let [choose (http-post-form (str base-url \"/auth/choose-username\")\n-                                   {:session (:session start-json) :username username})]\n-        (when-not (= 200 (:status choose))\n-          (throw (ex-info \"choose-username failed\" {:resp choose})))\n-        (let [poll (http-get (str base-url \"/api/v0/pending-session/\" (:session start-json)))]\n-          (when-not (= 200 (:status poll))\n-            (throw (ex-info \"pending-session poll failed\" {:resp poll})))\n-          (let [poll-json (json/parse-string (:body poll) true)]\n-            (when-not (:complete poll-json)\n-              (throw (ex-info \"pending session not complete\" {:poll poll-json})))\n-            (when-not (clojure.string/starts-with? (:token poll-json) \"slug_\")\n-              (throw (ex-info \"bad token in poll response\" {:poll poll-json})))\n-            (:token poll-json)))))))\n+  (let [token (complete-registration! base-url :username username :agent agent)]\n+    (when-not (str/starts-with? token \"slug_\")\n+      (throw (ex-info \"bad token in poll response\" {:token token})))\n+    token))\n","role":"user"}],"model":"~x-ai/grok-latest"}