diff --git a/crates/mind-body/src/bin/mind-persona.rs b/crates/mind-body/src/bin/mind-persona.rs index c3552a9..bdd5621 100644 --- a/crates/mind-body/src/bin/mind-persona.rs +++ b/crates/mind-body/src/bin/mind-persona.rs @@ -199,6 +199,7 @@ fn run_project(args: &[String]) -> Result { through, last_heard: vec![], recent: vec![], + own_rooms: vec![], }; let report = project(&organs, &request, chrono::Utc::now())?; let addressing = &report["addressing"]; diff --git a/crates/mind-body/src/heartbeat.rs b/crates/mind-body/src/heartbeat.rs index 4b60be8..1459d17 100644 --- a/crates/mind-body/src/heartbeat.rs +++ b/crates/mind-body/src/heartbeat.rs @@ -437,8 +437,8 @@ pub(crate) enum WakePolicy { /// only while fewer than this many Mind lines in a row came before it across her rooms (`LineFacts::mind_run`): the /// backstop. HumansPace(usize), - /// `Ruled`, with at most this many Mind lines in a row in a room before a human must speak again: a Mind's line past - /// the cap wakes no one. + /// `Ruled`, with at most this many lines in her current Mind-only run (`LineFacts::mind_run`) before a human must + /// speak where it runs: a Mind's line past the cap wakes no one. NamesWithCap(usize), /// The swarm's old loop, a control: any line in her rooms but her own. AllMessages, @@ -459,8 +459,8 @@ pub(crate) enum WakeCause { /// and passes the default; `Live` reads none. #[derive(Clone, Copy, Debug, PartialEq, Eq)] pub(crate) struct LineFacts { - /// How many Mind lines in a row came before this one, across every room she sees, since a human last spoke in any of - /// them: the backstop counts a Mind-only run per Mind, not per room, so a loop cannot dodge it by changing rooms. + /// How many lines her current Mind-only run held before this one: one run across every room she sees, so a loop + /// cannot dodge the backstop by changing rooms, and ended only by a human's line in a room the run has lines in. pub mind_run: usize, /// The line is in a room of hers: a direct message (the delivery says so) or a room configured as hers. pub own_room: bool, diff --git a/crates/mind-body/src/projection.rs b/crates/mind-body/src/projection.rs index cd6823d..e4b0fb7 100644 --- a/crates/mind-body/src/projection.rs +++ b/crates/mind-body/src/projection.rs @@ -149,6 +149,8 @@ pub struct Request { /// The ids each earlier projection selected, oldest first, for freshness: a simulation's earlier turns of hers. /// Empty live until trace v2 (C3c) carries them. pub recent: Vec>, + /// The rooms that are hers, by the key the lines carry: a simulation's plan. The live body records none yet. + pub own_rooms: Vec, } /// Her addressee: the heartbeat's row for her when its table holds one, else her own names (handle and public name). @@ -181,7 +183,7 @@ fn own_addressee(addressing: Option<&dyn HeartbeatView>, own_sender: &str, publi fn read_room(chat: &dyn MouthReader, request: &Request, own: &Addressee) -> (Room, Value) { let pending = match chat.pending() { Ok(pending) => pending, - Err(fault) => return (Room { here: request.room.clone(), last_heard: request.last_heard.clone(), ..Room::default() }, json!({ "read": false, "why": format!("{fault:#}") })), + Err(fault) => return (Room { here: request.room.clone(), last_heard: request.last_heard.clone(), own: request.own_rooms.clone(), ..Room::default() }, json!({ "read": false, "why": format!("{fault:#}") })), }; // One key names a room everywhere: the one the tail carries, the alias for a public room and the id for a direct // message (the mouth's alias of a direct room is its id). No table in her body maps a public room's id to its @@ -217,7 +219,8 @@ fn read_room(chat: &dyn MouthReader, request: &Request, own: &Addressee) -> (Roo { report["why"] = json!("no line carries this room id: a public room is named by its alias (#name:server), a direct message by its id"); } - (Room { messages, tail, here, last_heard: request.last_heard.clone() }, report) + let direct = pending.deliveries.iter().filter(|delivery| delivery.is_direct).map(|delivery| delivery.room_alias.clone()).collect(); + (Room { messages, tail, here, last_heard: request.last_heard.clone(), direct, own: request.own_rooms.clone() }, report) } fn packet_json(packet: &Packet) -> Value { @@ -316,7 +319,7 @@ pub fn project(organs: &Organs, request: &Request, now: DateTime) -> Result let (own, addressing) = own_addressee(organs.addressing, &request.own_sender, &public_name, now); let (room, room_report) = match organs.chat { Some(chat) => read_room(chat, request, &own), - None => (Room { here: request.room.clone(), last_heard: request.last_heard.clone(), ..Room::default() }, json!({ "read": false, "why": "no mouth is configured" })), + None => (Room { here: request.room.clone(), last_heard: request.last_heard.clone(), own: request.own_rooms.clone(), ..Room::default() }, json!({ "read": false, "why": "no mouth is configured" })), }; // Freshness and her own recent words come from trace v2, which the commit writes (C3c); until then only what the // caller carried from earlier turns of its own. diff --git a/crates/mind-body/src/projection/fixtures/golden-chat.txt b/crates/mind-body/src/projection/fixtures/golden-chat.txt index b86387b..034ffa9 100644 --- a/crates/mind-body/src/projection/fixtures/golden-chat.txt +++ b/crates/mind-body/src/projection/fixtures/golden-chat.txt @@ -1,5 +1,5 @@ -lens: MemorySurfacing -selected: libby-sounds, t1-m0, curse, need-relatedness +lens: UnresolvedWant +selected: libby-sounds, dm-secret, curse, need-relatedness, reveal present: Kiko, Libby --- identity Eureka (she/her). Dry, direct, almost feral; zeal aimed at revealing. @@ -11,9 +11,10 @@ Eureka (she/her). Dry, direct, almost feral; zeal aimed at revealing. - the conversation: Lately Libby with her; Kiko to the room. The last 2 lines are the Minds' alone. - pronouns: Libby — she/her; Kiko — she/her - memory [libby-sounds]: Libby laughed at the door fix. -- memory [t1-m0]: The heartbeat stalled at noon. +- memory [dm-secret]: she knows privately: Deru told her about the move, privately. - memory [curse]: Her curse is the knife. The same drive makes her good and will lead her wrong. - need [need-relatedness]: company, strong +- value [reveal] Reveal: Reveal, never obscure. --- stimulus Said to her: - Libby in #swarm:gamecult.org: "Eureka, did you see the door fix?" diff --git a/crates/mind-body/src/projection/harness.rs b/crates/mind-body/src/projection/harness.rs index 3bdd0ca..3c0a2ba 100644 --- a/crates/mind-body/src/projection/harness.rs +++ b/crates/mind-body/src/projection/harness.rs @@ -333,6 +333,7 @@ pub fn fixture_request(harness: &Harness, fixture: &Fixture, state: Option>().join(", ")).unwrap_or_default(); let reply = line["reply_to"].as_str().map_or_else(String::new, |id| format!("; reply to {id}")); let _ = writeln!(out, "- in {}{}{}: {}", line["room"].as_str().unwrap_or_default(), if mentions.is_empty() { String::new() } else { format!(", mentioning {mentions}") }, reply, line["text"].as_str().unwrap_or_default()); - let _ = writeln!(out, " - rests on: \"{}\"", line["rests_on"]["quote"].as_str().unwrap_or_default()); + let spans: Vec = line["rests_on"].as_array().into_iter().flatten().map(|span| format!("\"{}\"", span["quote"].as_str().unwrap_or_default())).collect(); + let _ = writeln!(out, " - her words: {}", spans.join(" + ")); } out.push('\n'); } for line in decision["refused"].as_array().into_iter().flatten() { - let _ = writeln!(out, "- refused ({}): {}", line["why"].as_str().unwrap_or_default(), line["text"].as_str().unwrap_or_default()); + let what = line["text"].as_str().map_or_else(|| line["spans"].to_string(), str::to_owned); + let _ = writeln!(out, "- refused ({}): {what}", line["why"].as_str().unwrap_or_default()); } for gap in decision["gaps"].as_array().into_iter().flatten() { let _ = writeln!(out, "- gap: {gap}"); diff --git a/crates/mind-body/src/projection/harness/tests.rs b/crates/mind-body/src/projection/harness/tests.rs index a4271f1..26d63bd 100644 --- a/crates/mind-body/src/projection/harness/tests.rs +++ b/crates/mind-body/src/projection/harness/tests.rs @@ -41,20 +41,19 @@ impl Scripted { } } -/// The recorded Interpreter of the tests: each double-quoted span of her prose is a line said in the first room listed, -/// resting on itself, mentioning no one. A test double that keeps the tests' prose readable, not the speech rule: the -/// live Interpreter is a model told quotes are not speech. +/// The recorded Interpreter of the tests: each double-quoted span of her prose is a line she says, citing itself, +/// mentioning no one. A test double that keeps the tests' prose readable, not the speech rule: to code a quotation is +/// only a text whose sentences are whole, and the live Interpreter is a model. pub(crate) fn quoted_lines(prompt: &str) -> String { - let prose = prompt.split("Persona turn (already preserved verbatim as source evidence):\n").nth(1).unwrap_or_default(); - let room = prompt.split("Rooms she may speak in: ").nth(1).and_then(|rooms| rooms.lines().next()).and_then(|rooms| rooms.split("; ").next()).unwrap_or_default(); - let say: Vec = prose.split('"').enumerate().filter(|(at, part)| at % 2 == 1 && !part.trim().is_empty()).map(|(_, part)| json!({ "room": room, "text": part, "source_quote": part, "mentions": [], "reply_to": null })).collect(); + let prose = prompt.split("Her prose:\n").nth(1).unwrap_or_default(); + let say: Vec = prose.split('"').enumerate().filter(|(at, part)| at % 2 == 1 && !part.trim().is_empty()).map(|(_, part)| json!({ "spans": [part], "mentions": [], "reply_to": null })).collect(); json!({ "say": say }).to_string() } impl Model for Scripted { fn ask(&self, _request_id: &str, model: &str, prompt: &str) -> std::result::Result { self.calls.borrow_mut().push((model.to_owned(), prompt.to_owned())); - let text = if prompt.contains(":interpreter -->") { + let text = if prompt.starts_with("You decide what one person says aloud") { (self.interpreter)(prompt) } else if prompt.starts_with("") && prompt.ends_with("I say nothing."), "Ghostlight's Interpreter membrane, her prose last"); - assert!(prompt.contains("Rooms she may speak in: #minds:gamecult.org") && prompt.contains(NIBU) && prompt.contains("People she may address"), "{prompt}"); - for rule in ["never her speech", "is not speech", "character for character", "No tool is available"] { +fn the_prompt_is_hugins_chat_prompt_with_the_room_its_kind_and_who_is_in_it() { + let packet = packet(); + assert_eq!((packet.room.as_deref(), packet.room_kind), (Some(MINDS), RoomKind::Public)); + let prompt = speech_prompt(&packet, "The room is warm.", "I say nothing."); + assert!(!prompt.contains("membrane") && prompt.ends_with("I say nothing."), "Huginn's own prompt, her prose last"); + assert!(prompt.contains("The room: #minds:gamecult.org (a public room).") && prompt.contains(NIBU), "{prompt}"); + for rule in ["You never write her words", "is not speech", "never her speech", "in a direct message with exactly that person", "She never says half a sentence", "consecutive sentences", "conditional | addressee | elsewhere", "At most two lines"] { assert!(prompt.contains(rule), "{rule}"); } } diff --git a/crates/mind-body/src/projection/select.rs b/crates/mind-body/src/projection/select.rs index 0bdb3f6..d9c56ef 100644 --- a/crates/mind-body/src/projection/select.rs +++ b/crates/mind-body/src/projection/select.rs @@ -18,8 +18,8 @@ //! it, never under a bonded person's name. Every message body and display name is rendered by one escape (`spoken`, a //! JSON string), so no text can forge a line; speaker and room come from the mouth's metadata alone. //! -//! Never read: `agencyPressure`, `candidateActions`, `privateNotes` and `provenance`. A memory tagged with a direct -//! message room (`room:!…`) is selectable only in that room. +//! Never read: `agencyPressure`, `candidateActions`, `privateNotes` and `provenance`. Whether an item is private, and +//! whom it concerns, is read by one function (`concerns`); how a private item reaches the packet, by one other (`scope`). use std::collections::BTreeSet; use std::fmt::Write as _; @@ -101,6 +101,29 @@ pub(crate) struct Room { /// When she last heard from people, by Matrix id, beyond what the tail shows: a fixture's table (`mind-persona project /// --room`). The live turn has none yet; the tail is its only source. pub last_heard: Vec<(String, u64)>, + /// The rooms the mouth called direct messages (a delivery's `is_direct`), by the key the lines carry. + pub direct: Vec, + /// The rooms that are hers, by key: the caller's (a simulation's plan); the live body records none yet. + pub own: Vec, +} + +/// Who a room's audience is, for what she may say there: a direct message, a room of her own, or a public room. +#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize)] +#[serde(rename_all = "snake_case")] +pub(crate) enum RoomKind { + Direct, + Own, + Public, +} + +impl RoomKind { + pub(crate) fn words(self) -> &'static str { + match self { + Self::Direct => "a direct message", + Self::Own => "her own room, open to its members", + Self::Public => "a public room", + } + } } /// One thing she said, from the trace. @@ -132,15 +155,18 @@ pub(crate) struct People<'a> { } impl People<'_> { - /// The id a bond names a person by: `operator` for the operator, a Mind's localpart for a Mind of the swarm, and the - /// full Matrix id for anyone else, so `@libby:evil.example` is never Libby. - pub(crate) fn person_of(&self, sender: &str) -> String { - if self.operators.iter().any(|operator| operator == sender) { + /// The key a person goes by in her state, from a sender or from either spelling a seed may use: the operator's + /// Matrix id is `operator`, a Mind of the swarm's is her handle (`@kiko:gamecult.org` is `kiko`), anyone else's is + /// the full Matrix id, so `@libby:evil.example` is never Libby; a bare key (`operator`, `kiko`) is itself. One + /// operator is assumed: every operator id is `operator`. + pub(crate) fn person_of(&self, id: &str) -> String { + let id = id.trim(); + if self.operators.iter().any(|operator| operator == id) { "operator".into() - } else if self.minds.iter().any(|mind| mind == sender) { - localpart(sender).to_lowercase() + } else if self.minds.iter().any(|mind| mind == id) { + localpart(id).to_lowercase() } else { - sender.to_lowercase() + id.to_lowercase() } } } @@ -222,10 +248,16 @@ pub(crate) struct Packet { /// Her pronouns, for the words the prompts speak of her in. #[serde(skip)] pub forms: Forms, - /// Whom the Interpreter may mention or reply to: (label, Matrix id). + /// Whom she may mention or reply to: the people this packet showed her from the room, (label, Matrix id). pub people: Vec<(String, String)>, - /// Where she may speak this turn: the turn's room, or the rooms the messages to her and around her came from. - pub rooms: Vec, + /// The one room she may speak in this turn, and its kind. + pub room: Option, + pub room_kind: RoomKind, + /// The bodies of the lines the stimulus quoted to her this turn, without speakers or rooms: a chat turn's messages, + /// a beat's tail lines. What an echo is measured against. + pub bodies: Vec, + /// The words of each private item this packet shows her as known privately: none of them may be said in this room. + pub private: Vec, } /// What the messages to her cost past the caps: bytes over the stimulus and heard caps, the older messages to her the @@ -243,6 +275,8 @@ struct Candidate { pool: Pool, line: String, log_score: f64, + /// The item's words, when the line shows them as known privately. + private: Option, } // --------------------------------------------------------------------------------------------- @@ -444,71 +478,80 @@ fn recency_log(at: Option>, now: DateTime, tau_h: f64) -> f64 at.map_or(0.0, |at| -((now - at).num_seconds().max(0) as f64 / 3600.0) / tau_h) } -/// The memory's tags name a direct-message room other than the turn's: private matter stays in its room. -fn private_elsewhere(item: &Value, here: Option<&str>) -> bool { - items(item, &["tags"]).iter().filter_map(Value::as_str).filter_map(|tag| tag.strip_prefix("room:")).any(|room| room.starts_with('!') && Some(room) != here) -} - fn in_room(item: &Value, here: Option<&str>) -> bool { here.is_some_and(|here| items(item, &["tags"]).iter().filter_map(Value::as_str).any(|tag| tag.strip_prefix("room:") == Some(here))) } -fn about_present(item: &Value, present: &BTreeSet) -> bool { - let target = text(item, &["target", "id"]).to_lowercase(); - present.contains(&target) || items(item, &["tags"]).iter().filter_map(Value::as_str).filter_map(|tag| tag.strip_prefix("about:")).any(|id| present.contains(&id.to_lowercase())) +fn about_present(people: &People, item: &Value, present: &BTreeSet) -> bool { + let target = people.person_of(text(item, &["target", "id"])); + present.contains(&target) || items(item, &["tags"]).iter().filter_map(Value::as_str).filter_map(|tag| tag.strip_prefix("about:")).any(|id| present.contains(&people.person_of(id))) } fn candidates(inputs: &Inputs, tuning: &Tuning, present: &BTreeSet, touching: &BTreeSet) -> Vec { let state = inputs.state; let here = inputs.room.here.as_deref(); let item_bytes = tuning.select.item_bytes; + let her = forms(state); let mut out = Vec::new(); - let mut push = |id: &str, pool: Pool, line: String, salience: f64, recency: f64, touch: f64, unresolved: f64| { + // Every item passes `scope` here: left out, its words shown as known privately, or as written. `line` renders the + // item around its words. + let mut push = |id: &str, pool: Pool, scope: Scope, words: &str, line: &dyn Fn(&str) -> String, salience: f64, recency: f64, touch: f64, unresolved: f64| { if id.is_empty() || salience <= 0.0 { return; } + let (line, private) = match scope { + Scope::Omitted => return, + Scope::Framed => (line(&format!("{} knows privately: {words}", her.subj)), Some(one_line(words))), + Scope::Plain => (line(words), None), + }; let log_score = salience.ln() + recency + touch.ln() + unresolved.ln() + freshness_log(id, inputs.history, tuning); - out.push(Candidate { id: id.to_owned(), pool, line, log_score }); + out.push(Candidate { id: id.to_owned(), pool, line, log_score, private }); }; + let scoped = |item: &Value| scope(inputs, concerns(&inputs.people, item).as_ref(), present); let crystallized = items(state, &["thoughtMemory", "memories"]).iter().map(|memory| (memory, false)); let memories = crystallized.chain(items(state, &["thoughtMemory", "shortTerm"]).iter().map(|memory| (memory, true))); - for (memory, short_term) in memories.filter(|(memory, _)| live(memory) && !private_elsewhere(memory, here)) { - let about = about_present(memory, present); + for (memory, short_term) in memories.filter(|(memory, _)| live(memory)) { + let about = about_present(&inputs.people, memory, present); let pool = if about { Pool::MemoriesAboutPresent } else { Pool::OtherMemories }; let touch = if about { TOUCH_PRESENT } else if in_room(memory, here) { TOUCH_ROOM } else { TOUCH_ELSE }; let body = [text(memory, &["summary"]), text(memory, &["tension"])].into_iter().filter(|part| !part.is_empty()).collect::>().join(" "); if body.is_empty() { continue; } - let line = format!("- memory [{}]: {}", text(memory, &["id"]), clip(&one_line(&body), item_bytes)); let salience = number(memory, &["intensity"]).unwrap_or(SALIENCE_UNSTATED); // Only the day's short-term items fade; a crystallized memory comes forward by what the room touches. let nearness = if short_term { recency_log(time(memory), inputs.now, tuning.select.memory_tau_h) } else { relevance_log(&body, touching) }; - push(text(memory, &["id"]), pool, line, salience, nearness, touch, 1.0); + let line = |words: &str| format!("- memory [{}]: {}", text(memory, &["id"]), clip(&one_line(words), item_bytes)); + push(text(memory, &["id"]), pool, scoped(memory), &body, &line, salience, nearness, touch, 1.0); } for need in items(state, &["affect", "needs"]).iter().filter(|need| live(need)) { let intensity = number(need, &["intensity"]).unwrap_or(SALIENCE_UNSTATED); let Some(name) = [text(need, &["label"]), text(need, &["summary"])].into_iter().find(|name| !name.is_empty()) else { continue }; - let line = format!("- need [{}]: {}, {}", text(need, &["id"]), clip(&one_line(name), item_bytes), need_movement(need, inputs.history.previous.as_ref(), forms(state).poss)); - push(text(need, &["id"]), Pool::Needs, line, intensity, 0.0, TOUCH_ELSE, 1.0 + intensity); + let movement = need_movement(need, inputs.history.previous.as_ref(), her.poss); + let line = |words: &str| format!("- need [{}]: {}, {movement}", text(need, &["id"]), clip(&one_line(words), item_bytes)); + push(text(need, &["id"]), Pool::Needs, scoped(need), name, &line, intensity, 0.0, TOUCH_ELSE, 1.0 + intensity); } - for wondering in items(state, &["thoughtMemory", "incubation"]).iter().filter(|item| live(item) && !private_elsewhere(item, here) && !text(item, &["summary"]).is_empty()) { + for wondering in items(state, &["thoughtMemory", "incubation"]).iter().filter(|item| live(item) && !text(item, &["summary"]).is_empty()) { let days = time(wondering).map_or(0.0, |at| (inputs.now - at).num_seconds().max(0) as f64 / 86_400.0); - let touch = if about_present(wondering, present) { TOUCH_PRESENT } else { TOUCH_ELSE }; - let line = format!("- wondering [{}]: {}", text(wondering, &["id"]), clip(&one_line(text(wondering, &["summary"])), item_bytes)); - push(text(wondering, &["id"]), Pool::Incubation, line, number(wondering, &["intensity"]).unwrap_or(SALIENCE_UNSTATED), 0.0, touch, (1.0 + days / 7.0).min(INCUBATION_UNRESOLVED_MAX)); + let touch = if about_present(&inputs.people, wondering, present) { TOUCH_PRESENT } else { TOUCH_ELSE }; + let line = |words: &str| format!("- wondering [{}]: {}", text(wondering, &["id"]), clip(&one_line(words), item_bytes)); + let unresolved = (1.0 + days / 7.0).min(INCUBATION_UNRESOLVED_MAX); + push(text(wondering, &["id"]), Pool::Incubation, scoped(wondering), text(wondering, &["summary"]), &line, number(wondering, &["intensity"]).unwrap_or(SALIENCE_UNSTATED), 0.0, touch, unresolved); } for stance in items(state, &["affect", "doctrineStances"]).iter().filter(|stance| live(stance) && !text(stance, &["summary"]).is_empty()) { - let touch = if about_present(stance, present) { TOUCH_PRESENT } else { TOUCH_ELSE }; - let line = format!("- stance [{}]: {}", text(stance, &["id"]), clip(&one_line(text(stance, &["summary"])), item_bytes)); - push(text(stance, &["id"]), Pool::Stance, line, number(stance, &["intensity"]).unwrap_or(SALIENCE_UNSTATED), relevance_log(text(stance, &["summary"]), touching), touch, 1.0); + let touch = if about_present(&inputs.people, stance, present) { TOUCH_PRESENT } else { TOUCH_ELSE }; + let line = |words: &str| format!("- stance [{}]: {}", text(stance, &["id"]), clip(&one_line(words), item_bytes)); + let relevance = relevance_log(text(stance, &["summary"]), touching); + push(text(stance, &["id"]), Pool::Stance, scoped(stance), text(stance, &["summary"]), &line, number(stance, &["intensity"]).unwrap_or(SALIENCE_UNSTATED), relevance, touch, 1.0); } - for value in items(state, &["values"]).iter().filter(|value| !text(value, &["label"]).is_empty() || !text(value, &["summary"]).is_empty()) { + // A value has no target, tags or extensions in the schema, so nothing can mark it private; one that carries a mark + // anyway is not a valid value and is refused, never rendered. + for value in items(state, &["values"]).iter().filter(|value| concerns(&inputs.people, value).is_none() && (!text(value, &["label"]).is_empty() || !text(value, &["summary"]).is_empty())) { let summary = clip(&one_line(text(value, &["summary"])), item_bytes); let label = clip(text(value, &["label"]), NAME_BYTES); let line = match (label.is_empty(), summary.is_empty()) { @@ -517,13 +560,15 @@ fn candidates(inputs: &Inputs, tuning: &Tuning, present: &BTreeSet, touc _ => format!("- value [{}]: {summary}", text(value, &["id"])), }; let relevance = relevance_log(&format!("{} {}", text(value, &["label"]), text(value, &["summary"])), touching); - push(text(value, &["id"]), Pool::Value, line, number(value, &["priority"]).unwrap_or(SALIENCE_UNSTATED), relevance, TOUCH_ELSE, 1.0); + push(text(value, &["id"]), Pool::Value, Scope::Plain, &line, &str::to_owned, number(value, &["priority"]).unwrap_or(SALIENCE_UNSTATED), relevance, TOUCH_ELSE, 1.0); } for said in &inputs.history.said { let touch = if Some(said.room.as_str()) == here { TOUCH_ROOM } else { TOUCH_ELSE }; - let line = format!("- {} said [{}] in {}: {}", forms(state).subj, said.id, said.room, spoken(&clip(&said.text, item_bytes))); - push(&said.id, Pool::Said, line, SALIENCE_UNSTATED, recency_log(Some(said.at), inputs.now, tuning.select.memory_tau_h), touch, 1.0); + // What she said in a direct message is private about its partner: shown only there, still only the two of them. + let partner = direct(inputs, &said.room).then(|| Concerns::Partner(said.room.clone())); + let line = |words: &str| format!("- {} said [{}] in {}: {}", her.subj, said.id, said.room, spoken(&clip(words, item_bytes))); + push(&said.id, Pool::Said, scope(inputs, partner.as_ref(), present), &said.text, &line, SALIENCE_UNSTATED, recency_log(Some(said.at), inputs.now, tuning.select.memory_tau_h), touch, 1.0); } out } @@ -548,7 +593,7 @@ fn cap_of(pool: Pool, tuning: &Tuning) -> usize { /// it, so a stranger called "Meta" never reads as the operator. fn name_of(line: &RoomLine, inputs: &Inputs) -> String { let person = inputs.people.person_of(&line.sender); - let bonded = items(inputs.state, &["affect", "socialBonds"]).iter().find(|bond| live(bond) && text(bond, &["object", "id"]).to_lowercase() == person).map(|bond| text(bond, &["object", "label"]).to_owned()).filter(|label| !label.is_empty()); + let bonded = items(inputs.state, &["affect", "socialBonds"]).iter().find(|bond| live(bond) && inputs.people.person_of(text(bond, &["object", "id"])) == person).map(|bond| text(bond, &["object", "label"]).to_owned()).filter(|label| !label.is_empty()); match bonded { Some(label) => clip(&one_line(&label), NAME_BYTES), // A display name is the speaker's own text: quoted and escaped, at most `NAME_BYTES`, the real id always after it. @@ -750,7 +795,7 @@ fn beat_stimulus(inputs: &Inputs, tuning: &Tuning) -> String { let cap = tuning.select.stimulus_bytes; let mut contacts: Vec<(Option, String)> = Vec::new(); for bond in items(inputs.state, &["affect", "socialBonds"]).iter().filter(|bond| live(bond) && text(bond, &["object", "kind"]) == "person") { - let person = text(bond, &["object", "id"]).to_lowercase(); + let person = inputs.people.person_of(text(bond, &["object", "id"])); let label = clip(&one_line([text(bond, &["object", "label"]), text(bond, &["object", "id"])].into_iter().find(|name| !name.is_empty()).unwrap_or_default()), NAME_BYTES); let heard = inputs.room.tail.iter().map(|line| (line.sender.as_str(), line.at_ms)).chain(inputs.room.last_heard.iter().map(|(sender, at)| (sender.as_str(), *at))); let last = heard.filter(|(sender, _)| inputs.people.person_of(sender) == person).map(|(_, at)| at).max(); @@ -774,9 +819,7 @@ fn beat_stimulus(inputs: &Inputs, tuning: &Tuning) -> String { if left_out > 0 { out.push(&format!("({left_out} more people {} {} bound to not shown)", her.subj, her.be)); } - let others: Vec<&RoomLine> = inputs.room.tail.iter().filter(|line| line.sender != inputs.people.own_sender).collect(); - let shown = &others[others.len().saturating_sub(tuning.select.beat_tail_lines)..]; - let lines: Vec = shown.iter().map(|line| format!("- {} in {}, {} h ago: {}", name_of(line, inputs), line.room, hours(inputs.now, line.at_ms), spoken(&clip(&line.text, tuning.select.item_bytes / 2)))).collect(); + let lines: Vec = beat_tail(inputs, tuning).iter().map(|line| format!("- {} in {}, {} h ago: {}", name_of(line, inputs), line.room, hours(inputs.now, line.at_ms), spoken(&clip(&line.text, tuning.select.item_bytes / 2)))).collect(); let section = newest_section(&format!("Lately in {} rooms:", her.poss), &lines, cap.saturating_sub(out.out.len() + 2)); if !section.is_empty() && out.push("") { out.push(§ion); @@ -784,6 +827,12 @@ fn beat_stimulus(inputs: &Inputs, tuning: &Tuning) -> String { out.out } +/// The tail lines a beat's stimulus quotes: the newest `beat_tail_lines` of others'. +fn beat_tail<'a>(inputs: &'a Inputs, tuning: &Tuning) -> Vec<&'a RoomLine> { + let others: Vec<&RoomLine> = inputs.room.tail.iter().filter(|line| line.sender != inputs.people.own_sender).collect(); + others[others.len().saturating_sub(tuning.select.beat_tail_lines)..].to_vec() +} + fn reflection_stimulus(inputs: &Inputs, tuning: &Tuning) -> String { let lines: Vec = items(inputs.state, &["thoughtMemory", "shortTerm"]).iter().filter(|item| live(item)).map(|item| format!("- {}", clip(&one_line(text(item, &["summary"])), tuning.select.item_bytes))).collect(); let subj = forms(inputs.state).subj; @@ -813,7 +862,7 @@ fn present_people(inputs: &Inputs, tuning: &Tuning) -> Vec<(String, String)> { /// A bond line: the person, the kind of bond after a dash (a label may hold a comma: "Meta, the operator"), trust and /// friction as words when the bond carries them, and its summary. What the bond does not carry is left out. -fn bond_line(bond: &Value, name: &str, tuning: &Tuning) -> String { +fn bond_line(bond: &Value, name: &str, tuning: &Tuning, scope: Scope, her: Forms) -> String { let feel: Vec<&str> = [number(bond, &["trust"]).map(trust_words), number(bond, &["tension"]).map(friction_words)].into_iter().flatten().collect(); let custom = text(bond, &["customRelationshipKind"]); let kind = clip(&one_line(if custom.is_empty() { text(bond, &["relationshipKind"]) } else { custom }), NAME_BYTES); @@ -822,6 +871,11 @@ fn bond_line(bond: &Value, name: &str, tuning: &Tuning) -> String { let _ = write!(line, " \u{2014} {kind}"); } let summary = clip(&one_line(text(bond, &["summary"])), tuning.select.bond_summary_bytes); + let summary = match scope { + Scope::Framed if !summary.is_empty() => format!("{} knows privately: {summary}", her.cap_subj), + Scope::Omitted => String::new(), + _ => summary, + }; match (feel.is_empty(), summary.is_empty()) { (true, true) => {} (true, false) => { @@ -881,7 +935,7 @@ fn is_mind(inputs: &Inputs, sender: &str) -> bool { /// The label her bond with a sender gives them, when she has a live one. fn bond_label(inputs: &Inputs, sender: &str) -> Option { let person = inputs.people.person_of(sender); - items(inputs.state, &["affect", "socialBonds"]).iter().find(|bond| live(bond) && text(bond, &["object", "id"]).to_lowercase() == person).map(|bond| text(bond, &["object", "label"]).to_owned()).filter(|label| !label.is_empty()) + items(inputs.state, &["affect", "socialBonds"]).iter().find(|bond| live(bond) && inputs.people.person_of(text(bond, &["object", "id"])) == person).map(|bond| text(bond, &["object", "label"]).to_owned()).filter(|label| !label.is_empty()) } /// The words a line may call its sender by: the Matrix localpart, the display name, and the bond's label when she has one. @@ -893,9 +947,25 @@ fn names_of(line: &RoomLine, inputs: &Inputs) -> Vec { /// once, oldest first. The room is the turn's when it is one room; otherwise the room of the newest message to her, else /// of the newest message, else of the newest tail line. Never several rooms folded into one, so a direct message is /// only ever read as its own room. -fn recent_lines<'a>(inputs: &'a Inputs) -> Vec<&'a RoomLine> { +/// The turn's room: the one it is in when it is one room; otherwise the room of the newest message to her, else of the +/// newest message, else of the newest tail line. Where the packet describes and the only room she may speak in. +pub(crate) fn turn_room<'a>(inputs: &'a Inputs) -> Option<&'a str> { let newest = |lines: &'a [RoomLine], keep: &dyn Fn(&RoomLine) -> bool| lines.iter().filter(|line| keep(line)).max_by_key(|line| line.at_ms).map(|line| line.room.as_str()); - let Some(room) = inputs.room.here.as_deref().or_else(|| newest(&inputs.room.messages, &|line| line.to_her)).or_else(|| newest(&inputs.room.messages, &|_| true)).or_else(|| newest(&inputs.room.tail, &|_| true)) else { + inputs.room.here.as_deref().or_else(|| newest(&inputs.room.messages, &|line| line.to_her)).or_else(|| newest(&inputs.room.messages, &|_| true)).or_else(|| newest(&inputs.room.tail, &|_| true)) +} + +fn room_kind(inputs: &Inputs, room: &str) -> RoomKind { + if direct(inputs, room) { + RoomKind::Direct + } else if inputs.room.own.iter().any(|own| own == room) { + RoomKind::Own + } else { + RoomKind::Public + } +} + +fn recent_lines<'a>(inputs: &'a Inputs) -> Vec<&'a RoomLine> { + let Some(room) = turn_room(inputs) else { return Vec::new(); }; let mut lines: Vec<&RoomLine> = Vec::new(); @@ -1008,38 +1078,91 @@ fn pronoun_line(inputs: &Inputs, tuning: &Tuning) -> Option { (!parts.is_empty()).then(|| clip(&format!("- pronouns: {}", parts.join("; ")), ALSO_HERE_BYTES)) } +/// How an item's content reaches the packet. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +enum Scope { + /// As it is: shared, or private and this is the room where it may be said. + Plain, + /// "She knows privately: …": private, about someone who is not in the turn's room. + Framed, + /// Left out: private, and whom it concerns is in the room, or cannot be told apart from who is. Nothing private about + /// a person is hinted at to their face. + Omitted, +} + +/// Whom a private item concerns. +#[derive(Clone, Debug, PartialEq, Eq)] +enum Concerns { + /// One person, keyed as her bonds key people. + Person(String), + /// The other member of the direct message a `room:!…` tag (or her line's room) names, when no person is named. + Partner(String), + /// No person named: private about everyone. + Everyone, +} + +/// Whether an item is private, and whom it concerns: the one owner of that reading, for the bonds and every pool. Private +/// is `extensions.privacy` "private", a `private` tag, or a tag naming a direct message (`room:!…`); anything else is +/// shared (None). It concerns the person its `target` (a bond's `object`) names when that is a person, else the person +/// an `about:` tag names, else the partner of the direct message its room tag names, else everyone. The convention is +/// the Persona State Standard's, read without a schema change. +fn concerns(people: &People, item: &Value) -> Option { + let tags: Vec<&str> = items(item, &["tags"]).iter().filter_map(Value::as_str).collect(); + let direct = tags.iter().filter_map(|tag| tag.strip_prefix("room:")).find(|room| room.starts_with('!')); + if text(item, &["extensions", "privacy"]) != "private" && !tags.contains(&"private") && direct.is_none() { + return None; + } + let named = ["target", "object"].into_iter().find(|key| text(item, &[*key, "kind"]) == "person").map(|key| people.person_of(text(item, &[key, "id"]))); + let about = || tags.iter().find_map(|tag| tag.strip_prefix("about:")).map(|id| people.person_of(id)); + Some(match (named.filter(|id| !id.is_empty()).or_else(about).filter(|id| !id.is_empty()), direct) { + (Some(person), _) => Concerns::Person(person), + (None, Some(room)) => Concerns::Partner(room.to_owned()), + (None, None) => Concerns::Everyone, + }) +} + +/// Whether a room is a direct message: the mouth said so, or it is keyed by a room id, as only a direct message is. +fn direct(inputs: &Inputs, room: &str) -> bool { + room.starts_with('!') || inputs.room.direct.iter().any(|direct| direct == room) +} + +/// Everyone a room's lines show in it but her, keyed as her bonds key people. Matrix tells her body no membership, so a +/// member who never spoke in the lines she has is not counted. +fn members(inputs: &Inputs, room: &str) -> BTreeSet { + inputs.room.messages.iter().chain(&inputs.room.tail).filter(|line| line.room == room && line.sender != inputs.people.own_sender).map(|line| inputs.people.person_of(&line.sender)).collect() +} + +/// How an item reaches the packet here, by whom it concerns (`concerns`; None is shared, and plain). Plain only where it +/// may be said: about one person, in a direct message with exactly her and that person; about a direct message's +/// partner, in that direct message, still only the two of them; about everyone, in a room of her own. Elsewhere it is +/// left out when whom it concerns is in the room (everyone always is, and a partner unnamed cannot be told apart), and +/// framed as known privately when they are not. Structural: whether a line fits its audience stays the Interpreter's +/// judgement. +fn scope(inputs: &Inputs, concerns: Option<&Concerns>, present: &BTreeSet) -> Scope { + let Some(concerns) = concerns else { + return Scope::Plain; + }; + let room = turn_room(inputs); + let members = room.map(|room| members(inputs, room)).unwrap_or_default(); + // The one other person of a direct message that has exactly two members. + let with = room.filter(|room| room_kind(inputs, room) == RoomKind::Direct && members.len() == 1).and_then(|_| members.first()); + match concerns { + Concerns::Person(person) if with == Some(person) => Scope::Plain, + Concerns::Person(person) if present.contains(person) || members.contains(person) => Scope::Omitted, + Concerns::Person(_) => Scope::Framed, + Concerns::Partner(dm) if with.is_some() && room == Some(dm.as_str()) => Scope::Plain, + Concerns::Everyone if room.is_some_and(|room| room_kind(inputs, room) == RoomKind::Own) => Scope::Plain, + Concerns::Partner(_) | Concerns::Everyone => Scope::Omitted, + } +} + /// A part as a sentence: its first letter upper-cased, a full stop after it. fn sentence(part: &str) -> String { let mut chars = part.chars(); chars.next().map_or_else(String::new, |first| format!("{}{}.", first.to_uppercase(), chars.as_str())) } -/// Whom the Interpreter may address: everyone the packet shows from the room, then the swarm's other Minds, who are in -/// her rooms whether or not they spoke; a Mind she is bound to goes by the bond's label, any other by the id alone. -fn addressable(inputs: &Inputs, tuning: &Tuning) -> Vec<(String, String)> { - let mut people = people_in_view(inputs, tuning); - for mind in inputs.people.minds.iter().filter(|mind| *mind != inputs.people.own_sender) { - if !people.iter().any(|(_, id)| id == mind) { - people.push((bond_label(inputs, mind).unwrap_or_else(|| mind.clone()), mind.clone())); - } - } - people -} -fn speaking_rooms(inputs: &Inputs) -> Vec { - let mut rooms: Vec = inputs.room.here.iter().cloned().collect(); - for line in &inputs.room.messages { - if !rooms.contains(&line.room) { - rooms.push(line.room.clone()); - } - } - if rooms.is_empty() - && let Some(line) = recent_lines(inputs).last() - { - rooms.push(line.room.clone()); - } - rooms -} /// The pronouns of a person nobody listed. const UNKNOWN_PRONOUNS: &str = "they/them"; @@ -1072,16 +1195,21 @@ pub(crate) fn select(inputs: &Inputs, tuning: &Tuning) -> Packet { let mut used: usize = fixed.iter().map(|line| line.len() + 1).sum(); let mut ids = Vec::new(); let mut named = Vec::new(); + let mut private = Vec::new(); let mut full = 0; for (id, name) in &present { - match bonds.iter().find(|bond| live(bond) && text(bond, &["object", "id"]).to_lowercase() == *id) { + match bonds.iter().find(|bond| live(bond) && inputs.people.person_of(text(bond, &["object", "id"])) == *id) { Some(bond) if full < tuning.select.people_full => { - let line = bond_line(bond, name, tuning); + let scope = scope(inputs, concerns(&inputs.people, bond).as_ref(), &present_ids); + let line = bond_line(bond, name, tuning, scope, forms(inputs.state)); if used + line.len() < budget { full += 1; used += line.len() + 1; ids.push(text(bond, &["id"]).to_owned()); fixed.push(line); + if scope == Scope::Framed && !text(bond, &["summary"]).is_empty() { + private.push(one_line(text(bond, &["summary"]))); + } } else { named.push(name.clone()); } @@ -1138,6 +1266,12 @@ pub(crate) fn select(inputs: &Inputs, tuning: &Tuning) -> Packet { let mut lines = fixed; lines.extend(taken.iter().map(|candidate| candidate.line.clone())); ids.extend(taken.iter().map(|candidate| candidate.id.clone())); + private.extend(taken.iter().filter_map(|candidate| candidate.private.clone())); + let bodies = match inputs.kind { + TurnKind::Chat => inputs.room.messages.iter().map(|line| line.text.clone()).collect(), + TurnKind::Beat => beat_tail(inputs, tuning).iter().map(|line| line.text.clone()).collect(), + TurnKind::FollowUp | TurnKind::Reflection => Vec::new(), + }; let selected = taken.into_iter().map(|candidate| Pick { id: candidate.id, pool: candidate.pool, log_score: candidate.log_score }).collect(); - Packet { kind: inputs.kind, seed: inputs.seed, lens, identity, context: lines.join("\n"), stimulus, heard, overflow, present: present_names, ids, selected, forms: forms(inputs.state), people: addressable(inputs, tuning), rooms: speaking_rooms(inputs) } + Packet { kind: inputs.kind, seed: inputs.seed, lens, identity, context: lines.join("\n"), stimulus, heard, overflow, present: present_names, ids, selected, forms: forms(inputs.state), people: people_in_view(inputs, tuning), room: turn_room(inputs).map(str::to_owned), room_kind: turn_room(inputs).map_or(RoomKind::Public, |room| room_kind(inputs, room)), bodies, private } } diff --git a/crates/mind-body/src/projection/simulate.rs b/crates/mind-body/src/projection/simulate.rs index c29414c..a525dc1 100644 --- a/crates/mind-body/src/projection/simulate.rs +++ b/crates/mind-body/src/projection/simulate.rs @@ -4,8 +4,13 @@ //! //! Who wakes is the heartbeat's: `heartbeat::wakes` under the plan's `WakePolicy`, over each persona's addressee as the //! heartbeat's addressing table holds it (her stewarded projects' names included) when the plan names the table. The -//! beat is the heartbeat's too: when it falls, one Persona wakes, the winner of `tempo::pick`. Those woken in one round -//! go in an order drawn from the seed, each against the room as it stands at her turn. +//! beat is the heartbeat's too: when it falls, one Persona wakes, the winner of `tempo::pick`. Who wakes in a round is +//! decided from the room as the round opens, as one heartbeat poll decides from the pending it read: a line spoken by a +//! turn of this round wakes no one, and counts toward a cap, only from the next round. A persona takes at most one turn +//! a round, as the live heartbeat never starts a Mind whose unit is still running: in the room of her earliest waking +//! line. She reads only that room, and only that room is marked seen, so a line in another room that woke her wakes +//! her again next round: no line is seen without a turn that read it. The turns of a round go in an order drawn from +//! the seed, each against the room as it stands at that turn. //! //! Her state does not move during a run: the Interpreter (C3b) and the commit (C3c) are not built. `state_after_turn` //! is the seam where they will. An explicit addressee (the Interpreter naming whom she speaks to) cannot be simulated @@ -111,17 +116,24 @@ struct Member { rooms: Vec, } -/// One persona's view of the room at her turn: the lines since her last turn are new. +/// Per room, how many lines she had seen when a turn of hers last read it: a line at or past that is new to her. +type Seen = BTreeMap; + +fn unseen(seen: &Seen, lines: &[Line], at: usize) -> bool { + at >= seen.get(&lines[at].room).copied().unwrap_or(0) +} + +/// One persona's view of the room at her turn: the lines she has not seen are new. struct View<'a> { lines: &'a [Line], viewer: &'a str, rooms: &'a [String], - seen: usize, + seen: &'a Seen, } impl MouthReader for View<'_> { fn pending(&self) -> Result { - Ok(pending_for(self.lines, self.viewer, self.rooms, |at| at >= self.seen)) + Ok(pending_for(self.lines, self.viewer, self.rooms, |at| unseen(self.seen, self.lines, at))) } } @@ -151,15 +163,24 @@ fn speaker(line: &Line, member: &Member, operators: &[String], cast: &[String]) } } -/// For each line, how many Mind lines in a row came before it in its room since a human last spoke there. +/// For each line, how many Mind lines in a row came before it in her current Mind-only run: one run across every room +/// she sees, which a human's line ends only when it is in a room the run has lines in. Meta chatting in #eureka does not +/// end a loop in #minds. fn mind_runs(lines: &[Line], cast: &[String], member: &Member) -> Vec { let mut run = 0usize; + let mut run_rooms: Vec<&str> = Vec::new(); lines .iter() .map(|line| { let before = run; if line.visible_to(&member.entry.id, &member.rooms) { - run = if cast.contains(&line.from) { run + 1 } else { 0 }; + if cast.contains(&line.from) { + run += 1; + run_rooms.push(&line.room); + } else if run_rooms.contains(&line.room.as_str()) { + run = 0; + run_rooms.clear(); + } } before }) @@ -183,23 +204,26 @@ fn how_addressed(line: &Line, at: usize, member: &Member, lines: &[Line]) -> &'s /// it, the strongest evidence that addressed her and the lines that did. struct Woken { cause: WakeCause, + /// The newest line with that cause: its room is the turn's room. + line: usize, how: Option<&'static str>, by: Vec, } -/// Whether she spoke in the exchange a line continues: walking back through the lines of its room while each is within -/// `gap` of the one after it. +/// Whether she is in the exchange a line belongs to: she spoke in its room within `window` before it. fn in_exchange(lines: &[Line], at: usize, her: &str, window: Duration) -> bool { let line = &lines[at]; let since = line.at_ms.saturating_sub(u64::try_from(window.num_milliseconds()).unwrap_or(0)); lines[..at].iter().any(|earlier| earlier.room == line.room && earlier.from == her && earlier.at_ms >= since) } +/// Her wake, if a line she has not seen wakes her: in the room of the earliest such line, with the strongest cause among +/// that room's waking lines. #[allow(clippy::too_many_arguments, reason = "one wake decision's inputs, each a plan or room fact")] -fn woken(lines: &[Line], runs: &[usize], seen: usize, member: &Member, operators: &[String], cast: &[String], policy: WakePolicy, gap: Duration) -> Option { +fn woken(lines: &[Line], runs: &[usize], seen: &Seen, member: &Member, operators: &[String], cast: &[String], policy: WakePolicy, gap: Duration) -> Option { let mut found: Vec<(usize, WakeCause)> = Vec::new(); - for (at, line) in lines.iter().enumerate().skip(seen) { - if !line.visible_to(&member.entry.id, &member.rooms) { + for (at, line) in lines.iter().enumerate() { + if !unseen(seen, lines, at) || !line.visible_to(&member.entry.id, &member.rooms) { continue; } let delivery = line.delivery(at, &member.entry.id, lines); @@ -208,15 +232,18 @@ fn woken(lines: &[Line], runs: &[usize], seen: usize, member: &Member, operators found.push((at, cause)); } } + let room = &lines[found.first()?.0].room; + found.retain(|(at, _)| lines[*at].room == *room); let cause = found.iter().map(|(_, cause)| *cause).min()?; + let line = found.iter().rev().find(|(_, found)| *found == cause).map_or(0, |(at, _)| *at); if cause != WakeCause::AddressedByMind { - return Some(Woken { cause, how: None, by: vec![] }); + return Some(Woken { cause, line, how: None, by: vec![] }); } let addressing: Vec = found.iter().filter(|(_, cause)| *cause == WakeCause::AddressedByMind).map(|(at, _)| *at).collect(); let rank = |how: &str| ["mention or reply", "id as text", "name in text"].iter().position(|one| *one == how).unwrap_or(3); let how = addressing.iter().map(|at| how_addressed(&lines[*at], *at, member, lines)).min_by_key(|how| rank(how)); let by = addressing.iter().map(|at| json!({ "from": lines[*at].from, "how": how_addressed(&lines[*at], *at, member, lines), "says": lines[*at].says })).collect(); - Some(Woken { cause, how, by }) + Some(Woken { cause, line, how, by }) } /// The wire spelling of a cause, and of the beat. @@ -313,7 +340,7 @@ fn run(harness: &Harness, plan: &SimFile, members: &mut [Member], repeat: usize) }; scripted(0, &mut lines, &mut rounds_of, &mut causes)?; let opening = lines.len(); - let mut seen = vec![0usize; members.len()]; + let mut seen: Vec = vec![Seen::new(); members.len()]; let mut last_turn: Vec>> = vec![None; members.len()]; let mut last_beat = plan.start; let mut recent: Vec>> = vec![Vec::new(); members.len()]; @@ -322,7 +349,8 @@ fn run(harness: &Harness, plan: &SimFile, members: &mut [Member], repeat: usize) for round in 1..=plan.rounds { scripted(round, &mut lines, &mut rounds_of, &mut causes)?; let round_at = at_round(round); - let mut woke: Vec<(usize, Option)> = members.iter().enumerate().filter_map(|(at, member)| woken(&lines, &mind_runs(&lines, &cast, member), seen[at], member, &plan.operators, &cast, plan.wake, Duration::minutes(plan.exchange_minutes)).map(|why| (at, Some(why)))).collect(); + // Decided from the room as the round opens, as a poll decides from the pending it read. + let mut woke: Vec<(usize, Option)> = members.iter().enumerate().filter_map(|(at, member)| woken(&lines, &mind_runs(&lines, &cast, member), &seen[at], member, &plan.operators, &cast, plan.wake, Duration::minutes(plan.exchange_minutes)).map(|why| (at, Some(why)))).collect(); // The beat, as the heartbeat's: when it has fallen, one more wake for the winner of `tempo::pick` among those // not already woken. if plan.beat_s > 0 && (round_at - last_beat).num_seconds() >= i64::from(plan.beat_s) { @@ -335,7 +363,7 @@ fn run(harness: &Harness, plan: &SimFile, members: &mut [Member], repeat: usize) waited_s: last_turn[at].map(|turn| u64::try_from((round_at - turn).num_seconds()).unwrap_or(0)), last_turn_ms: last_turn[at].map(|turn| turn.timestamp_millis()), topic_permille: 0, - addressed_by_member: addressed_by_member(&plan.operators, &member.addressee, &pending_for(&lines, &member.entry.id, &member.rooms, |index| index >= seen[at]).deliveries), + addressed_by_member: addressed_by_member(&plan.operators, &member.addressee, &pending_for(&lines, &member.entry.id, &member.rooms, |index| unseen(&seen[at], &lines, index)).deliveries), }) .collect(); if let Some(winner) = pick(&standings, plan.beat_s) { @@ -347,12 +375,13 @@ fn run(harness: &Harness, plan: &SimFile, members: &mut [Member], repeat: usize) counter += 1; let member = &members[at]; let id = member.entry.id.clone(); - let fresh: Vec<&Line> = lines[seen[at]..].iter().filter(|line| line.from != id && line.visible_to(&id, &member.rooms)).collect(); - let woke_on = fresh.iter().rev().find(|line| line.mentions.contains(&id) || line.dm_to.as_deref() == Some(id.as_str())).or(fresh.last()).copied(); + let fresh: Vec<&Line> = lines.iter().enumerate().filter(|(index, line)| unseen(&seen[at], &lines, *index) && line.from != id && line.visible_to(&id, &member.rooms)).map(|(_, line)| line).collect(); + // The turn is in the room of the line that woke her; a beat's, in the room of the newest line she has not seen. + let woke_on = why.as_ref().map(|why| &lines[why.line]).or(fresh.last().copied()); let here = woke_on.map_or_else(|| member.rooms[0].clone(), |line| line.room.clone()); // Woken by a direct message, she answers in it: to its sender alone. let dm_to = woke_on.filter(|line| line.dm_to.as_deref() == Some(id.as_str())).map(|line| line.from.clone()); - let kind = if fresh.is_empty() { TurnKind::Beat } else { TurnKind::Chat }; + let kind = if fresh.iter().any(|line| line.room == here) { TurnKind::Chat } else { TurnKind::Beat }; let now = round_at + Duration::seconds(30 + counter as i64); let request = Request { instance: localpart(&id).to_owned(), @@ -369,12 +398,14 @@ fn run(harness: &Harness, plan: &SimFile, members: &mut [Member], repeat: usize) through: Through::Interpreter, last_heard: vec![], recent: recent[at].clone(), + own_rooms: member.entry.own_rooms.clone(), }; - let view = View { lines: &lines, viewer: &id, rooms: &member.rooms, seen: seen[at] }; + let view = View { lines: &lines, viewer: &id, rooms: &member.rooms, seen: &seen[at] }; let names = Names(&member.addressee); let organs = Organs { persona: None, chat: Some(&view), addressing: Some(&names), model: harness.model }; let report = project(&organs, &request, now).unwrap_or_else(|fault| json!({ "error": format!("{fault:#}") })); - seen[at] = lines.len(); + // Only the room she read is seen. + seen[at].insert(here.clone(), lines.len()); last_turn[at] = Some(now); let render = &report["renders"][0]; if let Some(selected) = render["selected"].as_array() { @@ -556,8 +587,8 @@ fn policy_words(policy: WakePolicy) -> String { match policy { WakePolicy::Live => "live: the operator or another Mind addressing her (the heartbeat's rule today)".into(), WakePolicy::Ruled => "ruled: a line addressing her, from anyone, and any human line in her rooms".into(), - WakePolicy::HumansPace(cap) => format!("humans_pace (cap {cap}): a human's line wakes a Mind in her own room always, and in a public room when it addresses her or continues an exchange she is in; a Mind's line wakes another only by an explicit mention or a reply, while fewer than {cap} Mind lines in a row came before it in its room, never by a name in prose"), - WakePolicy::NamesWithCap(cap) => format!("names_with_cap {cap}: ruled, but a Mind's line past {cap} Mind lines in a row in its room wakes no one until a human speaks"), + WakePolicy::HumansPace(cap) => format!("humans_pace (cap {cap}): a human's line wakes a Mind in her own room always, and in a public room when it addresses her or continues an exchange she is in; a Mind's line wakes another only by an explicit mention or a reply, while her current Mind-only run, across her rooms, is under {cap} lines, never by a name in prose"), + WakePolicy::NamesWithCap(cap) => format!("names_with_cap {cap}: ruled, but a Mind's line wakes no one once her current Mind-only run, across her rooms, has {cap} lines, until a human speaks where it runs"), WakePolicy::AllMessages => "all_messages: any line in her rooms, a Mind's too (the old loop, the control)".into(), } } diff --git a/crates/mind-body/src/projection/simulate/tests.rs b/crates/mind-body/src/projection/simulate/tests.rs index 468d248..c2565d0 100644 --- a/crates/mind-body/src/projection/simulate/tests.rs +++ b/crates/mind-body/src/projection/simulate/tests.rs @@ -1,3 +1,4 @@ +use std::collections::BTreeMap; use std::path::Path; use serde_json::Value; @@ -59,9 +60,9 @@ fn is_tobiah(prompt: &str) -> bool { prompt.contains("Who you are:\nTobiah") } -/// Both speak every turn, neither naming the other. +/// Both speak every turn, neither naming the other: each line a standalone quotation, sayable. fn chatty() -> Scripted { - Scripted::new(|prompt| if is_tobiah(prompt) { "\"what a day\" he says".into() } else { "\"mm, the deploy went fine\" she says".into() }) + Scripted::new(|prompt| if is_tobiah(prompt) { "\"what a day\"".into() } else { "\"mm, the deploy went fine\"".into() }) } /// Both speak every turn, each naming the other. @@ -243,27 +244,34 @@ fn a_seed_replays_its_order_and_another_seed_changes_it() { fn tagging(mention: bool) -> Scripted { let mentions = if mention { json!([LIBBY]) } else { json!([]) }; Scripted::new(|prompt| if is_tobiah(prompt) { "\"ask @libby:gamecult.org, and Libby too\"".into() } else { "She lets it be.".into() }).interpreting(move |prompt| { - if !prompt.contains("Identity:\nTobiah") { + if !prompt.contains("Who she is:\nTobiah") { return json!({ "say": [] }).to_string(); } - json!({ "say": [{ "room": "#minds:gamecult.org", "text": "ask @libby:gamecult.org, and Libby too", "source_quote": "ask @libby:gamecult.org, and Libby too", "mentions": mentions, "reply_to": null }] }).to_string() + json!({ "say": [{ "spans": ["ask @libby:gamecult.org, and Libby too"], "mentions": mentions, "reply_to": null }] }).to_string() }) } #[test] fn only_the_interpreters_structured_mention_is_a_mention_and_an_at_in_the_text_is_not() { + // Libby says hello first, so the packet shows her to Tobiah: a mention reaches only someone shown. + let hello = "[[message]]\nround = 0\nfrom = \"@libby:gamecult.org\"\nname = \"Libby\"\nroom = \"#minds:gamecult.org\"\nsays = \"hello all\"\n"; + let plan = |dir: &Path, wake: &str, rounds: usize| { + let path = plan(dir, wake, rounds, ""); + std::fs::write(&path, format!("{}{hello}", std::fs::read_to_string(&path).unwrap())).unwrap(); + path + }; let dir = tempfile::tempdir().unwrap(); - let (_, plain) = run_plan(&plan(dir.path(), "\"ruled\"", 3, ""), &tagging(false)); + let (_, plain) = run_plan(&plan(dir.path(), "\"ruled\"", 3), &tagging(false)); let addressed = &plain["metrics"]["mind_addressed_wakes"]; assert_eq!(addressed["mention_or_reply"].as_u64(), Some(0), "an @id in the words tags no one: {addressed}"); let dir = tempfile::tempdir().unwrap(); - let (_, tagged) = run_plan(&plan(dir.path(), "\"ruled\"", 3, ""), &tagging(true)); + let (_, tagged) = run_plan(&plan(dir.path(), "\"ruled\"", 3), &tagging(true)); let addressed = &tagged["metrics"]["mind_addressed_wakes"]; let libby_mind_wakes = turns(&tagged).iter().filter(|(_, who, why)| who == "Libby" && why == "addressed_by_mind").count(); assert_eq!(addressed["mention_or_reply"].as_u64().unwrap() as usize, libby_mind_wakes, "{addressed}"); // Under humans_pace a name or an @ in the words wakes no one; the structured mention does. let dir = tempfile::tempdir().unwrap(); - let path = plan(dir.path(), "{ humans_pace = 4 }", 3, ""); + let path = plan(dir.path(), "{ humans_pace = 4 }", 3); let opening = "says = \"good afternoon, everyone\"\n"; std::fs::write(&path, std::fs::read_to_string(&path).unwrap().replace(opening, &format!("{opening}mentions = [\"{TOBIAH}\"]\n"))).unwrap(); let woken_libby = |model: &Scripted| turns(&run_plan(&path, model).1).iter().any(|(_, who, _)| who == "Libby"); @@ -284,14 +292,18 @@ fn a_direct_message_in_one_of_the_plans_rooms_is_refused() { #[test] fn the_mind_run_is_counted_across_her_rooms_and_an_uncounted_run_is_at_the_cap() { - let her = Member { names_from: "test", addressee: Addressee::new(LIBBY, ["libby"]), entry: CastEntry { id: LIBBY.into(), name: "Libby".into(), state: PathBuf::new(), rooms: vec![], own_rooms: vec![] }, state: Value::Null, rooms: vec!["#a:x".into(), "#b:x".into()] }; - let cast = vec![TOBIAH.to_owned(), LIBBY.to_owned(), "@kiko:x".to_owned()]; + let her = Member { names_from: "test", addressee: Addressee::new("@kiko:x", ["kiko"]), entry: CastEntry { id: "@kiko:x".into(), name: "Kiko".into(), state: PathBuf::new(), rooms: vec![], own_rooms: vec![] }, state: Value::Null, rooms: vec!["#a:x".into(), "#b:x".into()] }; + let cast = vec![TOBIAH.to_owned(), LIBBY.to_owned(), "@kiko:x".to_owned(), "@other:x".to_owned()]; let line = |from: &str, room: &str| Line { from: from.into(), name: String::new(), room: room.into(), at_ms: 0, says: "hi".into(), mentions: vec![], dm_to: None, follow_up: false, reply_to: None, new: false }; - let lines = [line("@meta:x", "#a:x"), line(TOBIAH, "#a:x"), line("@kiko:x", "#b:x"), line(TOBIAH, "#b:x"), line("@meta:x", "#c:x")]; + let lines = [line("@meta:x", "#a:x"), line(TOBIAH, "#a:x"), line("@other:x", "#b:x"), line(TOBIAH, "#b:x"), line("@meta:x", "#c:x")]; assert_eq!(mind_runs(&lines, &cast, &her), vec![0, 0, 1, 2, 3], "one run across #a and #b; a room she is not in does not break it"); + // Soul's case: Meta chatting in #eureka does not end a loop in #minds; a word from Meta in #minds does. + let kiko = Member { rooms: vec!["#minds:x".into(), "#eureka:x".into()], ..her }; + let lines = [line(TOBIAH, "#minds:x"), line(LIBBY, "#minds:x"), line("@meta:x", "#eureka:x"), line(TOBIAH, "#minds:x"), line("@meta:x", "#minds:x"), line(LIBBY, "#minds:x")]; + assert_eq!(mind_runs(&lines, &cast, &kiko), vec![0, 1, 2, 2, 3, 0]); assert_eq!(LineFacts::default().mind_run, usize::MAX, "fail-safe: an uncounted run is at the cap"); - let tagged = Line { mentions: vec![LIBBY.into()], ..line(TOBIAH, "#a:x") }; - assert_eq!(wakes(WakePolicy::HumansPace(4), &her.addressee, &tagged.delivery(0, LIBBY, &[]), Speaker::Mind, LineFacts::default()), None); + let tagged = Line { mentions: vec!["@kiko:x".into()], ..line(TOBIAH, "#a:x") }; + assert_eq!(wakes(WakePolicy::HumansPace(4), &kiko.addressee, &tagged.delivery(0, "@kiko:x", &[]), Speaker::Mind, LineFacts::default()), None); } #[test] @@ -333,3 +345,72 @@ fn a_scripted_direct_message_reaches_and_wakes_only_its_recipient() { let harness = Harness { instance: "eureka".into(), persona: None, model: Some(&model), tuning: dir.path().join("persona-tuning.toml") }; assert!(format!("{:#}", simulate(&harness, &path).unwrap_err()).contains("name its recipient"), "a direct message without a recipient is refused"); } + +#[test] +fn the_turn_is_in_the_room_of_the_line_that_woke_her() { + let dir = tempfile::tempdir().unwrap(); + cast(dir.path()); + let path = dir.path().join("plan.toml"); + let line = |round: usize, from: &str, room: &str, says: &str| format!("[[message]]\nround = {round}\nfrom = \"{from}\"\nname = \"X\"\nroom = \"{room}\"\nsays = \"{says}\"\n"); + // Meta speaks in Tobiah's own room, then Libby says something in #minds after it: Tobiah's turn is in his room. + std::fs::write( + &path, + format!( + "rounds = 1\nseed = 11\nwake = {{ humans_pace = 4 }}\nbeat_s = 0\nstart = \"2026-11-20T15:00:00Z\"\nrooms = [\"#minds:gamecult.org\", \"#tobiah:gamecult.org\"]\noperators = [\"@meta:gamecult.org\"]\n[[cast]]\nid = \"{TOBIAH}\"\nname = \"Tobiah\"\nstate = \"tobiah.json\"\nown_rooms = [\"#tobiah:gamecult.org\"]\n[[cast]]\nid = \"{LIBBY}\"\nname = \"Libby\"\nstate = \"libby.json\"\n{}{}", + line(0, "@meta:gamecult.org", "#tobiah:gamecult.org", "quiet in here"), + line(0, LIBBY, "#minds:gamecult.org", "hello all") + ), + ) + .unwrap(); + let (_, run) = run_plan(&path, &silent()); + assert_eq!(run["turns"][0]["room"], "#tobiah:gamecult.org", "{}", run["turns"]); +} + +/// Each persona's turns, as (round, room), in order. +fn turns_by_persona(run: &Value) -> BTreeMap> { + let mut out: BTreeMap> = BTreeMap::new(); + for turn in run["turns"].as_array().unwrap() { + out.entry(turn["persona"].as_str().unwrap().to_owned()).or_default().push((turn["round"].as_u64().unwrap(), turn["room"].as_str().unwrap().to_owned())); + } + out +} + +#[test] +fn soul_f5_one_turn_a_round_and_a_room_that_woke_her_waits_for_the_next() { + let dir = tempfile::tempdir().unwrap(); + let path = plan(dir.path(), "\"ruled\"", 2, ""); + let line = |room: &str, dm: bool, says: &str| format!("[[message]]\nround = 1\nfrom = \"@meta:gamecult.org\"\nname = \"Meta\"\nroom = \"{room}\"\n{}says = \"{says}\"\n", if dm { "dm = true\nto = \"@libby:gamecult.org\"\n" } else { "" }); + let opening = "[[message]]\nfrom = \"@meta:gamecult.org\"\nname = \"Meta\"\nroom = \"#minds:gamecult.org\"\nsays = \"good afternoon, everyone\"\n"; + let text = std::fs::read_to_string(&path).unwrap().replace(opening, &format!("{}{}", line("!dm-libby:gamecult.org", true, "just you: how are you, really?"), line("#minds:gamecult.org", false, "Libby, how was the gig?"))); + std::fs::write(&path, text).unwrap(); + let (_, run) = run_plan(&path, &silent()); + // Her earliest waking line is the direct message: round 1 is there; #minds, still unseen, wakes her in round 2. + assert_eq!(turns_by_persona(&run)["Libby"], vec![(1, "!dm-libby:gamecult.org".to_owned()), (2, "#minds:gamecult.org".to_owned())], "{}", run["turns"]); + // Each turn read its own room's line, and no other's. + for turn in run["turns"].as_array().unwrap().iter().filter(|turn| turn["persona"] == "Libby") { + let report = turn["report"].to_string(); + let (own, other) = if turn["room"] == "#minds:gamecult.org" { ("how was the gig", "how are you, really") } else { ("how are you, really", "how was the gig") }; + assert!(report.contains(own) && !report.contains(other), "{}: {report}", turn["room"]); + } +} + +#[test] +fn soul_f5_three_rooms_open_at_once_take_three_rounds_not_one() { + for wake in ["\"ruled\"", "{ names_with_cap = 2 }"] { + let dir = tempfile::tempdir().unwrap(); + let path = plan(dir.path(), wake, 6, ""); + let more = |room: &str, says: &str| format!("[[message]]\nfrom = \"@meta:gamecult.org\"\nname = \"Meta\"\nroom = \"{room}\"\nsays = \"{says}\"\n"); + let text = std::fs::read_to_string(&path) + .unwrap() + .replace("rooms = [\"#minds:gamecult.org\"]", "rooms = [\"#minds:gamecult.org\", \"#lab:gamecult.org\", \"#ops:gamecult.org\"]") + .replace("says = \"good afternoon, everyone\"\n", &format!("says = \"good afternoon, everyone\"\n{}{}", more("#lab:gamecult.org", "lab is open"), more("#ops:gamecult.org", "ops is open"))); + std::fs::write(&path, text).unwrap(); + let (_, run) = run_plan(&path, &namers()); + for (who, turns) in turns_by_persona(&run) { + let rounds: Vec = turns.iter().map(|(round, _)| *round).collect(); + assert!(rounds.windows(2).all(|pair| pair[0] < pair[1]), "{wake}: {who} took two turns in one round: {turns:?}"); + let rooms: Vec<&str> = turns.iter().take(3).map(|(_, room)| room.as_str()).collect(); + assert_eq!(rooms, ["#minds:gamecult.org", "#lab:gamecult.org", "#ops:gamecult.org"], "{wake}: {who} answers each room in the order it opened"); + } + } +} diff --git a/crates/mind-body/src/projection/tests.rs b/crates/mind-body/src/projection/tests.rs index 5717c16..73f77fb 100644 --- a/crates/mind-body/src/projection/tests.rs +++ b/crates/mind-body/src/projection/tests.rs @@ -187,12 +187,32 @@ fn mission_pressure_private_notes_and_candidate_actions_never_reach_a_packet() { } } +const DERU: &str = "@deru:gamecult.org"; +const DM_DERU: &str = "!dm-deru:gamecult.org"; + +/// The line the `dm-secret` memory renders as over seeds 1 to 40, if any. +fn dm_secret(state: &Value, room: &Room) -> Option { + (1..=40).find_map(|seed| packet_of(TurnKind::Chat, state, room, &History::default(), seed).context.lines().find(|line| line.starts_with("- memory [dm-secret]")).map(str::to_owned)) +} + #[test] -fn a_direct_message_memory_stays_in_its_room() { - let shown = |room: Option<&str>| (1..=40).any(|seed| ids(&packet_of(TurnKind::Chat, &state(), &Room { here: room.map(str::to_owned), ..chat_room() }, &History::default(), seed)).iter().any(|id| id == "dm-secret")); - assert!(!shown(Some("#swarm:gamecult.org")), "a public room never sees the direct message's memory"); - assert!(!shown(None)); - assert!(shown(Some("!dm-deru:gamecult.org")), "its own room may"); +fn a_direct_message_memory_is_private_about_its_partner() { + // Its `room:` tag marks it private; its target names Deru by his full Matrix id, as an unbonded person is keyed. + let mut named = state(); + named["thoughtMemory"]["memories"][2]["target"]["id"] = DERU.into(); + let with_deru = Room { messages: vec![message(DM_DERU, DERU, "Deru", "so, the move", 2, true)], here: Some(DM_DERU.into()), direct: vec![DM_DERU.into()], ..Room::default() }; + assert_eq!(dm_secret(&named, &with_deru).as_deref(), Some("- memory [dm-secret]: Deru told her about the move, privately."), "plain in the direct message with exactly him"); + assert_eq!(dm_secret(&named, &chat_room()).as_deref(), Some("- memory [dm-secret]: she knows privately: Deru told her about the move, privately."), "framed where he is not"); + let deru_in_public = Room { messages: vec![message("#swarm:gamecult.org", DERU, "Deru", "hi all", 2, false)], ..chat_room() }; + assert_eq!(dm_secret(&named, &deru_in_public), None, "left out where he is, in public"); + // Naming no person, it concerns the direct message's partner, whom no other room can tell apart: left out + // everywhere but that direct message, and there still only the two of them. + let mut partner = state(); + partner["thoughtMemory"]["memories"][2].as_object_mut().unwrap().remove("target"); + assert!(dm_secret(&partner, &with_deru).is_some_and(|line| !line.contains("privately:"))); + assert_eq!(dm_secret(&partner, &chat_room()), None); + let three = Room { messages: [with_deru.messages.clone(), vec![message(DM_DERU, "@libby:gamecult.org", "Libby", "me too", 1, true)]].concat(), ..with_deru.clone() }; + assert_eq!(dm_secret(&partner, &three), None, "a third person in the direct message"); } #[test] @@ -665,7 +685,7 @@ impl PersonaSource for Stored { } fn request(dir: &std::path::Path, renders: Option, judge_against: Option) -> Request { - Request { instance: INSTANCE.into(), kind: TurnKind::Chat, state: None, room: Some("#swarm:gamecult.org".into()), seed: 5, renders, judge_against, operators: operators(), minds: minds(), own_sender: OWN.into(), tuning: dir.join(TUNING_FILE), through: Through::Projector, last_heard: vec![], recent: vec![] } + Request { instance: INSTANCE.into(), kind: TurnKind::Chat, state: None, room: Some("#swarm:gamecult.org".into()), seed: 5, renders, judge_against, operators: operators(), minds: minds(), own_sender: OWN.into(), tuning: dir.join(TUNING_FILE), through: Through::Projector, last_heard: vec![], recent: vec![], own_rooms: vec![] } } #[test] @@ -1412,3 +1432,141 @@ fn a_room_is_named_by_the_key_the_tail_carries_and_a_public_rooms_id_is_reported let by_id = project(&organs, &Request { room: Some("!1:gamecult.org".into()), ..request(dir.path(), None, None) }, now()).unwrap(); assert!(by_id["room"]["why"].as_str().unwrap().contains("named by its alias"), "{}", by_id["room"]); } + +/// The test state with Kiko's bond and the memory about Libby marked private, and the operator's bond not. +fn marked() -> Value { + let mut marked = state(); + marked["affect"]["socialBonds"][1]["extensions"] = json!({ "privacy": "private" }); + marked["thoughtMemory"]["memories"][1]["tags"] = json!(["private"]); + marked +} + +#[test] +fn a_private_marking_frames_a_fact_about_someone_absent_and_an_unmarked_one_renders_plainly() { + // Libby is not here; Kiko and the operator are not either: only Meta speaks in #minds. + let public = Room { messages: vec![message("#minds:gamecult.org", OPERATOR, "Meta", "how is everyone?", 2, false)], here: Some("#minds:gamecult.org".into()), ..Room::default() }; + let shown = |seed| packet_of(TurnKind::Chat, &marked(), &public, &History::default(), seed).context; + let memory = (1..=40).map(shown).find(|context| context.contains("[libby-sounds]")).expect("the memory about Libby is selected on some seed"); + assert!(memory.contains("- memory [libby-sounds]: she knows privately: Libby laughed at the door fix."), "{memory}"); + let context = shown(1); + assert!(context.contains("The operator rules on what the work is for.") && !context.contains("knows privately: The operator"), "an unmarked bond is plain: {context}"); +} + +#[test] +fn a_private_fact_about_someone_present_in_public_is_left_out_and_plain_in_a_direct_message_with_them() { + // Kiko is here, in #minds: her marked bond's summary is left out, and no hint of it remains. + let public = Room { messages: vec![message("#minds:gamecult.org", "@kiko:gamecult.org", "Kiko", "afternoon", 2, false)], here: Some("#minds:gamecult.org".into()), ..Room::default() }; + let packet = packet_of(TurnKind::Chat, &marked(), &public, &History::default(), 1); + let line = packet.context.lines().find(|line| line.starts_with("- bond [bond-kiko]")).unwrap_or_else(|| panic!("{}", packet.context)).to_owned(); + assert!(!line.contains("massaging the pipeline") && !line.contains("privately"), "{line}"); + // In a direct message with Kiko it is plain. + let dm = Room { messages: vec![message("!dm-kiko:gamecult.org", "@kiko:gamecult.org", "Kiko", "hey", 2, true)], here: Some("!dm-kiko:gamecult.org".into()), direct: vec!["!dm-kiko:gamecult.org".into()], ..Room::default() }; + let packet = packet_of(TurnKind::Chat, &marked(), &dm, &History::default(), 1); + assert!(packet.context.contains("Kiko pokes her to stop massaging the pipeline.") && !packet.context.contains("privately"), "{}", packet.context); +} + +/// The first context over seeds 1 to 60 that carries `marker`, and its lines that do. +fn lines_with(state: &Value, room: &Room, kind: TurnKind, marker: &str) -> Option> { + (1..=60).map(|seed| packet_of(kind, state, room, &History::default(), seed).context).find(|context| context.contains(marker)).map(|context| context.lines().filter(|line| line.contains(marker)).map(str::to_owned).collect()) +} + +#[test] +fn soul_q5a_a_private_memory_naming_its_person_by_an_about_tag_is_never_plain_in_public() { + let mut marked = state(); + marked["thoughtMemory"]["memories"] = json!([{ "id": "secret-a", "summary": "SECRETA Libby told me her diagnosis.", "createdAt": hours_ago(20), "status": "crystallized", "intensity": 1.0, "tags": ["private", "about:libby"] }]); + let public = Room { messages: vec![message("#minds:gamecult.org", OPERATOR, "Meta", "how is Libby doing?", 2, false)], here: Some("#minds:gamecult.org".into()), ..Room::default() }; + // Libby is not here: framed as known privately. + assert_eq!(lines_with(&marked, &public, TurnKind::Chat, "SECRETA"), Some(vec!["- memory [secret-a]: she knows privately: SECRETA Libby told me her diagnosis.".to_owned()])); + let present = Room { messages: vec![message("#minds:gamecult.org", "@libby:gamecult.org", "Libby", "hi all", 2, false)], ..public.clone() }; + assert_eq!(lines_with(&marked, &present, TurnKind::Chat, "SECRETA"), None, "left out to her face"); + // Naming no one, it is private about everyone: left out of public rooms and direct messages, plain in her own room. + marked["thoughtMemory"]["memories"][0]["tags"] = json!(["private"]); + assert_eq!(lines_with(&marked, &public, TurnKind::Chat, "SECRETA"), None); + let dm = Room { messages: vec![message("!dm-libby:gamecult.org", "@libby:gamecult.org", "Libby", "hey", 2, true)], here: Some("!dm-libby:gamecult.org".into()), direct: vec!["!dm-libby:gamecult.org".into()], ..Room::default() }; + assert_eq!(lines_with(&marked, &dm, TurnKind::Chat, "SECRETA"), None); + let own = Room { messages: vec![message("#eureka:gamecult.org", OPERATOR, "Meta", "morning", 2, false)], here: Some("#eureka:gamecult.org".into()), own: vec!["#eureka:gamecult.org".into()], ..Room::default() }; + assert_eq!(lines_with(&marked, &own, TurnKind::Chat, "SECRETA"), Some(vec!["- memory [secret-a]: SECRETA Libby told me her diagnosis.".to_owned()])); +} + +#[test] +fn soul_q5b_every_pool_honours_the_mark() { + let mut marked = state(); + let private = json!({ "privacy": "private" }); + let libby = json!({ "id": "libby", "kind": "person" }); + marked["thoughtMemory"]["incubation"] = json!([{ "id": "w-secret", "summary": "SECRETB Whether Libby's relapse is why she went quiet.", "createdAt": hours_ago(20), "status": "active", "intensity": 1.0, "extensions": private, "target": libby }]); + marked["affect"]["needs"] = json!([{ "id": "need-secret", "label": "SECRETN to keep Libby's relapse quiet", "intensity": 1.0, "status": "active", "extensions": private, "target": libby }]); + marked["affect"]["doctrineStances"] = json!([{ "id": "stance-secret", "summary": "SECRETS Libby should not be on call.", "intensity": 1.0, "status": "active", "extensions": private, "target": libby }]); + let present = Room { messages: vec![message("#minds:gamecult.org", "@libby:gamecult.org", "Libby", "hi all", 2, false)], here: Some("#minds:gamecult.org".into()), ..Room::default() }; + let absent = Room { messages: vec![message("#minds:gamecult.org", OPERATOR, "Meta", "hi all", 2, false)], ..present.clone() }; + for marker in ["SECRETB", "SECRETN", "SECRETS"] { + assert_eq!(lines_with(&marked, &present, TurnKind::Chat, marker), None, "{marker} is left out with Libby here"); + let framed = lines_with(&marked, &absent, TurnKind::Chat, marker).unwrap_or_else(|| panic!("{marker} is selected on some seed")); + assert!(framed.iter().all(|line| line.contains(&format!("she knows privately: {marker}"))), "{framed:?}"); + } + let packet = (1..=60).map(|seed| packet_of(TurnKind::Chat, &marked, &absent, &History::default(), seed)).find(|packet| packet.context.contains("SECRETB")).unwrap(); + assert!(packet.private.iter().any(|words| words.starts_with("SECRETB")), "the Interpreter is shown what is private: {:?}", packet.private); +} + +#[test] +fn soul_q5c_a_direct_message_with_a_third_person_is_not_a_direct_message_with_her() { + let mut marked = state(); + marked["affect"]["socialBonds"][0]["extensions"] = json!({ "privacy": "private" }); + let room = "!group-dm:gamecult.org"; + let group = Room { messages: vec![message(room, "@kiko:gamecult.org", "Kiko", "hey", 3, true), message(room, "@libby:gamecult.org", "Libby", "hey both", 2, true)], here: Some(room.into()), direct: vec![room.into()], ..Room::default() }; + let packet = packet_of(TurnKind::Chat, &marked, &group, &History::default(), 1); + let bond = packet.context.lines().find(|line| line.starts_with("- bond [bond-libby]")).unwrap_or_else(|| panic!("{}", packet.context)).to_owned(); + assert!(!bond.contains("holds the sounds") && !bond.contains("privately"), "left out before Kiko: {bond}"); + let alone = Room { messages: vec![message(room, "@libby:gamecult.org", "Libby", "hey", 2, true)], ..group }; + assert!(packet_of(TurnKind::Chat, &marked, &alone, &History::default(), 1).context.contains("Libby holds the sounds"), "plain with Libby alone"); +} + +#[test] +fn what_she_said_in_a_direct_message_stays_in_it() { + let said = |room: &str| super::select::Said { id: "said-dm".into(), room: room.into(), text: "SAIDDM I'm tired of the pipeline.".into(), at: now() - chrono::Duration::minutes(5) }; + let history = History { said: vec![said(DM_DERU)], ..History::default() }; + let shown = |room: &Room| (1..=60).any(|seed| packet_of(TurnKind::Chat, &state(), room, &history, seed).context.contains("SAIDDM")); + assert!(!shown(&chat_room()), "never in a public packet"); + let with_deru = Room { messages: vec![message(DM_DERU, DERU, "Deru", "and?", 2, true)], here: Some(DM_DERU.into()), direct: vec![DM_DERU.into()], ..Room::default() }; + assert!(shown(&with_deru), "in its own direct message"); + let public = History { said: vec![said("#swarm:gamecult.org")], ..History::default() }; + assert!((1..=60).any(|seed| packet_of(TurnKind::Chat, &state(), &chat_room(), &public, seed).context.contains("SAIDDM")), "a public line is shared"); +} + +#[test] +fn soul_f6_a_mind_is_one_person_by_her_handle_or_her_full_matrix_id() { + let kiko_here = Room { messages: vec![message("#minds:gamecult.org", "@kiko:gamecult.org", "Kiko", "hi all", 2, false)], here: Some("#minds:gamecult.org".into()), ..Room::default() }; + let kiko_dm = Room { messages: vec![message("!dm-kiko:gamecult.org", "@kiko:gamecult.org", "Kiko", "hey", 2, true)], here: Some("!dm-kiko:gamecult.org".into()), direct: vec!["!dm-kiko:gamecult.org".into()], ..Room::default() }; + for (spelling, memory) in [ + ("target, handle", json!({ "target": { "id": "kiko", "kind": "person" }, "tags": ["private"] })), + ("target, full id", json!({ "target": { "id": "@kiko:gamecult.org", "kind": "person" }, "tags": ["private"] })), + ("about, handle", json!({ "tags": ["private", "about:kiko"] })), + ("about, full id", json!({ "tags": ["private", "about:@kiko:gamecult.org"] })), + ] { + let mut marked = state(); + let mut item = json!({ "id": "kiko-secret", "summary": "KIKOSECRET she is leaving.", "createdAt": hours_ago(3), "status": "crystallized", "intensity": 1.0 }); + for (key, value) in memory.as_object().unwrap() { + item[key] = value.clone(); + } + marked["thoughtMemory"]["memories"] = json!([item]); + assert_eq!(lines_with(&marked, &kiko_here, TurnKind::Chat, "KIKOSECRET"), None, "{spelling}: left out with Kiko here"); + assert_eq!(lines_with(&marked, &kiko_dm, TurnKind::Chat, "KIKOSECRET"), Some(vec!["- memory [kiko-secret]: KIKOSECRET she is leaving.".to_owned()]), "{spelling}: plain with Kiko alone"); + } + // A bond keyed by her full Matrix id is her bond, and the operator's full id is `operator`. + let mut full = state(); + full["affect"]["socialBonds"][1]["object"]["id"] = "@kiko:gamecult.org".into(); + full["affect"]["socialBonds"][2]["object"]["id"] = OPERATOR.into(); + let both = Room { messages: vec![message("#minds:gamecult.org", "@kiko:gamecult.org", "Kiko", "hi", 3, false), message("#minds:gamecult.org", OPERATOR, "Meta", "hi", 2, false)], ..kiko_here }; + let context = packet_of(TurnKind::Chat, &full, &both, &History::default(), 1).context; + assert!(context.contains("- bond [bond-kiko] Kiko") && context.contains("- bond [bond-operator] Meta, the operator"), "{context}"); +} + +#[test] +fn soul_f7_a_value_carrying_a_mark_is_refused_not_rendered() { + let mut marked = state(); + marked["values"] = json!([{ "id": "v-secret", "label": "SECRETVALUE", "priority": 0.9, "summary": "Never tell Kiko.", "extensions": { "privacy": "private" } }, { "id": "coherence", "label": "Coherence", "priority": 0.9, "summary": "Coherence over velocity." }]); + let own = Room { messages: vec![message("#eureka:gamecult.org", OPERATOR, "Meta", "morning", 2, false)], here: Some("#eureka:gamecult.org".into()), own: vec!["#eureka:gamecult.org".into()], ..Room::default() }; + for room in [chat_room(), own] { + assert_eq!(lines_with(&marked, &room, TurnKind::Chat, "SECRETVALUE"), None); + } + assert!(lines_with(&marked, &chat_room(), TurnKind::Chat, "Coherence").is_some(), "an unmarked value still renders"); +} diff --git a/crates/mind-body/src/projection/tuning.rs b/crates/mind-body/src/projection/tuning.rs index 24a4364..a63c90d 100644 --- a/crates/mind-body/src/projection/tuning.rs +++ b/crates/mind-body/src/projection/tuning.rs @@ -20,14 +20,11 @@ pub const TUNING_FILE: &str = "persona-tuning.toml"; /// The Persona stage's setting (map section 2): she continues the Projector's paragraph, her interior, with speech only /// where her thought moves her to it, quoted (map section 5.5, invariant 5). It is not a reply to the room. -const PERSONA_GUIDANCE: &str = "Continue her inner stream where the paragraph leaves off: her own next thoughts, in the first person, in her own words. This is not a message to the room. If she means to say something aloud, she thinks it as she would, what and to whom; whether anything is said, and what, is decided after her. In a busy room most moments pass with nothing said."; +const PERSONA_GUIDANCE: &str = "Continue her inner stream where the paragraph leaves off: her own next thoughts, in the first person, in her own words. This is not a message to the room. When she means to say something aloud, she writes the very words she would type, in her own voice and addressed as she would address them, never a description of what she will say. Whether she says them now is decided after her. In a busy room most moments pass with nothing said."; /// The setting the Projector renders for. No task: in the Persona-only shape nothing is work she owes. const GUIDANCE: &str = "This person is a Mind of the GameCult swarm. She lives in its chat rooms among the operator, the other Minds and whoever drops by. Render the moment as she lives it: who is here and how they sit with her, what she carries, what she wants. What was said reaches her word for word after this stream, so never retell or summarise it: render what it stirs in her and what she makes of the people who said it. Render the conversation as it stands. Do not weigh options or list what she might do or say; what she does is hers to decide. Leave out whatever the context does not carry: an absence is not part of her moment. Use each person's pronouns as given."; -/// The Interpreter's speech step (map section 4, C3b): its scope and rules beside Ghostlight's membrane. It has no tools; -/// what the membrane calls the gap tool is the `gaps` list of the JSON. -const INTERPRETER_GUIDANCE: &str = "This step decides only what she says aloud in chat this turn, from her prose. No tool is available in this step: report every translation and every gap in the JSON object the contract describes, and return that object alone. A line is speech only when her prose shows her choosing to say it now, to the room or to someone in it. Words she recalls, quotes, or heard from someone else are never her speech, even when her prose repeats them. Thinking about saying something, deciding to stay quiet, or saying that she says nothing, is not speech. Write each line as she would type it, in her voice, without @handles or quotation marks around it, and copy into source_quote the exact words of her prose the line rests on, character for character. Name in mentions, by Matrix id from the people listed, only someone she addresses directly; in reply_to, the Matrix id of the person whose message she answers, when she answers one. The room is one of the rooms listed. An empty say list is the usual answer in a busy room."; /// The context room the fixed slots need beside the identity: the hour and the mood lines always fit. const FIXED_ROOM: usize = 256; @@ -177,17 +174,16 @@ impl Default for ProjectorTuning { } } -/// The Interpreter's speech call: its model and its guidance. +/// The Interpreter's speech call: its model. Its prompt is code (`interpret`): what it may decide is not a knob. #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(default, deny_unknown_fields)] pub struct InterpreterTuning { pub model: String, - pub guidance: String, } impl Default for InterpreterTuning { fn default() -> Self { - Self { model: "claude-sonnet-5-5".into(), guidance: INTERPRETER_GUIDANCE.into() } + Self { model: "claude-sonnet-5-5".into() } } } @@ -290,7 +286,6 @@ impl Tuning { ("select.group_bytes", select.group_bytes), ("projector.guidance", self.projector.guidance.len()), ("persona.guidance", self.persona.guidance.len()), - ("interpreter.guidance", self.interpreter.guidance.len()), ] { if bytes > PART_BYTES_MAX { bail!("{name} must be at most {PART_BYTES_MAX} bytes, not {bytes}: the prompt must fit the connector's frame"); diff --git a/crates/mind-body/tests/public_surface.txt b/crates/mind-body/tests/public_surface.txt index 60b7234..e2049ed 100644 --- a/crates/mind-body/tests/public_surface.txt +++ b/crates/mind-body/tests/public_surface.txt @@ -249,7 +249,7 @@ mind_body::projection: pub use select :: TurnKind ; mind_body::projection: pub use tuning :: { TUNING_FILE , TUNING_ROOT } ; mind_body::projection: struct HuginnPersonaSource pub-fields[] mind_body::projection: struct Organs< 'a > pub-fields[persona: Option < & 'a dyn PersonaSource >, chat: Option < & 'a dyn MouthReader >, addressing: Option < & 'a dyn HeartbeatView >, model: Option < & 'a dyn Model >] -mind_body::projection: struct Request pub-fields[instance: String, kind: TurnKind, state: Option < Value >, room: Option < String >, seed: u64, renders: Option < usize >, judge_against: Option < Value >, operators: Vec < String >, minds: Vec < String >, own_sender: String, tuning: PathBuf, through: Through, last_heard: Vec < (String , u64) >, recent: Vec < Vec < String > >] +mind_body::projection: struct Request pub-fields[instance: String, kind: TurnKind, state: Option < Value >, room: Option < String >, seed: u64, renders: Option < usize >, judge_against: Option < Value >, operators: Vec < String >, minds: Vec < String >, own_sender: String, tuning: PathBuf, through: Through, last_heard: Vec < (String , u64) >, recent: Vec < Vec < String > >, own_rooms: Vec < String >] mind_body::projection::harness: fn batch (harness : & Harness , plan_path : & Path) -> Result < String > mind_body::projection::harness: fn fixture_request (harness : & Harness , fixture : & Fixture , state : Option < Value > , seed : u64 , renders : Option < usize > , through : Through) -> Request mind_body::projection::harness: fn state_file (path : & Path , instance : & str) -> Result < Value > @@ -281,6 +281,7 @@ mind_body::projection::select: impl Draw mind_body::projection::select: impl Lens mind_body::projection::select: impl Lines mind_body::projection::select: impl People < '_ > +mind_body::projection::select: impl RoomKind mind_body::projection::simulate: fn simulate (harness : & Harness , plan_path : & Path) -> Result < String > mind_body::projection::simulate: impl HeartbeatView for Names < '_ > mind_body::projection::simulate: impl MouthReader for View < '_ > @@ -295,7 +296,7 @@ mind_body::projection::tuning: impl Default for ProjectorTuning mind_body::projection::tuning: impl Default for SelectTuning mind_body::projection::tuning: impl Default for Tuning mind_body::projection::tuning: impl Tuning -mind_body::projection::tuning: struct InterpreterTuning # [derive (Clone , Debug , PartialEq , Serialize , Deserialize)] pub-fields[model: String, guidance: String] +mind_body::projection::tuning: struct InterpreterTuning # [derive (Clone , Debug , PartialEq , Serialize , Deserialize)] pub-fields[model: String] mind_body::projection::tuning: struct LensWeights # [derive (Clone , Debug , PartialEq , Serialize , Deserialize)] pub-fields[body_and_hour: f64, person_present: f64, unresolved_want: f64, memory_surfacing: f64, wondering: f64] mind_body::projection::tuning: struct Loaded # [derive (Clone , Debug , PartialEq , Serialize)] pub-fields[tuning: Tuning, source: & 'static str, sha256: String] mind_body::projection::tuning: struct PersonaTuning # [derive (Clone , Debug , PartialEq , Serialize , Deserialize)] pub-fields[model: String, guidance: String, words: usize]