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..2f07796 100644 --- a/crates/mind-body/src/projection/fixtures/golden-chat.txt +++ b/crates/mind-body/src/projection/fixtures/golden-chat.txt @@ -6,11 +6,11 @@ Eureka (she/her). Dry, direct, almost feral; zeal aimed at revealing. --- context - now: Thursday 19 November, 14:05 UTC - mood: lighter, more settled than middling -- bond [bond-kiko] Kiko — sparring partner: fair trust, heavy friction. Kiko pokes her to stop massaging the pipeline. -- bond [bond-libby] Libby — collaborator: fair trust, a little friction. Libby holds the sounds and teases her about the pipeline. +- bond [bond-kiko] Kiko — sparring partner: fair trust, heavy friction. She knows privately: Kiko pokes her to stop massaging the pipeline. +- bond [bond-libby] Libby — collaborator: fair trust, a little friction. She knows privately: Libby holds the sounds and teases her about the pipeline. - 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 [libby-sounds]: she knows privately: Libby laughed at the door fix. - memory [t1-m0]: The heartbeat stalled at noon. - memory [curse]: Her curse is the knife. The same drive makes her good and will lead her wrong. - need [need-relatedness]: company, strong 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..b719a04 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: quotation marks mean +/// nothing to code, 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", "known privately", "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..6578a95 100644 --- a/crates/mind-body/src/projection/select.rs +++ b/crates/mind-body/src/projection/select.rs @@ -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. @@ -222,10 +245,13 @@ 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 messages she heard this turn, without speakers or rooms: what an echo is measured against. + pub bodies: Vec, } /// What the messages to her cost past the caps: bytes over the stimulus and heard caps, the older messages to her the @@ -481,6 +507,12 @@ fn candidates(inputs: &Inputs, tuning: &Tuning, present: &BTreeSet, touc if body.is_empty() { continue; } + let person = text(memory, &["target", "id"]).to_lowercase(); + let about_someone = text(memory, &["target", "kind"]) == "person" && !person.is_empty(); + let body = match privately(inputs, &person) { + Some(forms) if about_someone => format!("{} knows privately: {body}", forms.subj), + _ => body, + }; 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. @@ -813,7 +845,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, private: Option) -> 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 +854,10 @@ 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 private { + Some(forms) if !summary.is_empty() => format!("{} knows privately: {summary}", forms.cap_subj), + _ => summary, + }; match (feel.is_empty(), summary.is_empty()) { (true, true) => {} (true, false) => { @@ -893,9 +929,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 inputs.room.direct.iter().any(|direct| direct == 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 +1060,22 @@ fn pronoun_line(inputs: &Inputs, tuning: &Tuning) -> Option { (!parts.is_empty()).then(|| clip(&format!("- pronouns: {}", parts.join("; ")), ALSO_HERE_BYTES)) } +/// Whether what she knows of `person` (a bond's or memory's id) is framed as known privately here: everywhere but a +/// direct message with that person. Structural, never a reading of the fact: whether a line fits its audience stays the +/// Interpreter's judgement. Her pronouns when it is. +fn privately(inputs: &Inputs, person: &str) -> Option { + let room = turn_room(inputs)?; + let partner = room_kind(inputs, room) == RoomKind::Direct && inputs.room.messages.iter().chain(&inputs.room.tail).any(|line| line.room == room && inputs.people.person_of(&line.sender) == person); + (!partner).then(|| forms(inputs.state)) +} + /// 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"; @@ -1076,7 +1112,7 @@ pub(crate) fn select(inputs: &Inputs, tuning: &Tuning) -> Packet { for (id, name) in &present { match bonds.iter().find(|bond| live(bond) && text(bond, &["object", "id"]).to_lowercase() == *id) { Some(bond) if full < tuning.select.people_full => { - let line = bond_line(bond, name, tuning); + let line = bond_line(bond, name, tuning, privately(inputs, id)); if used + line.len() < budget { full += 1; used += line.len() + 1; @@ -1139,5 +1175,5 @@ pub(crate) fn select(inputs: &Inputs, tuning: &Tuning) -> Packet { lines.extend(taken.iter().map(|candidate| candidate.line.clone())); ids.extend(taken.iter().map(|candidate| candidate.id.clone())); 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: inputs.room.messages.iter().map(|line| line.text.clone()).collect() } } diff --git a/crates/mind-body/src/projection/simulate.rs b/crates/mind-body/src/projection/simulate.rs index c29414c..f57d0db 100644 --- a/crates/mind-body/src/projection/simulate.rs +++ b/crates/mind-body/src/projection/simulate.rs @@ -151,15 +151,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,12 +192,13 @@ 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)); @@ -209,14 +219,15 @@ fn woken(lines: &[Line], runs: &[usize], seen: usize, member: &Member, operators } } 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. @@ -348,7 +359,8 @@ fn run(harness: &Harness, plan: &SimFile, members: &mut [Member], repeat: usize) 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(); + // 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()); @@ -369,6 +381,7 @@ 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 names = Names(&member.addressee); @@ -556,8 +569,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..d735f98 100644 --- a/crates/mind-body/src/projection/simulate/tests.rs +++ b/crates/mind-body/src/projection/simulate/tests.rs @@ -243,27 +243,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 +291,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 +344,23 @@ 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"]); +} diff --git a/crates/mind-body/src/projection/tests.rs b/crates/mind-body/src/projection/tests.rs index 5717c16..c89b823 100644 --- a/crates/mind-body/src/projection/tests.rs +++ b/crates/mind-body/src/projection/tests.rs @@ -665,7 +665,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 +1412,13 @@ 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"]); } + +#[test] +fn what_she_knows_of_someone_is_known_privately_except_in_a_direct_message_with_them() { + 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 packet = packet_of(TurnKind::Chat, &state(), &public, &History::default(), 1); + assert!(packet.context.contains("She knows privately: The operator rules on what the work is for."), "{}", packet.context); + let dm = Room { messages: vec![message("!dm-meta:gamecult.org", OPERATOR, "Meta", "how are you?", 2, true)], here: Some("!dm-meta:gamecult.org".into()), direct: vec!["!dm-meta:gamecult.org".into()], ..Room::default() }; + let packet = packet_of(TurnKind::Chat, &state(), &dm, &History::default(), 1); + assert!(packet.context.contains("The operator rules on what the work is for.") && !packet.context.contains("knows privately: The operator"), "{}", packet.context); +} 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]