diff --git a/crates/mind-body/src/connector.rs b/crates/mind-body/src/connector.rs index e0846da..3ca7688 100644 --- a/crates/mind-body/src/connector.rs +++ b/crates/mind-body/src/connector.rs @@ -4,21 +4,11 @@ use chrono::{DateTime, SecondsFormat, Utc}; use model_connector::PlanQuota; -/// A span in the two largest units that fit: `45s`, `12m`, `3h 20m`, `4d 11h`. -fn span(ms: u64) -> String { - let seconds = ms / 1000; - match seconds { - 0..=59 => format!("{seconds}s"), - 60..=3599 => format!("{}m", seconds / 60), - 3600..=86399 => format!("{}h {}m", seconds / 3600, seconds % 3600 / 60), - _ => format!("{}d {}h", seconds / 86400, seconds % 86400 / 3600), - } -} - -/// When a window resets: the UTC time, and how far off it is from `now_ms`. -fn resets(at_unix_ms: u64, now_ms: u64) -> String { +/// When a window resets: the UTC time alone. An instant is true when read again hours later; "in 4d 11h" +/// or "already past" is not. +fn resets(at_unix_ms: u64) -> String { let at = i64::try_from(at_unix_ms).ok().and_then(DateTime::::from_timestamp_millis).map_or_else(|| at_unix_ms.to_string(), |at| at.to_rfc3339_opts(SecondsFormat::Secs, true)); - if at_unix_ms > now_ms { format!("resets at {at} (in {})", span(at_unix_ms - now_ms)) } else { format!("resets at {at} (already past)") } + format!("resets at {at}") } /// The minute a reading was taken, as a UTC time. An instant, not an age: the line stays true when @@ -31,7 +21,7 @@ fn read_at(at_unix_ms: u64) -> String { /// status, when it resets and the minute the reading was taken. Rendered from the readout /// and nothing else, so no number in it is ever a paraphrase; the guidance that /// follows it states the swarm's aim and that nothing enforces it. -pub fn render_plan(windows: &[PlanQuota], now_ms: u64) -> String { +pub fn render_plan(windows: &[PlanQuota], _now_ms: u64) -> String { let guidance = "The swarm aims to have used about 90% of the weekly allowance at reset; nothing enforces it; you and the other Minds set the tempo."; if windows.is_empty() { return format!("Plan usage: unobserved. {guidance}"); @@ -45,10 +35,10 @@ pub fn render_plan(windows: &[PlanQuota], now_ms: u64) -> String { permille / 10, permille % 10, plan.status, - resets(plan.resets_at_unix_ms, now_ms), + resets(plan.resets_at_unix_ms), read_at(plan.observed_at_unix_ms) ), - None => format!("{} expired, {}", plan.window, resets(plan.resets_at_unix_ms, now_ms)), + None => format!("{} expired, {}", plan.window, resets(plan.resets_at_unix_ms)), }) .collect(); format!("Plan usage: {}. {guidance}", rendered.join("; ")) @@ -63,22 +53,15 @@ mod tests { } #[test] - fn a_window_reads_as_a_time_and_spans_not_unix_milliseconds() { + fn a_window_reads_as_a_time_not_unix_milliseconds() { let now = 1_793_307_000_000 - (4 * 86_400 + 11 * 3600 + 30 * 60) * 1000; let line = render_plan(&[window(Some(423), 1_793_307_000_000, now - 385_639_000)], now); - assert!(line.starts_with("Plan usage: five_hour 42.3% allowed, resets at 2026-10-29T20:50:00Z (in 4d 11h), read at 2026-10-20T22:12Z. "), "{line}"); + assert!(line.starts_with("Plan usage: five_hour 42.3% allowed, resets at 2026-10-29T20:50:00Z, read at 2026-10-20T22:12Z. "), "{line}"); assert!(!line.contains("unix ms"), "{line}"); } #[test] - fn spans_use_the_two_largest_units_and_a_passed_reset_says_so() { - let reset = 1_793_307_000_000; - assert!(render_plan(&[window(Some(10), reset, reset - 5000)], reset - 5000).contains("(in 5s), read at 2026-10-29T20:49Z")); - assert!(render_plan(&[window(Some(10), reset, reset - 720_000)], reset - 600_000).contains("(in 10m), read at 2026-10-29T20:38Z")); - assert!(render_plan(&[window(Some(10), reset, reset)], reset).contains("(already past), read at 2026-10-29T20:50Z"), "a reset at this very moment is past"); - assert!(render_plan(&[window(Some(10), reset, reset)], reset + 1000).contains("(already past), read at 2026-10-29T20:50Z")); - assert!(render_plan(&[window(None, reset, reset)], reset - 12_000_000).contains("five_hour expired, resets at 2026-10-29T20:50:00Z (in 3h 20m)")); - } +fn the_reset_is_an_instant_whatever_the_moment_of_rendering() { let reset = 1_793_307_000_000; let at = |now| render_plan(&[window(Some(10), reset, reset - 5000)], now); let before = at(reset - 5000); assert!(before.contains("resets at 2026-10-29T20:50:00Z, read at 2026-10-29T20:49Z"), "{before}"); for now in [reset - 12_000_000, reset, reset + 1000] { assert_eq!(at(now), before, "the line does not depend on when it is rendered"); } assert!(!before.contains("(in ") && !before.contains("already past"), "{before}"); assert_eq!(render_plan(&[window(None, reset, reset)], reset - 12_000_000).split(". ").next().unwrap(), "Plan usage: five_hour expired, resets at 2026-10-29T20:50:00Z"); } #[test] fn the_reading_is_dated_by_the_minute_it_was_taken_and_the_line_does_not_age() { let reset = 1_793_307_000_000; diff --git a/crates/mind-body/src/persona/tests.rs b/crates/mind-body/src/persona/tests.rs index 453dba1..9ab6709 100644 --- a/crates/mind-body/src/persona/tests.rs +++ b/crates/mind-body/src/persona/tests.rs @@ -3511,7 +3511,7 @@ Near what was said: - (2026-10-09, in #swarm, Did): "Closed the old bridge" -Plan usage: five_hour 42.3% allowed, resets at 2026-10-29T20:50:00Z (in 20d 7h), read at 2026-10-29T20:33Z. The swarm aims to have used about 90% of the weekly allowance at reset; nothing enforces it; you and the other Minds set the tempo. +Plan usage: five_hour 42.3% allowed, resets at 2026-10-29T20:50:00Z, read at 2026-10-29T20:33Z. The swarm aims to have used about 90% of the weekly allowance at reset; nothing enforces it; you and the other Minds set the tempo. Tempo: not yet read. The swarm beat is the lower median of the votes cast: a Mind with no standing vote abstains and is not counted, and with no vote cast the beat is 900 s. A vote only needs changing when conditions change; leave it standing otherwise. You vote with tempo_vote_beat_s (60 to 86400 seconds per beat; omit the key to leave your standing vote as it is, and send null to withdraw it and abstain) and declare your own urgency with urgency_permille (0 to 1000, null for none); an urgency lasts until your next turn, so use it as etiquette, not as a habit. @@ -3538,7 +3538,7 @@ What you remember (from your own mind; `huginn view ` reads a record): - nothing is remembered yet. -Plan usage: five_hour 42.3% allowed, resets at 2026-10-29T20:50:00Z (in 20d 7h), read at 2026-10-29T20:33Z. The swarm aims to have used about 90% of the weekly allowance at reset; nothing enforces it; you and the other Minds set the tempo. +Plan usage: five_hour 42.3% allowed, resets at 2026-10-29T20:50:00Z, read at 2026-10-29T20:33Z. The swarm aims to have used about 90% of the weekly allowance at reset; nothing enforces it; you and the other Minds set the tempo. Tempo: not yet read. The swarm beat is the lower median of the votes cast: a Mind with no standing vote abstains and is not counted, and with no vote cast the beat is 900 s. A vote only needs changing when conditions change; leave it standing otherwise. You vote with tempo_vote_beat_s (60 to 86400 seconds per beat; omit the key to leave your standing vote as it is, and send null to withdraw it and abstain) and declare your own urgency with urgency_permille (0 to 1000, null for none); an urgency lasts until your next turn, so use it as etiquette, not as a habit. diff --git a/crates/mind-body/src/self_run/tests.rs b/crates/mind-body/src/self_run/tests.rs index 49d5659..3b36761 100644 --- a/crates/mind-body/src/self_run/tests.rs +++ b/crates/mind-body/src/self_run/tests.rs @@ -357,7 +357,7 @@ fn the_start_message_is_the_first_thing_written_and_names_the_skill_the_instance let ran = go(vec![Out(result_line())]); assert!(matches!(&ran.events[0], Event::Wrote(_)), "the start precedes the first read: {:?}", ran.events[0]); let written = ran.written(); - for needle in ["Plan usage: five_hour 42.3% allowed, resets at 2026-10-29T20:50:00Z (in 20d 7h), read at 2026-10-29T20:33Z", "about 90% of the weekly allowance", "nothing enforces it"] { + for needle in ["Plan usage: five_hour 42.3% allowed, resets at 2026-10-29T20:50:00Z, read at 2026-10-29T20:33Z", "about 90% of the weekly allowance", "nothing enforces it"] { assert!(written[0].contains(needle), "the lease grant plan windows reach the child: {needle}: {}", written[0]); } for needle in ["Use the eureka skill.", "yggdrasil", "yggdrasil:run:selfrun-a", AGENT] {