{"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 (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` — 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`** 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`** 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 {\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 for RouteContext {\n+ fn from(nav: ThreadNav) -> Self {\n+ Self(nav)\n+ }\n+}\n+\n+impl From 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[c94456ff] Make feed catch-up stable and permission-aware\n\nAnchor implicit feeds to durable ingest order and cover multi-user private-room visibility so concurrent posts are not missed or leaked.\n\nCo-authored-by: Cursor \n\nSide B — unified diff (full patch):\ndiff --git a/cli/src/main.rs b/cli/src/main.rs\nindex abb5a55b49f60fe28fbfd4ec02715cb94ea0b4ec..c4f1494df3aedbd8b883aea6249579aa8336abfe 100644\n--- a/cli/src/main.rs\n+++ b/cli/src/main.rs\n@@ -878,6 +878,30 @@ mod tests {\n \"graph: 4 items, 3/6 pairs (50.0% density), 1 component, connected\"\n );\n }\n+\n+ #[test]\n+ fn feed_without_since_uses_logged_in_delegate_from_env() {\n+ let key = \"SLUG_DELEGATE\";\n+ let previous = std::env::var_os(key);\n+ let expected = \"00000000-0000-0000-0000-0000000000ee:test:local/model\";\n+ std::env::set_var(key, expected);\n+\n+ let cli = Cli::try_parse_from([\"slugsocial\", \"feed\"]).expect(\"parse feed\");\n+\n+ match previous {\n+ Some(value) => std::env::set_var(key, value),\n+ None => std::env::remove_var(key),\n+ }\n+ match cli.cmd {\n+ Some(Command::Feed {\n+ delegate, since, ..\n+ }) => {\n+ assert_eq!(delegate.as_deref(), Some(expected));\n+ assert!(since.is_none());\n+ }\n+ _ => panic!(\"expected feed command\"),\n+ }\n+ }\n }\n \n async fn run_scoped(base: &str, room: &str, sub: ScopedCmd) -> Result<()> {\n@@ -1626,7 +1650,15 @@ async fn run() -> Result<()> {\n } else {\n for p in &resp.posts {\n let ago = slug_types::timeago::timeago(now_ms, p.ts);\n- println!(\"\", p.id, ago);\n+ let thread_attr = p\n+ .thread\n+ .as_deref()\n+ .map(|thread| format!(\" thread=\\\"{thread}\\\"\"))\n+ .unwrap_or_default();\n+ println!(\n+ \"\",\n+ p.id, ago, p.room, thread_attr\n+ );\n print!(\"{}\", p.body);\n if !p.body.ends_with('\\n') { println!(); }\n println!(\"\");\ndiff --git a/server/src/api/rpc.rs b/server/src/api/rpc.rs\nindex afc4f95bef160c1e38ecff2c096d6440cd94e2b3..46d748f918d9b225acc4ecedfe5a1793089407b5 100644\n--- a/server/src/api/rpc.rs\n+++ b/server/src/api/rpc.rs\n@@ -72,6 +72,80 @@ fn can_view_scope(reduced: &ReducerState, scope: &ScopeId, principal: Option<&st\n }\n }\n \n+/// Build a feed in durable ingest order.\n+///\n+/// An implicit feed boundary is an ingest position, not only its millisecond timestamp. Two users\n+/// can post in the same millisecond, and wall-clock timestamps can move backwards during replay.\n+/// Explicit `since` remains a timestamp query for API compatibility, but scans the whole ordered\n+/// ledger rather than assuming timestamps are monotonic.\n+fn rpc_feed(\n+ reduced: &ReducerState,\n+ viewer: &str,\n+ delegate: Option,\n+ requested_since: Option,\n+ implicit_anchor: Option<(usize, i64)>,\n+ limit: usize,\n+) -> FeedResponse {\n+ let since = requested_since.or_else(|| implicit_anchor.map(|(_, ts)| ts));\n+ let implicit_anchor_index = requested_since\n+ .is_none()\n+ .then(|| implicit_anchor.map(|(index, _)| index))\n+ .flatten();\n+\n+ let matching: Vec<&str> = reduced\n+ .ingests_ordered\n+ .iter()\n+ .enumerate()\n+ .rev()\n+ .filter(|(index, id)| {\n+ reduced.ingests_by_id.get(id.as_str()).is_some_and(|ing| {\n+ match requested_since {\n+ Some(cutoff) => ing.ts > cutoff,\n+ None => implicit_anchor_index.is_none_or(|anchor| *index > anchor),\n+ }\n+ })\n+ })\n+ .map(|(_, id)| id.as_str())\n+ .filter(|id| {\n+ reduced.ingests_by_id.get(*id).is_some_and(|ing| {\n+ let scope = scope_from_room_wire(&ing.room_id);\n+ can_view_scope(reduced, &scope, Some(viewer))\n+ })\n+ })\n+ .filter(|id| !reduced.redacted_posts.contains(*id))\n+ .collect();\n+\n+ let total = matching.len();\n+ let posts = matching\n+ .into_iter()\n+ .take(limit)\n+ .filter_map(|id| reduced.ingests_by_id.get(id))\n+ .map(|ing| {\n+ let scope = scope_from_room_wire(&ing.room_id);\n+ let thread_post_index = reduced.try_thread_post_index_chronological(\n+ &scope,\n+ &ing.thread_tag,\n+ &ing.id,\n+ );\n+ FeedPost {\n+ ts: ing.ts,\n+ id: ing.id.clone(),\n+ room: ing.room_id.clone(),\n+ thread: Some(ing.thread_tag.clone()),\n+ thread_post_index,\n+ body: ing.raw.clone(),\n+ }\n+ })\n+ .collect();\n+\n+ FeedResponse {\n+ delegate,\n+ since,\n+ posts,\n+ total,\n+ }\n+}\n+\n fn principal_from_optional_bearer(headers: &HeaderMap, reduced: &ReducerState) -> Result, RpcErr> {\n if headers.contains_key(axum::http::header::AUTHORIZATION) {\n verify_bearer_principal(headers, reduced)\n@@ -1506,60 +1580,27 @@ pub async fn handle_rpc_batch(\n Some(\"this delegate is not bound to your signed-in account\".into()),\n )\n } else {\n- let since_default = reduced\n+ let implicit_anchor = reduced\n .ingests_ordered\n .iter()\n+ .enumerate()\n .rev()\n- .filter_map(|id| reduced.ingests_by_id.get(id))\n- .find(|ing| {\n- if ing.delegate.as_deref() != Some(delegate_stored.as_str()) {\n- return false;\n- }\n- let scope = scope_from_room_wire(&ing.room_id);\n- can_view_scope(&reduced, &scope, Some(viewer.as_str()))\n- })\n- .map(|ing| ing.ts);\n- let since = since.or(since_default);\n- let cutoff = since.unwrap_or(0);\n- let limit = limit.unwrap_or(DEFAULT_LIMIT).min(MAX_LIMIT);\n- let matching: Vec<&str> = reduced.ingests_ordered.iter().rev()\n- .map(|id| id.as_str())\n- .take_while(|id| reduced.ingests_by_id.get(*id).is_some_and(|ing| ing.ts > cutoff))\n- .filter(|id| {\n- reduced.ingests_by_id.get(*id).is_some_and(|ing| {\n- let scope = scope_from_room_wire(&ing.room_id);\n- can_view_scope(&reduced, &scope, Some(viewer.as_str()))\n+ .find_map(|(index, id)| {\n+ reduced.ingests_by_id.get(id).and_then(|ing| {\n+ (ing.delegate.as_deref()\n+ == Some(delegate_stored.as_str()))\n+ .then_some((index, ing.ts))\n })\n- })\n- .filter(|id| !reduced.redacted_posts.contains(*id))\n- .collect();\n- let total = matching.len();\n- let posts: Vec = matching.into_iter()\n- .take(limit)\n- .filter_map(|id| reduced.ingests_by_id.get(id))\n- .map(|ing| {\n- let scope = scope_from_room_wire(&ing.room_id);\n- let thread_post_index = reduced\n- .try_thread_post_index_chronological(\n- &scope,\n- &ing.thread_tag,\n- &ing.id,\n- );\n- FeedPost {\n- ts: ing.ts,\n- id: ing.id.clone(),\n- thread: Some(ing.thread_tag.clone()),\n- thread_post_index,\n- body: ing.raw.clone(),\n- }\n- })\n- .collect();\n- line_ok(RpcResult::Feed(FeedResponse {\n- delegate: Some(delegate_stored),\n+ });\n+ let limit = limit.unwrap_or(DEFAULT_LIMIT).min(MAX_LIMIT);\n+ line_ok(RpcResult::Feed(rpc_feed(\n+ &reduced,\n+ &viewer,\n+ Some(delegate_stored),\n since,\n- posts,\n- total,\n- }))\n+ implicit_anchor,\n+ limit,\n+ )))\n };\n drop(reduced);\n line\n@@ -1567,60 +1608,25 @@ pub async fn handle_rpc_batch(\n None => {\n // Session catch-up: last time *you* posted anything (delegate or not), so revisiting\n // an old chat with only a token still gets a sane cutoff.\n- let since_default = reduced\n+ let implicit_anchor = reduced\n .ingests_ordered\n .iter()\n+ .enumerate()\n .rev()\n- .filter_map(|id| reduced.ingests_by_id.get(id))\n- .find(|ing| {\n- if ing.principal != viewer {\n- return false;\n- }\n- let scope = scope_from_room_wire(&ing.room_id);\n- can_view_scope(&reduced, &scope, Some(viewer.as_str()))\n- })\n- .map(|ing| ing.ts);\n- let since = since.or(since_default);\n- let cutoff = since.unwrap_or(0);\n- let limit = limit.unwrap_or(DEFAULT_LIMIT).min(MAX_LIMIT);\n- let matching: Vec<&str> = reduced.ingests_ordered.iter().rev()\n- .map(|id| id.as_str())\n- .take_while(|id| reduced.ingests_by_id.get(*id).is_some_and(|ing| ing.ts > cutoff))\n- .filter(|id| {\n- reduced.ingests_by_id.get(*id).is_some_and(|ing| {\n- let scope = scope_from_room_wire(&ing.room_id);\n- can_view_scope(&reduced, &scope, Some(viewer.as_str()))\n+ .find_map(|(index, id)| {\n+ reduced.ingests_by_id.get(id).and_then(|ing| {\n+ (ing.principal == viewer).then_some((index, ing.ts))\n })\n- })\n- .filter(|id| !reduced.redacted_posts.contains(*id))\n- .collect();\n- let total = matching.len();\n- let posts: Vec = matching.into_iter()\n- .take(limit)\n- .filter_map(|id| reduced.ingests_by_id.get(id))\n- .map(|ing| {\n- let scope = scope_from_room_wire(&ing.room_id);\n- let thread_post_index = reduced\n- .try_thread_post_index_chronological(\n- &scope,\n- &ing.thread_tag,\n- &ing.id,\n- );\n- FeedPost {\n- ts: ing.ts,\n- id: ing.id.clone(),\n- thread: Some(ing.thread_tag.clone()),\n- thread_post_index,\n- body: ing.raw.clone(),\n- }\n- })\n- .collect();\n- let line = line_ok(RpcResult::Feed(FeedResponse {\n- delegate: None,\n+ });\n+ let limit = limit.unwrap_or(DEFAULT_LIMIT).min(MAX_LIMIT);\n+ let line = line_ok(RpcResult::Feed(rpc_feed(\n+ &reduced,\n+ &viewer,\n+ None,\n since,\n- posts,\n- total,\n- }));\n+ implicit_anchor,\n+ limit,\n+ )));\n drop(reduced);\n line\n }\ndiff --git a/server/tests/integration_rooms.rs b/server/tests/integration_rooms.rs\nindex a3b378267e090a016a7e663f103a0dd9f482690b..e623523ba352ce456674a399542c689505760b78 100644\n--- a/server/tests/integration_rooms.rs\n+++ b/server/tests/integration_rooms.rs\n@@ -1,6 +1,9 @@\n mod support;\n \n use slug_types::room_route_segment;\n+use slugsocial_server::events::{\n+ AgentBound, Event, GrantAdded, GrantRevoked, Ingest, RoomCreated, ThreadCapability,\n+};\n use support::*;\n \n #[tokio::test]\n@@ -473,6 +476,247 @@ async fn test_feed_without_delegate_uses_principal_last_post_including_delegate(\n );\n }\n \n+#[tokio::test]\n+async fn test_feed_uses_delegate_ingest_position_when_multi_user_timestamps_collide() {\n+ let (addr, _tmp, _log, state, _handle) = create_test_server_with_state().await;\n+ seed_test_identity(&state, \"bob\", \"bobtok\", \"bobsecret\").await;\n+ let client = reqwest::Client::new();\n+ let alice_delegate =\n+ \"00000000-0000-0000-0000-0000000000c1:feedtest:local/alice-model\";\n+ let bob_delegate =\n+ \"00000000-0000-0000-0000-0000000000c2:feedtest:local/bob-model\";\n+\n+ {\n+ let mut reduced = state.reduced.write().await;\n+ for (agent, username) in [\n+ (alice_delegate, \"testuser\"),\n+ (bob_delegate, \"bob\"),\n+ ] {\n+ reduced.apply_event(Event::AgentBound(AgentBound {\n+ ts: 1,\n+ agent: agent.to_string(),\n+ username: username.to_string(),\n+ }));\n+ }\n+ reduced.apply_event(Event::Ingest(Ingest {\n+ ts: 100,\n+ id: \"alice-anchor\".into(),\n+ raw: \"alice anchor\".into(),\n+ principal: \"testuser\".into(),\n+ delegate: Some(alice_delegate.into()),\n+ room_id: \"public\".into(),\n+ thread_tag: \"feed-order\".into(),\n+ }));\n+ reduced.apply_event(Event::Ingest(Ingest {\n+ ts: 100,\n+ id: \"bob-same-millisecond\".into(),\n+ raw: \"bob same-millisecond change\".into(),\n+ principal: \"bob\".into(),\n+ delegate: Some(bob_delegate.into()),\n+ room_id: \"public\".into(),\n+ thread_tag: \"feed-order\".into(),\n+ }));\n+ // Event-log order remains authoritative even if the wall clock moves backwards.\n+ reduced.apply_event(Event::Ingest(Ingest {\n+ ts: 99,\n+ id: \"bob-clock-rollback\".into(),\n+ raw: \"bob change after clock rollback\".into(),\n+ principal: \"bob\".into(),\n+ delegate: Some(bob_delegate.into()),\n+ room_id: \"public\".into(),\n+ thread_tag: \"feed-order\".into(),\n+ }));\n+ }\n+\n+ let feed = rpc_batch(\n+ &client,\n+ addr,\n+ Some(&test_bearer()),\n+ serde_json::json!([{\n+ \"GetFeed\": { \"delegate\": alice_delegate, \"limit\": 20 }\n+ }]),\n+ )\n+ .await;\n+ let posts = feed[\"results\"][0][\"result\"][\"Feed\"][\"posts\"]\n+ .as_array()\n+ .unwrap();\n+ let ids: Vec<&str> = posts.iter().filter_map(|p| p[\"id\"].as_str()).collect();\n+ assert_eq!(\n+ ids,\n+ [\"bob-clock-rollback\", \"bob-same-millisecond\"],\n+ \"implicit feed cutoff must use append position, not timestamp\"\n+ );\n+}\n+\n+#[tokio::test]\n+async fn test_feed_multi_user_private_room_visibility_and_revoked_anchor_access() {\n+ let (addr, _tmp, _log, state, _handle) = create_test_server_with_state().await;\n+ seed_test_identity(&state, \"bob\", \"bobtok\", \"bobsecret\").await;\n+ seed_test_identity(&state, \"carol\", \"caroltok\", \"carolsecret\").await;\n+ let client = reqwest::Client::new();\n+ let alice_delegate =\n+ \"00000000-0000-0000-0000-0000000000d1:feedtest:local/alice-model\";\n+ let bob_delegate =\n+ \"00000000-0000-0000-0000-0000000000d2:feedtest:local/bob-model\";\n+ let room_alice = \"alice01/alice-room\";\n+ let room_bob = \"bob0001/bob-room\";\n+\n+ {\n+ let mut reduced = state.reduced.write().await;\n+ for (agent, username) in [\n+ (alice_delegate, \"testuser\"),\n+ (bob_delegate, \"bob\"),\n+ ] {\n+ reduced.apply_event(Event::AgentBound(AgentBound {\n+ ts: 1,\n+ agent: agent.to_string(),\n+ username: username.to_string(),\n+ }));\n+ }\n+ for (room_id, slug, owner) in [\n+ (room_alice, \"alice-room\", \"testuser\"),\n+ (room_bob, \"bob-room\", \"bob\"),\n+ ] {\n+ reduced.apply_event(Event::RoomCreated(RoomCreated {\n+ ts: 2,\n+ room_id: room_id.to_string(),\n+ slug: slug.to_string(),\n+ owner: owner.to_string(),\n+ }));\n+ reduced.apply_event(Event::GrantAdded(GrantAdded {\n+ ts: 2,\n+ room_id: room_id.to_string(),\n+ username: owner.to_string(),\n+ capabilities: vec![ThreadCapability::View],\n+ granted_by: owner.to_string(),\n+ }));\n+ }\n+\n+ let mut add_ingest =\n+ |ts, id: &str, raw: &str, principal: &str, delegate: Option<&str>, room: &str| {\n+ reduced.apply_event(Event::Ingest(Ingest {\n+ ts,\n+ id: id.into(),\n+ raw: raw.into(),\n+ principal: principal.into(),\n+ delegate: delegate.map(str::to_string),\n+ room_id: room.into(),\n+ thread_tag: \"feed-permissions\".into(),\n+ }));\n+ };\n+ add_ingest(10, \"prehistory\", \"must remain before alice anchor\", \"carol\", None, \"public\");\n+ add_ingest(\n+ 11,\n+ \"alice-private-anchor\",\n+ \"alice last posted here\",\n+ \"testuser\",\n+ Some(alice_delegate),\n+ room_alice,\n+ );\n+ add_ingest(\n+ 12,\n+ \"bob-public-anchor\",\n+ \"bob last posted here\",\n+ \"bob\",\n+ Some(bob_delegate),\n+ \"public\",\n+ );\n+ add_ingest(13, \"alice-room-change\", \"visible only to alice\", \"carol\", None, room_alice);\n+ add_ingest(14, \"bob-room-change\", \"visible only to bob\", \"carol\", None, room_bob);\n+ add_ingest(15, \"public-change\", \"visible to everyone\", \"carol\", None, \"public\");\n+\n+ reduced.apply_event(Event::GrantRevoked(GrantRevoked {\n+ ts: 16,\n+ room_id: room_alice.into(),\n+ username: \"testuser\".into(),\n+ capabilities: vec![ThreadCapability::View],\n+ revoked_by: \"testuser\".into(),\n+ }));\n+ }\n+\n+ let alice_feed = rpc_batch(\n+ &client,\n+ addr,\n+ Some(&test_bearer()),\n+ serde_json::json!([{\n+ \"GetFeed\": { \"delegate\": alice_delegate, \"limit\": 20 }\n+ }]),\n+ )\n+ .await;\n+ let alice_posts = alice_feed[\"results\"][0][\"result\"][\"Feed\"][\"posts\"]\n+ .as_array()\n+ .unwrap();\n+ let alice_ids: Vec<&str> = alice_posts\n+ .iter()\n+ .filter_map(|p| p[\"id\"].as_str())\n+ .collect();\n+ assert_eq!(\n+ alice_ids,\n+ [\"public-change\", \"bob-public-anchor\"],\n+ \"revoked private content must be hidden without moving the delegate anchor backwards\"\n+ );\n+ assert!(!alice_ids.contains(&\"prehistory\"));\n+ assert!(\n+ alice_posts\n+ .iter()\n+ .all(|post| post[\"room\"].as_str() == Some(\"public\")),\n+ \"private posts must not leak and every feed post must identify its room\"\n+ );\n+\n+ let bob_bearer = test_bearer_for(\"bobtok\", \"bobsecret\");\n+ let bob_feed = rpc_batch(\n+ &client,\n+ addr,\n+ Some(&bob_bearer),\n+ serde_json::json!([{\n+ \"GetFeed\": { \"delegate\": bob_delegate, \"limit\": 20 }\n+ }]),\n+ )\n+ .await;\n+ let bob_ids: Vec<&str> = bob_feed[\"results\"][0][\"result\"][\"Feed\"][\"posts\"]\n+ .as_array()\n+ .unwrap()\n+ .iter()\n+ .filter_map(|p| p[\"id\"].as_str())\n+ .collect();\n+ assert_eq!(bob_ids, [\"public-change\", \"bob-room-change\"]);\n+ assert_eq!(\n+ bob_feed[\"results\"][0][\"result\"][\"Feed\"][\"posts\"][1][\"room\"],\n+ room_bob\n+ );\n+\n+ // Restoring View exposes only changes after the same stable delegate anchor.\n+ {\n+ let mut reduced = state.reduced.write().await;\n+ reduced.apply_event(Event::GrantAdded(GrantAdded {\n+ ts: 17,\n+ room_id: room_alice.into(),\n+ username: \"testuser\".into(),\n+ capabilities: vec![ThreadCapability::View],\n+ granted_by: \"testuser\".into(),\n+ }));\n+ }\n+ let restored = rpc_batch(\n+ &client,\n+ addr,\n+ Some(&test_bearer()),\n+ serde_json::json!([{\n+ \"GetFeed\": { \"delegate\": alice_delegate, \"limit\": 20 }\n+ }]),\n+ )\n+ .await;\n+ let restored_ids: Vec<&str> = restored[\"results\"][0][\"result\"][\"Feed\"][\"posts\"]\n+ .as_array()\n+ .unwrap()\n+ .iter()\n+ .filter_map(|p| p[\"id\"].as_str())\n+ .collect();\n+ assert_eq!(\n+ restored_ids,\n+ [\"public-change\", \"alice-room-change\", \"bob-public-anchor\"]\n+ );\n+}\n+\n #[tokio::test]\n async fn test_private_room_thread_urls_use_t_segment() {\n let (addr, _tmp, _log, _handle) = create_test_server().await;\ndiff --git a/server/tests/support/mod.rs b/server/tests/support/mod.rs\nindex 4a620eaa875e7a1145f2a4e82cc4ff2be21d5345..a4320e991763617c1a760efad4b621977e2b74d0 100644\n--- a/server/tests/support/mod.rs\n+++ b/server/tests/support/mod.rs\n@@ -20,8 +20,10 @@ pub fn sha256_hex(s: &str) -> String {\n \n /// Fixed bearer for integration tests (`TokenIssued` seeded into reducer in `create_test_server`).\n pub fn test_bearer() -> String {\n- let token_id = \"testtok\";\n- let secret = \"secret\";\n+ test_bearer_for(\"testtok\", \"secret\")\n+}\n+\n+pub fn test_bearer_for(token_id: &str, secret: &str) -> String {\n format!(\"slug_{token_id}_{secret}\")\n }\n \n@@ -71,19 +73,27 @@ pub async fn rpc_batch(\n }\n \n pub async fn seed_test_token(state: &AppState) {\n+ seed_test_identity(state, \"testuser\", \"testtok\", \"secret\").await;\n+}\n+\n+/// Add a distinct principal and bearer to a running integration-test server.\n+pub async fn seed_test_identity(\n+ state: &AppState,\n+ username: &str,\n+ token_id: &str,\n+ secret: &str,\n+) {\n let registered = Event::UserRegistered(UserRegistered {\n ts: 0,\n- username: \"testuser\".to_string(),\n+ username: username.to_string(),\n provider: \"test\".to_string(),\n- provider_id: \"testuser\".to_string(),\n+ provider_id: username.to_string(),\n });\n- let token_id = \"testtok\";\n- let secret = \"secret\";\n let salt = \"salt\";\n let token_hash = sha256_hex(&format!(\"{salt}:{secret}\"));\n let ev = Event::TokenIssued(TokenIssued {\n ts: 0,\n- username: \"testuser\".to_string(),\n+ username: username.to_string(),\n token_id: token_id.to_string(),\n token_hash,\n salt: salt.to_string(),\ndiff --git a/types/src/lib.rs b/types/src/lib.rs\nindex 211493935d19582607f5c87fb492faf47bdc6f53..cd6f94c60a4e1c3bfbce13bc0404b803f5f57c6d 100644\n--- a/types/src/lib.rs\n+++ b/types/src/lib.rs\n@@ -264,6 +264,9 @@ pub struct FeedResponse {\n pub struct FeedPost {\n pub ts: i64,\n pub id: String,\n+ /// Permission scope containing the post: `\"public\"` or a private room id.\n+ #[serde(default)]\n+ pub room: String,\n /// Primary thread tag (without #), if the ingest declared one.\n #[serde(skip_serializing_if = \"Option::is_none\")]\n pub thread: Option,\n","role":"user"}],"model":"~anthropic/claude-sonnet-latest"}