kami/Maven
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'fix/g04' into fix/integrated

Browse Source 
# Conflicts:
#	cmd/mavend/actions_query.go
#	cmd/mavend/dayplan_test.go
This commit is contained in:
kami
2026-08-01 14:19:15 +04:00
parent fa783cba8f 1c94df76b7
commit 89afe4ca99
20 changed files with 857 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/mavend/actions_query.go
+7 -9
View File
@@ -140,11 +140,16 @@ func (h *reactiveHandler) queryFactByKey(ctx context.Context, t *queryTurn) (str
// queryDayPlan — "какие планы на сегодня?", "что у меня по плану?", "что
// дальше?" (Vikunja #128). Recites the day: calendar events, pending
// reminders, and any morning checklist still outstanding.
// reminders, and every morning checklist item today still has no evidence for,
// including the ones whose window has closed.
//
// Read-only by construction — the plan is assembled and rendered core-side and
// nothing here schedules or announces. "что дальше?" asks for the rest of the
// day, so that phrasing trims what has already passed.
//
// What surface this belongs on is still open, tracked as Vikunja #431 ("Board
// surface: Maven holds the work board, runs the intake form, never argues").
// The spoken recital here is the current answer, not the decided one.
func (h *reactiveHandler) queryDayPlan(ctx context.Context, t *queryTurn) (string, bool) {
if !router.IsDayPlanQuery(t.dec.Utterance) {
return "", false
@@ -154,7 +159,7 @@ func (h *reactiveHandler) queryDayPlan(ctx context.Context, t *queryTurn) (strin
log.Printf("voice: day plan: %v", err)
return "не получилось собрать план.", true
}
if !isRestOfDayQuery(t.dec.Utterance) {
if !router.IsRestOfDayQuery(t.dec.Utterance) {
return plan.Spoken, true
}
// Rebuild the pure plan so the rest-of-day rendering is the same code that
@@ -171,13 +176,6 @@ func (h *reactiveHandler) queryDayPlan(ctx context.Context, t *queryTurn) (strin
return p.After(h.now()).FormatRU(), true
}
// isRestOfDayQuery — "что дальше?" and its English form, the only plan phrasing
// that means "from now on" rather than "the whole day".
func isRestOfDayQuery(text string) bool {
s := strings.ToLower(text)
return strings.Contains(s, "дальше") || strings.Contains(s, "next")
}
// habitFactWindow — how many recent SELF facts the behaviour profile is counted
// over. Enough for a season of habits without scanning the whole store on every
// question; the profile is recomputed on read, so the bound is the cost control.
cmd/mavend/dayplan_test.go
+84
View File
@@ -2,11 +2,13 @@ package main
import (
"context"
"database/sql"
"errors"
"strings"
"testing"
"time"
"github.com/kami/maven/internal/calendar"
"github.com/kami/maven/internal/ipc"
"github.com/kami/maven/internal/router"
"github.com/kami/maven/internal/store"
@@ -86,12 +88,40 @@ func TestQueryDayPlanTrimsToRestOfDay(t *testing.T) {
}
}
// "что дальше?" after the last item of the day. The day was not empty, it is
// over, and the whole-day empty line says something false about a day he just
// lived through.
func TestQueryDayPlanRestOfDayWhenNothingIsLeft(t *testing.T) {
plan := samplePlan()
h := &reactiveHandler{api: &planAPI{plan: plan}, now: func() time.Time {
return time.Date(2026, 8, 3, 23, 0, 0, 0, time.UTC)
}}
reply, ok := h.queryDayPlan(context.Background(), &queryTurn{
dec: router.Decision{Intent: router.IntentQuery, Utterance: "что дальше?"},
})
if !ok {
t.Fatal("expected the plan source to claim it")
}
if strings.Contains(reply, plan.Date.Format("02.01.2006")) {
t.Errorf("the day had things on it and they are done, not empty: %q", reply)
}
if reply != "на сегодня больше ничего не запланировано." {
t.Errorf("reply = %q", reply)
}
}
// A question that is not about the plan must fall through, or the plan buries
// the calendar listing and the weather behind it.
func TestQueryDayPlanPassesOnEverythingElse(t *testing.T) {
for _, q := range []string{
"что у меня сегодня?",
"какие планы на завтра?",
// The plan can only be built for the clock's own day. Naming another
// one has to fall through, not get answered with today.
"какие планы на понедельник?",
"какие планы на неделю?",
"какие планы на выходные?",
"what are my plans for friday?",
"когда планёрка?",
"какая погода?",
"",
@@ -267,3 +297,57 @@ func TestHabitQueryWithPlanWordReachesHabits(t *testing.T) {
t.Errorf("reply = %q, want %q", reply, want)
}
}
// The plan reads the store on the owner's clock: one line per event, the hour
// printed once, and reminders selected by fire time rather than by how
// recently they were stated.
func TestTickDayPlanReadsTheStore(t *testing.T) {
st := newTestStore(t)
ctx := context.Background()
tl := newTestTickLoop(t, st, &fakeSink{}, nil)
now := time.Date(2026, 8, 3, 12, 0, 0, 0, time.Local)
day := time.Date(2026, 8, 3, 0, 0, 0, 0, time.Local)
ev := calendar.Event{
Summary: "Standup",
Start: day.Add(14 * time.Hour),
End: day.Add(14*time.Hour + 30*time.Minute),
}
// Rescheduled: same key, a second row.
if _, err := st.WriteFact(ctx, ev.Start, store.KindEnv, calendar.FactKey(ev),
calendar.FactValue(ev), calendar.SourcePersonal, 1.0, sql.NullInt64{}); err != nil {
t.Fatalf("WriteFact: %v", err)
}
moved := ev
moved.Start, moved.End = day.Add(16*time.Hour), day.Add(16*time.Hour+30*time.Minute)
if _, err := st.WriteFact(ctx, moved.Start, store.KindEnv, calendar.FactKey(moved),
calendar.FactValue(moved), calendar.SourcePersonal, 1.0, sql.NullInt64{}); err != nil {
t.Fatalf("WriteFact: %v", err)
}
// One reminder today, one next year. Both are pending; only today's is a
// plan for today.
if _, err := st.CreateReminder(ctx, day.Add(18*time.Hour), "позвонить маме", ""); err != nil {
t.Fatalf("CreateReminder: %v", err)
}
if _, err := st.CreateReminder(ctx, day.AddDate(1, 0, 0), "продлить страховку", ""); err != nil {
t.Fatalf("CreateReminder: %v", err)
}
plan := tl.dayPlan(ctx, now)
if len(plan.Items) != 2 {
t.Fatalf("got %d items, want the moved standup and today's reminder: %+v", len(plan.Items), plan.Items)
}
ev0 := plan.Items[0]
if ev0.Kind != "event" || ev0.At.In(time.Local).Format("15:04") != "16:00" {
t.Errorf("event = %+v, want the 16:00 one", ev0)
}
if ev0.Text != "Standup" {
t.Errorf("text = %q — the plan prints the hour itself", ev0.Text)
}
if plan.Items[1].Text != "позвонить маме" {
t.Errorf("second item = %+v", plan.Items[1])
}
if strings.Contains(plan.Spoken, "страховку") {
t.Errorf("a reminder for next year is not today's plan: %q", plan.Spoken)
}
}
cmd/mavend/tick.go
+8 -9
View File
@@ -19,6 +19,7 @@ import (
"sync"
"time"
"github.com/kami/maven/internal/calendar"
"github.com/kami/maven/internal/config"
"github.com/kami/maven/internal/delivery"
"github.com/kami/maven/internal/ipc"
@@ -825,8 +826,10 @@ func (t *tickLoop) dayPlan(ctx context.Context, now time.Time) ipc.DayPlan {
}
for _, f := range facts {
events = append(events, morning.PlanEntry{
At: f.Ts,
Text: f.Value,
At: f.Ts,
// The plan prints the hour itself, so the "@ 14:00-14:30" tail the
// fact value carries would say it twice.
Text: calendar.FactSummary(f.Value),
Kind: morning.PlanEvent,
// Provenance below a calendar read (an ambient relay, #126) is
// hedged rather than recited as fact.
@@ -835,12 +838,12 @@ func (t *tickLoop) dayPlan(ctx context.Context, now time.Time) ipc.DayPlan {
}
var reminders []morning.PlanEntry
rems, err := t.store.ListReminders(ctx, dayPlanMaxReminders)
rems, err := t.store.PendingReminders(ctx, dayStart, dayEnd)
if err != nil {
log.Printf("tick: day plan: list reminders: %v", err)
log.Printf("tick: day plan: pending reminders: %v", err)
}
for _, r := range rems {
if r.Status != "pending" {
if r.Status != store.ReminderPending {
continue
}
fire := r.NextFireTs
@@ -873,10 +876,6 @@ func (t *tickLoop) dayPlan(ctx context.Context, now time.Time) ipc.DayPlan {
return out
}
// dayPlanMaxReminders bounds the reminder scan. The plan covers one day; a
// pending queue longer than this is a bug elsewhere, not a plan to recite.
const dayPlanMaxReminders = 500
// tune — the feedback auto-tuner's impure step. runs on a slow cadence
// (autotuneInterval, see run) so it doesn't write a fact every tick. for each
// rule: