{"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[1c914c6e] stage set\n\nSide A — 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\n\nSide B — contributor: tommy-mor\nSide B — commit message:\n[9ecc4e2e] nice\n\nSide B — unified diff (full patch):\ndiff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs\nindex 5675dcd2e28062acbe3c037b94b77c33adf32474..a18241f3ed7b4a248748fcefc799f9801ca62461 100644\n--- a/server/src/api/rpc.rs\n+++ b/server/src/api/rpc.rs\n@@ -936,7 +936,15 @@ pub async fn handle_rpc_batch(\n                 line_ok(RpcResult::ForumThreads(rpc_list_forum_threads(&reduced, &room)))\n             }\n             RpcCommand::RoomCreate { slug, visibility } => {\n-                match verify_bearer_principal(&headers, &*state.reduced.read().await) {\n+                // Scope the first read so its guard drops before any nested `read().await` / `write().await`.\n+                // A guard from `match verify(..., &*state.reduced.read().await)` would otherwise live for the\n+                // whole `match` and deadlock here (tokio::sync::RwLock is not reentrant).\n+                let principal = {\n+                    let reduced = state.reduced.read().await;\n+                    verify_bearer_principal(&headers, &*reduced)\n+                };\n+                match principal {\n+                    Err((_, m)) => line_err(m, None),\n                     Ok(principal) => {\n                         let slug = slug.trim().to_lowercase();\n                         if slug.is_empty() || slug.len() > 64 {\n@@ -994,7 +1002,6 @@ pub async fn handle_rpc_batch(\n                             }\n                         }\n                     }\n-                    Err((_, m)) => line_err(m, None),\n                 }\n             }\n             RpcCommand::RoomGrant {\n@@ -1002,17 +1009,28 @@ pub async fn handle_rpc_batch(\n                 username,\n                 capability,\n             } => {\n-                match verify_bearer_principal(&headers, &*state.reduced.read().await) {\n+                let principal = {\n+                    let reduced = state.reduced.read().await;\n+                    verify_bearer_principal(&headers, &*reduced)\n+                };\n+                match principal {\n                     Err((_, m)) => line_err(m, None),\n                     Ok(principal) => {\n-                        let reduced = state.reduced.read().await;\n-                        if !reduced.user_has_cap(&room, &principal, ThreadCapability::Manage) {\n+                        let can_manage = {\n+                            let reduced = state.reduced.read().await;\n+                            reduced.user_has_cap(&room, &principal, ThreadCapability::Manage)\n+                        };\n+                        if !can_manage {\n                             line_err(\"requires Manage capability\", None)\n                         } else {\n                             match parse_username(&username) {\n                                 Err(msg) => line_err(\"invalid username\", Some(msg)),\n                                 Ok(target) => {\n-                                    if !reduced.users_by_provider.values().any(|u| u == &target) {\n+                                    let user_exists = {\n+                                        let reduced = state.reduced.read().await;\n+                                        reduced.users_by_provider.values().any(|u| u == &target)\n+                                    };\n+                                    if !user_exists {\n                                         line_err(format!(\"user @{target} not found\"), None)\n                                     } else {\n                                         match parse_capability(&capability) {\ndiff --git a/server/tests/integration.rs b/server/tests/integration.rs\nindex 9162bd5bee84035e3908bfb9c8e201b7878ca339..b930120da09fe7d307f0411b84fb639fb8bd0b15 100644\n--- a/server/tests/integration.rs\n+++ b/server/tests/integration.rs\n@@ -95,6 +95,23 @@ async fn test_healthz() {\n     assert_eq!(response.text().await.unwrap(), \"ok\");\n }\n \n+#[tokio::test]\n+async fn test_room_create_private_rpc() {\n+    let (addr, _tmp, _log, _handle) = create_test_server().await;\n+    let client = reqwest::Client::new();\n+    let batch = serde_json::json!([{\n+        \"RoomCreate\": { \"slug\": \"secret-project\", \"visibility\": \"private\" }\n+    }]);\n+    let body = rpc_batch(&client, addr, Some(&test_bearer()), batch).await;\n+    let line = &body[\"results\"][0];\n+    assert_eq!(line[\"ok\"], true, \"room create: {:?}\", line);\n+    let room_id = line[\"result\"][\"RoomCreated\"][\"room_id\"].as_str().unwrap();\n+    assert!(\n+        room_id.contains(\"/secret-project\"),\n+        \"expected room_id to contain slug, got {room_id}\"\n+    );\n+}\n+\n #[tokio::test]\n async fn test_index_page() {\n     // HTML routes are offline during the auth-v3 refactor.\ndiff --git a/test/auth.bb b/test/auth.bb\nindex 611e04f1806ef81d678a91f499597fe55f691dd7..a67cc1de763434176d2f68e419dd37a8cd328395 100644\n--- a/test/auth.bb\n+++ b/test/auth.bb\n@@ -176,7 +176,7 @@\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 @bbuser\")\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 \n            (println \"\\nwhoami…\")\n@@ -184,7 +184,7 @@\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\"))))))\n+               (assert! (= \"bbuser\" (:user who-json)) \"whoami user is bbuser (stored form)\"))))))\n \n      (println \"\\nCLI: identity start → OAuth → identity poll → whoami…\")\n      (let [cli-home (str tmp-dir \"/cli-home\")\n@@ -208,7 +208,7 @@\n                       (str \"identity poll exits 0 (stderr: \" (:err poll-proc) \")\"))\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\")\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                (let [token-path (str cli-home \"/.config/slugsocial/token\")]\n                  (assert! (fs/exists? token-path) \"token written under isolated HOME\")\n@@ -219,7 +219,7 @@\n                  (assert! (zero? (:exit who-proc))\n                           (str \"whoami exits 0 (stderr: \" (:err who-proc) \")\"))\n                  (let [who-cli (json/parse-string (:out who-proc) true)]\n-                   (assert! (= \"@cliuser\" (:user who-cli)) \"CLI whoami uses saved token\"))))))))\n+                   (assert! (= \"cliuser\" (:user who-cli)) \"CLI whoami uses saved token\"))))))))\n \n      (finally\n        (when-some [s @!server] (common/kill-server s))\ndiff --git a/test/common.bb b/test/common.bb\nindex ebb16c615a8b40e8830b5d5765d1e935a45538d0..4ed450377cdbb020f5ff164a812dfbbfc23c0f47 100644\n--- a/test/common.bb\n+++ b/test/common.bb\n@@ -78,9 +78,20 @@\n \n (defn start-server\n   \"Start the slugsocial-server binary with the given env map.\n-   Returns the babashka.process map.\"\n-  [server-bin env-map]\n-  (p/process [server-bin] {:out :inherit :err :inherit :env env-map}))\n+   Returns the babashka.process map.\n+\n+   When `log-file` (string path) is provided, stdout and stderr are appended there\n+   instead of inheriting the parent descriptors. Inheriting shared pipes while the\n+   parent blocks on HTTP I/O can fill the pipe buffer and deadlock the server on log writes.\"\n+  ([server-bin env-map]\n+   (start-server server-bin env-map nil))\n+  ([server-bin env-map log-file]\n+   (p/process [server-bin]\n+              (if log-file\n+                ;; Two string paths (same file): babashka.process can deref the process cleanly.\n+                ;; :err :out + ProcessBuilder$Redirect breaks stream copying in deref/kill-server.\n+                {:env env-map :out log-file :err log-file}\n+                {:out :inherit :err :inherit :env env-map}))))\n \n (defn kill-server\n   \"Forcibly kill a server process (babashka.process map) and wait for it to exit.\"\ndiff --git a/test/grants.bb b/test/grants.bb\nindex 7066c1f2a57f39a362052f8524206dccf37bb7b1..793ba216f2de76a77eb20a76d08403db07ff411b 100644\n--- a/test/grants.bb\n+++ b/test/grants.bb\n@@ -35,13 +35,14 @@\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 (.GET) (.build))\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@@ -52,6 +53,7 @@\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@@ -67,6 +69,7 @@\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","role":"user"}],"model":"~x-ai/grok-latest"}