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:
[b32c92f2] consolidated shared functions in tests (composer 2 fast)

Side A — 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))


Side B — contributor: tommy-mor
Side B — commit message:
[601d3a05] fix(html): drop home toolbar + and ExpandNewThreadForm (single + flow)

Public home now SSRs #new-thread-ui-slot like room pages: collapsed compose
for signed-in users, login hint when logged out. Removes the extra toolbar
that morphed the same collapsed state and the expand_new_thread_form action.

Made-with: Cursor

Side B — unified diff (full patch):
diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs
index e979053ff1ba8c0e2bf55add0a32b7de11cf1e56..f3ce5cb2ab2f923440a8479d0f1fb4acbba166ca 100644
--- a/server/src/api/ui_html.rs
+++ b/server/src/api/ui_html.rs
@@ -139,51 +139,6 @@ async fn dispatch_ui_action(
                 }
             }
         }
-        HtmlUiAction::ExpandNewThreadForm { room_wire } => {
-            let room_wire = room_wire.trim().to_string();
-            if room_wire.is_empty() {
-                return ui_js_warn("missing room").into_response();
-            }
-            if room_wire == "public" {
-                let reduced = state.reduced.read().await;
-                let user = session.map(|s| s.username.as_str());
-                drop(reduced);
-                let markup = if user.is_some() {
-                    fragment_new_thread_slot(&ThreadNav::public(), true, false)
-                } else {
-                    login_to_post_hint_markup()
-                };
-                return JsBuilder::new()
-                    .morph_inner_selector("#new-thread-ui-slot", markup)
-                    .into_response();
-            }
-            let reduced = state.reduced.read().await;
-            let user = session.map(|s| s.username.as_str());
-            if !reduced.rooms.contains(&room_wire) {
-                drop(reduced);
-                return ui_js_warn("room not found").into_response();
-            }
-            if !user_can_view_room(&reduced, &room_wire, user) {
-                drop(reduced);
-                return ui_js_warn("forbidden").into_response();
-            }
-            let can_post = session
-                .as_ref()
-                .map(|s| user_can_post_room(&reduced, &room_wire, &s.username))
-                .unwrap_or(false);
-            drop(reduced);
-            let Some(nav) = ThreadNav::from_room_id(&room_wire) else {
-                return ui_js_warn("bad room").into_response();
-            };
-            let markup = if can_post {
-                fragment_new_thread_slot(&nav, true, false)
-            } else {
-                login_to_post_hint_markup()
-            };
-            JsBuilder::new()
-                .morph_inner_selector("#new-thread-ui-slot", markup)
-                .into_response()
-        }
         HtmlUiAction::SetRoomMembersExpanded { room_wire, expanded } => {
             let room_wire = room_wire.trim().to_string();
             if room_wire.is_empty() {
diff --git a/server/src/html/forum/feed.rs b/server/src/html/forum/feed.rs
index 1b4ae7baa3ad4757b74172d7b67f3f2b33d1075d..945bdd6c48bc164e2cf91fd0996c4321b75f5abf 100644
--- a/server/src/html/forum/feed.rs
+++ b/server/src/html/forum/feed.rs
@@ -14,6 +14,7 @@ use crate::timeago;
 
 use super::ingest::ingest_entry_markup;
 use super::nav::ThreadNav;
+use super::new_thread::{fragment_new_thread_slot, login_to_post_hint_markup};
 use super::page::auth_strip;
 use super::paginator::{render_thread_paginator, PAGE_SIZE};
 use crate::html::{
@@ -217,9 +218,6 @@ pub async fn home(
     let strip = auth_strip(&headers, &jar, &reduced_read);
     drop(reduced_read);
 
-    use crate::html::ui_action::{HtmlUiAction, UI_RPC_FIELD};
-    use crate::form_template::template_json_compact;
-
     let page = layout(
         "slug.social",
         "view-thread",
@@ -243,15 +241,13 @@ pub async fn home(
                 }
             }
             p class="muted" { "dark = time-ordered · light = vote-ranked" }
-            div class="thread-feed-toolbar" {
-                form method="POST" action="/ui" {
-                    input type="hidden" name=(UI_RPC_FIELD) value=(template_json_compact(&HtmlUiAction::ExpandNewThreadForm {
-                        room_wire: "public".into(),
-                    }).expect("static json"));
-                    button type="submit" class="section-add-btn" { "+" }
+            div id="new-thread-ui-slot" {
+                @if user.is_some() {
+                    (fragment_new_thread_slot(&nav, true, false))
+                } @else {
+                    (login_to_post_hint_markup())
                 }
             }
-            div id="new-thread-ui-slot" {}
             (render_thread_feed(Some(&nav), "thread-feed", &public_rows, now))
             (cli_panel(&["npx slugsocial public forum list"]))
         },
diff --git a/server/src/html/ui_action.rs b/server/src/html/ui_action.rs
index 5031ebfeb928f28e471f23210b8c644654adb7c7..da0c9b3541e8e4988a78768cddef22324755c3f2 100644
--- a/server/src/html/ui_action.rs
+++ b/server/src/html/ui_action.rs
@@ -38,11 +38,6 @@ pub enum HtmlUiAction {
     RedactPost {
         post_id: String,
     },
-    /// Morph `#new-thread-ui-slot` inner to the collapsed compose toggle (or login hint).
-    /// Use `room_wire: "public"` for the public forum home; otherwise a private room id (`short/slug`).
-    ExpandNewThreadForm {
-        room_wire: String,
-    },
     /// Morph `#room-members-section` — members list open or collapsed (server-rendered).
     SetRoomMembersExpanded {
         room_wire: String,
@@ -131,26 +126,6 @@ mod tests {
         );
     }
 
-    #[test]
-    fn expand_new_thread_form_public() {
-        let template = serde_json::json!({
-            "action": "expand_new_thread_form",
-            "room_wire": "public",
-        });
-        let mut form = HashMap::new();
-        form.insert(
-            UI_RPC_FIELD.to_string(),
-            serde_json::to_string(&template).unwrap(),
-        );
-        let a = parse_html_ui_from_form(&form).unwrap();
-        assert_eq!(
-            a,
-            HtmlUiAction::ExpandNewThreadForm {
-                room_wire: "public".into(),
-            }
-        );
-    }
-
     #[test]
     fn expand_post_full_round_trip() {
         let template = serde_json::json!({