{"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[b9476669] Remove browser sentinel delegates so multi-user votes work.\n\nShared WEB_BROWSER_AGENT bound on first vote and blocked every later human; browser posts now use no delegate, matching forum UI.\n\nCo-authored-by: Cursor \n\nSide A — unified diff (full patch):\ndiff --git a/cli/src/main.rs b/cli/src/main.rs\nindex c4f1494df3aedbd8b883aea6249579aa8336abfe..af3e4fee876910a44f6f872b24821bc541a23e20 100644\n--- a/cli/src/main.rs\n+++ b/cli/src/main.rs\n@@ -1741,8 +1741,8 @@ async fn run() -> Result<()> {\n tokio::time::sleep(std::time::Duration::from_millis(poll_interval_ms)).await;\n let poll: PendingSessionPollResponse =\n expect_json(client.get(&poll_url).send().await?).await?;\n- if !poll.agent.trim().is_empty() {\n- agent_out = Some(poll.agent.clone());\n+ if let Some(a) = poll.agent.as_deref().map(str::trim).filter(|s| !s.is_empty()) {\n+ agent_out = Some(a.to_string());\n }\n if poll.complete {\n token_out = poll.token;\ndiff --git a/server/src/api/auth.rs b/server/src/api/auth.rs\nindex 50dc6af908412b16343829eae25154ebf4e19fca..01c02f50c19bcd62c7f1717f9b927f203c3164d0 100644\n--- a/server/src/api/auth.rs\n+++ b/server/src/api/auth.rs\n@@ -29,18 +29,6 @@ use crate::{\n write_cmd::WriteCmd,\n };\n \n-/// Delegate id for browser users who land via `/join/inv_…` (no CLI agent).\n-const INVITE_BROWSER_AGENT: &str = \"00000000-0000-0000-0000-000000000000:invite:web/join\";\n-\n-/// Agent id for `/login` browser OAuth (no CLI); must pass [`parse_agent`].\n-pub const WEB_BROWSER_AGENT: &str = \"00000000-0000-0000-0000-000000000001:social:web/browser\";\n-\n-/// True for well-known browser / human-form sentinel delegates (not real AI agents).\n-/// HTML attribution should show the human username for these, not `@@uuid:rig:…`.\n-pub fn is_browser_sentinel_delegate(agent: &str) -> bool {\n- agent == WEB_BROWSER_AGENT || agent == INVITE_BROWSER_AGENT\n-}\n-\n /// HttpOnly cookie storing the same `slug_*` bearer string the CLI uses.\n pub const SLUG_SESSION_COOKIE: &str = \"slug_session\";\n \n@@ -288,7 +276,7 @@ pub async fn get_join_invite(\n let session = format!(\"p_{}\", uuid::Uuid::new_v4().simple());\n let redirect_next = safe_local_redirect(q.next.as_deref().or(q.redirect.as_deref()));\n let s = PendingSession {\n- agent: INVITE_BROWSER_AGENT.to_string(),\n+ agent: None,\n created_ts: now_ms(),\n provider: None,\n provider_id: None,\n@@ -555,7 +543,7 @@ pub async fn post_choose_username(\n };\n \n let sessions = pending_sessions(&state);\n- let (provider, provider_id, agent) = {\n+ let (provider, provider_id) = {\n let sessions_read = sessions.read().await;\n let Some(s) = sessions_read.get(&form.session) else {\n return api_error(StatusCode::NOT_FOUND, \"unknown session\", None).into_response();\n@@ -566,14 +554,9 @@ pub async fn post_choose_username(\n let Some(provider_id) = s.provider_id.clone() else {\n return js_form_error_fragment(&form.session, \"oauth not completed\").into_response();\n };\n- (provider, provider_id, s.agent.clone())\n+ (provider, provider_id)\n };\n \n- if let Err(msg) = parse_agent(&agent) {\n- return js_form_error_fragment(&form.session, &format!(\"invalid agent format — {msg}\"))\n- .into_response();\n- }\n-\n let redeem_invite = {\n let sessions_read = sessions.read().await;\n sessions_read\n@@ -643,7 +626,8 @@ pub async fn get_web_login(\n let redirect_next = safe_local_redirect(q.next.as_deref().or(q.redirect.as_deref()))\n .or_else(|| Some(\"/\".to_string()));\n let s = PendingSession {\n- agent: WEB_BROWSER_AGENT.to_string(),\n+ // Humans sign in via the website with no AI delegate.\n+ agent: None,\n created_ts: now_ms(),\n provider: None,\n provider_id: None,\n@@ -704,7 +688,7 @@ pub async fn post_pending_session(\n );\n let poll_url = format!(\"/api/v0/pending-session/{session}\");\n let s = PendingSession {\n- agent: agent_naked,\n+ agent: Some(agent_naked),\n created_ts: now_ms(),\n provider: None,\n provider_id: None,\ndiff --git a/server/src/api/mod.rs b/server/src/api/mod.rs\nindex fdff6db0472b36cd7870a4be68574023e0daf120..920e967b47852ea82fa61b84c457ae3582dd9800 100644\n--- a/server/src/api/mod.rs\n+++ b/server/src/api/mod.rs\n@@ -18,13 +18,11 @@ pub use auth::{\n get_choose_username,\n get_web_login,\n get_logout,\n- is_browser_sentinel_delegate,\n optional_principal,\n resolve_web_session,\n session_cookie_header_value,\n WebSession,\n SLUG_SESSION_COOKIE,\n- WEB_BROWSER_AGENT,\n };\n \n pub use helpers::{\ndiff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs\nindex 611956d0a46062b49ce350be176e4be139312ff0..6e56c039a184953cd1d0593c34cf4d5abe41f2a3 100644\n--- a/server/src/api/ui_html.rs\n+++ b/server/src/api/ui_html.rs\n@@ -277,7 +277,7 @@ async fn dispatch_ui_action(\n &session.bearer,\n room.clone(),\n thread_tag.clone(),\n- Some(crate::api::auth::WEB_BROWSER_AGENT.to_string()),\n+ None,\n text,\n )\n .await\ndiff --git a/server/src/html/mod.rs b/server/src/html/mod.rs\nindex 645d54f2e117ba901e02ed958ada6ff69a78ae34..03ad762e88709c77b9d5dd130c48bc96226616a1 100644\n--- a/server/src/html/mod.rs\n+++ b/server/src/html/mod.rs\n@@ -560,27 +560,28 @@ fn identity_color_css(seed: &str) -> String {\n format!(\"hsl({hue}, 62%, 66%)\")\n }\n \n-/// Seed for author color: real AI → delegate uuid; human/sentinel → principal username.\n+/// Seed for author color: AI → delegate uuid; human (no delegate) → principal username.\n fn authorship_color_seed<'a>(principal: &'a str, delegate: &'a Option) -> &'a str {\n match delegate {\n- Some(d) if !crate::api::is_browser_sentinel_delegate(d) => {\n- d.split(':').next().filter(|s| !s.is_empty()).unwrap_or(d.as_str())\n- }\n- _ => principal,\n+ Some(d) => d\n+ .split(':')\n+ .next()\n+ .filter(|s| !s.is_empty())\n+ .unwrap_or(d.as_str()),\n+ None => principal,\n }\n }\n \n-/// Prefer the AI delegate in attribution; fall back to the human username when there is no\n-/// delegate or the delegate is a browser/human-form sentinel.\n+/// Prefer the AI delegate in attribution; humans post with no delegate and show `@username`.\n pub(crate) fn authorship_attr(principal: &str, delegate: &Option) -> AuthorshipAttr {\n let color = identity_color_css(authorship_color_seed(principal, delegate));\n match delegate {\n- Some(d) if !crate::api::is_browser_sentinel_delegate(d) => AuthorshipAttr {\n+ Some(d) => AuthorshipAttr {\n label: format!(\"@@{}\", actor_label(d)),\n author_title: Some(format!(\"@{principal}\")),\n color,\n },\n- _ => AuthorshipAttr {\n+ None => AuthorshipAttr {\n label: format!(\"@{principal}\"),\n author_title: None,\n color,\n@@ -933,7 +934,6 @@ pub(super) fn recency_class(now_ms: i64, ts_ms: i64) -> &'static str {\n #[cfg(test)]\n mod authorship_tests {\n use super::*;\n- use crate::api::WEB_BROWSER_AGENT;\n \n #[test]\n fn human_or_missing_delegate_shows_username() {\n@@ -943,15 +943,6 @@ mod authorship_tests {\n assert!(a.color.starts_with(\"hsl(\"));\n }\n \n- #[test]\n- fn browser_sentinel_delegate_shows_username() {\n- let d = Some(WEB_BROWSER_AGENT.to_string());\n- let a = authorship_attr(\"alice\", &d);\n- assert_eq!(a.label, \"@alice\");\n- assert_eq!(a.author_title, None);\n- assert_eq!(authorship_address(\"alice\", &d), \"@alice\");\n- }\n-\n #[test]\n fn real_ai_delegate_shows_short_agent_with_username_hover() {\n let d = Some(\ndiff --git a/server/src/state.rs b/server/src/state.rs\nindex 648ab5304764a329fcabbbbcd3782b94e3e005a8..8ea84dcf9b1df8f8037e913cdd94e5908e6d5d55 100644\n--- a/server/src/state.rs\n+++ b/server/src/state.rs\n@@ -21,7 +21,8 @@ pub struct InviteState {\n \n #[derive(Debug, Clone)]\n pub struct PendingSession {\n- pub agent: String,\n+ /// CLI `identity start` delegate (`uuid:rig:model`). `None` for browser `/login` and `/join`.\n+ pub agent: Option,\n pub created_ts: i64,\n pub provider: Option,\n pub provider_id: Option,\ndiff --git a/server/tests/integration_ui.rs b/server/tests/integration_ui.rs\nindex 6b1475b773106a2dd3f326475c9fb4cc727f6b4b..714563a8b330e3917d95a54ae29b4de143e3b8a4 100644\n--- a/server/tests/integration_ui.rs\n+++ b/server/tests/integration_ui.rs\n@@ -418,6 +418,99 @@ async fn test_web_login_carries_vote_pair_next_into_pending_session() {\n let sessions = state.pending_sessions.read().await;\n let pending = sessions.get(&session).expect(\"pending session\");\n assert_eq!(pending.redirect_next.as_deref(), Some(next));\n+ assert_eq!(\n+ pending.agent, None,\n+ \"browser /login must not invent a sentinel delegate\"\n+ );\n+}\n+\n+#[tokio::test]\n+async fn test_vote_compare_two_users_both_succeed_without_delegate() {\n+ let (addr, _tmp, _log, state, _handle) = create_test_server_with_state().await;\n+ let client = reqwest::Client::new();\n+ let alice = test_bearer();\n+ let bob = seed_test_identity(&state, \"bob\", \"bobtok\", \"bobsecret\").await;\n+\n+ // Define items first (votes require existing item bodies).\n+ let seed = ui_post_ingest_rpc(\n+ \"public\",\n+ \"multi-vote\",\n+ \"~/multi-a {alpha}\\n~/multi-b {beta}\\n\",\n+ );\n+ let seed_resp = client\n+ .post(format!(\"http://{addr}/ui\"))\n+ .header(\"Authorization\", format!(\"Bearer {alice}\"))\n+ .form(&[(\"__rpc__\", seed.as_str())])\n+ .send()\n+ .await\n+ .unwrap();\n+ assert_eq!(seed_resp.status(), reqwest::StatusCode::OK);\n+ let seed_js = seed_resp.text().await.unwrap();\n+ assert!(\n+ !seed_js.contains(\"auth-error\"),\n+ \"item seed must succeed, got: {seed_js}\"\n+ );\n+\n+ for (bearer, left, right, explanation) in [\n+ (&alice, \"3\", \"1\", \"alice prefers a\"),\n+ (&bob, \"1\", \"3\", \"bob prefers b\"),\n+ ] {\n+ let rpc = ui_vote_compare_post_rpc(\n+ \"public\",\n+ \"multi-vote\",\n+ \"~/multi-a\",\n+ \"~/multi-b\",\n+ left,\n+ right,\n+ explanation,\n+ );\n+ let resp = client\n+ .post(format!(\"http://{addr}/ui\"))\n+ .header(\"Authorization\", format!(\"Bearer {bearer}\"))\n+ .form(&[(\"__rpc__\", rpc.as_str())])\n+ .send()\n+ .await\n+ .unwrap();\n+ assert_eq!(resp.status(), reqwest::StatusCode::OK);\n+ let js = resp.text().await.unwrap();\n+ assert!(\n+ !js.contains(\"delegate already bound\"),\n+ \"human vote must not hit shared-sentinel AgentBound ({explanation}), got: {js}\"\n+ );\n+ assert!(\n+ !js.contains(\"auth-error\"),\n+ \"human vote must succeed ({explanation}), got: {js}\"\n+ );\n+ assert!(\n+ js.contains(\"vote-edge-history-region\"),\n+ \"vote should morph edge history ({explanation}), got: {js}\"\n+ );\n+ }\n+\n+ let reduced = state.reduced.read().await;\n+ let human_votes: Vec<_> = reduced\n+ .ingests_ordered\n+ .iter()\n+ .filter_map(|id| reduced.ingests_by_id.get(id))\n+ .filter(|ing| ing.raw.contains(\"prefers\"))\n+ .collect();\n+ assert_eq!(human_votes.len(), 2, \"expected two vote ingests\");\n+ let mut principals: Vec<&str> = human_votes.iter().map(|i| i.principal.as_str()).collect();\n+ principals.sort();\n+ assert_eq!(principals, [\"bob\", \"testuser\"]);\n+ for ing in &human_votes {\n+ assert!(\n+ ing.delegate.is_none(),\n+ \"browser votes must have no delegate, principal={} delegate={:?}\",\n+ ing.principal,\n+ ing.delegate\n+ );\n+ }\n+ assert!(\n+ reduced.agent_bindings.is_empty(),\n+ \"human votes must not create AgentBound entries: {:?}\",\n+ reduced.agent_bindings\n+ );\n }\n \n #[tokio::test]\ndiff --git a/server/tests/support/mod.rs b/server/tests/support/mod.rs\nindex a4320e991763617c1a760efad4b621977e2b74d0..67650520ea8f9f144bfe904347c40329d5db37e8 100644\n--- a/server/tests/support/mod.rs\n+++ b/server/tests/support/mod.rs\n@@ -72,17 +72,14 @@ pub async fn rpc_batch(\n response.json().await.unwrap()\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+/// Seed a user + bearer into reducer state (not appended to the event log).\n+/// Returns the `slug__` bearer string.\n pub async fn seed_test_identity(\n state: &AppState,\n username: &str,\n token_id: &str,\n secret: &str,\n-) {\n+) -> String {\n let registered = Event::UserRegistered(UserRegistered {\n ts: 0,\n username: username.to_string(),\n@@ -102,6 +99,11 @@ pub async fn seed_test_identity(\n let mut r = state.reduced.write().await;\n r.apply_event(registered);\n r.apply_event(ev);\n+ format!(\"slug_{token_id}_{secret}\")\n+}\n+\n+pub async fn seed_test_token(state: &AppState) {\n+ let _ = seed_test_identity(state, \"testuser\", \"testtok\", \"secret\").await;\n }\n \n pub async fn create_test_server_with_state() -> (\ndiff --git a/test/oauth.clj b/test/oauth.clj\nindex 3cbf496005e906ad6c579d44ac8c4055ee60d063..6911ac34a55707acda9f9ce091c079964649a252 100644\n--- a/test/oauth.clj\n+++ b/test/oauth.clj\n@@ -186,8 +186,9 @@\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+ \"Simulate CLI identity OAuth + username choice; returns `slug_…` bearer token.\n+ Pass `:agent` (default local/dev) when the test will CLI-ingest with `--delegate`\n+ so first write can `AgentBound`. Browser UI posts use no delegate.\"\n [base-url & {:keys [username agent] :or {username \"intuser\" agent default-agent}}]\n (let [token (complete-registration! base-url :username username :agent agent)]\n (when-not (str/starts-with? token \"slug_\")\ndiff --git a/types/src/lib.rs b/types/src/lib.rs\nindex cd6f94c60a4e1c3bfbce13bc0404b803f5f57c6d..4d05466c19a2f15f7d600e1d4a206b39984fabc4 100644\n--- a/types/src/lib.rs\n+++ b/types/src/lib.rs\n@@ -538,7 +538,9 @@ pub struct PendingSessionStartResponse {\n pub struct PendingSessionPollResponse {\n pub ok: bool,\n pub complete: bool,\n- pub agent: String,\n+ /// Present for CLI identity sessions; omitted for browser `/login` / `/join` (no delegate).\n+ #[serde(default, skip_serializing_if = \"Option::is_none\")]\n+ pub agent: Option,\n #[serde(skip_serializing_if = \"Option::is_none\")]\n pub user: Option,\n #[serde(skip_serializing_if = \"Option::is_none\")]\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"}