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:
[7964b28f] fix

Side A — unified diff (full patch):
diff --git a/Cargo.lock b/Cargo.lock
index 8c43fb75c472b102e6e1d3b837dce3355be898f2..e55d87f32ab32064686431c7082ef8c9ca872d63 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -923,6 +923,15 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
 [[package]]
 name = "prettyplease"
 version = "0.2.37"
@@ -980,6 +989,36 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 
+[[package]]
+name = "rand"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.17",
+]
+
 [[package]]
 name = "regex-automata"
 version = "0.4.14"
@@ -1270,6 +1309,7 @@ dependencies = [
  "dotenvy",
  "futures-util",
  "maud",
+ "rand",
  "reqwest",
  "serde",
  "serde_json",
@@ -1280,6 +1320,7 @@ dependencies = [
  "tower-http 0.5.2",
  "tracing",
  "tracing-subscriber",
+ "urlencoding",
 ]
 
 [[package]]
@@ -1656,6 +1697,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -2052,6 +2099,26 @@ dependencies = [
  "synstructure",
 ]
 
+[[package]]
+name = "zerocopy"
+version = "0.8.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b065d4f0e55f82fae73202e189638116a87c55ab6b8e6c2721e13dd9d854ad1"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b631b19d36a892ab55420c92dbc83ccd79274f25be714855d3074aa71cab639"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "zerofrom"
 version = "0.1.8"
diff --git a/server/Cargo.toml b/server/Cargo.toml
index c940acb687fb141d21760a3d6656172013cf6f41..6fb7bf52fa58f46f5e8fb0f7fd395247b57506d7 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -20,6 +20,8 @@ reqwest = { version = "0.12", features = ["json"] }
 dotenvy = "0.15"
 async-stream = "0.3"
 futures-util = { version = "0.3", default-features = false, features = ["std"] }
+rand = "0.8"
+urlencoding = "2"
 
 [dev-dependencies]
 reqwest = { version = "0.12", features = ["json"] }
diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs
index e649a7d192feade465e19ce6187a829f6ec74372..06001212820101e0cc953d3687dea64f85e60787 100644
--- a/server/src/api/ui_html.rs
+++ b/server/src/api/ui_html.rs
@@ -47,6 +47,7 @@ pub async fn post_ui_html(
             ratio_left,
             ratio_right,
             scope,
+            next,
         } => {
             let parent = parent_from_scope(&scope);
             if let Err(e) = state
@@ -56,9 +57,19 @@ pub async fn post_ui_html(
                 return ui_js_warn(&e).into_response();
             }
             let tree = state.tree.read().await;
+            if !next.trim().is_empty() {
+                drop(tree);
+                return JsBuilder::new()
+                    .raw(&format!(
+                        "window.location.href={};",
+                        js_string_literal(next.trim())
+                    ))
+                    .into_response();
+            }
             let empty = crate::reducer::NodeState::default();
             let node = tree.get(&parent).unwrap_or(&empty);
             let panel = ranking_panel(&parent, node, &tree);
+            drop(tree);
             JsBuilder::new()
                 .morph_selector("#ranking-panel", panel)
                 .into_response()
@@ -126,6 +137,7 @@ mod tests {
                 ratio_left: 3,
                 ratio_right: 1,
                 scope: String::new(),
+                next: String::new(),
             }
         );
     }
diff --git a/server/src/form_template.rs b/server/src/form_template.rs
index b9bc3982a125e94e67c99175ea9055979541abba..bd4a7195a6eaabfed55333bab5640708ea108b81 100644
--- a/server/src/form_template.rs
+++ b/server/src/form_template.rs
@@ -7,19 +7,30 @@ pub fn template_json_compact<T: Serialize>(v: &T) -> serde_json::Result<String>
     serde_json::to_string(v)
 }
 
-/// Recursively walk the JSON AST and replace `{"$form": "key"}` with the submitted
-/// string for `key` (empty if missing). Other keys are unchanged.
+/// Recursively walk the JSON AST and replace form holes with submitted values.
+///
+/// - `{"$form": "key"}` → string (empty if missing)
+/// - `{"$form:i32": "key"}` → JSON number (0 if missing or unparseable)
 pub fn substitute_form_vars(val: &mut Value, form_data: &HashMap<String, String>) {
     match val {
         Value::Object(map) => {
             if map.len() == 1 {
-                if let Some(Value::String(field_name)) = map.get("$form") {
-                    let submitted = form_data
-                        .get(field_name.as_str())
-                        .map(|s| s.as_str())
-                        .unwrap_or("");
-                    *val = Value::String(submitted.to_string());
-                    return;
+                if let Some((hole_key, Value::String(field_name))) = map.iter().next() {
+                    if let Some(form_type) = hole_key.strip_prefix("$form") {
+                        let submitted = form_data
+                            .get(field_name.as_str())
+                            .map(|s| s.as_str())
+                            .unwrap_or("");
+                        *val = match form_type {
+                            "" => Value::String(submitted.to_string()),
+                            ":i32" => {
+                                let n: i32 = submitted.trim().parse().unwrap_or(0);
+                                Value::Number(n.into())
+                            }
+                            _ => Value::String(submitted.to_string()),
+                        };
+                        return;
+                    }
                 }
             }
             for v in map.values_mut() {
@@ -62,6 +73,45 @@ mod tests {
         text: String,
     }
 
+    #[test]
+    fn i32_holes_become_numbers() {
+        let json = r#"{
+            "ratio_left": {"$form:i32": "ratio_left"},
+            "ratio_right": {"$form:i32": "ratio_right"}
+        }"#;
+        let mut form = HashMap::new();
+        form.insert("ratio_left".into(), "75".into());
+        form.insert("ratio_right".into(), "25".into());
+        let v = fill_template_from_form(json, &form).unwrap();
+        assert_eq!(v["ratio_left"], 75);
+        assert_eq!(v["ratio_right"], 25);
+
+        #[derive(Debug, Deserialize, PartialEq, Eq)]
+        struct Ratios {
+            ratio_left: i32,
+            ratio_right: i32,
+        }
+        let r: Ratios = serde_json::from_value(v).unwrap();
+        assert_eq!(
+            r,
+            Ratios {
+                ratio_left: 75,
+                ratio_right: 25,
+            }
+        );
+    }
+
+    #[test]
+    fn i32_hole_missing_or_bad_defaults_to_zero() {
+        let json = r#"{"n": {"$form:i32": "missing"}}"#;
+        let v = fill_template_from_form(json, &HashMap::new()).unwrap();
+        assert_eq!(v["n"], 0);
+        let mut form = HashMap::new();
+        form.insert("missing".into(), "nope".into());
+        let v = fill_template_from_form(json, &form).unwrap();
+        assert_eq!(v["n"], 0);
+    }
+
     #[test]
     fn holes_become_strings() {
         let json = r#"{
diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs
index 3bf9fc7e92e50beed24e2c25106a77421038c90b..61cdbc094819ddedb755572c59456ec0d6617619 100644
--- a/server/src/html/mod.rs
+++ b/server/src/html/mod.rs
@@ -20,6 +20,8 @@ use crate::{
     ui_action::UI_RPC_FIELD,
 };
 
+pub mod vote;
+
 const SORTER_CSS: &str = include_str!("../../static/sorter.css");
 const SORTER_UI_JS: &str = include_str!("../../static/sorter_ui.js");
 
@@ -131,7 +133,7 @@ fn layout(title: &str, body: Markup, views: u64) -> Markup {
     }
 }
 
-fn item_href(id: &ItemId) -> String {
+pub(crate) fn item_href(id: &ItemId) -> String {
     id.browse_href()
 }
 
@@ -309,11 +311,23 @@ async fn item_page(state: AppState, uri: Uri, item: ItemId) -> Markup {
     let empty_node = NodeState::default();
     let node = tree.get(&item).unwrap_or(&empty_node);
 
+    let child_count = node.children.len();
+    let vote_link = if child_count >= 2 {
+        Some(vote::vote_href(&item))
+    } else {
+        None
+    };
+
     let body = html! {
         h1 { "sorter" }
         (input_panel("", None))
         (breadcrumb_path(&item))
         (entity_section(&item, node, false))
+        @if let Some(href) = vote_link {
+            p class="vote-cta" {
+                a class="btn-primary" href=(href) data-testid="vote-children" { "Vote on children" }
+            }
+        }
         (ranking_panel(&item, node, &tree))
     };
     layout("sorter2", body, views)
diff --git a/server/src/lib.rs b/server/src/lib.rs
index da5f3ebecec1794b05a2a69cc78379551b2ad769..7f7e28c8ac3758de87f1f8e073b24be4132d38da 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -4,6 +4,7 @@ pub mod events;
 pub mod fetch;
 pub mod form_template;
 pub mod html;
+pub mod pair;
 pub mod parser;
 pub mod path_types;
 pub mod ranking;
@@ -33,6 +34,7 @@ pub fn create_app(state: AppState) -> Router {
         .route("/static/:filename", get(crate::html::serve_static))
         .route("/~/*item_path", get(crate::html::browse))
         .route("/", get(crate::html::home))
+        .route("/vote", get(crate::html::vote::vote_page))
         .route("/ui", post(crate::api::ui_html::post_ui_html))
         .with_state(state)
         .layer(TraceLayer::new_for_http())
diff --git a/server/src/ui_action.rs b/server/src/ui_action.rs
index 2047713762c932ac9bc325fe15624f2aecb3364d..53581e1362bfcc5dfb4ae3069c41ea6f7be41437 100644
--- a/server/src/ui_action.rs
+++ b/server/src/ui_action.rs
@@ -31,6 +31,9 @@ pub enum HtmlUiAction {
         /// Parent node [`ItemId`] string; empty = tree root.
         #[serde(default)]
         scope: String,
+        /// After vote, navigate here (vote compare page).
+        #[serde(default)]
+        next: String,
     },
     /// Parse pasted Reddit URL/path; redirect to subreddit ranking on success.
     ParseQuery {
@@ -70,6 +73,36 @@ pub fn parse_html_ui_from_form(
 mod tests {
     use super::*;
 
+    #[test]
+    fn record_vote_round_trip_with_typed_ratio_holes() {
+        let template = serde_json::json!({
+            "action": "record_vote",
+            "a": "x",
+            "b": "y",
+            "ratio_left": {"$form:i32": "ratio_left"},
+            "ratio_right": {"$form:i32": "ratio_right"},
+            "scope": "parent",
+        });
+        let mut form = HashMap::new();
+        form.insert(
+            UI_RPC_FIELD.to_string(),
+            serde_json::to_string(&template).unwrap(),
+        );
+        form.insert("ratio_left".into(), "60".into());
+        form.insert("ratio_right".into(), "40".into());
+        assert_eq!(
+            parse_html_ui_from_form(&form).unwrap(),
+            HtmlUiAction::RecordVote {
+                a: "x".into(),
+                b: "y".into(),
+                ratio_left: 60,
+                ratio_right: 40,
+                scope: "parent".into(),
+                next: String::new(),
+            }
+        );
+    }
+
     #[test]
     fn record_vote_round_trip_with_form_holes() {
         let template = serde_json::json!({
@@ -96,6 +129,7 @@ mod tests {
                 ratio_left: 2,
                 ratio_right: 1,
                 scope: "amitheasshole".into(),
+                next: String::new(),
             }
         );
     }
@@ -122,6 +156,7 @@ mod tests {
                 ratio_left: 2,
                 ratio_right: 1,
                 scope: String::new(),
+                next: String::new(),
             }
         );
     }
diff --git a/server/static/sorter.css b/server/static/sorter.css
index 021918f8e778b84e4b3eac8559fab7d223a3d490..3c2cec5cb5094013387147c621d75bd341bc06cc 100644
--- a/server/static/sorter.css
+++ b/server/static/sorter.css
@@ -224,4 +224,148 @@ code {
 
 h1 {
   margin: 0;
+}
+
+.vote-cta {
+  margin: 0.75rem 0;
+}
+
+.vote-compare-shell {
+  max-width: 960px;
+}
+
+.vote-compare-scope {
+  margin: 0.5rem 0 1rem;
+}
+
+.vote-compare-pair {
+  display: grid;
+  grid-template-columns: 1fr auto 1fr;
+  gap: 1rem;
+  align-items: start;
+  margin: 1rem 0;
+}
+
+.vote-compare-vs {
+  align-self: center;
+  font-size: 1.25rem;
+  color: var(--muted);
+  font-weight: 600;
+}
+
+.vote-compare-side {
+  background: var(--panel);
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  padding: 1rem;
+  min-height: 120px;
+}
+
+.vote-compare-item {
+  color: var(--accent);
+  text-decoration: none;
+  display: block;
+}
+
+.vote-compare-item:hover {
+  text-decoration: underline;
+}
+
+.vote-compare-figure {
+  margin: 0.75rem 0 0;
+}
+
+.vote-compare-image {
+  display: block;
+  max-width: 100%;
+  height: auto;
+  border-radius: 6px;
+  border: 1px solid var(--border);
+}
+
+.vote-compare-item-body {
+  margin-top: 0.75rem;
+  font-size: 0.9rem;
+}
+
+.vote-compare-nav {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 1rem;
+  margin: 1rem 0;
+}
+
+.vote-compare-next {
+  color: var(--accent);
+  text-decoration: none;
+}
+
+.vote-compare-next.is-disabled {
+  color: var(--muted);
+}
+
+.vote-compare-back {
+  text-decoration: none;
+}
+
+.vote-compare-back:hover {
+  text-decoration: underline;
+}
+
+.vote-compare-slider-label {
+  display: grid;
+  grid-template-columns: 1fr auto 1fr;
+  gap: 0.75rem;
+  align-items: center;
+  margin: 1.25rem 0;
+}
+
+.vote-compare-slider-label input[type="range"] {
+  width: 100%;
+  min-width: 160px;
+}
+
+#vote-slider-left-label {
+  text-align: right;
+}
+
+#vote-slider-right-label {
+  text-align: left;
+}
+
+.vote-edge-history-title {
+  margin: 1.5rem 0 0.5rem;
+  font-size: 1rem;
+}
+
+.vote-edge-history {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+.vote-edge-history-row {
+  margin-bottom: 0.75rem;
+}
+
+.vote-edge-meta {
+  font-size: 0.875rem;
+  margin-bottom: 0.25rem;
+}
+
+.ratio-bar {
+  display: flex;
+  height: 8px;
+  border-radius: 4px;
+  overflow: hidden;
+  background: var(--border);
+}
+
+.ratio-left {
+  background: var(--accent);
+}
+
+.ratio-right {
+  background: var(--muted);
 }
\ No newline at end of file
diff --git a/server/static/sorter_ui.js b/server/static/sorter_ui.js
index 62c9158ecb3c2140b83efd2b27ea706a9e0ae127..c8d7c3ef2413399ced7898a7edb3e7a2c8e16163 100644
--- a/server/static/sorter_ui.js
+++ b/server/static/sorter_ui.js
@@ -81,7 +81,22 @@
     });
   }
 
+  function initVoteSlider() {
+    var slider = document.getElementById('vote-preference-slider');
+    if (!slider) return;
+    var leftInput = document.getElementById('vote-ratio-left');
+    var rightInput = document.getElementById('vote-ratio-right');
+    function update() {
+      var v = parseInt(slider.value, 10);
+      if (leftInput) leftInput.value = String(v);
+      if (rightInput) rightInput.value = String(100 - v);
+    }
+    slider.addEventListener('input', update);
+    update();
+  }
+
   function initSorterUi() {
+    initVoteSlider();
     document.addEventListener('submit', async function (e) {
       var f = e.target;
       if (!f || f.tagName !== 'FORM') return;
@@ -89,10 +104,11 @@
       if (f.getAttribute('data-navigate') === 'full') return;
       e.preventDefault();
       await postUiForm(f);
-      if (f.id === 'vote-form') {
+      if (f.id === 'vote-form' || f.id === 'vote-compare-form') {
         f.reset();
-        var firstField = f.querySelector('input[type="text"]');
-        if (firstField) firstField.focus();
+        var slider = f.querySelector('#vote-preference-slider');
+        if (slider) slider.value = '50';
+        initVoteSlider();
       }
     });
   }


Side B — contributor: tommy-mor
Side B — commit message:
[b32c92f2] consolidated shared functions in tests (composer 2 fast)

Side B — unified diff (full patch):
diff --git a/test/auth.bb b/test/auth.bb
index a67cc1de763434176d2f68e419dd37a8cd328395..78cffc875ffe83f512bca253f4a7489227311da4 100644
--- a/test/auth.bb
+++ b/test/auth.bb
@@ -3,113 +3,14 @@
   (:require [babashka.process :as p]
             [babashka.fs :as fs]
             [cheshire.core :as json]
-            [org.httpkit.server :as http]
-            [test.common :as common]))
+            [clojure.string :as str]
+            [test.common :as common]
+            [test.oauth :as oauth]))
 
-(def ^:private ansi-green "\033[32m")
-(def ^:private ansi-red   "\033[31m")
-(def ^:private ansi-reset "\033[0m")
 (def ^:private counts (atom {:pass 0 :fail 0}))
 
-(defn- pass [msg]
-  (swap! counts update :pass inc)
-  (println (str ansi-green "  ✓ " ansi-reset msg)))
-
-(defn- fail [msg]
-  (swap! counts update :fail inc)
-  (println (str ansi-red "  ✗ " ansi-reset msg)))
-
 (defn- assert! [pred msg]
-  (if pred
-    (pass msg)
-    (do (fail msg)
-        (throw (ex-info (str "FAIL: " msg) {})))))
-
-(defn- http-client []
-  (-> (java.net.http.HttpClient/newBuilder)
-      (.followRedirects java.net.http.HttpClient$Redirect/ALWAYS)
-      (.build)))
-
-(defn- http-get [url & {:keys [headers]}]
-  (let [b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]
-    (doseq [[k v] (or headers {})]
-      (.header b k v))
-    (let [req (-> b (.GET) (.build))
-          resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]
-      {:status (.statusCode resp) :body (.body resp) :headers (.map (.headers resp))})))
-
-(defn- http-post-json [url data & {:keys [headers]}]
-  (let [body (json/generate-string data)
-        b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]
-    (.header b "Content-Type" "application/json")
-    (doseq [[k v] (or headers {})]
-      (.header b k v))
-    (let [req (-> b
-                  (.POST (java.net.http.HttpRequest$BodyPublishers/ofString body))
-                  (.build))
-          resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]
-      {:status (.statusCode resp) :body (.body resp) :headers (.map (.headers resp))})))
-
-(defn- http-post-form [url form]
-  (let [pairs (->> form
-                   (map (fn [[k v]]
-                          (str (java.net.URLEncoder/encode (name k) "UTF-8")
-                               "="
-                               (java.net.URLEncoder/encode (str v) "UTF-8"))))
-                   (clojure.string/join "&"))
-        b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]
-    (.header b "Content-Type" "application/x-www-form-urlencoded")
-    (let [req (-> b
-                  (.POST (java.net.http.HttpRequest$BodyPublishers/ofString pairs))
-                  (.build))
-          resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]
-      {:status (.statusCode resp) :body (.body resp) :headers (.map (.headers resp))})))
-
-(defn- parse-query [s]
-  (into {}
-        (for [part (clojure.string/split (or s "") #"&")
-              :when (not (clojure.string/blank? part))]
-          (let [[k v] (clojure.string/split part #"=" 2)]
-            [(keyword (java.net.URLDecoder/decode k "UTF-8"))
-             (some-> v (java.net.URLDecoder/decode "UTF-8"))]))))
-
-(defn- b64url [s]
-  (-> (java.util.Base64/getUrlEncoder)
-      (.withoutPadding)
-      (.encodeToString (.getBytes s "UTF-8"))))
-
-(defn- make-id-token [sub]
-  (str (b64url "{\"alg\":\"RS256\",\"typ\":\"JWT\"}")
-       "."
-       (b64url (json/generate-string {:sub sub}))
-       ".fakesig"))
-
-(defn- start-mock-google [port]
-  (let [google-users ["google-user-1" "google-user-2"]
-        !call-count (atom 0)
-        handler
-        (fn [req]
-          (cond
-            (and (= :get (:request-method req))
-                 (= "/o/oauth2/v2/auth" (:uri req)))
-            (let [q (parse-query (:query-string req))
-                  redirect-uri (:redirect_uri q)
-                  state (:state q)
-                  loc (str redirect-uri "?code=mockcode&state=" state)]
-              {:status 302 :headers {"Location" loc} :body ""})
-
-            (and (= :post (:request-method req))
-                 (= "/token" (:uri req)))
-            (let [n   (swap! !call-count inc)
-                  sub (nth google-users (mod (dec n) (count google-users)))]
-              {:status 200
-               :headers {"Content-Type" "application/json"}
-               :body (json/generate-string {:id_token (make-id-token sub)})})
-
-            :else
-            {:status 404 :body "not found"}))
-        stop-fn (http/run-server handler {:port port})]
-    {:stop-fn stop-fn :port port}))
+  (common/test-assert! counts pred msg))
 
 (defn auth-test [& _args]
   (println "\n━━━ auth v3 integration check ━━━\n")
@@ -117,8 +18,7 @@
 
   (println "building server + CLI binaries…")
   (common/letlocals
-   (bind build @(p/process [(common/cargo-bin) "build" "--release" "-p" "slugsocial-server" "-p" "slugsocial"]
-                           {:inherit true :env common/base-env}))
+   (bind build (common/run-cargo-build-release! ["slugsocial-server" "slugsocial"]))
    (assert! (zero? (:exit build)) "cargo build succeeds")
    (bind server-bin "target/release/slugsocial-server")
    (bind cli-bin "target/release/slugsocial")
@@ -134,19 +34,10 @@
    (bind !server (atom nil))
    (bind !google (atom nil))
 
-   (bind server-env (merge common/base-env
-                           {"SLUG_DATA_DIR" tmp-dir
-                            "SLUG_KEYS"     "test:test"
-                            "PORT"          (str slug-port)
-                            "RUST_LOG"      "warn"
-                            "SLUG_PUBLIC_URL" base-url
-                            "SLUG_GOOGLE_AUTH_URL" (str google-url "/o/oauth2/v2/auth")
-                            "SLUG_GOOGLE_TOKEN_URL" (str google-url "/token")
-                            "SLUG_GOOGLE_CLIENT_ID" "mock"
-                            "SLUG_GOOGLE_CLIENT_SECRET" "mock"}))
+   (bind server-env (common/slug-server-env tmp-dir base-url google-url slug-port))
    (try
      (println (str "\nstarting mock google on :" google-port))
-     (reset! !google (start-mock-google google-port))
+     (reset! !google (oauth/start-mock-google google-port :google-users ["google-user-1" "google-user-2"]))
      (assert! (some? (:stop-fn @!google)) "mock google started")
 
      (println (str "starting server on :" slug-port))
@@ -154,34 +45,33 @@
      (assert! (common/wait-for-server base-url 10000) "server responds to /healthz")
 
      (println "\nstarting pending session…")
-     (let [start-resp (http-post-json (str base-url "/api/v0/pending-session")
-                                      {:agent "00000000-0000-0000-0000-000000000000:bb:local/dev"})
+     (let [start-resp (oauth/http-post-json (str base-url "/api/v0/pending-session")
+                                            {:agent "00000000-0000-0000-0000-000000000000:bb:local/dev"})
            _ (assert! (= 200 (:status start-resp)) "pending-session start returns 200")
            start-json (json/parse-string (:body start-resp) true)]
-       (assert! (clojure.string/starts-with? (:session start-json) "p_") "session id has p_ prefix")
-       (assert! (clojure.string/includes? (:login_url start-json) "/auth/login") "login_url provided")
+       (assert! (str/starts-with? (:session start-json) "p_") "session id has p_ prefix")
+       (assert! (str/includes? (:login_url start-json) "/auth/login") "login_url provided")
 
        (println "\nsimulating browser oauth redirects…")
-       ;; This will follow redirects: /auth/login -> mock google -> /auth/callback -> /auth/choose-username
-       (let [login-get (http-get (:login_url start-json))]
+       (let [login-get (oauth/http-get (:login_url start-json))]
          (assert! (= 200 (:status login-get)) "choose-username page reachable after oauth callback"))
 
        (println "\nchoosing username…")
-       (let [choose (http-post-form (str base-url "/auth/choose-username")
-                                    {:session (:session start-json) :username "bbuser"})]
+       (let [choose (oauth/http-post-form (str base-url "/auth/choose-username")
+                                          {:session (:session start-json) :username "bbuser"})]
          (assert! (= 200 (:status choose)) "choose-username POST returns 200"))
 
        (println "\npolling pending session…")
-       (let [poll (http-get (str base-url "/api/v0/pending-session/" (:session start-json)))]
+       (let [poll (oauth/http-get (str base-url "/api/v0/pending-session/" (:session start-json)))]
          (assert! (= 200 (:status poll)) "pending-session poll returns 200")
          (let [poll-json (json/parse-string (:body poll) true)]
            (assert! (:complete poll-json) "pending session complete=true")
            (assert! (= "bbuser" (:user poll-json)) "poll returns stored username bbuser")
-           (assert! (clojure.string/starts-with? (:token poll-json) "slug_") "poll returns bearer token")
+           (assert! (str/starts-with? (:token poll-json) "slug_") "poll returns bearer token")
 
            (println "\nwhoami…")
-           (let [who (http-get (str base-url "/api/v0/whoami")
-                               :headers {"Authorization" (str "Bearer " (:token poll-json))})]
+           (let [who (oauth/http-get (str base-url "/api/v0/whoami")
+                                     :headers {"Authorization" (str "Bearer " (:token poll-json))})]
              (assert! (= 200 (:status who)) "whoami returns 200")
              (let [who-json (json/parse-string (:body who) true)]
                (assert! (= "bbuser" (:user who-json)) "whoami user is bbuser (stored form)"))))))
@@ -195,11 +85,11 @@
                   (str "identity start exits 0 (stderr: " (:err start-proc) ")"))
          (let [start-cli (json/parse-string (:out start-proc) true)]
            (assert! (= "present_oauth_url_to_user" (:phase start-cli)) "identity start --json phase")
-           (assert! (clojure.string/starts-with? (:session start-cli) "p_") "CLI start session id")
-           (let [login-get (http-get (:login_url start-cli))]
+           (assert! (str/starts-with? (:session start-cli) "p_") "CLI start session id")
+           (let [login-get (oauth/http-get (:login_url start-cli))]
              (assert! (= 200 (:status login-get)) "CLI login_url redirect chain succeeds"))
-           (let [choose (http-post-form (str base-url "/auth/choose-username")
-                                        {:session (:session start-cli) :username "cliuser"})]
+           (let [choose (oauth/http-post-form (str base-url "/auth/choose-username")
+                                              {:session (:session start-cli) :username "cliuser"})]
              (assert! (= 200 (:status choose)) "choose-username for cliuser"))
            (let [poll-proc @(p/process [cli-bin "identity" "poll" (:session start-cli)
                                         "--poll-interval-ms" "100" "--max-wait-secs" "30" "--json"]
@@ -209,10 +99,10 @@
              (let [poll-cli (json/parse-string (:out poll-proc) true)]
                (assert! (= "complete" (:phase poll-cli)) "identity poll --json phase")
                (assert! (= "cliuser" (:user poll-cli)) "CLI poll user (stored form)")
-               (assert! (clojure.string/starts-with? (:token poll-cli) "slug_") "CLI poll token")
+               (assert! (str/starts-with? (:token poll-cli) "slug_") "CLI poll token")
                (let [token-path (str cli-home "/.config/slugsocial/token")]
                  (assert! (fs/exists? token-path) "token written under isolated HOME")
-                 (assert! (= (clojure.string/trim (slurp token-path)) (:token poll-cli))
+                 (assert! (= (str/trim (slurp token-path)) (:token poll-cli))
                           "token file matches poll JSON"))
                (let [who-proc @(p/process [cli-bin "whoami" "--json"]
                                           {:out :string :err :string :env cli-env})]
@@ -227,5 +117,4 @@
        (fs/delete-tree tmp-dir)))
 
    (bind {pass :pass} @counts)
-   (println (str "\n" ansi-green "━━━ " pass " auth checks passed ━━━" ansi-reset "\n"))))
-
+   (println (str "\n" common/ansi-green "━━━ " pass " auth checks passed ━━━" common/ansi-reset "\n"))))
diff --git a/test/common.bb b/test/common.bb
index 4ed450377cdbb020f5ff164a812dfbbfc23c0f47..0b855ea5fc6cc513df065a221a28eae6e0848edc 100644
--- a/test/common.bb
+++ b/test/common.bb
@@ -1,6 +1,7 @@
 (ns test.common
   "Shared utilities for slug test rigs: port allocation, server lifecycle,
-   environment helpers, CLI runner, and the letlocals macro."
+   environment helpers, CLI runner, test harness (ANSI + pass/fail counts),
+   standard server env for bb suites, and the letlocals macro."
   (:require [babashka.process :as p]
             [clojure.string :as str]
             [babashka.fs :as fs]))
@@ -43,6 +44,42 @@
               env
               (assoc env "PATH" (str cargo-home ":" (get env "PATH" "")))))))
 
+;; ---------------------------------------------------------------------------
+;; test harness (ANSI + counters)
+;; ---------------------------------------------------------------------------
+
+(def ansi-green "\033[32m")
+(def ansi-red   "\033[31m")
+(def ansi-reset "\033[0m")
+
+(defn test-pass! [counts-atom msg]
+  (swap! counts-atom update :pass inc)
+  (println (str ansi-green "  ✓ " ansi-reset msg)))
+
+(defn test-fail! [counts-atom msg]
+  (swap! counts-atom update :fail inc)
+  (println (str ansi-red "  ✗ " ansi-reset msg)))
+
+(defn test-assert! [counts-atom pred msg]
+  (if pred
+    (test-pass! counts-atom msg)
+    (do (test-fail! counts-atom msg)
+        (throw (ex-info (str "FAIL: " msg) {})))))
+
+(defn slug-server-env
+  "Env map for `slugsocial-server` in bb integration tests (mock Google URLs, data dir, keys)."
+  [tmp-dir base-url google-base-url slug-port]
+  (merge base-env
+         {"SLUG_DATA_DIR" tmp-dir
+          "SLUG_KEYS"     "test:test"
+          "PORT"          (str slug-port)
+          "RUST_LOG"      "warn"
+          "SLUG_PUBLIC_URL" base-url
+          "SLUG_GOOGLE_AUTH_URL" (str google-base-url "/o/oauth2/v2/auth")
+          "SLUG_GOOGLE_TOKEN_URL" (str google-base-url "/token")
+          "SLUG_GOOGLE_CLIENT_ID" "mock"
+          "SLUG_GOOGLE_CLIENT_SECRET" "mock"}))
+
 (defn cargo-bin
   "Resolve cargo, preferring ~/.cargo/bin if not on PATH."
   []
@@ -50,6 +87,13 @@
     (str cargo-home "/cargo")
     "cargo"))
 
+(defn run-cargo-build-release!
+  "`cargo build --release` for each package name in `packages` (e.g. [\"slugsocial-server\"])."
+  [packages]
+  @(p/process (into [(cargo-bin) "build" "--release"]
+                    (mapcat (fn [p] ["-p" p]) packages))
+              {:inherit true :env base-env}))
+
 ;; ---------------------------------------------------------------------------
 ;; port / server utilities
 ;; ---------------------------------------------------------------------------
diff --git a/test/grants.bb b/test/grants.bb
index 793ba216f2de76a77eb20a76d08403db07ff411b..10ef0f08ce1c3945e5f1634314e6aebcf6810cd2 100644
--- a/test/grants.bb
+++ b/test/grants.bb
@@ -7,145 +7,20 @@
   - user with View + Post -> ok=true for prose
   - user with View + Post but no Vote -> ok=false for vote
   - user with View + Post + Vote -> ok=true for vote"
-  (:require [babashka.process :as p]
-            [babashka.fs :as fs]
+  (:require [babashka.fs :as fs]
             [cheshire.core :as json]
-            [org.httpkit.server :as http]
-            [test.common :as common]))
+            [test.common :as common]
+            [test.oauth :as oauth]))
 
-(def ^:private ansi-green "\033[32m")
-(def ^:private ansi-red   "\033[31m")
-(def ^:private ansi-reset "\033[0m")
 (def ^:private counts (atom {:pass 0 :fail 0}))
 
-(defn- pass [msg]
-  (swap! counts update :pass inc)
-  (println (str ansi-green "  ✓ " ansi-reset msg)))
-
-(defn- fail [msg]
-  (swap! counts update :fail inc)
-  (println (str ansi-red "  ✗ " ansi-reset msg)))
-
 (defn- assert! [pred msg]
-  (if pred
-    (pass msg)
-    (do (fail msg)
-        (throw (ex-info (str "FAIL: " msg) {})))))
-
-(defn- http-client []
-  (-> (java.net.http.HttpClient/newBuilder)
-      (.followRedirects java.net.http.HttpClient$Redirect/ALWAYS)
-      (.connectTimeout (java.time.Duration/ofSeconds 15))
-      (.build)))
-
-(defn- http-get [url & {:keys [headers]}]
-  (let [b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]
-    (doseq [[k v] (or headers {})]
-      (.header b k v))
-    (let [req (-> b (.timeout (java.time.Duration/ofSeconds 60)) (.GET) (.build))
-          resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]
-      {:status (.statusCode resp) :body (.body resp)})))
-
-(defn- http-post-json [url data & {:keys [headers]}]
-  (let [body (json/generate-string data)
-        b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]
-    (.header b "Content-Type" "application/json")
-    (doseq [[k v] (or headers {})]
-      (.header b k v))
-    (let [req (-> b
-                  (.timeout (java.time.Duration/ofSeconds 60))
-                  (.POST (java.net.http.HttpRequest$BodyPublishers/ofString body))
-                  (.build))
-          resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]
-      {:status (.statusCode resp) :body (.body resp)})))
-
-(defn- http-post-form [url form]
-  (let [pairs (->> form
-                   (map (fn [[k v]]
-                          (str (java.net.URLEncoder/encode (name k) "UTF-8")
-                               "="
-                               (java.net.URLEncoder/encode (str v) "UTF-8"))))
-                   (clojure.string/join "&"))
-        b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]
-    (.header b "Content-Type" "application/x-www-form-urlencoded")
-    (let [req (-> b
-                  (.timeout (java.time.Duration/ofSeconds 60))
-                  (.POST (java.net.http.HttpRequest$BodyPublishers/ofString pairs))
-                  (.build))
-          resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]
-      {:status (.statusCode resp) :body (.body resp)})))
-
-(defn- parse-query [s]
-  (into {}
-        (for [part (clojure.string/split (or s "") #"&")
-              :when (not (clojure.string/blank? part))]
-          (let [[k v] (clojure.string/split part #"=" 2)]
-            [(keyword (java.net.URLDecoder/decode k "UTF-8"))
-             (some-> v (java.net.URLDecoder/decode "UTF-8"))]))))
-
-(defn- b64url [s]
-  (-> (java.util.Base64/getUrlEncoder)
-      (.withoutPadding)
-      (.encodeToString (.getBytes s "UTF-8"))))
-
-(defn- make-id-token [sub]
-  (str (b64url "{\"alg\":\"RS256\",\"typ\":\"JWT\"}")
-       "."
-       (b64url (json/generate-string {:sub sub}))
-       ".fakesig"))
-
-;; Stateful mock: each /token call returns the next user in the list.
-;; This lets us register two distinct users in one test run.
-(defn- start-mock-google [port]
-  (let [google-users ["google-user-alice" "google-user-bob"]
-        !call-count (atom 0)
-        handler
-        (fn [req]
-          (cond
-            (and (= :get (:request-method req))
-                 (= "/o/oauth2/v2/auth" (:uri req)))
-            (let [q (parse-query (:query-string req))
-                  redirect-uri (:redirect_uri q)
-                  state (:state q)
-                  loc (str redirect-uri "?code=mockcode&state=" state)]
-              {:status 302 :headers {"Location" loc} :body ""})
-
-            (and (= :post (:request-method req))
-                 (= "/token" (:uri req)))
-            (let [n   (swap! !call-count inc)
-                  sub (nth google-users (mod (dec n) (count google-users)))]
-              {:status 200
-               :headers {"Content-Type" "application/json"}
-               :body (json/generate-string {:id_token (make-id-token sub)})})
-
-            :else
-            {:status 404 :body "not found"}))
-        stop-fn (http/run-server handler {:port port})]
-    {:stop-fn stop-fn :port port}))
-
-(defn- register-user
-  "Walk the full OAuth flow for one user. Returns the bearer token."
-  [base-url session-agent username]
-  (let [start-resp (http-post-json (str base-url "/api/v0/pending-session")
-                                   {:agent session-agent})
-        _ (assert! (= 200 (:status start-resp))
-                   (str "pending-session for " username " returns 200"))
-        start-json (json/parse-string (:body start-resp) true)
-        _login (http-get (:login_url start-json))
-        _choose (http-post-form (str base-url "/auth/choose-username")
-                                {:session (:session start-json) :username username})
-        _ (assert! (= 200 (:status _choose))
-                   (str "choose-username for " username " returns 200"))
-        poll (http-get (str base-url "/api/v0/pending-session/" (:session start-json)))
-        poll-json (json/parse-string (:body poll) true)
-        _ (assert! (:complete poll-json)
-                   (str "pending session complete for " username))]
-    (:token poll-json)))
+  (common/test-assert! counts pred msg))
 
 (defn- bearer [token] {"Authorization" (str "Bearer " token)})
 
 (defn- rpc-batch! [base-url token cmds]
-  (let [resp (http-post-json (str base-url "/api/v0/rpc") cmds :headers (bearer token))]
+  (let [resp (oauth/http-post-json (str base-url "/api/v0/rpc") cmds :headers (bearer token))]
     {:status (:status resp)
      :parsed (json/parse-string (:body resp) false)}))
 
@@ -160,14 +35,19 @@
                         "text" text
                         "return_rank_diff" false}}]))
 
+(defn- register-user! [base-url session-agent username]
+  (oauth/complete-registration! base-url
+                                :agent session-agent
+                                :username username
+                                :assert! (fn [pred msg] (assert! pred msg))))
+
 (defn grants-test [& _args]
   (println "\n━━━ grants enforcement integration check ━━━\n")
   (reset! counts {:pass 0 :fail 0})
 
   (println "building server binary…")
   (common/letlocals
-   (bind build @(p/process [(common/cargo-bin) "build" "--release" "-p" "slugsocial-server"]
-                           {:inherit true :env common/base-env}))
+   (bind build (common/run-cargo-build-release! ["slugsocial-server"]))
    (assert! (zero? (:exit build)) "cargo build succeeds")
    (bind server-bin "target/release/slugsocial-server")
 
@@ -180,33 +60,24 @@
    (bind !server (atom nil))
    (bind !google (atom nil))
 
-   (bind server-env (merge common/base-env
-                           {"SLUG_DATA_DIR" tmp-dir
-                            "SLUG_KEYS"     "test:test"
-                            "PORT"          (str slug-port)
-                            "RUST_LOG"      "warn"
-                            "SLUG_PUBLIC_URL" base-url
-                            "SLUG_GOOGLE_AUTH_URL" (str google-url "/o/oauth2/v2/auth")
-                            "SLUG_GOOGLE_TOKEN_URL" (str google-url "/token")
-                            "SLUG_GOOGLE_CLIENT_ID" "mock"
-                            "SLUG_GOOGLE_CLIENT_SECRET" "mock"}))
+   (bind server-env (common/slug-server-env tmp-dir base-url google-url slug-port))
    (try
      (println (str "starting mock google on :" google-port))
-     (reset! !google (start-mock-google google-port))
+     (reset! !google (oauth/start-mock-google google-port
+                                              :google-users ["google-user-alice" "google-user-bob"]))
 
      (println (str "starting server on :" slug-port))
      (reset! !server (common/start-server server-bin server-env))
      (assert! (common/wait-for-server base-url 10000) "server responds to /healthz")
 
-     ;; Register two users. The mock google cycles through google-user-alice then google-user-bob.
      (println "\nregistering alice…")
-     (let [alice-token (register-user base-url
-                                      "00000000-0000-0000-0000-000000000001:test:local/dev"
-                                      "alice")
+     (let [alice-token (register-user! base-url
+                                       "00000000-0000-0000-0000-000000000001:test:local/dev"
+                                       "alice")
            _ (println "registering bob…")
-           bob-token   (register-user base-url
-                                      "00000000-0000-0000-0000-000000000002:test:local/dev"
-                                      "bob")
+           bob-token   (register-user! base-url
+                                       "00000000-0000-0000-0000-000000000002:test:local/dev"
+                                       "bob")
 
            ;; Alice creates a private room.
            _ (println "\nalice creates private room…")
@@ -288,6 +159,6 @@
 
    (bind {pass :pass fail :fail} @counts)
    (if (zero? fail)
-     (println (str "\n" ansi-green "━━━ " pass " grant checks passed ━━━" ansi-reset "\n"))
-     (do (println (str "\n" ansi-red "━━━ " fail " grant checks FAILED ━━━" ansi-reset "\n"))
+     (println (str "\n" common/ansi-green "━━━ " pass " grant checks passed ━━━" common/ansi-reset "\n"))
+     (do (println (str "\n" common/ansi-red "━━━ " fail " grant checks FAILED ━━━" common/ansi-reset "\n"))
          (System/exit 1)))))
diff --git a/test/integration.bb b/test/integration.bb
index 07c9851e5e112f644556a847302d00b5e0f6acb4..c9af7afb3942ffb509a7d053b903c36cdbf1691b 100644
--- a/test/integration.bb
+++ b/test/integration.bb
@@ -2,8 +2,7 @@
   "End-to-end integration check: DSL → CLI → HTTP → JSONL → materialized view → CLI query.
    Boots a server, ingests via CLI, queries back, kills server, restarts from
    the same JSONL, and queries again to prove replay determinism."
-  (:require [babashka.process :as p]
-            [clojure.string :as str]
+  (:require [clojure.string :as str]
             [babashka.fs :as fs]
             [cheshire.core :as json]
             [test.common :as common]
@@ -13,25 +12,10 @@
 ;; helpers
 ;; ---------------------------------------------------------------------------
 
-(def ^:private ansi-green "\033[32m")
-(def ^:private ansi-red   "\033[31m")
-(def ^:private ansi-reset "\033[0m")
-
 (def ^:private counts (atom {:pass 0 :fail 0}))
 
-(defn- pass [msg]
-  (swap! counts update :pass inc)
-  (println (str ansi-green "  ✓ " ansi-reset msg)))
-
-(defn- fail [msg]
-  (swap! counts update :fail inc)
-  (println (str ansi-red "  ✗ " ansi-reset msg)))
-
 (defn- assert! [pred msg]
-  (if pred
-    (pass msg)
-    (do (fail msg)
-        (throw (ex-info (str "FAIL: " msg) {})))))
+  (common/test-assert! counts pred msg))
 
 ;; ---------------------------------------------------------------------------
 ;; letlocals unit tests
@@ -102,8 +86,7 @@
   (println "\nbuilding binaries…")
   (common/letlocals
     ;; 1. build
-   (bind build      @(p/process [(common/cargo-bin) "build" "--release" "-p" "slugsocial-server" "-p" "slugsocial"]
-                                {:inherit true :env common/base-env}))
+   (bind build (common/run-cargo-build-release! ["slugsocial-server" "slugsocial"]))
    (assert! (zero? (:exit build)) "cargo build succeeds")
 
    (bind server-bin "target/release/slugsocial-server")
@@ -120,16 +103,7 @@
    (bind !server    (atom nil))
    (bind !server2   (atom nil))
    (bind !google    (atom nil))
-   (bind server-env (merge common/base-env
-                           {"SLUG_DATA_DIR" tmp-dir
-                            "SLUG_KEYS"     "test:test"
-                            "PORT"          (str port)
-                            "RUST_LOG"      "warn"
-                            "SLUG_PUBLIC_URL" base-url
-                            "SLUG_GOOGLE_AUTH_URL" (str google-url "/o/oauth2/v2/auth")
-                            "SLUG_GOOGLE_TOKEN_URL" (str google-url "/token")
-                            "SLUG_GOOGLE_CLIENT_ID" "mock"
-                            "SLUG_GOOGLE_CLIENT_SECRET" "mock"}))
+   (bind server-env (common/slug-server-env tmp-dir base-url google-url port))
 
    (try
      (common/letlocals
@@ -291,4 +265,4 @@
        (fs/delete-tree tmp-dir)))
 
    (bind {pass :pass} @counts)
-   (println (str "\n" ansi-green "━━━ " pass " checks passed ━━━" ansi-reset "\n"))))
+   (println (str "\n" common/ansi-green "━━━ " pass " checks passed ━━━" common/ansi-reset "\n"))))
diff --git a/test/oauth.bb b/test/oauth.bb
index 84679e1a4adbe100dfe7e7d64a2c6270b023d275..b69459acd17c23c023170d8dd93fe45bb49c8d88 100644
--- a/test/oauth.bb
+++ b/test/oauth.bb
@@ -1,18 +1,23 @@
 (ns test.oauth
   "Shared Babashka HTTP helpers + mock Google OAuth + token handoff for integration tests."
   (:require [cheshire.core :as json]
+            [clojure.string :as str]
             [org.httpkit.server :as http]))
 
+(def ^:private connect-timeout (java.time.Duration/ofSeconds 15))
+(def ^:private request-timeout (java.time.Duration/ofSeconds 60))
+
 (defn http-client []
   (-> (java.net.http.HttpClient/newBuilder)
       (.followRedirects java.net.http.HttpClient$Redirect/ALWAYS)
+      (.connectTimeout connect-timeout)
       (.build)))
 
 (defn http-get [url & {:keys [headers]}]
   (let [b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]
     (doseq [[k v] (or headers {})]
       (.header b k v))
-    (let [req (-> b (.GET) (.build))
+    (let [req (-> b (.timeout request-timeout) (.GET) (.build))
           resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]
       {:status (.statusCode resp) :body (.body resp) :headers (.map (.headers resp))})))
 
@@ -23,6 +28,7 @@
     (doseq [[k v] (or headers {})]
       (.header b k v))
     (let [req (-> b
+                  (.timeout request-timeout)
                   (.POST (java.net.http.HttpRequest$BodyPublishers/ofString body))
                   (.build))
           resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]
@@ -34,10 +40,11 @@
                           (str (java.net.URLEncoder/encode (name k) "UTF-8")
                                "="
                                (java.net.URLEncoder/encode (str v) "UTF-8"))))
-                   (clojure.string/join "&"))
+                   (str/join "&"))
         b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]
     (.header b "Content-Type" "application/x-www-form-urlencoded")
     (let [req (-> b
+                  (.timeout request-timeout)
                   (.POST (java.net.http.HttpRequest$BodyPublishers/ofString pairs))
                   (.build))
           resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]
@@ -45,9 +52,9 @@
 
 (defn parse-query [s]
   (into {}
-        (for [part (clojure.string/split (or s "") #"&")
-              :when (not (clojure.string/blank? part))]
-          (let [[k v] (clojure.string/split part #"=" 2)]
+        (for [part (str/split (or s "") #"&")
+              :when (not (str/blank? part))]
+          (let [[k v] (str/split part #"=" 2)]
             [(keyword (java.net.URLDecoder/decode k "UTF-8"))
              (some-> v (java.net.URLDecoder/decode "UTF-8"))]))))
 
@@ -62,8 +69,14 @@
        (b64url (json/generate-string {:sub sub}))
        ".fakesig"))
 
-(defn start-mock-google [port]
-  (let [handler
+(defn start-mock-google
+  "Minimal Google OAuth stub. With multiple `google-users`, each `/token` call returns the next
+   `sub` in order (wraps), so several registrations get distinct Google identities."
+  [port & {:keys [google-users] :or {google-users ["google-user-1"]}}]
+  (let [users (vec google-users)
+        multi? (> (count users) 1)
+        !call-count (when multi? (atom 0))
+        handler
         (fn [req]
           (cond
             (and (= :get (:request-method req))
@@ -76,9 +89,13 @@
 
             (and (= :post (:request-method req))
                  (= "/token" (:uri req)))
-            {:status 200
-             :headers {"Content-Type" "application/json"}
-             :body (json/generate-string {:id_token (make-id-token "google-user-1")})}
+            (let [sub (if multi?
+                        (let [n (swap! !call-count inc)]
+                          (nth users (mod (dec n) (count users))))
+                        (first users))]
+              {:status 200
+               :headers {"Content-Type" "application/json"}
+               :body (json/generate-string {:id_token (make-id-token sub)})})
 
             :else
             {:status 404 :body "not found"}))
@@ -87,28 +104,46 @@
 
 (def ^:private default-agent "00000000-0000-0000-0000-000000000000:cli:local/dev")
 
+(defn complete-registration!
+  "Run pending-session → login redirect → choose-username → poll; return bearer token string.
+   With `assert!`, use `(fn [pred msg] …)` for test-style checks; without it, throw `ex-info` on failure."
+  [base-url & {:keys [username agent assert!]
+               :or {username "user" agent default-agent}}]
+  (let [check! (fn [pred msg resp]
+                 (if assert!
+                   (assert! pred msg)
+                   (when-not pred
+                     (throw (ex-info msg {:resp resp})))))]
+    (let [start-resp (http-post-json (str base-url "/api/v0/pending-session")
+                                     {:agent agent})]
+      (check! (= 200 (:status start-resp))
+              (str "pending-session for " username " returns 200")
+              start-resp)
+      (let [start-json (json/parse-string (:body start-resp) true)
+            login-get (http-get (:login_url start-json))]
+        (check! (= 200 (:status login-get))
+                (str "login redirect chain for " username)
+                login-get)
+        (let [choose (http-post-form (str base-url "/auth/choose-username")
+                                     {:session (:session start-json) :username username})]
+          (check! (= 200 (:status choose))
+                  (str "choose-username for " username " returns 200")
+                  choose)
+          (let [poll (http-get (str base-url "/api/v0/pending-session/" (:session start-json)))]
+            (check! (= 200 (:status poll))
+                    (str "pending-session poll for " username " returns 200")
+                    poll)
+            (let [poll-json (json/parse-string (:body poll) true)]
+              (check! (:complete poll-json)
+                      (str "pending session complete for " username)
+                      poll)
+              (:token poll-json))))))))
+
 (defn fetch-bearer-token!
   "Simulate browser OAuth + username choice; returns `slug_…` bearer token.
    Ingest `--delegate` must match this agent string for `AgentBound` on first write."
   [base-url & {:keys [username agent] :or {username "intuser" agent default-agent}}]
-  (let [start-resp (http-post-json (str base-url "/api/v0/pending-session")
-                                   {:agent agent})]
-    (when-not (= 200 (:status start-resp))
-      (throw (ex-info "pending-session start failed" {:resp start-resp})))
-    (let [start-json (json/parse-string (:body start-resp) true)
-          login-get (http-get (:login_url start-json))]
-      (when-not (= 200 (:status login-get))
-        (throw (ex-info "login redirect chain failed" {:resp login-get})))
-      (let [choose (http-post-form (str base-url "/auth/choose-username")
-                                   {:session (:session start-json) :username username})]
-        (when-not (= 200 (:status choose))
-          (throw (ex-info "choose-username failed" {:resp choose})))
-        (let [poll (http-get (str base-url "/api/v0/pending-session/" (:session start-json)))]
-          (when-not (= 200 (:status poll))
-            (throw (ex-info "pending-session poll failed" {:resp poll})))
-          (let [poll-json (json/parse-string (:body poll) true)]
-            (when-not (:complete poll-json)
-              (throw (ex-info "pending session not complete" {:poll poll-json})))
-            (when-not (clojure.string/starts-with? (:token poll-json) "slug_")
-              (throw (ex-info "bad token in poll response" {:poll poll-json})))
-            (:token poll-json)))))))
+  (let [token (complete-registration! base-url :username username :agent agent)]
+    (when-not (str/starts-with? token "slug_")
+      (throw (ex-info "bad token in poll response" {:token token})))
+    token))