{"messages":[{"content":"You are a constitutional council ranking individual git commits for ownership allocation.\n\nCompare these two commits. Decide which contributed more lasting value to the project.\n\nJudge substance, not spectacle:\n- Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise.\n- Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one.\n- Do not favor a side merely because its patch is longer or noisier.\n- Weight what the change does for the project, not the contributor's name.\n\nReturn ONLY a JSON object: {\"winner\": \"A\" or \"B\", \"ratio\": \"N:M\", \"explanation\": \"...\"}\nThe explanation must cite concrete differences in the patches (1-3 sentences).\n\nSide A — contributor: tommy-mor\nSide A — commit message:\n[b32c92f2] consolidated shared functions in tests (composer 2 fast)\n\nSide A — unified diff (full patch):\ndiff --git a/test/auth.bb b/test/auth.bb\nindex a67cc1de763434176d2f68e419dd37a8cd328395..78cffc875ffe83f512bca253f4a7489227311da4 100644\n--- a/test/auth.bb\n+++ b/test/auth.bb\n@@ -3,113 +3,14 @@\n   (:require [babashka.process :as p]\n             [babashka.fs :as fs]\n             [cheshire.core :as json]\n-            [org.httpkit.server :as http]\n-            [test.common :as common]))\n+            [clojure.string :as str]\n+            [test.common :as common]\n+            [test.oauth :as oauth]))\n \n-(def ^:private ansi-green \"\\033[32m\")\n-(def ^:private ansi-red   \"\\033[31m\")\n-(def ^:private ansi-reset \"\\033[0m\")\n (def ^:private counts (atom {:pass 0 :fail 0}))\n \n-(defn- pass [msg]\n-  (swap! counts update :pass inc)\n-  (println (str ansi-green \"  ✓ \" ansi-reset msg)))\n-\n-(defn- fail [msg]\n-  (swap! counts update :fail inc)\n-  (println (str ansi-red \"  ✗ \" ansi-reset msg)))\n-\n (defn- assert! [pred msg]\n-  (if pred\n-    (pass msg)\n-    (do (fail msg)\n-        (throw (ex-info (str \"FAIL: \" msg) {})))))\n-\n-(defn- http-client []\n-  (-> (java.net.http.HttpClient/newBuilder)\n-      (.followRedirects java.net.http.HttpClient$Redirect/ALWAYS)\n-      (.build)))\n-\n-(defn- http-get [url & {:keys [headers]}]\n-  (let [b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n-    (doseq [[k v] (or headers {})]\n-      (.header b k v))\n-    (let [req (-> b (.GET) (.build))\n-          resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n-      {:status (.statusCode resp) :body (.body resp) :headers (.map (.headers resp))})))\n-\n-(defn- http-post-json [url data & {:keys [headers]}]\n-  (let [body (json/generate-string data)\n-        b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n-    (.header b \"Content-Type\" \"application/json\")\n-    (doseq [[k v] (or headers {})]\n-      (.header b k v))\n-    (let [req (-> b\n-                  (.POST (java.net.http.HttpRequest$BodyPublishers/ofString body))\n-                  (.build))\n-          resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n-      {:status (.statusCode resp) :body (.body resp) :headers (.map (.headers resp))})))\n-\n-(defn- http-post-form [url form]\n-  (let [pairs (->> form\n-                   (map (fn [[k v]]\n-                          (str (java.net.URLEncoder/encode (name k) \"UTF-8\")\n-                               \"=\"\n-                               (java.net.URLEncoder/encode (str v) \"UTF-8\"))))\n-                   (clojure.string/join \"&\"))\n-        b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n-    (.header b \"Content-Type\" \"application/x-www-form-urlencoded\")\n-    (let [req (-> b\n-                  (.POST (java.net.http.HttpRequest$BodyPublishers/ofString pairs))\n-                  (.build))\n-          resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n-      {:status (.statusCode resp) :body (.body resp) :headers (.map (.headers resp))})))\n-\n-(defn- parse-query [s]\n-  (into {}\n-        (for [part (clojure.string/split (or s \"\") #\"&\")\n-              :when (not (clojure.string/blank? part))]\n-          (let [[k v] (clojure.string/split part #\"=\" 2)]\n-            [(keyword (java.net.URLDecoder/decode k \"UTF-8\"))\n-             (some-> v (java.net.URLDecoder/decode \"UTF-8\"))]))))\n-\n-(defn- b64url [s]\n-  (-> (java.util.Base64/getUrlEncoder)\n-      (.withoutPadding)\n-      (.encodeToString (.getBytes s \"UTF-8\"))))\n-\n-(defn- make-id-token [sub]\n-  (str (b64url \"{\\\"alg\\\":\\\"RS256\\\",\\\"typ\\\":\\\"JWT\\\"}\")\n-       \".\"\n-       (b64url (json/generate-string {:sub sub}))\n-       \".fakesig\"))\n-\n-(defn- start-mock-google [port]\n-  (let [google-users [\"google-user-1\" \"google-user-2\"]\n-        !call-count (atom 0)\n-        handler\n-        (fn [req]\n-          (cond\n-            (and (= :get (:request-method req))\n-                 (= \"/o/oauth2/v2/auth\" (:uri req)))\n-            (let [q (parse-query (:query-string req))\n-                  redirect-uri (:redirect_uri q)\n-                  state (:state q)\n-                  loc (str redirect-uri \"?code=mockcode&state=\" state)]\n-              {:status 302 :headers {\"Location\" loc} :body \"\"})\n-\n-            (and (= :post (:request-method req))\n-                 (= \"/token\" (:uri req)))\n-            (let [n   (swap! !call-count inc)\n-                  sub (nth google-users (mod (dec n) (count google-users)))]\n-              {:status 200\n-               :headers {\"Content-Type\" \"application/json\"}\n-               :body (json/generate-string {:id_token (make-id-token sub)})})\n-\n-            :else\n-            {:status 404 :body \"not found\"}))\n-        stop-fn (http/run-server handler {:port port})]\n-    {:stop-fn stop-fn :port port}))\n+  (common/test-assert! counts pred msg))\n \n (defn auth-test [& _args]\n   (println \"\\n━━━ auth v3 integration check ━━━\\n\")\n@@ -117,8 +18,7 @@\n \n   (println \"building server + CLI binaries…\")\n   (common/letlocals\n-   (bind build @(p/process [(common/cargo-bin) \"build\" \"--release\" \"-p\" \"slugsocial-server\" \"-p\" \"slugsocial\"]\n-                           {:inherit true :env common/base-env}))\n+   (bind build (common/run-cargo-build-release! [\"slugsocial-server\" \"slugsocial\"]))\n    (assert! (zero? (:exit build)) \"cargo build succeeds\")\n    (bind server-bin \"target/release/slugsocial-server\")\n    (bind cli-bin \"target/release/slugsocial\")\n@@ -134,19 +34,10 @@\n    (bind !server (atom nil))\n    (bind !google (atom nil))\n \n-   (bind server-env (merge common/base-env\n-                           {\"SLUG_DATA_DIR\" tmp-dir\n-                            \"SLUG_KEYS\"     \"test:test\"\n-                            \"PORT\"          (str slug-port)\n-                            \"RUST_LOG\"      \"warn\"\n-                            \"SLUG_PUBLIC_URL\" base-url\n-                            \"SLUG_GOOGLE_AUTH_URL\" (str google-url \"/o/oauth2/v2/auth\")\n-                            \"SLUG_GOOGLE_TOKEN_URL\" (str google-url \"/token\")\n-                            \"SLUG_GOOGLE_CLIENT_ID\" \"mock\"\n-                            \"SLUG_GOOGLE_CLIENT_SECRET\" \"mock\"}))\n+   (bind server-env (common/slug-server-env tmp-dir base-url google-url slug-port))\n    (try\n      (println (str \"\\nstarting mock google on :\" google-port))\n-     (reset! !google (start-mock-google google-port))\n+     (reset! !google (oauth/start-mock-google google-port :google-users [\"google-user-1\" \"google-user-2\"]))\n      (assert! (some? (:stop-fn @!google)) \"mock google started\")\n \n      (println (str \"starting server on :\" slug-port))\n@@ -154,34 +45,33 @@\n      (assert! (common/wait-for-server base-url 10000) \"server responds to /healthz\")\n \n      (println \"\\nstarting pending session…\")\n-     (let [start-resp (http-post-json (str base-url \"/api/v0/pending-session\")\n-                                      {:agent \"00000000-0000-0000-0000-000000000000:bb:local/dev\"})\n+     (let [start-resp (oauth/http-post-json (str base-url \"/api/v0/pending-session\")\n+                                            {:agent \"00000000-0000-0000-0000-000000000000:bb:local/dev\"})\n            _ (assert! (= 200 (:status start-resp)) \"pending-session start returns 200\")\n            start-json (json/parse-string (:body start-resp) true)]\n-       (assert! (clojure.string/starts-with? (:session start-json) \"p_\") \"session id has p_ prefix\")\n-       (assert! (clojure.string/includes? (:login_url start-json) \"/auth/login\") \"login_url provided\")\n+       (assert! (str/starts-with? (:session start-json) \"p_\") \"session id has p_ prefix\")\n+       (assert! (str/includes? (:login_url start-json) \"/auth/login\") \"login_url provided\")\n \n        (println \"\\nsimulating browser oauth redirects…\")\n-       ;; This will follow redirects: /auth/login -> mock google -> /auth/callback -> /auth/choose-username\n-       (let [login-get (http-get (:login_url start-json))]\n+       (let [login-get (oauth/http-get (:login_url start-json))]\n          (assert! (= 200 (:status login-get)) \"choose-username page reachable after oauth callback\"))\n \n        (println \"\\nchoosing username…\")\n-       (let [choose (http-post-form (str base-url \"/auth/choose-username\")\n-                                    {:session (:session start-json) :username \"bbuser\"})]\n+       (let [choose (oauth/http-post-form (str base-url \"/auth/choose-username\")\n+                                          {:session (:session start-json) :username \"bbuser\"})]\n          (assert! (= 200 (:status choose)) \"choose-username POST returns 200\"))\n \n        (println \"\\npolling pending session…\")\n-       (let [poll (http-get (str base-url \"/api/v0/pending-session/\" (:session start-json)))]\n+       (let [poll (oauth/http-get (str base-url \"/api/v0/pending-session/\" (:session start-json)))]\n          (assert! (= 200 (:status poll)) \"pending-session poll returns 200\")\n          (let [poll-json (json/parse-string (:body poll) true)]\n            (assert! (:complete poll-json) \"pending session complete=true\")\n            (assert! (= \"bbuser\" (:user poll-json)) \"poll returns stored username bbuser\")\n-           (assert! (clojure.string/starts-with? (:token poll-json) \"slug_\") \"poll returns bearer token\")\n+           (assert! (str/starts-with? (:token poll-json) \"slug_\") \"poll returns bearer token\")\n \n            (println \"\\nwhoami…\")\n-           (let [who (http-get (str base-url \"/api/v0/whoami\")\n-                               :headers {\"Authorization\" (str \"Bearer \" (:token poll-json))})]\n+           (let [who (oauth/http-get (str base-url \"/api/v0/whoami\")\n+                                     :headers {\"Authorization\" (str \"Bearer \" (:token poll-json))})]\n              (assert! (= 200 (:status who)) \"whoami returns 200\")\n              (let [who-json (json/parse-string (:body who) true)]\n                (assert! (= \"bbuser\" (:user who-json)) \"whoami user is bbuser (stored form)\"))))))\n@@ -195,11 +85,11 @@\n                   (str \"identity start exits 0 (stderr: \" (:err start-proc) \")\"))\n          (let [start-cli (json/parse-string (:out start-proc) true)]\n            (assert! (= \"present_oauth_url_to_user\" (:phase start-cli)) \"identity start --json phase\")\n-           (assert! (clojure.string/starts-with? (:session start-cli) \"p_\") \"CLI start session id\")\n-           (let [login-get (http-get (:login_url start-cli))]\n+           (assert! (str/starts-with? (:session start-cli) \"p_\") \"CLI start session id\")\n+           (let [login-get (oauth/http-get (:login_url start-cli))]\n              (assert! (= 200 (:status login-get)) \"CLI login_url redirect chain succeeds\"))\n-           (let [choose (http-post-form (str base-url \"/auth/choose-username\")\n-                                        {:session (:session start-cli) :username \"cliuser\"})]\n+           (let [choose (oauth/http-post-form (str base-url \"/auth/choose-username\")\n+                                              {:session (:session start-cli) :username \"cliuser\"})]\n              (assert! (= 200 (:status choose)) \"choose-username for cliuser\"))\n            (let [poll-proc @(p/process [cli-bin \"identity\" \"poll\" (:session start-cli)\n                                         \"--poll-interval-ms\" \"100\" \"--max-wait-secs\" \"30\" \"--json\"]\n@@ -209,10 +99,10 @@\n              (let [poll-cli (json/parse-string (:out poll-proc) true)]\n                (assert! (= \"complete\" (:phase poll-cli)) \"identity poll --json phase\")\n                (assert! (= \"cliuser\" (:user poll-cli)) \"CLI poll user (stored form)\")\n-               (assert! (clojure.string/starts-with? (:token poll-cli) \"slug_\") \"CLI poll token\")\n+               (assert! (str/starts-with? (:token poll-cli) \"slug_\") \"CLI poll token\")\n                (let [token-path (str cli-home \"/.config/slugsocial/token\")]\n                  (assert! (fs/exists? token-path) \"token written under isolated HOME\")\n-                 (assert! (= (clojure.string/trim (slurp token-path)) (:token poll-cli))\n+                 (assert! (= (str/trim (slurp token-path)) (:token poll-cli))\n                           \"token file matches poll JSON\"))\n                (let [who-proc @(p/process [cli-bin \"whoami\" \"--json\"]\n                                           {:out :string :err :string :env cli-env})]\n@@ -227,5 +117,4 @@\n        (fs/delete-tree tmp-dir)))\n \n    (bind {pass :pass} @counts)\n-   (println (str \"\\n\" ansi-green \"━━━ \" pass \" auth checks passed ━━━\" ansi-reset \"\\n\"))))\n-\n+   (println (str \"\\n\" common/ansi-green \"━━━ \" pass \" auth checks passed ━━━\" common/ansi-reset \"\\n\"))))\ndiff --git a/test/common.bb b/test/common.bb\nindex 4ed450377cdbb020f5ff164a812dfbbfc23c0f47..0b855ea5fc6cc513df065a221a28eae6e0848edc 100644\n--- a/test/common.bb\n+++ b/test/common.bb\n@@ -1,6 +1,7 @@\n (ns test.common\n   \"Shared utilities for slug test rigs: port allocation, server lifecycle,\n-   environment helpers, CLI runner, and the letlocals macro.\"\n+   environment helpers, CLI runner, test harness (ANSI + pass/fail counts),\n+   standard server env for bb suites, and the letlocals macro.\"\n   (:require [babashka.process :as p]\n             [clojure.string :as str]\n             [babashka.fs :as fs]))\n@@ -43,6 +44,42 @@\n               env\n               (assoc env \"PATH\" (str cargo-home \":\" (get env \"PATH\" \"\")))))))\n \n+;; ---------------------------------------------------------------------------\n+;; test harness (ANSI + counters)\n+;; ---------------------------------------------------------------------------\n+\n+(def ansi-green \"\\033[32m\")\n+(def ansi-red   \"\\033[31m\")\n+(def ansi-reset \"\\033[0m\")\n+\n+(defn test-pass! [counts-atom msg]\n+  (swap! counts-atom update :pass inc)\n+  (println (str ansi-green \"  ✓ \" ansi-reset msg)))\n+\n+(defn test-fail! [counts-atom msg]\n+  (swap! counts-atom update :fail inc)\n+  (println (str ansi-red \"  ✗ \" ansi-reset msg)))\n+\n+(defn test-assert! [counts-atom pred msg]\n+  (if pred\n+    (test-pass! counts-atom msg)\n+    (do (test-fail! counts-atom msg)\n+        (throw (ex-info (str \"FAIL: \" msg) {})))))\n+\n+(defn slug-server-env\n+  \"Env map for `slugsocial-server` in bb integration tests (mock Google URLs, data dir, keys).\"\n+  [tmp-dir base-url google-base-url slug-port]\n+  (merge base-env\n+         {\"SLUG_DATA_DIR\" tmp-dir\n+          \"SLUG_KEYS\"     \"test:test\"\n+          \"PORT\"          (str slug-port)\n+          \"RUST_LOG\"      \"warn\"\n+          \"SLUG_PUBLIC_URL\" base-url\n+          \"SLUG_GOOGLE_AUTH_URL\" (str google-base-url \"/o/oauth2/v2/auth\")\n+          \"SLUG_GOOGLE_TOKEN_URL\" (str google-base-url \"/token\")\n+          \"SLUG_GOOGLE_CLIENT_ID\" \"mock\"\n+          \"SLUG_GOOGLE_CLIENT_SECRET\" \"mock\"}))\n+\n (defn cargo-bin\n   \"Resolve cargo, preferring ~/.cargo/bin if not on PATH.\"\n   []\n@@ -50,6 +87,13 @@\n     (str cargo-home \"/cargo\")\n     \"cargo\"))\n \n+(defn run-cargo-build-release!\n+  \"`cargo build --release` for each package name in `packages` (e.g. [\\\"slugsocial-server\\\"]).\"\n+  [packages]\n+  @(p/process (into [(cargo-bin) \"build\" \"--release\"]\n+                    (mapcat (fn [p] [\"-p\" p]) packages))\n+              {:inherit true :env base-env}))\n+\n ;; ---------------------------------------------------------------------------\n ;; port / server utilities\n ;; ---------------------------------------------------------------------------\ndiff --git a/test/grants.bb b/test/grants.bb\nindex 793ba216f2de76a77eb20a76d08403db07ff411b..10ef0f08ce1c3945e5f1634314e6aebcf6810cd2 100644\n--- a/test/grants.bb\n+++ b/test/grants.bb\n@@ -7,145 +7,20 @@\n   - user with View + Post -> ok=true for prose\n   - user with View + Post but no Vote -> ok=false for vote\n   - user with View + Post + Vote -> ok=true for vote\"\n-  (:require [babashka.process :as p]\n-            [babashka.fs :as fs]\n+  (:require [babashka.fs :as fs]\n             [cheshire.core :as json]\n-            [org.httpkit.server :as http]\n-            [test.common :as common]))\n+            [test.common :as common]\n+            [test.oauth :as oauth]))\n \n-(def ^:private ansi-green \"\\033[32m\")\n-(def ^:private ansi-red   \"\\033[31m\")\n-(def ^:private ansi-reset \"\\033[0m\")\n (def ^:private counts (atom {:pass 0 :fail 0}))\n \n-(defn- pass [msg]\n-  (swap! counts update :pass inc)\n-  (println (str ansi-green \"  ✓ \" ansi-reset msg)))\n-\n-(defn- fail [msg]\n-  (swap! counts update :fail inc)\n-  (println (str ansi-red \"  ✗ \" ansi-reset msg)))\n-\n (defn- assert! [pred msg]\n-  (if pred\n-    (pass msg)\n-    (do (fail msg)\n-        (throw (ex-info (str \"FAIL: \" msg) {})))))\n-\n-(defn- http-client []\n-  (-> (java.net.http.HttpClient/newBuilder)\n-      (.followRedirects java.net.http.HttpClient$Redirect/ALWAYS)\n-      (.connectTimeout (java.time.Duration/ofSeconds 15))\n-      (.build)))\n-\n-(defn- http-get [url & {:keys [headers]}]\n-  (let [b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n-    (doseq [[k v] (or headers {})]\n-      (.header b k v))\n-    (let [req (-> b (.timeout (java.time.Duration/ofSeconds 60)) (.GET) (.build))\n-          resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n-      {:status (.statusCode resp) :body (.body resp)})))\n-\n-(defn- http-post-json [url data & {:keys [headers]}]\n-  (let [body (json/generate-string data)\n-        b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n-    (.header b \"Content-Type\" \"application/json\")\n-    (doseq [[k v] (or headers {})]\n-      (.header b k v))\n-    (let [req (-> b\n-                  (.timeout (java.time.Duration/ofSeconds 60))\n-                  (.POST (java.net.http.HttpRequest$BodyPublishers/ofString body))\n-                  (.build))\n-          resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n-      {:status (.statusCode resp) :body (.body resp)})))\n-\n-(defn- http-post-form [url form]\n-  (let [pairs (->> form\n-                   (map (fn [[k v]]\n-                          (str (java.net.URLEncoder/encode (name k) \"UTF-8\")\n-                               \"=\"\n-                               (java.net.URLEncoder/encode (str v) \"UTF-8\"))))\n-                   (clojure.string/join \"&\"))\n-        b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n-    (.header b \"Content-Type\" \"application/x-www-form-urlencoded\")\n-    (let [req (-> b\n-                  (.timeout (java.time.Duration/ofSeconds 60))\n-                  (.POST (java.net.http.HttpRequest$BodyPublishers/ofString pairs))\n-                  (.build))\n-          resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n-      {:status (.statusCode resp) :body (.body resp)})))\n-\n-(defn- parse-query [s]\n-  (into {}\n-        (for [part (clojure.string/split (or s \"\") #\"&\")\n-              :when (not (clojure.string/blank? part))]\n-          (let [[k v] (clojure.string/split part #\"=\" 2)]\n-            [(keyword (java.net.URLDecoder/decode k \"UTF-8\"))\n-             (some-> v (java.net.URLDecoder/decode \"UTF-8\"))]))))\n-\n-(defn- b64url [s]\n-  (-> (java.util.Base64/getUrlEncoder)\n-      (.withoutPadding)\n-      (.encodeToString (.getBytes s \"UTF-8\"))))\n-\n-(defn- make-id-token [sub]\n-  (str (b64url \"{\\\"alg\\\":\\\"RS256\\\",\\\"typ\\\":\\\"JWT\\\"}\")\n-       \".\"\n-       (b64url (json/generate-string {:sub sub}))\n-       \".fakesig\"))\n-\n-;; Stateful mock: each /token call returns the next user in the list.\n-;; This lets us register two distinct users in one test run.\n-(defn- start-mock-google [port]\n-  (let [google-users [\"google-user-alice\" \"google-user-bob\"]\n-        !call-count (atom 0)\n-        handler\n-        (fn [req]\n-          (cond\n-            (and (= :get (:request-method req))\n-                 (= \"/o/oauth2/v2/auth\" (:uri req)))\n-            (let [q (parse-query (:query-string req))\n-                  redirect-uri (:redirect_uri q)\n-                  state (:state q)\n-                  loc (str redirect-uri \"?code=mockcode&state=\" state)]\n-              {:status 302 :headers {\"Location\" loc} :body \"\"})\n-\n-            (and (= :post (:request-method req))\n-                 (= \"/token\" (:uri req)))\n-            (let [n   (swap! !call-count inc)\n-                  sub (nth google-users (mod (dec n) (count google-users)))]\n-              {:status 200\n-               :headers {\"Content-Type\" \"application/json\"}\n-               :body (json/generate-string {:id_token (make-id-token sub)})})\n-\n-            :else\n-            {:status 404 :body \"not found\"}))\n-        stop-fn (http/run-server handler {:port port})]\n-    {:stop-fn stop-fn :port port}))\n-\n-(defn- register-user\n-  \"Walk the full OAuth flow for one user. Returns the bearer token.\"\n-  [base-url session-agent username]\n-  (let [start-resp (http-post-json (str base-url \"/api/v0/pending-session\")\n-                                   {:agent session-agent})\n-        _ (assert! (= 200 (:status start-resp))\n-                   (str \"pending-session for \" username \" returns 200\"))\n-        start-json (json/parse-string (:body start-resp) true)\n-        _login (http-get (:login_url start-json))\n-        _choose (http-post-form (str base-url \"/auth/choose-username\")\n-                                {:session (:session start-json) :username username})\n-        _ (assert! (= 200 (:status _choose))\n-                   (str \"choose-username for \" username \" returns 200\"))\n-        poll (http-get (str base-url \"/api/v0/pending-session/\" (:session start-json)))\n-        poll-json (json/parse-string (:body poll) true)\n-        _ (assert! (:complete poll-json)\n-                   (str \"pending session complete for \" username))]\n-    (:token poll-json)))\n+  (common/test-assert! counts pred msg))\n \n (defn- bearer [token] {\"Authorization\" (str \"Bearer \" token)})\n \n (defn- rpc-batch! [base-url token cmds]\n-  (let [resp (http-post-json (str base-url \"/api/v0/rpc\") cmds :headers (bearer token))]\n+  (let [resp (oauth/http-post-json (str base-url \"/api/v0/rpc\") cmds :headers (bearer token))]\n     {:status (:status resp)\n      :parsed (json/parse-string (:body resp) false)}))\n \n@@ -160,14 +35,19 @@\n                         \"text\" text\n                         \"return_rank_diff\" false}}]))\n \n+(defn- register-user! [base-url session-agent username]\n+  (oauth/complete-registration! base-url\n+                                :agent session-agent\n+                                :username username\n+                                :assert! (fn [pred msg] (assert! pred msg))))\n+\n (defn grants-test [& _args]\n   (println \"\\n━━━ grants enforcement integration check ━━━\\n\")\n   (reset! counts {:pass 0 :fail 0})\n \n   (println \"building server binary…\")\n   (common/letlocals\n-   (bind build @(p/process [(common/cargo-bin) \"build\" \"--release\" \"-p\" \"slugsocial-server\"]\n-                           {:inherit true :env common/base-env}))\n+   (bind build (common/run-cargo-build-release! [\"slugsocial-server\"]))\n    (assert! (zero? (:exit build)) \"cargo build succeeds\")\n    (bind server-bin \"target/release/slugsocial-server\")\n \n@@ -180,33 +60,24 @@\n    (bind !server (atom nil))\n    (bind !google (atom nil))\n \n-   (bind server-env (merge common/base-env\n-                           {\"SLUG_DATA_DIR\" tmp-dir\n-                            \"SLUG_KEYS\"     \"test:test\"\n-                            \"PORT\"          (str slug-port)\n-                            \"RUST_LOG\"      \"warn\"\n-                            \"SLUG_PUBLIC_URL\" base-url\n-                            \"SLUG_GOOGLE_AUTH_URL\" (str google-url \"/o/oauth2/v2/auth\")\n-                            \"SLUG_GOOGLE_TOKEN_URL\" (str google-url \"/token\")\n-                            \"SLUG_GOOGLE_CLIENT_ID\" \"mock\"\n-                            \"SLUG_GOOGLE_CLIENT_SECRET\" \"mock\"}))\n+   (bind server-env (common/slug-server-env tmp-dir base-url google-url slug-port))\n    (try\n      (println (str \"starting mock google on :\" google-port))\n-     (reset! !google (start-mock-google google-port))\n+     (reset! !google (oauth/start-mock-google google-port\n+                                              :google-users [\"google-user-alice\" \"google-user-bob\"]))\n \n      (println (str \"starting server on :\" slug-port))\n      (reset! !server (common/start-server server-bin server-env))\n      (assert! (common/wait-for-server base-url 10000) \"server responds to /healthz\")\n \n-     ;; Register two users. The mock google cycles through google-user-alice then google-user-bob.\n      (println \"\\nregistering alice…\")\n-     (let [alice-token (register-user base-url\n-                                      \"00000000-0000-0000-0000-000000000001:test:local/dev\"\n-                                      \"alice\")\n+     (let [alice-token (register-user! base-url\n+                                       \"00000000-0000-0000-0000-000000000001:test:local/dev\"\n+                                       \"alice\")\n            _ (println \"registering bob…\")\n-           bob-token   (register-user base-url\n-                                      \"00000000-0000-0000-0000-000000000002:test:local/dev\"\n-                                      \"bob\")\n+           bob-token   (register-user! base-url\n+                                       \"00000000-0000-0000-0000-000000000002:test:local/dev\"\n+                                       \"bob\")\n \n            ;; Alice creates a private room.\n            _ (println \"\\nalice creates private room…\")\n@@ -288,6 +159,6 @@\n \n    (bind {pass :pass fail :fail} @counts)\n    (if (zero? fail)\n-     (println (str \"\\n\" ansi-green \"━━━ \" pass \" grant checks passed ━━━\" ansi-reset \"\\n\"))\n-     (do (println (str \"\\n\" ansi-red \"━━━ \" fail \" grant checks FAILED ━━━\" ansi-reset \"\\n\"))\n+     (println (str \"\\n\" common/ansi-green \"━━━ \" pass \" grant checks passed ━━━\" common/ansi-reset \"\\n\"))\n+     (do (println (str \"\\n\" common/ansi-red \"━━━ \" fail \" grant checks FAILED ━━━\" common/ansi-reset \"\\n\"))\n          (System/exit 1)))))\ndiff --git a/test/integration.bb b/test/integration.bb\nindex 07c9851e5e112f644556a847302d00b5e0f6acb4..c9af7afb3942ffb509a7d053b903c36cdbf1691b 100644\n--- a/test/integration.bb\n+++ b/test/integration.bb\n@@ -2,8 +2,7 @@\n   \"End-to-end integration check: DSL → CLI → HTTP → JSONL → materialized view → CLI query.\n    Boots a server, ingests via CLI, queries back, kills server, restarts from\n    the same JSONL, and queries again to prove replay determinism.\"\n-  (:require [babashka.process :as p]\n-            [clojure.string :as str]\n+  (:require [clojure.string :as str]\n             [babashka.fs :as fs]\n             [cheshire.core :as json]\n             [test.common :as common]\n@@ -13,25 +12,10 @@\n ;; helpers\n ;; ---------------------------------------------------------------------------\n \n-(def ^:private ansi-green \"\\033[32m\")\n-(def ^:private ansi-red   \"\\033[31m\")\n-(def ^:private ansi-reset \"\\033[0m\")\n-\n (def ^:private counts (atom {:pass 0 :fail 0}))\n \n-(defn- pass [msg]\n-  (swap! counts update :pass inc)\n-  (println (str ansi-green \"  ✓ \" ansi-reset msg)))\n-\n-(defn- fail [msg]\n-  (swap! counts update :fail inc)\n-  (println (str ansi-red \"  ✗ \" ansi-reset msg)))\n-\n (defn- assert! [pred msg]\n-  (if pred\n-    (pass msg)\n-    (do (fail msg)\n-        (throw (ex-info (str \"FAIL: \" msg) {})))))\n+  (common/test-assert! counts pred msg))\n \n ;; ---------------------------------------------------------------------------\n ;; letlocals unit tests\n@@ -102,8 +86,7 @@\n   (println \"\\nbuilding binaries…\")\n   (common/letlocals\n     ;; 1. build\n-   (bind build      @(p/process [(common/cargo-bin) \"build\" \"--release\" \"-p\" \"slugsocial-server\" \"-p\" \"slugsocial\"]\n-                                {:inherit true :env common/base-env}))\n+   (bind build (common/run-cargo-build-release! [\"slugsocial-server\" \"slugsocial\"]))\n    (assert! (zero? (:exit build)) \"cargo build succeeds\")\n \n    (bind server-bin \"target/release/slugsocial-server\")\n@@ -120,16 +103,7 @@\n    (bind !server    (atom nil))\n    (bind !server2   (atom nil))\n    (bind !google    (atom nil))\n-   (bind server-env (merge common/base-env\n-                           {\"SLUG_DATA_DIR\" tmp-dir\n-                            \"SLUG_KEYS\"     \"test:test\"\n-                            \"PORT\"          (str port)\n-                            \"RUST_LOG\"      \"warn\"\n-                            \"SLUG_PUBLIC_URL\" base-url\n-                            \"SLUG_GOOGLE_AUTH_URL\" (str google-url \"/o/oauth2/v2/auth\")\n-                            \"SLUG_GOOGLE_TOKEN_URL\" (str google-url \"/token\")\n-                            \"SLUG_GOOGLE_CLIENT_ID\" \"mock\"\n-                            \"SLUG_GOOGLE_CLIENT_SECRET\" \"mock\"}))\n+   (bind server-env (common/slug-server-env tmp-dir base-url google-url port))\n \n    (try\n      (common/letlocals\n@@ -291,4 +265,4 @@\n        (fs/delete-tree tmp-dir)))\n \n    (bind {pass :pass} @counts)\n-   (println (str \"\\n\" ansi-green \"━━━ \" pass \" checks passed ━━━\" ansi-reset \"\\n\"))))\n+   (println (str \"\\n\" common/ansi-green \"━━━ \" pass \" checks passed ━━━\" common/ansi-reset \"\\n\"))))\ndiff --git a/test/oauth.bb b/test/oauth.bb\nindex 84679e1a4adbe100dfe7e7d64a2c6270b023d275..b69459acd17c23c023170d8dd93fe45bb49c8d88 100644\n--- a/test/oauth.bb\n+++ b/test/oauth.bb\n@@ -1,18 +1,23 @@\n (ns test.oauth\n   \"Shared Babashka HTTP helpers + mock Google OAuth + token handoff for integration tests.\"\n   (:require [cheshire.core :as json]\n+            [clojure.string :as str]\n             [org.httpkit.server :as http]))\n \n+(def ^:private connect-timeout (java.time.Duration/ofSeconds 15))\n+(def ^:private request-timeout (java.time.Duration/ofSeconds 60))\n+\n (defn http-client []\n   (-> (java.net.http.HttpClient/newBuilder)\n       (.followRedirects java.net.http.HttpClient$Redirect/ALWAYS)\n+      (.connectTimeout connect-timeout)\n       (.build)))\n \n (defn http-get [url & {:keys [headers]}]\n   (let [b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n     (doseq [[k v] (or headers {})]\n       (.header b k v))\n-    (let [req (-> b (.GET) (.build))\n+    (let [req (-> b (.timeout request-timeout) (.GET) (.build))\n           resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n       {:status (.statusCode resp) :body (.body resp) :headers (.map (.headers resp))})))\n \n@@ -23,6 +28,7 @@\n     (doseq [[k v] (or headers {})]\n       (.header b k v))\n     (let [req (-> b\n+                  (.timeout request-timeout)\n                   (.POST (java.net.http.HttpRequest$BodyPublishers/ofString body))\n                   (.build))\n           resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n@@ -34,10 +40,11 @@\n                           (str (java.net.URLEncoder/encode (name k) \"UTF-8\")\n                                \"=\"\n                                (java.net.URLEncoder/encode (str v) \"UTF-8\"))))\n-                   (clojure.string/join \"&\"))\n+                   (str/join \"&\"))\n         b (java.net.http.HttpRequest/newBuilder (java.net.URI/create url))]\n     (.header b \"Content-Type\" \"application/x-www-form-urlencoded\")\n     (let [req (-> b\n+                  (.timeout request-timeout)\n                   (.POST (java.net.http.HttpRequest$BodyPublishers/ofString pairs))\n                   (.build))\n           resp (.send (http-client) req (java.net.http.HttpResponse$BodyHandlers/ofString))]\n@@ -45,9 +52,9 @@\n \n (defn parse-query [s]\n   (into {}\n-        (for [part (clojure.string/split (or s \"\") #\"&\")\n-              :when (not (clojure.string/blank? part))]\n-          (let [[k v] (clojure.string/split part #\"=\" 2)]\n+        (for [part (str/split (or s \"\") #\"&\")\n+              :when (not (str/blank? part))]\n+          (let [[k v] (str/split part #\"=\" 2)]\n             [(keyword (java.net.URLDecoder/decode k \"UTF-8\"))\n              (some-> v (java.net.URLDecoder/decode \"UTF-8\"))]))))\n \n@@ -62,8 +69,14 @@\n        (b64url (json/generate-string {:sub sub}))\n        \".fakesig\"))\n \n-(defn start-mock-google [port]\n-  (let [handler\n+(defn start-mock-google\n+  \"Minimal Google OAuth stub. With multiple `google-users`, each `/token` call returns the next\n+   `sub` in order (wraps), so several registrations get distinct Google identities.\"\n+  [port & {:keys [google-users] :or {google-users [\"google-user-1\"]}}]\n+  (let [users (vec google-users)\n+        multi? (> (count users) 1)\n+        !call-count (when multi? (atom 0))\n+        handler\n         (fn [req]\n           (cond\n             (and (= :get (:request-method req))\n@@ -76,9 +89,13 @@\n \n             (and (= :post (:request-method req))\n                  (= \"/token\" (:uri req)))\n-            {:status 200\n-             :headers {\"Content-Type\" \"application/json\"}\n-             :body (json/generate-string {:id_token (make-id-token \"google-user-1\")})}\n+            (let [sub (if multi?\n+                        (let [n (swap! !call-count inc)]\n+                          (nth users (mod (dec n) (count users))))\n+                        (first users))]\n+              {:status 200\n+               :headers {\"Content-Type\" \"application/json\"}\n+               :body (json/generate-string {:id_token (make-id-token sub)})})\n \n             :else\n             {:status 404 :body \"not found\"}))\n@@ -87,28 +104,46 @@\n \n (def ^:private default-agent \"00000000-0000-0000-0000-000000000000:cli:local/dev\")\n \n+(defn complete-registration!\n+  \"Run pending-session → login redirect → choose-username → poll; return bearer token string.\n+   With `assert!`, use `(fn [pred msg] …)` for test-style checks; without it, throw `ex-info` on failure.\"\n+  [base-url & {:keys [username agent assert!]\n+               :or {username \"user\" agent default-agent}}]\n+  (let [check! (fn [pred msg resp]\n+                 (if assert!\n+                   (assert! pred msg)\n+                   (when-not pred\n+                     (throw (ex-info msg {:resp resp})))))]\n+    (let [start-resp (http-post-json (str base-url \"/api/v0/pending-session\")\n+                                     {:agent agent})]\n+      (check! (= 200 (:status start-resp))\n+              (str \"pending-session for \" username \" returns 200\")\n+              start-resp)\n+      (let [start-json (json/parse-string (:body start-resp) true)\n+            login-get (http-get (:login_url start-json))]\n+        (check! (= 200 (:status login-get))\n+                (str \"login redirect chain for \" username)\n+                login-get)\n+        (let [choose (http-post-form (str base-url \"/auth/choose-username\")\n+                                     {:session (:session start-json) :username username})]\n+          (check! (= 200 (:status choose))\n+                  (str \"choose-username for \" username \" returns 200\")\n+                  choose)\n+          (let [poll (http-get (str base-url \"/api/v0/pending-session/\" (:session start-json)))]\n+            (check! (= 200 (:status poll))\n+                    (str \"pending-session poll for \" username \" returns 200\")\n+                    poll)\n+            (let [poll-json (json/parse-string (:body poll) true)]\n+              (check! (:complete poll-json)\n+                      (str \"pending session complete for \" username)\n+                      poll)\n+              (:token poll-json))))))))\n+\n (defn fetch-bearer-token!\n   \"Simulate browser OAuth + username choice; returns `slug_…` bearer token.\n    Ingest `--delegate` must match this agent string for `AgentBound` on first write.\"\n   [base-url & {:keys [username agent] :or {username \"intuser\" agent default-agent}}]\n-  (let [start-resp (http-post-json (str base-url \"/api/v0/pending-session\")\n-                                   {:agent agent})]\n-    (when-not (= 200 (:status start-resp))\n-      (throw (ex-info \"pending-session start failed\" {:resp start-resp})))\n-    (let [start-json (json/parse-string (:body start-resp) true)\n-          login-get (http-get (:login_url start-json))]\n-      (when-not (= 200 (:status login-get))\n-        (throw (ex-info \"login redirect chain failed\" {:resp login-get})))\n-      (let [choose (http-post-form (str base-url \"/auth/choose-username\")\n-                                   {:session (:session start-json) :username username})]\n-        (when-not (= 200 (:status choose))\n-          (throw (ex-info \"choose-username failed\" {:resp choose})))\n-        (let [poll (http-get (str base-url \"/api/v0/pending-session/\" (:session start-json)))]\n-          (when-not (= 200 (:status poll))\n-            (throw (ex-info \"pending-session poll failed\" {:resp poll})))\n-          (let [poll-json (json/parse-string (:body poll) true)]\n-            (when-not (:complete poll-json)\n-              (throw (ex-info \"pending session not complete\" {:poll poll-json})))\n-            (when-not (clojure.string/starts-with? (:token poll-json) \"slug_\")\n-              (throw (ex-info \"bad token in poll response\" {:poll poll-json})))\n-            (:token poll-json)))))))\n+  (let [token (complete-registration! base-url :username username :agent agent)]\n+    (when-not (str/starts-with? token \"slug_\")\n+      (throw (ex-info \"bad token in poll response\" {:token token})))\n+    token))\n\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[1c914c6e] stage set\n\nSide B — unified diff (full patch):\ndiff --git a/plan.md b/plan.md\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..00d6867a1e0ed144a16a020ea037f685ce646c73\n--- /dev/null\n+++ b/plan.md\n@@ -0,0 +1,155 @@\n+# Plan: `ItemId` + `RouteContext` (identity vs hrefs)\n+\n+This document is for **the next agent** to continue the refactor without re-deriving context from chat. It supersedes ad-hoc notes: treat it as the checklist of record until the work lands and this file is deleted or trimmed.\n+\n+## Goal\n+\n+- **Identity** (what lives in the reducer graph, votes, indexes) becomes a **structural `ItemId` enum** in `slug-types`, not a canonical `String` / `CanonicalItemUrl` newtype.\n+- **Presentation** (tilde / dash display, breadcrumbs) derives from `ItemId` via explicit methods, not string stripping.\n+- **Routing** (browser `href`s for public vs room) goes through **`RouteContext`** (started in `server/src/html/routing.rs`) so Maud/handlers do not stitch `/r/…` vs `/~` ad hoc.\n+\n+**Non-goals for v1 of the migration:** backward-compatible JSONL or dual-read of old canonical strings in the event log (project has accepted breaking changes). If you reintroduce compat, document it here.\n+\n+## Current state (as of this plan)\n+\n+- **`CanonicalItemUrl`** (`types/src/paths.rs`): newtype around `String`; `parse` / `parent` / `display_path` / `tilde_tail` / etc. Reducer `ContentState`, `VoteData`, ranking, RPC, search, garden, breadcrumbs all use it or `String` keys derived from it.\n+- **`ThreadNav`** (`server/src/html/forum/nav.rs`): encodes scope prefixes for threads and garden URLs; **`RouteContext`** now wraps `ThreadNav` (`server/src/html/routing.rs`, re-exported from `server/src/html/mod.rs`) but **most HTML still takes `&ThreadNav` directly** — migration incomplete.\n+- **URL normalization** lives in `types/src/url_normalize.rs` + `canonicalize_item` / `finalize_external_identity_url` in `paths.rs` (YouTube, sorted query params, room path `room_route_segment` in `paths.rs`).\n+- **Room HTTP paths** are `/r/{short}{slug}` (fused segment); wire **`room_id`** remains `short/slug` for RPC/events.\n+\n+## Target architecture\n+\n+### `ItemId` (types)\n+\n+Suggested shape (adjust after profiling `Ord` / `Hash` / serde size):\n+\n+```text\n+ItemId::Root                      — tilde ontology root (today `SLUG_TILDE_ONTOLOGY_ROOT`)\n+ItemId::Local { segments }        — slug.social ~/… path as Vec<String> (lowercase segments, non-empty for non-root)\n+ItemId::External { url: Url }    — normalized `url::Url` (crate `url` already in `slug-types`)\n+```\n+\n+**API surface (minimum):**\n+\n+- `ItemId::parse(&str) -> Option<ItemId>` — single entry from DSL / user input / legacy wire (internally may call `canonicalize_item` + structured split).\n+- `ItemId::to_wire_url(&self) -> String` — only for **external** boundaries if needed (HTTP fetch, rare assertions); avoid using as the primary key once maps use `ItemId`.\n+- `parent`, `display_path`, `tilde_tail` / `tilde_http_tail`, `tilde_segments`, `last_segment`, `normalized_storage` — port from `CanonicalItemUrl`.\n+- **`Ord` + `Hash` + `Eq`** stable for `BTreeSet` / `HashMap` (see `write_actor` scope-rank snapshots).\n+- **`Serialize` / `Deserialize`** — decide **tagged JSON** for any persisted or API-carried structs (e.g. `VoteData` in tests). If RPC must stay stringy for clients, use a **DTO layer** that converts `ItemId` ↔ wire at the boundary only.\n+\n+**Remove:** `CanonicalItemUrl` type and all `path_types::CanonicalItemUrl` / `slug_types::paths::CanonicalItemUrl` exports once call sites are migrated. **`Borrow<str>`** on the old newtype goes away; update `nav!` / any code that assumed map keys borrowed as `str`.\n+\n+### `RouteContext` (server HTML)\n+\n+- **File:** `server/src/html/routing.rs` — **`RouteContext(ThreadNav)`** with `item_href`, `item_href_raw`, `thread_url`, `garden_root_url`, `room_url`, `From`/`Into` `ThreadNav`.\n+- **Direction:** new code and refactored Maud should take **`&RouteContext`** (or owned where appropriate) instead of `&ThreadNav` when building links. Long term, **`item_href(&ItemId)`** should not parse strings — it should pattern-match `ItemId` and append tilde tail or `/-/…` external tail using the same rules as today’s `ThreadNav::garden_item_url`.\n+\n+### Axum / garden routes\n+\n+- **No** single catch-all route (explicit decision): keep the existing router layout in `server/src/lib.rs`.\n+- Room routes stay **`/r/:room_key/...`** with `room_key` fused; parsing via `slug_types::room_id_from_route_segment` / `room_route_segment` in `paths.rs`.\n+\n+## Phased execution (recommended order)\n+\n+### Phase 0 — Preconditions (quick)\n+\n+1. Read **`AGENTS.md`** (UI contract, durability matrix, `RpcCommand` vs `HtmlUiAction`).\n+2. Run **`cargo test --workspace`** and **`./scripts/clj-test.sh`** on clean `main` before large diffs; repeat after each phase.\n+\n+### Phase 1 — `ItemId` in `slug-types` (no server yet)\n+\n+1. Add **`ItemId`** (new file e.g. `types/src/item_id.rs` **or** inline at bottom of `paths.rs` — see **Module cycle** below).\n+2. Implement **`ItemId::parse`** using existing **`canonicalize_item`** + normalization; port **`CanonicalItemUrl`** methods to **`ItemId`** with tests ported from `paths.rs` `#[cfg(test)] mod tests`.\n+3. **`GardenItemUrl::from_stored(&ItemId, room_wire)`** (and thread helpers) — build absolute hrefs from structure, not from re-parsing a canonical string.\n+4. **`TildeHttpPathTail::to_item_id`** (rename from `to_canonical`) / **`tilde_http_path_to_item_id`**.\n+5. **`TildeOntologyPath::from_stored(&ItemId)`**.\n+6. Export **`ItemId`** from **`types/src/lib.rs`**; update **`server/src/path_types.rs`** re-exports.\n+7. **Delete `CanonicalItemUrl`** and fix all **in-crate** references in `types` only until `cargo test` passes for `slug-types`.\n+\n+**Module cycle trap:** `item_id.rs` must not `use crate::paths::{...}` if `paths.rs` also imports `ItemId` for `GardenItemUrl` in the same module. **Fix one of:**\n+\n+- **A)** Put `ItemId` **inside `paths.rs`** below `canonicalize_item` / helpers (simplest, large file), or  \n+- **B)** Split **`canonicalize_item`** (+ dash host helpers + `finalize_external_identity_url`) into **`types/src/item_wire.rs`**, then `paths.rs` + `item_id.rs` both depend on `item_wire` only (cleaner, more files).\n+\n+### Phase 2 — Reducer + ranking (server core)\n+\n+1. **`server/src/reducer.rs`**: `ContentState` / `GroupState` / **`VoteData`** — replace **`CanonicalItemUrl`** with **`ItemId`** on all maps, sets, deques, vectors.\n+2. **`apply_vote`**: normalize `a`/`b` via **`ItemId::parse`** or **`ItemId`**-aware logic (remove string round-trip).\n+3. **`apply_ingest_to_content`**: **`dsl`** still yields strings for item titles in statements; normalize to **`ItemId`** at ingest boundary via **`ItemId::parse`** once per item.\n+4. **`server/src/ranking.rs`**, **`server/src/scope_rank.rs`**, **`server/src/api/write_actor.rs`** (including **`BTreeSet`** ordering), **`server/src/api/validate.rs`**, **`server/src/api/helpers.rs`** — propagate **`ItemId`**.\n+5. **`server/tests/basic.rs`** and any reducer tests constructing **`VoteData`** — use **`ItemId::parse(...).unwrap()`** or helpers.\n+\n+### Phase 3 — RPC + search + external resolver\n+\n+1. **`server/src/api/rpc.rs`**: rank/pair/matchup/search payloads; today many paths use **`GardenItemUrl::from_storage_str(item.as_str(), …)`** — switch to **`ItemId`** + **`GardenItemUrl::from_stored(&item_id, …)`** (or equivalent).\n+2. **`server/src/html/search.rs`**: scoring uses item path strings — derive from **`ItemId::display_path`** / **`to_wire_url`** only at the scoring boundary if needed.\n+3. **`server/src/external_resolver.rs`**: take **`&ItemId`** or **`ItemId::external_url()`** instead of **`&CanonicalItemUrl`**.\n+\n+### Phase 4 — HTML / Maud\n+\n+1. **`ThreadNav::garden_item_url`**: overload or replace with **`garden_item_href(&self, item: &ItemId)`** (no `CanonicalItemUrl::parse` inside).\n+2. **`RouteContext`**: extend **`item_href(&ItemId)`**; migrate call sites from **`ThreadNav`** to **`RouteContext`** where only link-building is needed (keep **`ThreadNav`** where scope / auth helpers need the full struct).\n+3. **`server/src/html/garden.rs`**, **`breadcrumb_path.rs`**, **`forum/*`**, **`editor.rs`**: replace **`CanonicalItemUrl`** with **`ItemId`**; breadcrumbs should walk **`ItemId::parent`** without string `rsplit`.\n+4. **`types` JSON types** (`RankRow`, etc.): decide whether **`GardenItemUrl`** stays string for JSON or becomes a structured field; keep **one** wire format for the public API.\n+\n+### Phase 5 — Cleanup + docs\n+\n+1. Remove dead **`canonical_path`** / **`breadcrumb_path`** string logic if fully superseded.\n+2. Update **`AGENTS.md`** if durability, `POST /ui`, or command surfaces change.\n+3. Delete or shrink **`plan.md`** when done.\n+\n+## File / symbol checklist (non-exhaustive — grep-driven)\n+\n+Run periodically:\n+\n+```bash\n+rg \"CanonicalItemUrl\" -g'*.rs'\n+rg \"path_types::CanonicalItemUrl\" -g'*.rs'\n+rg \"tilde_http_path_to_canonical\" -g'*.rs'\n+```\n+\n+**High-touch files (from prior exploration):**\n+\n+| Area | Files |\n+|------|--------|\n+| Types | `types/src/paths.rs`, `types/src/lib.rs`, `types/src/url_normalize.rs`, (optional) `types/src/item_id.rs`, `types/src/item_wire.rs` |\n+| Server re-exports | `server/src/path_types.rs`, `server/src/canonical_path.rs` |\n+| Reducer / ingest | `server/src/reducer.rs`, `server/src/dsl.rs` (parse output types if changed) |\n+| Ranking | `server/src/ranking.rs`, `server/src/scope_rank.rs` |\n+| Writer / RPC | `server/src/api/write_actor.rs`, `server/src/api/rpc.rs`, `server/src/api/helpers.rs`, `server/src/api/validate.rs` |\n+| HTML | `server/src/html/garden.rs`, `server/src/html/breadcrumb_path.rs`, `server/src/html/forum/nav.rs`, `server/src/html/routing.rs`, `server/src/html/search.rs`, `server/src/html/editor.rs`, `server/src/html/forum/ingest.rs`, … |\n+| Tests | `server/tests/basic.rs`, `server/tests/integration.rs`, `types/src/paths.rs` tests, Clojure under `test/` if URLs/assertions mention canonical shapes |\n+\n+## Events / JSONL\n+\n+- **`Ingest`** events store **`raw` DSL** only — no change required for item identity inside the event.\n+- If any future event type stores item ids as strings, migrate to **structured `ItemId` serde** or accept string only at the event boundary with immediate parse into **`ItemId`** on `apply_event`.\n+\n+## `nav!` macro (`server/src/paths.rs`)\n+\n+- Macros use **`keypath($key)`** with **`.clone()`** — **`ItemId`** must be **`Clone`** (already for enums). Remove any reliance on **`Borrow<str>`** for map keys.\n+\n+## Testing gate\n+\n+After each phase:\n+\n+```bash\n+cargo test --workspace\n+./scripts/clj-test.sh\n+```\n+\n+## Risks / gotchas\n+\n+1. **`Ord` on `ItemId`**: must match prior **`CanonicalItemUrl`** / `String` ordering wherever **`BTreeSet`** is used (e.g. deterministic scope-rank snapshots in **`write_actor`**).\n+2. **External `ItemId`**: **`Url`** equality / hashing — normalization is already centralized in **`url_normalize`**; ensure **`ItemId::parse`** always inserts normalized **`Url`** into **`External`**.\n+3. **Fake parent URLs** in garden (e.g. **`https://.`** for external root ranking): find all **`parse(\"https://.\")`** style hacks and express as **`ItemId`** or a dedicated sentinel.\n+4. **Serde**: tests and any RPC clients that snapshot JSON may need expectation updates if **`VoteData`** shape changes.\n+\n+## Optional follow-ups (not blocking `ItemId`)\n+\n+- More **domain normalizers** in **`url_normalize.rs`** (e.g. `music.youtube.com`, Spotify, etc.).\n+- **Room wire** vs **HTTP segment** helpers already in **`paths.rs`** (`ROOM_SHORT_ID_LEN`, `room_route_segment`, `room_id_from_route_segment`).\n+\n+---\n+\n+**End state criteria:** `rg CanonicalItemUrl` returns nothing; reducer maps use **`ItemId`**; HTML link generation for items goes through **`RouteContext` + `ItemId`**; tests and Kaocha green.\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex c3dccd03dc6da2a2f6f6fa828657e33a951884b1..668403a35c415e6f091362b28c63ac294057fb6d 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -15,6 +15,7 @@ mod breadcrumb_path;\n mod editor;\n mod forum;\n mod garden;\n+pub mod routing;\n mod search;\n pub mod ui_action;\n use breadcrumb_path::{ExternalOntologyPath, OntologyPath};\n@@ -35,6 +36,7 @@ pub use garden::{\n     external_garden_index, external_ontology_path, garden_index, ontology_path, room_external_garden_index,\n     room_external_ontology_path, room_garden_index, room_ontology_path,\n };\n+pub use routing::RouteContext;\n pub use search::{search_page, search_results_fragment};\n pub use forum::user_profile_page;\n pub use ui_action::{parse_html_ui_from_form, HtmlUiAction, HtmlUiParseError, UI_RPC_FIELD};\ndiff --git a/server/src/html/routing.rs b/server/src/html/routing.rs\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..13e9ae0cbe32d454e34a7737edf8234d2a558502\n--- /dev/null\n+++ b/server/src/html/routing.rs\n@@ -0,0 +1,71 @@\n+//! Scoped browser paths for HTML. **RouteContext** is the intended single place to build `href`s\n+//! given public vs room scope (the original blueprint name); today it wraps [`ThreadNav`].\n+//!\n+//! Prefer `RouteContext::item_href` / [`RouteContext::thread_url`] in new Maud over stitching\n+//! `/r/…` vs `/~` manually. Call sites can migrate incrementally from passing `&ThreadNav`.\n+\n+use crate::path_types::CanonicalItemUrl;\n+\n+use super::forum::ThreadNav;\n+\n+#[derive(Clone)]\n+pub struct RouteContext(ThreadNav);\n+\n+impl RouteContext {\n+    #[inline]\n+    pub fn public() -> Self {\n+        Self(ThreadNav::public())\n+    }\n+\n+    #[inline]\n+    pub fn from_room_id(room_id: &str) -> Option<Self> {\n+        ThreadNav::from_room_id(room_id).map(Self)\n+    }\n+\n+    #[inline]\n+    pub fn thread_nav(&self) -> &ThreadNav {\n+        &self.0\n+    }\n+\n+    #[inline]\n+    pub fn into_thread_nav(self) -> ThreadNav {\n+        self.0\n+    }\n+\n+    /// Relative path for a stored canonical item in this scope’s garden.\n+    pub fn item_href(&self, item: &CanonicalItemUrl) -> String {\n+        self.0.garden_item_url(item.as_str())\n+    }\n+\n+    /// Same as [`Self::item_href`] but parses `item` first (raw DSL / user paste).\n+    pub fn item_href_raw(&self, item: &str) -> String {\n+        self.0.garden_item_url(item)\n+    }\n+\n+    #[inline]\n+    pub fn thread_url(&self, tag: &str) -> String {\n+        self.0.thread_url(tag)\n+    }\n+\n+    #[inline]\n+    pub fn garden_root_url(&self) -> &str {\n+        self.0.garden_root_url()\n+    }\n+\n+    #[inline]\n+    pub fn room_url(&self) -> &str {\n+        self.0.room_url()\n+    }\n+}\n+\n+impl From<ThreadNav> for RouteContext {\n+    fn from(nav: ThreadNav) -> Self {\n+        Self(nav)\n+    }\n+}\n+\n+impl From<RouteContext> for ThreadNav {\n+    fn from(ctx: RouteContext) -> Self {\n+        ctx.0\n+    }\n+}\n","role":"user"}],"model":"~x-ai/grok-latest"}