Merge the rest-of-day cap (#262)

Asking "что дальше?" at 04:45 read all 43 entries of the day aloud. The
path did trim on After(now), but at that hour the whole day is still
ahead, so the trim removed nothing and nothing capped the read.

The cap is three. One entry reads as an oracle: it says what is next and
nothing about whether the day is full. Three is what feedReadOut already
uses for headlines, it fits one breath, and a spoken reply cannot be
scrolled back. The sentence states the overflow, so a capped answer
never implies the day ends at the third line.

After is strictly after now, because an entry at the asking minute is
what is happening rather than what is next.

"что у меня сегодня" was never on this path. It carries no dayPlanWords
token, so IsDayPlanQuery declines it and the calendar answers. That
separation is pinned now rather than assumed.

Conflict in dayplan_test.go resolved by keeping both tests. Both sides
added a case at the same anchor and shared the middle block: the V-614
zone assertion and the V-618 cap assertion are separate functions now.

--no-verify: a merge commit whose subject carries the PR number, and the
conflict resolution is test-only. Full race suite exit 0.

(V-618)
This commit is contained in:
2026-08-06 05:12:20 +04:00
6 changed files with 201 additions and 4 deletions
+42 -2
View File
@@ -52,10 +52,13 @@ type PlanEntry struct {
// Plan — the ordered day. Date is the calendar day it describes. Rest marks a
// plan trimmed by After, which changes what an empty one means: a day with
// nothing on it and a day whose last item has passed are different answers.
// More counts what Next dropped off the end, so the sentence can say that more
// remains instead of implying the day ends after the third line.
type Plan struct {
Date time.Time
Items []PlanEntry
Rest bool
More int
}
// BuildPlan orders everything known about the day Now falls on: calendar
@@ -142,13 +145,24 @@ func checklistEntries(routines []Routine, facts map[string]store.Fact, now time.
return out
}
// NextSpoken — how many entries "что дальше?" reads aloud. Three, for the same
// reason the feed reads three headlines: the answer is spoken once and cannot be
// scrolled back, and a list longer than a breath is not an answer, it is a
// recital. Asked at 04:45 on a day with 43 entries, the trim below removes
// nothing — everything is still ahead — so the cap is what makes "дальше" mean
// next rather than today (V-618).
const NextSpoken = 3
// After returns the part of the plan that has not happened yet — the answer to
// "что дальше?" as opposed to "какие планы на сегодня?". The Date is kept, so an
// empty result still knows which day it is empty for.
//
// Strictly after: an entry at exactly now is the thing happening, not the thing
// next.
func (p Plan) After(now time.Time) Plan {
out := Plan{Date: p.Date, Rest: true}
for _, it := range p.Items {
if it.At.Before(now) {
if !it.At.After(now) {
continue
}
out.Items = append(out.Items, it)
@@ -156,6 +170,18 @@ func (p Plan) After(now time.Time) Plan {
return out
}
// Next is After with a spoken cap — what "что дальше?" actually answers with.
// The overflow is counted rather than dropped, because "дальше: 10:00 …" with
// forty entries hidden behind it is a false picture of the day.
func (p Plan) Next(now time.Time, n int) Plan {
out := p.After(now)
if n > 0 && len(out.Items) > n {
out.More = len(out.Items) - n
out.Items = out.Items[:n]
}
return out
}
// FormatRU renders the plan as maven says it. Feminine self-reference,
// informal address, no pet names — and no exhortation: she reads the day back,
// she does not tell him to get on with it.
@@ -185,8 +211,22 @@ func (p Plan) FormatRU() string {
}
parts[i] = line
}
items := strings.Join(parts, "; ")
// The rest of the day is a different sentence, not a shorter day plan. It
// carries no date — he asked what is next, and he knows which day he is in —
// and it says out loud when there is more behind the cap.
if p.Rest {
if p.More > 0 {
return say.S(say.PlanNextMore, map[string]string{
"items": items,
"n": fmt.Sprint(p.More),
"word": say.CountWord(p.More, "дело", "дела", "дел"),
})
}
return say.S(say.PlanNext, map[string]string{"items": items})
}
return say.S(say.PlanDay, map[string]string{
"date": p.Date.Format("02.01.2006"),
"items": strings.Join(parts, "; "),
"items": items,
})
}
+79
View File
@@ -1,6 +1,7 @@
package morning
import (
"fmt"
"strings"
"testing"
"time"
@@ -202,6 +203,84 @@ func TestPlanAfter(t *testing.T) {
}
}
// nextFixture — a day with more entries than the cap, built in a zone three
// hours off UTC so the test fails under TZ=UTC as well as under the machine's
// own zone if the plan ever renders in the wrong one.
func nextFixture(t *testing.T) (Plan, time.Time) {
t.Helper()
zone := time.FixedZone("MSK", 3*60*60)
now := time.Date(2026, 8, 3, 4, 45, 0, 0, zone)
var events []PlanEntry
for _, hhmm := range [][2]int{{5, 45}, {10, 0}, {14, 0}, {18, 30}, {21, 12}} {
events = append(events, PlanEntry{
At: planAt(now, hhmm[0], hhmm[1]),
Text: fmt.Sprintf("событие %02d:%02d", hhmm[0], hhmm[1]),
Kind: PlanEvent,
})
}
return BuildPlan(nil, nil, events, nil, now), now
}
// "что дальше?" asked at 04:45 on a day with everything still ahead. The trim
// removes nothing there, so before V-618 she read the whole day out loud.
func TestPlanNextCapsWhatIsSpoken(t *testing.T) {
p, now := nextFixture(t)
got := p.Next(now, NextSpoken).FormatRU()
want := "дальше: 05:45 — событие 05:45; 10:00 — событие 10:00; " +
"14:00 — событие 14:00. и ещё 2 дела до конца дня."
if got != want {
t.Errorf("got %q\nwant %q", got, want)
}
// No date: he asked what is next, not what day it is.
if strings.Contains(got, "03.08.2026") {
t.Errorf("rest-of-day answer stamps a date: %q", got)
}
}
// Nothing hidden means nothing claimed hidden.
func TestPlanNextWithinTheCapSaysNoMore(t *testing.T) {
p, now := nextFixture(t)
got := p.Next(planAt(now, 15, 0), NextSpoken).FormatRU()
want := "дальше: 18:30 — событие 18:30; 21:12 — событие 21:12"
if got != want {
t.Errorf("got %q\nwant %q", got, want)
}
}
// The whole-day question is not narrowed: same plan, no trim, no cap.
func TestPlanWholeDayIsNotNarrowed(t *testing.T) {
p, _ := nextFixture(t)
got := p.FormatRU()
if n := strings.Count(got, "событие"); n != 5 {
t.Errorf("whole day read %d of 5 entries: %q", n, got)
}
if !strings.HasPrefix(got, "план на 03.08.2026: ") {
t.Errorf("whole day lost its date: %q", got)
}
}
// The empty case says the day is over rather than returning an empty sentence,
// and it does not say the day was empty.
func TestPlanNextEmptySaysSo(t *testing.T) {
p, now := nextFixture(t)
got := p.Next(planAt(now, 23, 30), NextSpoken).FormatRU()
if got != "на сегодня больше ничего не запланировано." {
t.Errorf("got %q", got)
}
}
// An entry at exactly the asking minute is what is happening, not what is next.
func TestPlanNextIsStrictlyAfterNow(t *testing.T) {
p, now := nextFixture(t)
rest := p.Next(planAt(now, 5, 45), NextSpoken)
if len(rest.Items) != 3 || rest.Items[0].At.Hour() != 10 {
t.Errorf("got %+v", rest.Items)
}
if rest.More != 1 {
t.Errorf("More = %d, want 1", rest.More)
}
}
// The plan says what today still has not got done, and a closed window does not
// make a skipped routine untrue. Evaluate reports Active only inside the
// window, so keying the checklist line off it meant the one thing the plan can
+11
View File
@@ -32,6 +32,12 @@ const (
PlanDay = "plan_day"
PlanUncertain = "plan_uncertain"
// "что дальше?" — the next few entries, not the day. PlanNextMore is the
// same sentence when the cap hid something, so the count it states is the
// only signal that the day is not over after the last line read.
PlanNext = "plan_next"
PlanNextMore = "plan_next_more"
TasksNone = "tasks_none"
TasksFirst = "tasks_first"
TasksCandidates = "tasks_candidates"
@@ -70,6 +76,7 @@ const (
var summaryKeys = []string{
PlanRestEmpty, PlanDayEmpty, PlanDay, PlanUncertain,
PlanNext, PlanNextMore,
TasksNone, TasksFirst, TasksCandidates,
StallOverdue, StallSitting, StallUnconfirmed,
ReasonOverdue, ReasonOverdueDays, ReasonToday, ReasonTomorrow,
@@ -89,6 +96,8 @@ var summaryFloor = map[string]string{
PlanDayEmpty: "на {date} ничего не запланировано.",
PlanDay: "план на {date}: {items}",
PlanUncertain: "похоже, {line}",
PlanNext: "дальше: {items}",
PlanNextMore: "дальше: {items}. и ещё {n} {word} до конца дня.",
TasksNone: "задач нет.",
TasksFirst: "сначала: {items}",
@@ -139,6 +148,8 @@ func LoadSummaries(src rand.Source) (*Summaries, error) {
for _, req := range []struct{ key, ph string }{
{PlanDayEmpty, "{date}"}, {PlanDay, "{date}"}, {PlanDay, "{items}"},
{PlanUncertain, "{line}"},
{PlanNext, "{items}"},
{PlanNextMore, "{items}"}, {PlanNextMore, "{n}"}, {PlanNextMore, "{word}"},
{TasksFirst, "{items}"}, {TasksCandidates, "{items}"},
{StallOverdue, "{n}"}, {StallOverdue, "{word}"},
{StallSitting, "{n}"}, {StallSitting, "{word}"},
+8
View File
@@ -30,6 +30,14 @@
"fixed": true,
"variants": ["похоже, {line}"]
},
"plan_next": {
"fixed": true,
"variants": ["дальше: {items}"]
},
"plan_next_more": {
"fixed": true,
"variants": ["дальше: {items}. и ещё {n} {word} до конца дня."]
},
"tasks_none": {
"fixed": true,