Compare commits
45 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f42d1594ef | |||
| b4646155b4 | |||
| da647e87d0 | |||
| bf6ccf9aea | |||
| 7b2b96b957 | |||
| c8444813e2 | |||
| ed9bdd5e09 | |||
| 49f089d8a6 | |||
| 3af290152c | |||
| dc7c72a3d7 | |||
| 766ca091a7 | |||
| c5317eb2b4 | |||
| 9190f897a3 | |||
| d29e7ba813 | |||
| f7e1187823 | |||
| ed48c59ba7 | |||
| b09967f9e6 | |||
| b4a3867479 | |||
| 88d07b5175 | |||
| c00e3003bf | |||
| c0f9834528 | |||
| ad5eb2d1cf | |||
| 5253123d99 | |||
| 2abf98dea6 | |||
| f5c71b87f3 | |||
| 5934110fa8 | |||
| 6e47a3d736 | |||
| 67a5eb3805 | |||
| 029449eefa | |||
| ac36216f5d | |||
| db17cfcc65 | |||
| 7d676eb941 | |||
| fe3a4e9514 | |||
| a906f2afad | |||
| a2031a31d1 | |||
| 9b8bdf73cc | |||
| 7ad3c9a408 | |||
| 84e1478823 | |||
| 9c8d0baffe | |||
| b0f5a16ec9 | |||
| 67563ed1f6 | |||
| f0f7ebc9b2 | |||
| d12de589a2 | |||
| 50cc17f33a | |||
| 73d13f1ea6 |
@@ -6,6 +6,7 @@
|
|||||||
/mavweb
|
/mavweb
|
||||||
/mavpoll
|
/mavpoll
|
||||||
/mavcaldav
|
/mavcaldav
|
||||||
|
/mavwaked
|
||||||
|
|
||||||
# Certs (private keys, don't commit)
|
# Certs (private keys, don't commit)
|
||||||
certs/
|
certs/
|
||||||
@@ -33,6 +34,8 @@ deps
|
|||||||
deploy/db_key.env
|
deploy/db_key.env
|
||||||
# Deploy secret (telegram bot token + chat id) — never commit
|
# Deploy secret (telegram bot token + chat id) — never commit
|
||||||
deploy/telegram.env
|
deploy/telegram.env
|
||||||
|
# zenmoney API token, read by mavpoll (never in argv, never committed)
|
||||||
|
deploy/zenmoney.token
|
||||||
|
|
||||||
# Temp files
|
# Temp files
|
||||||
/tmp/
|
/tmp/
|
||||||
|
|||||||
@@ -90,8 +90,19 @@ fallback. Any LLM error falls through to the classifier so a turn never breaks o
|
|||||||
Measured on the 77-case RU fixture (`MODEL-BAKEOFF-31-07-2026.md`): the classifier scores
|
Measured on the 77-case RU fixture (`MODEL-BAKEOFF-31-07-2026.md`): the classifier scores
|
||||||
36.8% full accuracy at p50 31ms; Qwen3-1.7B scores 67.5% intent-only / 72.7% through the
|
36.8% full accuracy at p50 31ms; Qwen3-1.7B scores 67.5% intent-only / 72.7% through the
|
||||||
cascade at p50 ≈2.7s. Accuracy roughly doubled, latency is ~90× worse, and that trade was
|
cascade at p50 ≈2.7s. Accuracy roughly doubled, latency is ~90× worse, and that trade was
|
||||||
accepted deliberately. Still open: `Confidence: 1.0` is hardcoded in `llmrouter.go`, so the
|
accepted deliberately. `Confidence: 1.0` used to be hardcoded in `llmrouter.go`, so the LLM
|
||||||
LLM path never asks for clarification (6/6 refusal cases missed) — Vikunja #359.
|
path could never ask for clarification (6/6 refusal cases missed on the fixture) — Vikunja
|
||||||
|
#359. Fixed 31-07-2026 with structural signal (single-token utterance, keyless fact, act with
|
||||||
|
no allowlisted fn) feeding the same stage-3 gate the classifier path already had — see
|
||||||
|
`gateLLMDecision` in `router.go`. Note the second half of that bug: the LLM branch never
|
||||||
|
consulted `r.threshold` at all, so a correct low confidence would have been discarded anyway.
|
||||||
|
|
||||||
|
Re-measured on the fixture after the fix: **missed clarify 6/6 → 1**, at the cost of 3 false
|
||||||
|
clarifies and 2.6pt of full accuracy (72.7% → 70.1%, intent-only 67.5% → 74.0%). Two of the
|
||||||
|
three false clarifies are acts the model mis-routed and the gate caught — asking beats wrongly
|
||||||
|
executing, so the fixture and the daemon disagree about what is correct there. The third,
|
||||||
|
`"поужинал"`, is a real defect: **the single-token rule is an English intuition and does not
|
||||||
|
transfer to Russian**, where one word is routinely a whole sentence. Narrow or drop it.
|
||||||
|
|
||||||
## LLM output contract
|
## LLM output contract
|
||||||
|
|
||||||
|
|||||||
+75
-144
@@ -1,17 +1,24 @@
|
|||||||
// mavcaldav — the CalDAV poller module.
|
// mavcaldav — the CalDAV module: reads calendars into facts, and renders
|
||||||
|
// maven's own reminders back out to a calendar she owns.
|
||||||
//
|
//
|
||||||
// Polls a Radicale (or any CalDAV) server for today's events and writes
|
// READ side (unchanged behaviour): polls a Radicale (or any CalDAV) server for
|
||||||
// `facts (kind=env, source=poll:caldav)` through core's IPC socket.
|
// today's events and writes `facts (kind=env, source=poll:caldav)` through
|
||||||
// Key-free, restart-free, fail-independent — crashes can't touch the
|
// core's IPC socket. Key-free, restart-free, fail-independent — crashes can't
|
||||||
// store key, worst case a stale calendar_busy fact until the next poll.
|
// touch the store key, worst case a stale calendar_busy fact until the next
|
||||||
|
// poll. Two facts:
|
||||||
//
|
//
|
||||||
// Two facts written:
|
|
||||||
// - calendar_busy ("true"/"false") — read by the loop gate to suppress
|
// - calendar_busy ("true"/"false") — read by the loop gate to suppress
|
||||||
// nudges during meetings
|
// nudges during meetings
|
||||||
// - calendar_event ("<summary> @ <start>-<end>") — per-event for query
|
// - calendar_event ("<summary> @ <start>-<end>") — per-event for query
|
||||||
//
|
//
|
||||||
// Append-only discipline: a fact is written only when its value CHANGED
|
// Append-only discipline: a fact is written only when its value CHANGED vs the
|
||||||
// vs the latest for that key+source.
|
// latest for that key+source.
|
||||||
|
//
|
||||||
|
// RENDER side (Vikunja #127, off unless -render-url is given): publishes each
|
||||||
|
// pending reminder as a single-event iCal resource in a collection maven owns.
|
||||||
|
// The calendar is a view, sqlite is the store — see render.go. The render URL
|
||||||
|
// must differ from the read URL, checked at startup, so the render target can
|
||||||
|
// never be a calendar maven is only supposed to read.
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -27,6 +34,7 @@ import (
|
|||||||
"syscall"
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/calendar"
|
||||||
"github.com/kami/maven/internal/ipc"
|
"github.com/kami/maven/internal/ipc"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -43,6 +51,10 @@ func run(args []string) error {
|
|||||||
url := fs.String("url", "", "CalDAV calendar URL, e.g. http://localhost:5232/kami/personal (required)")
|
url := fs.String("url", "", "CalDAV calendar URL, e.g. http://localhost:5232/kami/personal (required)")
|
||||||
user := fs.String("user", "", "CalDAV basic-auth username (required)")
|
user := fs.String("user", "", "CalDAV basic-auth username (required)")
|
||||||
pass := fs.String("pass", "", "CalDAV basic-auth password (required)")
|
pass := fs.String("pass", "", "CalDAV basic-auth password (required)")
|
||||||
|
renderURL := fs.String("render-url", "", "CalDAV collection maven publishes her own reminders to; empty disables rendering")
|
||||||
|
renderUser := fs.String("render-user", "", "basic-auth username for -render-url (defaults to -user)")
|
||||||
|
renderPass := fs.String("render-pass", "", "basic-auth password for -render-url (defaults to -pass)")
|
||||||
|
renderDur := fs.Duration("render-duration", calendar.DefaultReminderDuration, "how long a rendered reminder occupies")
|
||||||
interval := fs.Duration("interval", 5*time.Minute, "poll cadence")
|
interval := fs.Duration("interval", 5*time.Minute, "poll cadence")
|
||||||
timeout := fs.Duration("timeout", 10*time.Second, "per-request HTTP timeout")
|
timeout := fs.Duration("timeout", 10*time.Second, "per-request HTTP timeout")
|
||||||
if err := fs.Parse(args); err != nil {
|
if err := fs.Parse(args); err != nil {
|
||||||
@@ -54,6 +66,9 @@ func run(args []string) error {
|
|||||||
if *url == "" || *user == "" || *pass == "" {
|
if *url == "" || *user == "" || *pass == "" {
|
||||||
return fmt.Errorf("-url, -user, -pass are required")
|
return fmt.Errorf("-url, -user, -pass are required")
|
||||||
}
|
}
|
||||||
|
if err := checkRenderTarget(*url, *renderURL); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
|
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
|
||||||
defer stop()
|
defer stop()
|
||||||
@@ -64,16 +79,36 @@ func run(args []string) error {
|
|||||||
}
|
}
|
||||||
defer core.Close()
|
defer core.Close()
|
||||||
|
|
||||||
|
hc := &http.Client{Timeout: *timeout}
|
||||||
p := &poller{
|
p := &poller{
|
||||||
core: core,
|
core: core,
|
||||||
http: &http.Client{Timeout: *timeout},
|
http: hc,
|
||||||
url: strings.TrimRight(*url, "/"),
|
url: strings.TrimRight(*url, "/"),
|
||||||
user: *user,
|
user: *user,
|
||||||
pass: *pass,
|
pass: *pass,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var rend *renderer
|
||||||
|
if *renderURL != "" {
|
||||||
|
ru, rp := *renderUser, *renderPass
|
||||||
|
if ru == "" {
|
||||||
|
ru = *user
|
||||||
|
}
|
||||||
|
if rp == "" {
|
||||||
|
rp = *pass
|
||||||
|
}
|
||||||
|
rend = newRenderer(core, hc, *renderURL, ru, rp, *renderDur)
|
||||||
|
log.Printf("mavcaldav: rendering reminders to %s", *renderURL)
|
||||||
|
}
|
||||||
|
|
||||||
log.Printf("mavcaldav: polling %s every %s", *url, *interval)
|
log.Printf("mavcaldav: polling %s every %s", *url, *interval)
|
||||||
p.pollOnce(ctx) // fire immediately
|
tick := func() {
|
||||||
|
p.pollOnce(ctx)
|
||||||
|
if rend != nil {
|
||||||
|
rend.renderOnce(ctx)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tick() // fire immediately
|
||||||
t := time.NewTicker(*interval)
|
t := time.NewTicker(*interval)
|
||||||
defer t.Stop()
|
defer t.Stop()
|
||||||
for {
|
for {
|
||||||
@@ -82,11 +117,30 @@ func run(args []string) error {
|
|||||||
log.Printf("mavcaldav: bye")
|
log.Printf("mavcaldav: bye")
|
||||||
return nil
|
return nil
|
||||||
case <-t.C:
|
case <-t.C:
|
||||||
p.pollOnce(ctx)
|
tick()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// checkRenderTarget refuses a render URL that is also a read URL. This is the
|
||||||
|
// structural half of #127's "cannot write to your work calendar": the write
|
||||||
|
// credential and the write URL are separate flags, and the one calendar maven
|
||||||
|
// is known to only read is rejected as a target at startup rather than trusted
|
||||||
|
// at runtime.
|
||||||
|
func checkRenderTarget(readURL, renderURL string) error {
|
||||||
|
if renderURL == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if sameCollection(readURL, renderURL) {
|
||||||
|
return fmt.Errorf("-render-url must differ from -url: maven renders into a calendar she owns, never into one she reads")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func sameCollection(a, b string) bool {
|
||||||
|
return strings.EqualFold(strings.TrimRight(a, "/"), strings.TrimRight(b, "/"))
|
||||||
|
}
|
||||||
|
|
||||||
type poller struct {
|
type poller struct {
|
||||||
core ipc.CoreAPI
|
core ipc.CoreAPI
|
||||||
http *http.Client
|
http *http.Client
|
||||||
@@ -95,12 +149,6 @@ type poller struct {
|
|||||||
pass string
|
pass string
|
||||||
}
|
}
|
||||||
|
|
||||||
type icalEvent struct {
|
|
||||||
start time.Time
|
|
||||||
end time.Time
|
|
||||||
summary string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *poller) pollOnce(ctx context.Context) {
|
func (p *poller) pollOnce(ctx context.Context) {
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
events, err := p.fetchEvents(ctx, now)
|
events, err := p.fetchEvents(ctx, now)
|
||||||
@@ -109,38 +157,30 @@ func (p *poller) pollOnce(ctx context.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
busy := false
|
|
||||||
for _, e := range events {
|
|
||||||
if !now.Before(e.start) && now.Before(e.end) {
|
|
||||||
busy = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
busyVal := "false"
|
busyVal := "false"
|
||||||
if busy {
|
if calendar.Busy(events, now) {
|
||||||
busyVal = "true"
|
busyVal = "true"
|
||||||
}
|
}
|
||||||
|
|
||||||
// Write calendar_busy on change.
|
// Write calendar_busy on change.
|
||||||
if err := p.writeIfChanged(ctx, "calendar_busy", "poll:caldav", busyVal, now); err != nil {
|
if err := p.writeIfChanged(ctx, "calendar_busy", calendar.SourcePersonal, busyVal, now, 1.0); err != nil {
|
||||||
log.Printf("mavcaldav: write calendar_busy: %v", err)
|
log.Printf("mavcaldav: write calendar_busy: %v", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Write per-event facts (one per event, keyed by event summary + start).
|
// Write per-event facts (one per event, keyed by day + event summary).
|
||||||
// This lets the note RAG path answer "what's on my calendar" without
|
// This lets the note RAG path answer "what's on my calendar" without
|
||||||
// reaching back to Radicale.
|
// reaching back to Radicale.
|
||||||
for _, e := range events {
|
for _, e := range events {
|
||||||
val := fmt.Sprintf("%s @ %s-%s", e.summary, e.start.Format("15:04"), e.end.Format("15:04"))
|
key := calendar.FactKey(e)
|
||||||
eventKey := fmt.Sprintf("calendar_event_%s_%s", e.start.Format("20060102"), safeKey(e.summary))
|
if err := p.writeIfChanged(ctx, key, calendar.SourcePersonal, calendar.FactValue(e), e.Start, 1.0); err != nil {
|
||||||
if err := p.writeIfChanged(ctx, eventKey, "poll:caldav", val, e.start); err != nil {
|
log.Printf("mavcaldav: write %s: %v", key, err)
|
||||||
log.Printf("mavcaldav: write %s: %v", eventKey, err)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// fetchEvents GETs the calendar URL and parses VEVENTs from the iCal response.
|
// fetchEvents GETs the calendar URL and parses VEVENTs from the iCal response.
|
||||||
func (p *poller) fetchEvents(ctx context.Context, now time.Time) ([]icalEvent, error) {
|
func (p *poller) fetchEvents(ctx context.Context, now time.Time) ([]calendar.Event, error) {
|
||||||
req, err := http.NewRequestWithContext(ctx, http.MethodGet, p.url, nil)
|
req, err := http.NewRequestWithContext(ctx, http.MethodGet, p.url, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -162,120 +202,11 @@ func (p *poller) fetchEvents(ctx context.Context, now time.Time) ([]icalEvent, e
|
|||||||
return nil, fmt.Errorf("GET %s: %s", p.url, resp.Status)
|
return nil, fmt.Errorf("GET %s: %s", p.url, resp.Status)
|
||||||
}
|
}
|
||||||
|
|
||||||
return parseICal(body, now), nil
|
return calendar.ParseICalDay(body, now), nil
|
||||||
}
|
|
||||||
|
|
||||||
// parseICal scans iCal text for VEVENT components. Returns events that overlap
|
|
||||||
// with today (UTC day boundaries) to keep the response manageable.
|
|
||||||
func parseICal(body []byte, now time.Time) []icalEvent {
|
|
||||||
todayStart := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.UTC)
|
|
||||||
todayEnd := todayStart.AddDate(0, 0, 1)
|
|
||||||
|
|
||||||
var events []icalEvent
|
|
||||||
text := string(body)
|
|
||||||
for {
|
|
||||||
veventStart := strings.Index(text, "BEGIN:VEVENT")
|
|
||||||
if veventStart < 0 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
text = text[veventStart+len("BEGIN:VEVENT"):]
|
|
||||||
veventEnd := strings.Index(text, "END:VEVENT")
|
|
||||||
if veventEnd < 0 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
block := text[:veventEnd]
|
|
||||||
text = text[veventEnd+len("END:VEVENT"):]
|
|
||||||
|
|
||||||
e := parseVEVENT(block)
|
|
||||||
if e == nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
// Only keep events overlapping today.
|
|
||||||
if e.end.After(todayStart) && e.start.Before(todayEnd) {
|
|
||||||
events = append(events, *e)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return events
|
|
||||||
}
|
|
||||||
|
|
||||||
// parseVEVENT extracts start, end, summary from a VEVENT block.
|
|
||||||
// Supports both UTC (DTEND:20260703T100000Z) and local (DTSTART;TZID=...:...)
|
|
||||||
// formats. Returns nil for all-day events (no DTSTART/DTEND time component) or
|
|
||||||
// parse failures.
|
|
||||||
func parseVEVENT(block string) *icalEvent {
|
|
||||||
var e icalEvent
|
|
||||||
lines := strings.Split(block, "\n")
|
|
||||||
for _, line := range lines {
|
|
||||||
line = strings.TrimSpace(line)
|
|
||||||
switch {
|
|
||||||
case strings.HasPrefix(line, "DTSTART"):
|
|
||||||
if t, ok := parseDT(line); ok {
|
|
||||||
e.start = t
|
|
||||||
}
|
|
||||||
case strings.HasPrefix(line, "DTEND"):
|
|
||||||
if t, ok := parseDT(line); ok {
|
|
||||||
e.end = t
|
|
||||||
}
|
|
||||||
case strings.HasPrefix(line, "SUMMARY"):
|
|
||||||
if idx := strings.Index(line, ":"); idx >= 0 {
|
|
||||||
e.summary = strings.TrimSpace(line[idx+1:])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if e.start.IsZero() || e.end.IsZero() {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return &e
|
|
||||||
}
|
|
||||||
|
|
||||||
// parseDT parses a DTSTART/DTEND value. Supports:
|
|
||||||
// - UTC: DTEND:20260703T100000Z
|
|
||||||
// - Local: DTSTART;TZID=Europe/Moscow:20260703T130000
|
|
||||||
// - Value-date (all-day): DTSTART;VALUE=DATE:20260703 (returns zero time)
|
|
||||||
func parseDT(line string) (time.Time, bool) {
|
|
||||||
if strings.Contains(line, "VALUE=DATE:") {
|
|
||||||
return time.Time{}, false // all-day, skip
|
|
||||||
}
|
|
||||||
idx := strings.LastIndex(line, ":")
|
|
||||||
if idx < 0 {
|
|
||||||
return time.Time{}, false
|
|
||||||
}
|
|
||||||
val := line[idx+1:]
|
|
||||||
val = strings.TrimSuffix(val, "Z")
|
|
||||||
|
|
||||||
// Try UTC first (has Z suffix, or ended in Z before TrimSuffix).
|
|
||||||
if strings.HasSuffix(line, "Z") {
|
|
||||||
t, err := time.Parse("20060102T150405", val)
|
|
||||||
if err != nil {
|
|
||||||
return time.Time{}, false
|
|
||||||
}
|
|
||||||
return t.UTC(), true
|
|
||||||
}
|
|
||||||
|
|
||||||
// Local time — treat as UTC for simplicity (CalDAV server and poller
|
|
||||||
// run in the same timezone; the gate only needs busy/not-busy accuracy).
|
|
||||||
t, err := time.Parse("20060102T150405", val)
|
|
||||||
if err != nil {
|
|
||||||
return time.Time{}, false
|
|
||||||
}
|
|
||||||
return t.UTC(), true
|
|
||||||
}
|
|
||||||
|
|
||||||
// safeKey makes an event summary safe to use as a fact key (alphanumeric + dash).
|
|
||||||
func safeKey(s string) string {
|
|
||||||
var b strings.Builder
|
|
||||||
for _, r := range s {
|
|
||||||
if (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') || (r >= '0' && r <= '9') || r == '-' {
|
|
||||||
b.WriteRune(r)
|
|
||||||
} else if r == ' ' || r == '_' {
|
|
||||||
b.WriteRune('-')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return b.String()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// writeIfChanged writes a fact only when the value differs from the latest.
|
// writeIfChanged writes a fact only when the value differs from the latest.
|
||||||
func (p *poller) writeIfChanged(ctx context.Context, key, source, val string, ts time.Time) error {
|
func (p *poller) writeIfChanged(ctx context.Context, key, source, val string, ts time.Time, confidence float64) error {
|
||||||
prev, err := p.core.LatestFactBySource(ctx, key, source)
|
prev, err := p.core.LatestFactBySource(ctx, key, source)
|
||||||
switch {
|
switch {
|
||||||
case err == nil && prev.Value == val:
|
case err == nil && prev.Value == val:
|
||||||
@@ -289,7 +220,7 @@ func (p *poller) writeIfChanged(ctx context.Context, key, source, val string, ts
|
|||||||
Key: key,
|
Key: key,
|
||||||
Value: val,
|
Value: val,
|
||||||
Source: source,
|
Source: source,
|
||||||
Confidence: 1.0,
|
Confidence: confidence,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("write %s: %w", key, err)
|
return fmt.Errorf("write %s: %w", key, err)
|
||||||
|
|||||||
+6
-165
@@ -12,7 +12,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type fakeCore struct {
|
type fakeCore struct {
|
||||||
ipc.CoreAPI
|
ipc.UnimplementedCoreAPI
|
||||||
facts map[string]ipc.Fact // composite key "key|source" → Fact
|
facts map[string]ipc.Fact // composite key "key|source" → Fact
|
||||||
writeLog []ipc.WriteFactReq
|
writeLog []ipc.WriteFactReq
|
||||||
writeErr error
|
writeErr error
|
||||||
@@ -51,165 +51,6 @@ func (f *fakeCore) WriteFact(_ context.Context, req ipc.WriteFactReq) (int64, er
|
|||||||
return int64(len(f.writeLog)), nil
|
return int64(len(f.writeLog)), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
// Parsing tests
|
|
||||||
// ---------------------------------------------------------------------------
|
|
||||||
|
|
||||||
func TestParseICal(t *testing.T) {
|
|
||||||
now := time.Date(2026, 7, 3, 12, 0, 0, 0, time.UTC)
|
|
||||||
|
|
||||||
body := []byte(`BEGIN:VCALENDAR
|
|
||||||
BEGIN:VEVENT
|
|
||||||
DTSTART:20260703T090000Z
|
|
||||||
DTEND:20260703T100000Z
|
|
||||||
SUMMARY:Morning standup
|
|
||||||
END:VEVENT
|
|
||||||
BEGIN:VEVENT
|
|
||||||
DTSTART:20260703T140000Z
|
|
||||||
DTEND:20260703T150000Z
|
|
||||||
SUMMARY:Team sync
|
|
||||||
END:VEVENT
|
|
||||||
BEGIN:VEVENT
|
|
||||||
DTSTART:20260702T140000Z
|
|
||||||
DTEND:20260702T150000Z
|
|
||||||
SUMMARY:Yesterday retro
|
|
||||||
END:VEVENT
|
|
||||||
BEGIN:VEVENT
|
|
||||||
DTSTART:20260704T090000Z
|
|
||||||
DTEND:20260704T100000Z
|
|
||||||
SUMMARY:Tomorrow standup
|
|
||||||
END:VEVENT
|
|
||||||
BEGIN:VEVENT
|
|
||||||
DTSTART;VALUE=DATE:20260704
|
|
||||||
DTEND;VALUE=DATE:20260705
|
|
||||||
SUMMARY:All-day event
|
|
||||||
END:VEVENT
|
|
||||||
END:VCALENDAR`)
|
|
||||||
|
|
||||||
events := parseICal(body, now)
|
|
||||||
|
|
||||||
if len(events) != 2 {
|
|
||||||
t.Fatalf("got %d events, want 2 (today events, no all-day/past/future)", len(events))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Morning standup — overlaps today.
|
|
||||||
if events[0].summary != "Morning standup" {
|
|
||||||
t.Errorf("events[0].summary = %q, want %q", events[0].summary, "Morning standup")
|
|
||||||
}
|
|
||||||
wantStart0 := time.Date(2026, 7, 3, 9, 0, 0, 0, time.UTC)
|
|
||||||
if !events[0].start.Equal(wantStart0) {
|
|
||||||
t.Errorf("events[0].start = %v, want %v", events[0].start, wantStart0)
|
|
||||||
}
|
|
||||||
wantEnd0 := time.Date(2026, 7, 3, 10, 0, 0, 0, time.UTC)
|
|
||||||
if !events[0].end.Equal(wantEnd0) {
|
|
||||||
t.Errorf("events[0].end = %v, want %v", events[0].end, wantEnd0)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Team sync — overlaps today.
|
|
||||||
if events[1].summary != "Team sync" {
|
|
||||||
t.Errorf("events[1].summary = %q, want %q", events[1].summary, "Team sync")
|
|
||||||
}
|
|
||||||
wantStart1 := time.Date(2026, 7, 3, 14, 0, 0, 0, time.UTC)
|
|
||||||
if !events[1].start.Equal(wantStart1) {
|
|
||||||
t.Errorf("events[1].start = %v, want %v", events[1].start, wantStart1)
|
|
||||||
}
|
|
||||||
wantEnd1 := time.Date(2026, 7, 3, 15, 0, 0, 0, time.UTC)
|
|
||||||
if !events[1].end.Equal(wantEnd1) {
|
|
||||||
t.Errorf("events[1].end = %v, want %v", events[1].end, wantEnd1)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestParseVEVENT(t *testing.T) {
|
|
||||||
// Normal event with TZID in DTSTART and UTC DTEND.
|
|
||||||
block := "DTSTART;TZID=Europe/Moscow:20260703T130000\nDTEND:20260703T140000Z\nSUMMARY:Stand up meeting"
|
|
||||||
e := parseVEVENT(block)
|
|
||||||
if e == nil {
|
|
||||||
t.Fatal("expected non-nil icalEvent")
|
|
||||||
}
|
|
||||||
wantStart := time.Date(2026, 7, 3, 13, 0, 0, 0, time.UTC)
|
|
||||||
if !e.start.Equal(wantStart) {
|
|
||||||
t.Errorf("start = %v, want %v", e.start, wantStart)
|
|
||||||
}
|
|
||||||
wantEnd := time.Date(2026, 7, 3, 14, 0, 0, 0, time.UTC)
|
|
||||||
if !e.end.Equal(wantEnd) {
|
|
||||||
t.Errorf("end = %v, want %v", e.end, wantEnd)
|
|
||||||
}
|
|
||||||
if e.summary != "Stand up meeting" {
|
|
||||||
t.Errorf("summary = %q, want %q", e.summary, "Stand up meeting")
|
|
||||||
}
|
|
||||||
|
|
||||||
// All-day event (VALUE=DATE) → nil.
|
|
||||||
allDay := "DTSTART;VALUE=DATE:20260703\nDTEND;VALUE=DATE:20260704\nSUMMARY:All-day"
|
|
||||||
if e2 := parseVEVENT(allDay); e2 != nil {
|
|
||||||
t.Error("expected nil for all-day event")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestParseDT(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
name string
|
|
||||||
line string
|
|
||||||
want time.Time
|
|
||||||
wantOK bool
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
name: "UTC",
|
|
||||||
line: "DTEND:20260703T100000Z",
|
|
||||||
want: time.Date(2026, 7, 3, 10, 0, 0, 0, time.UTC),
|
|
||||||
wantOK: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "local time",
|
|
||||||
line: "DTSTART;TZID=Europe/Moscow:20260703T130000",
|
|
||||||
want: time.Date(2026, 7, 3, 13, 0, 0, 0, time.UTC),
|
|
||||||
wantOK: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "all-day",
|
|
||||||
line: "DTSTART;VALUE=DATE:20260703",
|
|
||||||
want: time.Time{},
|
|
||||||
wantOK: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "invalid",
|
|
||||||
line: "DTSTART:garbage",
|
|
||||||
want: time.Time{},
|
|
||||||
wantOK: false,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
|
||||||
got, ok := parseDT(tt.line)
|
|
||||||
if ok != tt.wantOK {
|
|
||||||
t.Errorf("ok = %v, want %v", ok, tt.wantOK)
|
|
||||||
}
|
|
||||||
if !got.Equal(tt.want) {
|
|
||||||
t.Errorf("got = %v, want %v", got, tt.want)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSafeKey(t *testing.T) {
|
|
||||||
tests := []struct {
|
|
||||||
input string
|
|
||||||
want string
|
|
||||||
}{
|
|
||||||
{"Stand up meeting", "Stand-up-meeting"},
|
|
||||||
{"Hello_World", "Hello-World"},
|
|
||||||
{"special@#$chars!!", "specialchars"},
|
|
||||||
{"ALL_CAPS_123", "ALL-CAPS-123"},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tt := range tests {
|
|
||||||
got := safeKey(tt.input)
|
|
||||||
if got != tt.want {
|
|
||||||
t.Errorf("safeKey(%q) = %q, want %q", tt.input, got, tt.want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// Core logic tests
|
// Core logic tests
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
@@ -221,7 +62,7 @@ func TestWriteIfChanged(t *testing.T) {
|
|||||||
t.Run("no previous fact writes", func(t *testing.T) {
|
t.Run("no previous fact writes", func(t *testing.T) {
|
||||||
fc := &fakeCore{}
|
fc := &fakeCore{}
|
||||||
p := &poller{core: fc}
|
p := &poller{core: fc}
|
||||||
err := p.writeIfChanged(ctx, "test_key", "poll:caldav", "hello", now)
|
err := p.writeIfChanged(ctx, "test_key", "poll:caldav", "hello", now, 1.0)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("unexpected error: %v", err)
|
t.Fatalf("unexpected error: %v", err)
|
||||||
}
|
}
|
||||||
@@ -249,7 +90,7 @@ func TestWriteIfChanged(t *testing.T) {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
p := &poller{core: fc}
|
p := &poller{core: fc}
|
||||||
err := p.writeIfChanged(ctx, "test_key", "poll:caldav", "hello", now)
|
err := p.writeIfChanged(ctx, "test_key", "poll:caldav", "hello", now, 1.0)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("unexpected error: %v", err)
|
t.Fatalf("unexpected error: %v", err)
|
||||||
}
|
}
|
||||||
@@ -265,7 +106,7 @@ func TestWriteIfChanged(t *testing.T) {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
p := &poller{core: fc}
|
p := &poller{core: fc}
|
||||||
err := p.writeIfChanged(ctx, "test_key", "poll:caldav", "new", now)
|
err := p.writeIfChanged(ctx, "test_key", "poll:caldav", "new", now, 1.0)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("unexpected error: %v", err)
|
t.Fatalf("unexpected error: %v", err)
|
||||||
}
|
}
|
||||||
@@ -280,7 +121,7 @@ func TestWriteIfChanged(t *testing.T) {
|
|||||||
t.Run("read error other than ErrNoFact returns error", func(t *testing.T) {
|
t.Run("read error other than ErrNoFact returns error", func(t *testing.T) {
|
||||||
fc := &fakeCore{readErr: fmt.Errorf("connection refused")}
|
fc := &fakeCore{readErr: fmt.Errorf("connection refused")}
|
||||||
p := &poller{core: fc}
|
p := &poller{core: fc}
|
||||||
err := p.writeIfChanged(ctx, "fail_key", "poll:caldav", "x", now)
|
err := p.writeIfChanged(ctx, "fail_key", "poll:caldav", "x", now, 1.0)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
t.Fatal("expected error, got nil")
|
t.Fatal("expected error, got nil")
|
||||||
}
|
}
|
||||||
@@ -292,7 +133,7 @@ func TestWriteIfChanged(t *testing.T) {
|
|||||||
writeErr: fmt.Errorf("disk full"),
|
writeErr: fmt.Errorf("disk full"),
|
||||||
}
|
}
|
||||||
p := &poller{core: fc}
|
p := &poller{core: fc}
|
||||||
err := p.writeIfChanged(ctx, "test_key", "poll:caldav", "hello", now)
|
err := p.writeIfChanged(ctx, "test_key", "poll:caldav", "hello", now, 1.0)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
t.Fatal("expected error, got nil")
|
t.Fatal("expected error, got nil")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,145 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"log"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/calendar"
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
)
|
||||||
|
|
||||||
|
// renderer is the write half of maven's own local calendar (Vikunja #127).
|
||||||
|
//
|
||||||
|
// It is a RENDER TARGET, not a store. sqlite stays canonical: every tick the
|
||||||
|
// renderer reads the pending reminders out of core and publishes each one as a
|
||||||
|
// single-event iCal resource in a CalDAV collection maven owns. Nothing is ever
|
||||||
|
// read back from that collection, and losing it costs nothing — the next tick
|
||||||
|
// rebuilds it.
|
||||||
|
//
|
||||||
|
// It structurally cannot write to a calendar maven only reads. The URL comes
|
||||||
|
// from its own flag, checked at startup against every read URL (see
|
||||||
|
// run in main.go), and the only paths it ever addresses carry
|
||||||
|
// calendar.ReminderUIDPrefix — so even pointed at the wrong collection it can
|
||||||
|
// only touch resources it created.
|
||||||
|
type renderer struct {
|
||||||
|
core ipc.CoreAPI
|
||||||
|
http *http.Client
|
||||||
|
url string
|
||||||
|
user string
|
||||||
|
pass string
|
||||||
|
dur time.Duration
|
||||||
|
|
||||||
|
// published maps reminder id → the body last successfully PUT, so an
|
||||||
|
// unchanged reminder costs nothing. Purely an optimisation: a restart
|
||||||
|
// re-publishes every reminder once, which is idempotent.
|
||||||
|
published map[int64]string
|
||||||
|
}
|
||||||
|
|
||||||
|
func newRenderer(core ipc.CoreAPI, hc *http.Client, url, user, pass string, dur time.Duration) *renderer {
|
||||||
|
return &renderer{
|
||||||
|
core: core,
|
||||||
|
http: hc,
|
||||||
|
url: strings.TrimRight(url, "/"),
|
||||||
|
user: user,
|
||||||
|
pass: pass,
|
||||||
|
dur: dur,
|
||||||
|
published: make(map[int64]string),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// renderOnce publishes every pending reminder and withdraws the ones that are
|
||||||
|
// no longer pending. Errors are logged and skipped: a calendar maven cannot
|
||||||
|
// reach must never break the reminder itself, which lives in sqlite.
|
||||||
|
func (r *renderer) renderOnce(ctx context.Context) {
|
||||||
|
reminders, err := r.core.ListReminders(ctx, renderMaxReminders)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("mavcaldav: list reminders: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
live := make(map[int64]bool, len(reminders))
|
||||||
|
for _, rem := range reminders {
|
||||||
|
if rem.Status != "pending" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
live[rem.ID] = true
|
||||||
|
e := calendar.ReminderEvent(rem.ID, fireTime(rem), rem.Payload, r.dur)
|
||||||
|
body := calendar.RenderICal([]calendar.Event{e})
|
||||||
|
if r.published[rem.ID] == body {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if err := r.put(ctx, calendar.ReminderPath(rem.ID), body); err != nil {
|
||||||
|
log.Printf("mavcaldav: render reminder %d: %v", rem.ID, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
r.published[rem.ID] = body
|
||||||
|
log.Printf("mavcaldav: rendered reminder %d (%s)", rem.ID, e.Summary)
|
||||||
|
}
|
||||||
|
|
||||||
|
for id := range r.published {
|
||||||
|
if live[id] {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if err := r.delete(ctx, calendar.ReminderPath(id)); err != nil {
|
||||||
|
log.Printf("mavcaldav: withdraw reminder %d: %v", id, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
delete(r.published, id)
|
||||||
|
log.Printf("mavcaldav: withdrew reminder %d", id)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// renderMaxReminders bounds the read. Reminders past this count are older than
|
||||||
|
// anything a calendar view is useful for.
|
||||||
|
const renderMaxReminders = 200
|
||||||
|
|
||||||
|
// fireTime prefers NextFireTs — for a recurring reminder that is the occurrence
|
||||||
|
// worth showing; FireTs is the original statement.
|
||||||
|
func fireTime(rem ipc.Reminder) time.Time {
|
||||||
|
if !rem.NextFireTs.IsZero() {
|
||||||
|
return rem.NextFireTs
|
||||||
|
}
|
||||||
|
return rem.FireTs
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *renderer) put(ctx context.Context, name, body string) error {
|
||||||
|
req, err := http.NewRequestWithContext(ctx, http.MethodPut, r.url+"/"+name, strings.NewReader(body))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
req.SetBasicAuth(r.user, r.pass)
|
||||||
|
req.Header.Set("Content-Type", "text/calendar; charset=utf-8")
|
||||||
|
return r.do(req, name)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *renderer) delete(ctx context.Context, name string) error {
|
||||||
|
req, err := http.NewRequestWithContext(ctx, http.MethodDelete, r.url+"/"+name, nil)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
req.SetBasicAuth(r.user, r.pass)
|
||||||
|
return r.do(req, name)
|
||||||
|
}
|
||||||
|
|
||||||
|
// do runs the request and treats any 2xx, plus 404 on a DELETE, as success —
|
||||||
|
// a resource that is already gone is the state the caller wanted.
|
||||||
|
func (r *renderer) do(req *http.Request, name string) error {
|
||||||
|
resp, err := r.http.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
io.Copy(io.Discard, io.LimitReader(resp.Body, 1<<16))
|
||||||
|
switch {
|
||||||
|
case resp.StatusCode >= 200 && resp.StatusCode < 300:
|
||||||
|
return nil
|
||||||
|
case req.Method == http.MethodDelete && resp.StatusCode == http.StatusNotFound:
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return fmt.Errorf("%s %s: %s", req.Method, name, resp.Status)
|
||||||
|
}
|
||||||
@@ -0,0 +1,186 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
)
|
||||||
|
|
||||||
|
// reminderCore is a fakeCore that also answers ListReminders.
|
||||||
|
type reminderCore struct {
|
||||||
|
fakeCore
|
||||||
|
reminders []ipc.Reminder
|
||||||
|
listErr error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *reminderCore) ListReminders(context.Context, int) ([]ipc.Reminder, error) {
|
||||||
|
if c.listErr != nil {
|
||||||
|
return nil, c.listErr
|
||||||
|
}
|
||||||
|
return c.reminders, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// calSrv records what a CalDAV collection received.
|
||||||
|
type calSrv struct {
|
||||||
|
mu sync.Mutex
|
||||||
|
puts map[string]string
|
||||||
|
dels []string
|
||||||
|
status int
|
||||||
|
*httptest.Server
|
||||||
|
}
|
||||||
|
|
||||||
|
func newCalSrv() *calSrv {
|
||||||
|
s := &calSrv{puts: map[string]string{}, status: http.StatusCreated}
|
||||||
|
s.Server = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
body, _ := io.ReadAll(r.Body)
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
switch r.Method {
|
||||||
|
case http.MethodPut:
|
||||||
|
s.puts[strings.TrimPrefix(r.URL.Path, "/cal/")] = string(body)
|
||||||
|
case http.MethodDelete:
|
||||||
|
s.dels = append(s.dels, strings.TrimPrefix(r.URL.Path, "/cal/"))
|
||||||
|
}
|
||||||
|
w.WriteHeader(s.status)
|
||||||
|
}))
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *calSrv) putCount() int {
|
||||||
|
s.mu.Lock()
|
||||||
|
defer s.mu.Unlock()
|
||||||
|
return len(s.puts)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRenderOncePublishesPendingReminders(t *testing.T) {
|
||||||
|
fire := time.Date(2026, 8, 1, 18, 30, 0, 0, time.UTC)
|
||||||
|
srv := newCalSrv()
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
core := &reminderCore{reminders: []ipc.Reminder{
|
||||||
|
{ID: 7, FireTs: fire, Payload: "позвонить маме", Status: "pending"},
|
||||||
|
{ID: 8, FireTs: fire, Payload: "уже сделано", Status: "fired"},
|
||||||
|
{ID: 9, FireTs: fire, Payload: "отменено", Status: "cancelled"},
|
||||||
|
}}
|
||||||
|
r := newRenderer(core, srv.Client(), srv.URL+"/cal/", "u", "p", 0)
|
||||||
|
r.renderOnce(context.Background())
|
||||||
|
|
||||||
|
srv.mu.Lock()
|
||||||
|
body, ok := srv.puts["maven-reminder-7.ics"]
|
||||||
|
n := len(srv.puts)
|
||||||
|
srv.mu.Unlock()
|
||||||
|
|
||||||
|
if n != 1 {
|
||||||
|
t.Fatalf("expected exactly the pending reminder to be published, got %d PUTs", n)
|
||||||
|
}
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("pending reminder 7 was not published")
|
||||||
|
}
|
||||||
|
if !strings.Contains(body, "SUMMARY:позвонить маме") {
|
||||||
|
t.Errorf("payload missing from rendered body:\n%s", body)
|
||||||
|
}
|
||||||
|
if !strings.Contains(body, "UID:maven-reminder-7") {
|
||||||
|
t.Errorf("UID missing from rendered body:\n%s", body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRenderOnceSkipsUnchanged(t *testing.T) {
|
||||||
|
srv := newCalSrv()
|
||||||
|
defer srv.Close()
|
||||||
|
core := &reminderCore{reminders: []ipc.Reminder{
|
||||||
|
{ID: 1, FireTs: time.Date(2026, 8, 1, 9, 0, 0, 0, time.UTC), Payload: "выпить воды", Status: "pending"},
|
||||||
|
}}
|
||||||
|
r := newRenderer(core, srv.Client(), srv.URL+"/cal", "u", "p", 0)
|
||||||
|
r.renderOnce(context.Background())
|
||||||
|
r.renderOnce(context.Background())
|
||||||
|
if got := srv.putCount(); got != 1 {
|
||||||
|
t.Fatalf("an unchanged reminder was re-published: %d distinct PUTs", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRenderOnceWithdrawsResolvedReminders(t *testing.T) {
|
||||||
|
srv := newCalSrv()
|
||||||
|
defer srv.Close()
|
||||||
|
core := &reminderCore{reminders: []ipc.Reminder{
|
||||||
|
{ID: 5, FireTs: time.Date(2026, 8, 1, 9, 0, 0, 0, time.UTC), Payload: "встреча", Status: "pending"},
|
||||||
|
}}
|
||||||
|
r := newRenderer(core, srv.Client(), srv.URL+"/cal", "u", "p", 0)
|
||||||
|
r.renderOnce(context.Background())
|
||||||
|
|
||||||
|
core.reminders[0].Status = "fired"
|
||||||
|
r.renderOnce(context.Background())
|
||||||
|
|
||||||
|
srv.mu.Lock()
|
||||||
|
dels := append([]string(nil), srv.dels...)
|
||||||
|
srv.mu.Unlock()
|
||||||
|
if len(dels) != 1 || dels[0] != "maven-reminder-5.ics" {
|
||||||
|
t.Fatalf("resolved reminder was not withdrawn: %v", dels)
|
||||||
|
}
|
||||||
|
if len(r.published) != 0 {
|
||||||
|
t.Errorf("published map still holds %v", r.published)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A calendar maven cannot reach must never break anything: sqlite is canonical.
|
||||||
|
func TestRenderOnceSurvivesServerErrors(t *testing.T) {
|
||||||
|
srv := newCalSrv()
|
||||||
|
srv.status = http.StatusInternalServerError
|
||||||
|
defer srv.Close()
|
||||||
|
core := &reminderCore{reminders: []ipc.Reminder{
|
||||||
|
{ID: 1, FireTs: time.Date(2026, 8, 1, 9, 0, 0, 0, time.UTC), Payload: "x", Status: "pending"},
|
||||||
|
}}
|
||||||
|
r := newRenderer(core, srv.Client(), srv.URL+"/cal", "u", "p", 0)
|
||||||
|
r.renderOnce(context.Background())
|
||||||
|
if len(r.published) != 0 {
|
||||||
|
t.Error("a failed PUT must not be recorded as published, or it never retries")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRenderOnceUsesNextFireForRecurring(t *testing.T) {
|
||||||
|
srv := newCalSrv()
|
||||||
|
defer srv.Close()
|
||||||
|
next := time.Date(2026, 8, 2, 7, 0, 0, 0, time.UTC)
|
||||||
|
core := &reminderCore{reminders: []ipc.Reminder{{
|
||||||
|
ID: 3,
|
||||||
|
FireTs: time.Date(2026, 8, 1, 7, 0, 0, 0, time.UTC),
|
||||||
|
NextFireTs: next,
|
||||||
|
Payload: "зарядка",
|
||||||
|
Status: "pending",
|
||||||
|
Cron: "0 7 * * *",
|
||||||
|
}}}
|
||||||
|
r := newRenderer(core, srv.Client(), srv.URL+"/cal", "u", "p", 0)
|
||||||
|
r.renderOnce(context.Background())
|
||||||
|
|
||||||
|
srv.mu.Lock()
|
||||||
|
body := srv.puts["maven-reminder-3.ics"]
|
||||||
|
srv.mu.Unlock()
|
||||||
|
if !strings.Contains(body, "DTSTART:20260802T070000Z") {
|
||||||
|
t.Errorf("recurring reminder should render its next occurrence:\n%s", body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCheckRenderTargetRefusesTheCalendarItReads(t *testing.T) {
|
||||||
|
read := "http://localhost:5232/kami/personal"
|
||||||
|
if err := checkRenderTarget(read, ""); err != nil {
|
||||||
|
t.Fatalf("rendering off must be fine: %v", err)
|
||||||
|
}
|
||||||
|
if err := checkRenderTarget(read, "http://localhost:5232/kami/maven"); err != nil {
|
||||||
|
t.Fatalf("a distinct collection must be accepted: %v", err)
|
||||||
|
}
|
||||||
|
if err := checkRenderTarget(read, read); err == nil {
|
||||||
|
t.Error("rendering into the read calendar must be refused")
|
||||||
|
}
|
||||||
|
if err := checkRenderTarget(read, read+"/"); err == nil {
|
||||||
|
t.Error("a trailing slash must not defeat the check")
|
||||||
|
}
|
||||||
|
if err := checkRenderTarget(read, strings.ToUpper(read)); err == nil {
|
||||||
|
t.Error("case must not defeat the check")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
// actionTable dispatches applyAction's per-intent bodies. Each of the 7
|
||||||
|
// intents (fact, reminder, note, query, act, chat, system) has one handler
|
||||||
|
// here with the signature:
|
||||||
|
//
|
||||||
|
// func(h *reactiveHandler, ctx context.Context, dec router.Decision) string
|
||||||
|
//
|
||||||
|
// same contract as applyAction itself: "" means "let the Replier phrase the
|
||||||
|
// reply", a non-empty string OVERRIDES it. This is a straight extraction of
|
||||||
|
// applyAction's old switch cases (formerly ~300 lines in voice.go) — no
|
||||||
|
// reordering of side effects, no new abstractions inside a handler.
|
||||||
|
//
|
||||||
|
// What does NOT belong in this table, because it is not per-intent:
|
||||||
|
//
|
||||||
|
// - the dec.Clarify short-circuit ("" when the router's stage-3 fired) —
|
||||||
|
// stays in applyAction, before dispatch, since it applies to every
|
||||||
|
// intent identically.
|
||||||
|
// - the destructive-act confirm gate (park / resolveConfirm / confirmTTL)
|
||||||
|
// and the enabled-tool allowlist. Both live entirely inside
|
||||||
|
// actionAct/handleAct in actions_act.go, exactly where they lived in the old
|
||||||
|
// switch's IntentAct case — they are act-specific (a fact or a note
|
||||||
|
// can't be destructive), not shared across intents, so they do not need
|
||||||
|
// to move to a separate layer. The important invariant, preserved
|
||||||
|
// as-is: applyAction runs identically whether dec came from a fresh
|
||||||
|
// route or from a completed clarify answer (see finishClarified in
|
||||||
|
// clarify.go and its comment "filling in an argument never grants
|
||||||
|
// authority") — a handler must never special-case a clarify-completed
|
||||||
|
// decision to skip the confirm gate or the allowlist.
|
||||||
|
// - detectPattern and dialogue-session bookkeeping (rememberTurn,
|
||||||
|
// followUpMerge) run in the callers (runTurn,
|
||||||
|
// finishClarified), not per-intent, and are untouched by this slice.
|
||||||
|
//
|
||||||
|
// Each handler lives in actions_<intent>.go; the small ones (chat, system)
|
||||||
|
// and the table itself stay here.
|
||||||
|
//
|
||||||
|
// Adding an intent: write its handler in its own file, add one line to
|
||||||
|
// actionHandlers. Do not grow applyAction's switch back.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"log"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/router"
|
||||||
|
)
|
||||||
|
|
||||||
|
// actionHandlers is the per-intent dispatch table used by applyAction.
|
||||||
|
var actionHandlers = map[router.Intent]func(*reactiveHandler, context.Context, router.Decision) string{
|
||||||
|
router.IntentFact: (*reactiveHandler).actionFact,
|
||||||
|
router.IntentReminder: (*reactiveHandler).actionReminder,
|
||||||
|
router.IntentAct: (*reactiveHandler).actionAct,
|
||||||
|
router.IntentChat: (*reactiveHandler).actionChat,
|
||||||
|
router.IntentSystem: (*reactiveHandler).actionSystem,
|
||||||
|
router.IntentNote: (*reactiveHandler).actionNote,
|
||||||
|
router.IntentQuery: (*reactiveHandler).actionQuery,
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *reactiveHandler) actionChat(ctx context.Context, dec router.Decision) string {
|
||||||
|
// Conversational: build history from dialogue session (prior user turns)
|
||||||
|
// and let the LLM respond from general knowledge + context.
|
||||||
|
history := h.chatHistory()
|
||||||
|
reply, err := h.phraser.PhraseChat(ctx, dec.Utterance, history)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("voice: chat: %v", err)
|
||||||
|
return "поговорили."
|
||||||
|
}
|
||||||
|
return reply
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *reactiveHandler) actionSystem(ctx context.Context, dec router.Decision) string {
|
||||||
|
return h.replySystem(ctx, dec)
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"log"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/router"
|
||||||
|
"github.com/kami/maven/internal/tool"
|
||||||
|
)
|
||||||
|
|
||||||
|
// actionAct handles router.IntentAct: match a verb to an enabled tool, offer
|
||||||
|
// it to the ecosystems first, and run it behind the confirm gate and the
|
||||||
|
// allowlist. proposeGap and the confirm gate itself live in confirm.go.
|
||||||
|
func (h *reactiveHandler) actionAct(ctx context.Context, dec router.Decision) string {
|
||||||
|
// tool executor: run the matched fn against the enabled allowlist.
|
||||||
|
// HasFn=false ⇒ try the matcher (for LLM-routed acts where the verb
|
||||||
|
// didn't go through the stage-0 act grammar).
|
||||||
|
if !dec.Slots.HasFn && dec.Slots.Text != "" && h.matcher != nil {
|
||||||
|
if fn, args, ok := h.matcher.Match(dec.Slots.Text); ok {
|
||||||
|
dec.Slots.Fn, dec.Slots.Args, dec.Slots.HasFn = fn, args, true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Praxis ecosystem tools: intercept before the system command executor.
|
||||||
|
if h.ecosystem != nil && h.ecosystem.praxis != nil && dec.Slots.HasFn {
|
||||||
|
if reply := h.handlePraxisAct(ctx, dec); reply != "" {
|
||||||
|
return reply
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hexis ecosystem action: if ecosystem is configured and we have a verb
|
||||||
|
// + entity text, try to resolve the entity and execute via Hexis.
|
||||||
|
if h.ecosystem != nil && h.ecosystem.hexis != nil && dec.Slots.Text != "" {
|
||||||
|
if reply := h.handleHexisAct(ctx, dec); reply != "" {
|
||||||
|
return reply
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// HasFn still false ⇒ no allowlist match: scaffold a 'proposed' tool
|
||||||
|
// the user can enable on the authed surface ("earn the right to ask").
|
||||||
|
if !dec.Slots.HasFn {
|
||||||
|
return h.proposeGap(ctx, dec)
|
||||||
|
}
|
||||||
|
out, err := h.tools.Exec(ctx, dec.Slots.Fn, dec.Slots.Args, false)
|
||||||
|
if err != nil {
|
||||||
|
switch {
|
||||||
|
case errors.Is(err, tool.ErrNeedsConfirm):
|
||||||
|
// destructive: park it and ask. The next utterance answers.
|
||||||
|
phrase := actPhrase(dec.Slots.Fn, dec.Slots.Args)
|
||||||
|
h.park(dec.Slots.Fn, dec.Slots.Args, phrase)
|
||||||
|
return "выполнить «" + phrase + "»? скажи «да» или «нет»."
|
||||||
|
case errors.Is(err, tool.ErrNotEnabled):
|
||||||
|
return h.proposeGap(ctx, dec)
|
||||||
|
}
|
||||||
|
log.Printf("voice: tool %s: %v", dec.Slots.Fn, err)
|
||||||
|
if out != "" {
|
||||||
|
return "не получилось выполнить команду: " + firstLine(out)
|
||||||
|
}
|
||||||
|
return "не получилось выполнить команду."
|
||||||
|
}
|
||||||
|
if out != "" {
|
||||||
|
return "готово: " + firstLine(out)
|
||||||
|
}
|
||||||
|
return "готово."
|
||||||
|
}
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"log"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
"github.com/kami/maven/internal/router"
|
||||||
|
)
|
||||||
|
|
||||||
|
// actionFact handles router.IntentFact: persist a tapped self-fact, index
|
||||||
|
// it for recall, and let pattern detection propose a routine.
|
||||||
|
func (h *reactiveHandler) actionFact(ctx context.Context, dec router.Decision) string {
|
||||||
|
if !dec.Slots.HasKey {
|
||||||
|
return "не разобрала, что записать — попробуй иначе."
|
||||||
|
}
|
||||||
|
now := h.now()
|
||||||
|
req := ipc.WriteFactReq{
|
||||||
|
Ts: now,
|
||||||
|
Kind: "self",
|
||||||
|
Key: dec.Slots.Key,
|
||||||
|
Value: dec.Slots.Value,
|
||||||
|
Source: "tap:voice",
|
||||||
|
Confidence: 1.0,
|
||||||
|
// Subject: the key doubles as the entity-resolution candidate —
|
||||||
|
// a voice-tapped fact's key is usually the thing/person it's
|
||||||
|
// about ("espresso_machine", "kate"), so queueing it for Nexus
|
||||||
|
// resolution costs one async lookup and is a no-op (not_found)
|
||||||
|
// for the abstract self-state keys (mood, water) that aren't
|
||||||
|
// entities at all.
|
||||||
|
Subject: dec.Slots.Key,
|
||||||
|
}
|
||||||
|
factID, err := h.api.WriteFact(ctx, req)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("voice: write fact: %v", err)
|
||||||
|
return "не получилось сохранить факт."
|
||||||
|
}
|
||||||
|
// Index the fact utterance in long-term memory (best-effort, must not
|
||||||
|
// fail the fact write). Facts aren't in the notes table, so this is the
|
||||||
|
// only recall path for them — "когда я пил воду?" reads back from here.
|
||||||
|
if h.memStore != nil {
|
||||||
|
if vec, err := router.EmbedPassage(ctx, h.embedder, dec.Utterance); err != nil {
|
||||||
|
log.Printf("voice: embed fact for memory: %v", err)
|
||||||
|
} else if err := h.memStore.Insert(ctx, "fact:"+dec.Slots.Key+":"+strconv.FormatInt(now.Unix(), 10), vec, map[string]string{
|
||||||
|
"source": "voice",
|
||||||
|
"type": "fact",
|
||||||
|
"text": dec.Utterance,
|
||||||
|
"ts": strconv.FormatInt(now.Unix(), 10),
|
||||||
|
}); err != nil {
|
||||||
|
log.Printf("voice: memory insert fact: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Event extraction + pattern detection (best-effort, must not fail the
|
||||||
|
// fact write). If the fact describes a recognizable action, it becomes a
|
||||||
|
// normalized event; if ≥3 events for the same action+object show stable
|
||||||
|
// intervals, a proposed routine is created and parked for confirmation.
|
||||||
|
if h.dataStore != nil {
|
||||||
|
if phrase := h.detectPattern(ctx, factID, dec.Slots.Key, dec.Slots.Value, now); phrase != "" {
|
||||||
|
return phrase // "ты заправляешь ... напоминать?"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "" // replier phrases the success reply
|
||||||
|
}
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"log"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
"github.com/kami/maven/internal/router"
|
||||||
|
"github.com/kami/maven/internal/zenmoney"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Money questions (Vikunja #125).
|
||||||
|
//
|
||||||
|
// This is the whole read side: mavpoll holds the zenmoney token and writes
|
||||||
|
// facts(kind=env, source=poll:zenmoney); core reads them back when he asks.
|
||||||
|
// Core never sees the token, never calls zenmoney, and has no rule on these
|
||||||
|
// keys — a total is never a reason for Maven to speak first. Maven is not a
|
||||||
|
// nag, least of all about his money.
|
||||||
|
//
|
||||||
|
// Nothing here can reach the external search capability: the figures are read
|
||||||
|
// from the store and rendered locally, and his financial data is never search
|
||||||
|
// input.
|
||||||
|
|
||||||
|
// queryMoney — "сколько я потратил сегодня?", "покажи мои траты".
|
||||||
|
//
|
||||||
|
// Answers only from the latest fact the poller wrote. Three honest outcomes and
|
||||||
|
// no fourth: the figure, "the fact is old and here is its date", or "money
|
||||||
|
// tracking is not connected". It never computes, estimates or rounds a total of
|
||||||
|
// its own — an invented number about his money is the worst thing this could do.
|
||||||
|
func (h *reactiveHandler) queryMoney(ctx context.Context, t *queryTurn) (string, bool) {
|
||||||
|
window, ok := router.ParseMoneyQuery(t.dec.Utterance)
|
||||||
|
if !ok {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
key, phrase := zenmoney.KeySpentMonth, "в этом месяце"
|
||||||
|
if window == router.MoneyToday {
|
||||||
|
key, phrase = zenmoney.KeySpentToday, "сегодня"
|
||||||
|
}
|
||||||
|
fact, err := h.api.LatestFactBySource(ctx, key, zenmoney.Source)
|
||||||
|
if err != nil {
|
||||||
|
// No fact at all is the normal state when the capability is off. Claim
|
||||||
|
// the turn anyway: falling through to recall would answer a question
|
||||||
|
// about money with whatever note happens to be nearest.
|
||||||
|
if !isNoFactErr(err) {
|
||||||
|
log.Printf("voice: money fact: %v", err)
|
||||||
|
}
|
||||||
|
return "я не отслеживаю траты — не подключено.", true
|
||||||
|
}
|
||||||
|
val, err := zenmoney.ParseFactValue(fact.Value)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("voice: money fact: decode: %v", err)
|
||||||
|
return "не получилось прочитать траты.", true
|
||||||
|
}
|
||||||
|
reply := val.FormatRU(phrase)
|
||||||
|
if reply == "" {
|
||||||
|
return "по тратам пока нечего сказать.", true
|
||||||
|
}
|
||||||
|
// A stale fact is reported as stale rather than spoken as today's number.
|
||||||
|
if h.now().Sub(fact.Ts) > zenmoney.StaleAfter {
|
||||||
|
return "данные от " + fact.Ts.Local().Format("02.01") + ": " + reply, true
|
||||||
|
}
|
||||||
|
return reply, true
|
||||||
|
}
|
||||||
|
|
||||||
|
// isNoFactErr — ErrNoFact survives the wire wrapped, so unwrap for it.
|
||||||
|
func isNoFactErr(err error) bool {
|
||||||
|
for e := err; e != nil; {
|
||||||
|
if e == ipc.ErrNoFact {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
u, ok := e.(interface{ Unwrap() error })
|
||||||
|
if !ok {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
e = u.Unwrap()
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
"github.com/kami/maven/internal/router"
|
||||||
|
"github.com/kami/maven/internal/zenmoney"
|
||||||
|
)
|
||||||
|
|
||||||
|
// moneyAPI answers only LatestFactBySource; everything else is unimplemented,
|
||||||
|
// which is the assertion that answering a money question costs no model call
|
||||||
|
// and reaches no network.
|
||||||
|
type moneyAPI struct {
|
||||||
|
ipc.UnimplementedCoreAPI
|
||||||
|
|
||||||
|
fact ipc.Fact
|
||||||
|
err error
|
||||||
|
gotKey string
|
||||||
|
gotSrc string
|
||||||
|
callCnt int
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *moneyAPI) LatestFactBySource(_ context.Context, key, source string) (ipc.Fact, error) {
|
||||||
|
a.gotKey, a.gotSrc = key, source
|
||||||
|
a.callCnt++
|
||||||
|
return a.fact, a.err
|
||||||
|
}
|
||||||
|
|
||||||
|
func moneyNow() time.Time { return time.Date(2026, 8, 15, 20, 0, 0, 0, time.UTC) }
|
||||||
|
|
||||||
|
func moneyFact(ts time.Time, val string) ipc.Fact {
|
||||||
|
return ipc.Fact{Kind: "env", Key: zenmoney.KeySpentMonth, Value: val, Source: zenmoney.Source, Ts: ts}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestQueryMoneyAnswersFromTheFact(t *testing.T) {
|
||||||
|
api := &moneyAPI{fact: moneyFact(moneyNow(), `{"spent":[{"currency":"RUB","amount":1749.5}],"count":3}`)}
|
||||||
|
h := &reactiveHandler{api: api, now: moneyNow}
|
||||||
|
reply, ok := h.queryMoney(context.Background(), &queryTurn{
|
||||||
|
dec: router.Decision{Utterance: "сколько я потратил в этом месяце?"},
|
||||||
|
})
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("the money source must claim a money question")
|
||||||
|
}
|
||||||
|
if api.gotKey != zenmoney.KeySpentMonth || api.gotSrc != zenmoney.Source {
|
||||||
|
t.Errorf("read %q/%q, want the month key from the poller's source", api.gotKey, api.gotSrc)
|
||||||
|
}
|
||||||
|
if !strings.Contains(reply, "1749.5") {
|
||||||
|
t.Errorf("reply = %q, want the exact figure", reply)
|
||||||
|
}
|
||||||
|
if !strings.Contains(reply, "в этом месяце") {
|
||||||
|
t.Errorf("reply = %q, want the window named", reply)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestQueryMoneyPicksTodaysKey(t *testing.T) {
|
||||||
|
api := &moneyAPI{fact: moneyFact(moneyNow(), `{"spent":[{"currency":"RUB","amount":250}],"count":1}`)}
|
||||||
|
h := &reactiveHandler{api: api, now: moneyNow}
|
||||||
|
if _, ok := h.queryMoney(context.Background(), &queryTurn{
|
||||||
|
dec: router.Decision{Utterance: "сколько я потратил сегодня?"},
|
||||||
|
}); !ok {
|
||||||
|
t.Fatal("expected the source to claim it")
|
||||||
|
}
|
||||||
|
if api.gotKey != zenmoney.KeySpentToday {
|
||||||
|
t.Errorf("key = %q, want today's", api.gotKey)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The capability is off unless configured, and then there is no fact. She says
|
||||||
|
// so instead of letting the recall pass answer a money question from a note.
|
||||||
|
func TestQueryMoneySaysNotConnected(t *testing.T) {
|
||||||
|
h := &reactiveHandler{api: &moneyAPI{err: ipc.ErrNoFact}, now: moneyNow}
|
||||||
|
reply, ok := h.queryMoney(context.Background(), &queryTurn{
|
||||||
|
dec: router.Decision{Utterance: "сколько я потратил?"},
|
||||||
|
})
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("expected the source to claim it")
|
||||||
|
}
|
||||||
|
if !strings.Contains(reply, "не подключено") {
|
||||||
|
t.Errorf("reply = %q, want an honest 'not connected'", reply)
|
||||||
|
}
|
||||||
|
// No number of any kind in that answer.
|
||||||
|
for _, d := range []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9"} {
|
||||||
|
if strings.Contains(reply, d) {
|
||||||
|
t.Errorf("reply %q contains a digit — nothing was read, so there is no figure", reply)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A fact older than the staleness bound is dated rather than spoken as if it
|
||||||
|
// were current: the poller can be down, and last week's total presented as
|
||||||
|
// today's is a lie by omission.
|
||||||
|
func TestQueryMoneyDatesAStaleFact(t *testing.T) {
|
||||||
|
old := moneyNow().Add(-72 * time.Hour)
|
||||||
|
api := &moneyAPI{fact: moneyFact(old, `{"spent":[{"currency":"RUB","amount":100}],"count":1}`)}
|
||||||
|
h := &reactiveHandler{api: api, now: moneyNow}
|
||||||
|
reply, _ := h.queryMoney(context.Background(), &queryTurn{
|
||||||
|
dec: router.Decision{Utterance: "сколько я потратил?"},
|
||||||
|
})
|
||||||
|
if !strings.Contains(reply, "данные от") {
|
||||||
|
t.Errorf("reply = %q, want the stale fact dated", reply)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestQueryMoneyPassesOtherQuestions(t *testing.T) {
|
||||||
|
api := &moneyAPI{}
|
||||||
|
h := &reactiveHandler{api: api, now: moneyNow}
|
||||||
|
for _, u := range []string{"какая погода?", "я потратил весь день на это", "какие у меня задачи?"} {
|
||||||
|
if _, ok := h.queryMoney(context.Background(), &queryTurn{dec: router.Decision{Utterance: u}}); ok {
|
||||||
|
t.Errorf("the money source claimed %q", u)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if api.callCnt != 0 {
|
||||||
|
t.Error("a non-money question must not read the money facts")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Money must be answered before the recall sources, or a question about
|
||||||
|
// spending gets answered by the nearest note.
|
||||||
|
func TestQuerySourcesOrderMoneyBeforeRecall(t *testing.T) {
|
||||||
|
moneyAt, notesAt := -1, -1
|
||||||
|
for i, src := range querySources {
|
||||||
|
switch src.name {
|
||||||
|
case "money":
|
||||||
|
moneyAt = i
|
||||||
|
case "notes":
|
||||||
|
notesAt = i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if moneyAt < 0 || notesAt < 0 {
|
||||||
|
t.Fatalf("sources missing: money=%d notes=%d", moneyAt, notesAt)
|
||||||
|
}
|
||||||
|
if moneyAt > notesAt {
|
||||||
|
t.Errorf("money source at %d, after notes at %d", moneyAt, notesAt)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"log"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/router"
|
||||||
|
)
|
||||||
|
|
||||||
|
// actionNote handles router.IntentNote: embed the note, persist it, and
|
||||||
|
// index it for recall.
|
||||||
|
func (h *reactiveHandler) actionNote(ctx context.Context, dec router.Decision) string {
|
||||||
|
// An utterance that explicitly files a task is work, not recall, and
|
||||||
|
// belongs in the task store (Vikunja #130). Checked before the embedding
|
||||||
|
// is paid for. Everything else is a note, exactly as before.
|
||||||
|
if reply, ok := h.captureTaskFromNote(ctx, dec); ok {
|
||||||
|
return reply
|
||||||
|
}
|
||||||
|
// embed the note text with the same model the classifier uses, persist
|
||||||
|
// via CoreAPI (source=tap:voice). Semantic recall lives in `notes`, not
|
||||||
|
// facts — no predicate reads it (spec's two-memory split).
|
||||||
|
vec, err := router.EmbedPassage(ctx, h.embedder, dec.Utterance)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("voice: embed note: %v", err)
|
||||||
|
return "не получилось сохранить заметку."
|
||||||
|
}
|
||||||
|
noteTs := h.now()
|
||||||
|
noteID, err := h.api.WriteNote(ctx, noteTs, dec.Utterance, vec, "tap:voice")
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("voice: write note: %v", err)
|
||||||
|
return "не получилось сохранить заметку."
|
||||||
|
}
|
||||||
|
// Insert into long-term memory (best-effort, must not fail the note write).
|
||||||
|
// text/ts in the meta make a Search hit self-describing (see bestRecall).
|
||||||
|
if h.memStore != nil {
|
||||||
|
if err := h.memStore.Insert(ctx, "note:"+strconv.FormatInt(noteID, 10), vec, map[string]string{
|
||||||
|
"source": "voice",
|
||||||
|
"type": "note",
|
||||||
|
"text": dec.Utterance,
|
||||||
|
"ts": strconv.FormatInt(noteTs.Unix(), 10),
|
||||||
|
}); err != nil {
|
||||||
|
log.Printf("voice: memory insert: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "" // replier phrases the "saved" reply
|
||||||
|
}
|
||||||
@@ -0,0 +1,320 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"log"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
"github.com/kami/maven/internal/memory"
|
||||||
|
"github.com/kami/maven/internal/morning"
|
||||||
|
"github.com/kami/maven/internal/router"
|
||||||
|
"github.com/kami/maven/internal/weather"
|
||||||
|
)
|
||||||
|
|
||||||
|
// queryTurn is the per-turn scratch a chain of query sources shares: the
|
||||||
|
// decision being answered plus the work an earlier source already paid for
|
||||||
|
// (the query embedding, the notes it pulled). Sources read and fill it in
|
||||||
|
// order, so a later source never re-embeds.
|
||||||
|
type queryTurn struct {
|
||||||
|
dec router.Decision
|
||||||
|
vec []float32
|
||||||
|
notes []ipc.Note
|
||||||
|
}
|
||||||
|
|
||||||
|
// querySource — one answer source in the chain actionQuery walks. answer
|
||||||
|
// returns (reply, true) when this source claims the question, ("", false)
|
||||||
|
// when it passes to the next one. name is for reading the table, not logged.
|
||||||
|
//
|
||||||
|
// A struct of one func rather than an interface: every source is a plain
|
||||||
|
// method on *reactiveHandler with no state of its own (what state a turn has
|
||||||
|
// lives in queryTurn), so an interface would mean one empty type per source
|
||||||
|
// to satisfy it — ceremony for nothing. Same reasoning as confirmResolver in
|
||||||
|
// confirm.go, and the table then reads like actionHandlers: a flat list of
|
||||||
|
// method expressions you extend with one line.
|
||||||
|
type querySource struct {
|
||||||
|
name string
|
||||||
|
answer func(*reactiveHandler, context.Context, *queryTurn) (string, bool)
|
||||||
|
}
|
||||||
|
|
||||||
|
// querySources is the ordered chain actionQuery walks; first source to claim
|
||||||
|
// answers the turn. THE ORDER IS LOAD-BEARING — see the memory-before-notes
|
||||||
|
// comment on queryMemory: running the notes-only pass first was #373, and the
|
||||||
|
// gate was never the bug. Adding a source (Kiwix, RSS, crawler, email) is one
|
||||||
|
// line here plus its method; where you put the line is the whole decision.
|
||||||
|
var querySources = []querySource{
|
||||||
|
{"fact-by-key", (*reactiveHandler).queryFactByKey},
|
||||||
|
// Before "calendar" on purpose: both match "…на сегодня", and the plan is
|
||||||
|
// the more specific ask (its matcher requires a plan word), so the calendar
|
||||||
|
// listing would otherwise swallow it.
|
||||||
|
{"day-plan", (*reactiveHandler).queryDayPlan},
|
||||||
|
// Also before "calendar": "что я обычно делаю по средам?" names a weekday,
|
||||||
|
// and the habit question is the more specific one. Its matcher requires a
|
||||||
|
// habit marker ("обычно", "каждый", …), so a question about this coming
|
||||||
|
// Wednesday still reaches the calendar.
|
||||||
|
{"habits", (*reactiveHandler).queryHabits},
|
||||||
|
// Before "calendar" and before the recall sources: "что мне нужно
|
||||||
|
// сделать?" is a question about the task list, and the notes pass would
|
||||||
|
// otherwise answer it with whatever note happens to be nearest. Its
|
||||||
|
// matcher requires a task noun or an explicit "что … сделать", so a
|
||||||
|
// date-bearing question still reaches the calendar.
|
||||||
|
{"tasks", (*reactiveHandler).queryTasks},
|
||||||
|
// Before the recall sources too: "сколько я потратил?" is a question about
|
||||||
|
// the money facts the poller wrote, and the notes pass would otherwise
|
||||||
|
// answer it from whatever he once said about spending. Its matcher needs a
|
||||||
|
// money noun plus an actual ask, so "я потратил весь день" is untouched.
|
||||||
|
{"money", (*reactiveHandler).queryMoney},
|
||||||
|
{"calendar", (*reactiveHandler).queryCalendar},
|
||||||
|
{"weather", (*reactiveHandler).queryWeather},
|
||||||
|
{"embed", (*reactiveHandler).queryEmbed},
|
||||||
|
{"memory", (*reactiveHandler).queryMemory},
|
||||||
|
{"notes", (*reactiveHandler).queryNotes},
|
||||||
|
{"general-knowledge", (*reactiveHandler).queryGeneral},
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *reactiveHandler) actionQuery(ctx context.Context, dec router.Decision) string {
|
||||||
|
t := &queryTurn{dec: dec}
|
||||||
|
for _, src := range querySources {
|
||||||
|
if reply, ok := src.answer(h, ctx, t); ok {
|
||||||
|
return reply
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "не знаю."
|
||||||
|
}
|
||||||
|
|
||||||
|
// queryFactByKey — when the dialogue layer resolved an anaphoric reference to
|
||||||
|
// a prior fact's key (e.g. "когда я это сделал?" after "запиши что я пил
|
||||||
|
// воду"), look up the fact's value directly.
|
||||||
|
func (h *reactiveHandler) queryFactByKey(ctx context.Context, t *queryTurn) (string, bool) {
|
||||||
|
dec := t.dec
|
||||||
|
if !dec.Slots.HasKey || dec.Slots.Key == "" {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
f, err := h.api.LatestFact(ctx, dec.Slots.Key)
|
||||||
|
if err != nil {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
if dec.Slots.HasTime {
|
||||||
|
// The query asks about timing — the fact's own timestamp is the
|
||||||
|
// answer it's looking for. Format as a natural reply.
|
||||||
|
return fmt.Sprintf("я записала это %s", formatTime(f.Ts)), true
|
||||||
|
}
|
||||||
|
// General fact reference: describe what we know.
|
||||||
|
if dec.Utterance == "" {
|
||||||
|
return fmt.Sprintf("вот что я знаю: %s — %s", dec.Slots.Key, f.Value), true
|
||||||
|
}
|
||||||
|
// The utterance still carries the question; fall through to normal RAG
|
||||||
|
// with the resolved key in context.
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
|
||||||
|
// queryDayPlan — "какие планы на сегодня?", "что у меня по плану?", "что
|
||||||
|
// дальше?" (Vikunja #128). Recites the day: calendar events, pending
|
||||||
|
// reminders, and any morning checklist still outstanding.
|
||||||
|
//
|
||||||
|
// 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.
|
||||||
|
func (h *reactiveHandler) queryDayPlan(ctx context.Context, t *queryTurn) (string, bool) {
|
||||||
|
if !router.IsDayPlanQuery(t.dec.Utterance) {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
plan, err := h.api.DayPlan(ctx)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("voice: day plan: %v", err)
|
||||||
|
return "не получилось собрать план.", true
|
||||||
|
}
|
||||||
|
if !isRestOfDayQuery(t.dec.Utterance) {
|
||||||
|
return plan.Spoken, true
|
||||||
|
}
|
||||||
|
// Rebuild the pure plan so the rest-of-day rendering is the same code that
|
||||||
|
// rendered the whole day — one formatter, one persona.
|
||||||
|
p := morning.Plan{Date: plan.Date}
|
||||||
|
for _, it := range plan.Items {
|
||||||
|
p.Items = append(p.Items, morning.PlanEntry{
|
||||||
|
At: it.At,
|
||||||
|
Text: it.Text,
|
||||||
|
Kind: morning.PlanKind(it.Kind),
|
||||||
|
Uncertain: it.Uncertain,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
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 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.
|
||||||
|
const habitFactWindow = 2000
|
||||||
|
|
||||||
|
// queryHabits — "что я обычно делаю по вторникам?" (Vikunja #254). Counts the
|
||||||
|
// answer out of the fact log rather than asking the model to summarise a life:
|
||||||
|
// see internal/memory/behavior.go for why nothing here is generated.
|
||||||
|
func (h *reactiveHandler) queryHabits(ctx context.Context, t *queryTurn) (string, bool) {
|
||||||
|
q, ok := router.ParseHabitQuery(t.dec.Utterance)
|
||||||
|
if !ok {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
facts, err := h.api.RecentFacts(ctx, habitFactWindow)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("voice: habits: recent facts: %v", err)
|
||||||
|
return "не получилось посмотреть записи.", true
|
||||||
|
}
|
||||||
|
obs := make([]memory.Observation, 0, len(facts))
|
||||||
|
for _, f := range facts {
|
||||||
|
obs = append(obs, memory.Observation{At: f.Ts, Key: f.Key, Kind: f.Kind})
|
||||||
|
}
|
||||||
|
profile := memory.BuildProfile(obs, h.now())
|
||||||
|
if q.HasWeekday {
|
||||||
|
return profile.FormatWeekdayRU(q.Weekday), true
|
||||||
|
}
|
||||||
|
return profile.FormatOverallRU(), true
|
||||||
|
}
|
||||||
|
|
||||||
|
// queryCalendar — "что у меня сегодня?", "планы на завтра?"
|
||||||
|
// h.now(), not time.Now(): the handler's clock is the injected one, so this
|
||||||
|
// source can be tested at a fixed time like the rest.
|
||||||
|
func (h *reactiveHandler) queryCalendar(ctx context.Context, t *queryTurn) (string, bool) {
|
||||||
|
date, ok := router.ParseCalendarDate(t.dec.Utterance, h.now())
|
||||||
|
if !ok {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
events, err := h.api.CalendarEvents(ctx, date, date.Add(24*time.Hour))
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("voice: calendar events: %v", err)
|
||||||
|
return "не получилось проверить календарь.", true
|
||||||
|
}
|
||||||
|
// Provenance travels with each event. A work meeting relayed off a phone
|
||||||
|
// notification (source ambient:notif, #126) is stored below full confidence
|
||||||
|
// and gets hedged; a CalDAV read is recited plainly.
|
||||||
|
entries := make([]router.CalendarEntry, len(events))
|
||||||
|
for i, e := range events {
|
||||||
|
entries[i] = router.CalendarEntry{Text: e.Value, Uncertain: e.Confidence < 1.0}
|
||||||
|
}
|
||||||
|
var f router.CalendarEventFormatter
|
||||||
|
return f.FormatEntries(entries, date), true
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *reactiveHandler) queryWeather(ctx context.Context, t *queryTurn) (string, bool) {
|
||||||
|
if !isWeatherQuery(t.dec.Utterance) {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
loc := extractWeatherLocation(t.dec.Utterance, h.weatherLocation)
|
||||||
|
ctxWT, cancel := context.WithTimeout(ctx, 5*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
w, err := h.weatherProvider.CurrentWeather(ctxWT, loc)
|
||||||
|
if errors.Is(err, weather.ErrNotConfigured) {
|
||||||
|
return "погода не настроена.", true
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("voice: weather: %v", err)
|
||||||
|
return "не получилось узнать погоду.", true
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("в %s сейчас %.0f градусов, %s.", w.Location, w.Temperature, w.Condition), true
|
||||||
|
}
|
||||||
|
|
||||||
|
// queryEmbed isn't an answer source — it's the shared cost the two recall
|
||||||
|
// sources below both need, run once, in the position it always ran in. It
|
||||||
|
// only claims the turn when the embedder fails.
|
||||||
|
func (h *reactiveHandler) queryEmbed(ctx context.Context, t *queryTurn) (string, bool) {
|
||||||
|
vec, err := router.EmbedQuery(ctx, h.embedder, t.dec.Utterance)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("voice: embed query: %v", err)
|
||||||
|
return "не получилось найти ответ.", true
|
||||||
|
}
|
||||||
|
t.vec = vec
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
|
||||||
|
// queryMemory — long-term memory first: ONE search over everything Maven
|
||||||
|
// remembers (notes and facts share this index) and ONE confidence gate, so
|
||||||
|
// the memory that is clearly the best match answers — a note just as much as
|
||||||
|
// a fact.
|
||||||
|
//
|
||||||
|
// This used to run only after the notes-only source below had already
|
||||||
|
// rejected the same note at the same score, which no note could ever survive
|
||||||
|
// a second time: the branch could only return a fact (#373). Order, not the
|
||||||
|
// gate, was the bug — the set of questions Maven answers is unchanged, only
|
||||||
|
// which memory gets to answer them.
|
||||||
|
func (h *reactiveHandler) queryMemory(ctx context.Context, t *queryTurn) (string, bool) {
|
||||||
|
if h.memStore == nil {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
hits, herr := h.memStore.Search(ctx, t.vec, 3)
|
||||||
|
if herr != nil {
|
||||||
|
log.Printf("voice: memory search: %v", herr)
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
hit, ok := bestRecall(hits, h.queryMinScore, h.queryMinMargin)
|
||||||
|
if !ok {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
text := hit.Meta["text"]
|
||||||
|
// A note is phrased in Maven's voice; a fact is read back as it was
|
||||||
|
// stored.
|
||||||
|
if hit.Meta["type"] == "note" {
|
||||||
|
if reply, perr := h.phraser.PhraseQuery(ctx, t.dec.Utterance, []string{text}); perr == nil && reply != "" {
|
||||||
|
return reply, true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return text, true
|
||||||
|
}
|
||||||
|
|
||||||
|
// queryNotes — notes-only pass, for notes the vector index above does not
|
||||||
|
// hold (an older note written before it existed). Same gate, notes-only
|
||||||
|
// candidates.
|
||||||
|
//
|
||||||
|
// Confidence gate: below it, say "I don't know" rather than read back the
|
||||||
|
// least-unrelated note — a confident wrong recall is worse than a gap (spec's
|
||||||
|
// "not a guesser-of-truth"). Same instinct as the loop's since(key)==null →
|
||||||
|
// don't fire. Two parts: an absolute cosine floor, and a margin over the
|
||||||
|
// runner-up, which is the part that works with the e5 embedder's narrow score
|
||||||
|
// band. See memory.Confident. Failing the gate passes the turn on to general
|
||||||
|
// knowledge, which is what "don't read back the runner-up" means here.
|
||||||
|
func (h *reactiveHandler) queryNotes(ctx context.Context, t *queryTurn) (string, bool) {
|
||||||
|
notes, err := h.api.QueryNotes(ctx, t.vec, 5)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("voice: query notes: %v", err)
|
||||||
|
return "не получилось найти ответ.", true
|
||||||
|
}
|
||||||
|
t.notes = notes
|
||||||
|
noteScores := make([]float64, len(notes))
|
||||||
|
for i, n := range notes {
|
||||||
|
noteScores[i] = n.Score
|
||||||
|
}
|
||||||
|
if !memory.ConfidentScores(noteScores, h.queryMinScore, h.queryMinMargin) {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
texts := make([]string, len(notes))
|
||||||
|
for i, n := range notes {
|
||||||
|
texts[i] = n.Text
|
||||||
|
}
|
||||||
|
reply, err := h.phraser.PhraseQuery(ctx, t.dec.Utterance, texts)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("voice: phrase query: %v", err)
|
||||||
|
}
|
||||||
|
if reply == "" {
|
||||||
|
reply = "вот что я нашла: " + texts[0]
|
||||||
|
}
|
||||||
|
return reply, true
|
||||||
|
}
|
||||||
|
|
||||||
|
// queryGeneral — general knowledge from the phraser, the last source before
|
||||||
|
// giving up. It always claims: either the model answers or Maven says she
|
||||||
|
// doesn't know.
|
||||||
|
func (h *reactiveHandler) queryGeneral(ctx context.Context, t *queryTurn) (string, bool) {
|
||||||
|
reply, err := h.phraser.PhraseQuery(ctx, t.dec.Utterance, nil)
|
||||||
|
if err != nil || reply == "" {
|
||||||
|
return "не знаю.", true
|
||||||
|
}
|
||||||
|
return reply, true
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"log"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/router"
|
||||||
|
)
|
||||||
|
|
||||||
|
// actionReminder handles router.IntentReminder: parse the time when stage-0
|
||||||
|
// skipped the extractor, then create the reminder.
|
||||||
|
func (h *reactiveHandler) actionReminder(ctx context.Context, dec router.Decision) string {
|
||||||
|
if !dec.Slots.HasTime {
|
||||||
|
// Stage-0 (reminder-wakeword grammar) skips the extractor, so the
|
||||||
|
// time wasn't parsed. Run the parser as a fallback.
|
||||||
|
if dec.Stage == 0 && h.timeParser != nil {
|
||||||
|
t, ok, err := h.timeParser.Parse(ctx, dec.Utterance, h.now())
|
||||||
|
if err == nil && ok {
|
||||||
|
dec.Slots.Time = t
|
||||||
|
dec.Slots.HasTime = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !dec.Slots.HasTime {
|
||||||
|
return "не получилось разобрать время напоминания."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
payload := `{"text":` + jsonString(dec.Utterance) + `}`
|
||||||
|
if _, err := h.api.CreateReminder(ctx, dec.Slots.Time, payload, ""); err != nil {
|
||||||
|
log.Printf("voice: create reminder: %v", err)
|
||||||
|
return "не получилось поставить напоминание."
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"log"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
"github.com/kami/maven/internal/router"
|
||||||
|
"github.com/kami/maven/internal/store"
|
||||||
|
"github.com/kami/maven/internal/tasks"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Task capture on the voice/chat path (Vikunja #130).
|
||||||
|
//
|
||||||
|
// Two halves, both deliberately small:
|
||||||
|
//
|
||||||
|
// - captureTaskFromNote runs at the top of actionNote. An utterance that
|
||||||
|
// explicitly files a task ("добавь в задачи купить молоко") goes to the task
|
||||||
|
// store instead of the note store. Anything without an explicit marker is
|
||||||
|
// still a note — see router.ParseTaskCapture for why "надо бы поспать" must
|
||||||
|
// not become a task.
|
||||||
|
// - queryTasks is a query source that reads the list back.
|
||||||
|
//
|
||||||
|
// Nothing here speaks unprompted. Tasks are answered when asked about; no tick
|
||||||
|
// rule reads the table.
|
||||||
|
|
||||||
|
// captureTaskFromNote claims the turn when the utterance explicitly files a
|
||||||
|
// task, returning the reply. ("", false) hands the turn back to the note path.
|
||||||
|
func (h *reactiveHandler) captureTaskFromNote(ctx context.Context, dec router.Decision) (string, bool) {
|
||||||
|
cap, ok := router.ParseTaskCapture(dec.Utterance)
|
||||||
|
if !ok {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
resp, err := h.api.CaptureTask(ctx, ipc.CaptureTaskReq{
|
||||||
|
Text: cap.Text,
|
||||||
|
Source: "tap:voice",
|
||||||
|
Status: store.TaskOpen, // he stated it himself — not a candidate
|
||||||
|
Weight: cap.Weight, // 0 unless he said "срочно" / "важно"
|
||||||
|
Ts: h.now(),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("voice: capture task: %v", err)
|
||||||
|
return "не получилось записать задачу.", true
|
||||||
|
}
|
||||||
|
if !resp.Created {
|
||||||
|
return "это уже в списке.", true
|
||||||
|
}
|
||||||
|
return "записала: " + cap.Text, true
|
||||||
|
}
|
||||||
|
|
||||||
|
// queryTasks — "какие у меня задачи?", "что мне нужно сделать?".
|
||||||
|
//
|
||||||
|
// Reads the live set and recites it in priority order (Vikunja #129). The order
|
||||||
|
// is computed by internal/tasks from what he told her — deadlines, the urgency
|
||||||
|
// he stated, how long a task has been sitting — never asked of the model. The
|
||||||
|
// rendering is the package's too, so the spoken list and the /tasks page can
|
||||||
|
// never disagree about what comes first.
|
||||||
|
func (h *reactiveHandler) queryTasks(ctx context.Context, t *queryTurn) (string, bool) {
|
||||||
|
if !router.IsTaskListQuery(t.dec.Utterance) {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
live, err := h.api.ListTasks(ctx, "live")
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("voice: list tasks: %v", err)
|
||||||
|
return "не получилось посмотреть задачи.", true
|
||||||
|
}
|
||||||
|
return tasks.FormatRU(tasks.Rank(taskItems(live), h.now())), true
|
||||||
|
}
|
||||||
|
|
||||||
|
// taskItems maps wire rows onto the ranker's input. Written here rather than in
|
||||||
|
// internal/tasks so the ranker stays a pure package with no ipc (and therefore
|
||||||
|
// no store, and therefore no cgo) dependency — the same posture as
|
||||||
|
// internal/morning and internal/memory.
|
||||||
|
func taskItems(ts []ipc.Task) []tasks.Item {
|
||||||
|
out := make([]tasks.Item, len(ts))
|
||||||
|
for i, t := range ts {
|
||||||
|
out[i] = tasks.Item{
|
||||||
|
ID: t.ID, Text: t.Text, Status: t.Status,
|
||||||
|
Created: t.CreatedTs, Due: t.Due, Weight: t.Weight,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
@@ -0,0 +1,227 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
"github.com/kami/maven/internal/router"
|
||||||
|
)
|
||||||
|
|
||||||
|
// taskAPI answers only the three task methods; every other call is
|
||||||
|
// unimplemented, which is the assertion that capture needs nothing else — in
|
||||||
|
// particular no embedder, so a filed task costs no model call.
|
||||||
|
type taskAPI struct {
|
||||||
|
ipc.UnimplementedCoreAPI
|
||||||
|
|
||||||
|
captured []ipc.CaptureTaskReq
|
||||||
|
created bool
|
||||||
|
capErr error
|
||||||
|
|
||||||
|
tasks []ipc.Task
|
||||||
|
listArg string
|
||||||
|
listErr error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *taskAPI) CaptureTask(_ context.Context, req ipc.CaptureTaskReq) (ipc.CaptureTaskResp, error) {
|
||||||
|
a.captured = append(a.captured, req)
|
||||||
|
if a.capErr != nil {
|
||||||
|
return ipc.CaptureTaskResp{}, a.capErr
|
||||||
|
}
|
||||||
|
return ipc.CaptureTaskResp{ID: 1, Created: a.created}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *taskAPI) ListTasks(_ context.Context, status string) ([]ipc.Task, error) {
|
||||||
|
a.listArg = status
|
||||||
|
return a.tasks, a.listErr
|
||||||
|
}
|
||||||
|
|
||||||
|
func taskNow() time.Time { return time.Date(2026, 8, 1, 9, 0, 0, 0, time.UTC) }
|
||||||
|
|
||||||
|
func taskHandler(api ipc.CoreAPI) *reactiveHandler {
|
||||||
|
return &reactiveHandler{api: api, now: taskNow}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCaptureTaskFromNoteFilesTheTask(t *testing.T) {
|
||||||
|
api := &taskAPI{created: true}
|
||||||
|
h := taskHandler(api)
|
||||||
|
reply, ok := h.captureTaskFromNote(context.Background(), router.Decision{
|
||||||
|
Intent: router.IntentNote, Utterance: "добавь в задачи купить молоко",
|
||||||
|
})
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("an explicit capture must claim the turn")
|
||||||
|
}
|
||||||
|
if len(api.captured) != 1 {
|
||||||
|
t.Fatalf("captured %d, want 1", len(api.captured))
|
||||||
|
}
|
||||||
|
got := api.captured[0]
|
||||||
|
if got.Text != "купить молоко" {
|
||||||
|
t.Errorf("text = %q, want the marker stripped", got.Text)
|
||||||
|
}
|
||||||
|
if got.Source != "tap:voice" {
|
||||||
|
t.Errorf("source = %q, want tap:voice", got.Source)
|
||||||
|
}
|
||||||
|
if got.Status != "open" {
|
||||||
|
t.Errorf("status = %q — work he stated is open, never a candidate", got.Status)
|
||||||
|
}
|
||||||
|
if !got.Ts.Equal(taskNow()) {
|
||||||
|
t.Errorf("ts = %v, want the handler clock", got.Ts)
|
||||||
|
}
|
||||||
|
if !strings.Contains(reply, "купить молоко") {
|
||||||
|
t.Errorf("reply = %q, want it to read the task back", reply)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A note is still a note: capture only fires on an explicit marker, so
|
||||||
|
// ordinary recall is untouched.
|
||||||
|
func TestCaptureTaskFromNotePassesOrdinaryNotes(t *testing.T) {
|
||||||
|
api := &taskAPI{}
|
||||||
|
h := taskHandler(api)
|
||||||
|
for _, u := range []string{"надо бы поспать", "мне понравился этот фильм", "запиши что я пил воду"} {
|
||||||
|
if _, ok := h.captureTaskFromNote(context.Background(), router.Decision{Utterance: u}); ok {
|
||||||
|
t.Errorf("%q was captured as a task", u)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(api.captured) != 0 {
|
||||||
|
t.Errorf("captured %d requests, want none", len(api.captured))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCaptureTaskFromNoteSaysAlreadyOnTheList(t *testing.T) {
|
||||||
|
h := taskHandler(&taskAPI{created: false})
|
||||||
|
reply, ok := h.captureTaskFromNote(context.Background(), router.Decision{Utterance: "добавь в задачи купить молоко"})
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("expected the capture path to claim it")
|
||||||
|
}
|
||||||
|
if !strings.Contains(reply, "уже") {
|
||||||
|
t.Errorf("reply = %q — a deduped capture must not claim it saved something new", reply)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCaptureTaskFromNoteReportsStoreFailure(t *testing.T) {
|
||||||
|
h := taskHandler(&taskAPI{capErr: errors.New("db is on fire")})
|
||||||
|
reply, ok := h.captureTaskFromNote(context.Background(), router.Decision{Utterance: "добавь задачу починить кран"})
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("a failed capture still claims the turn — the note path must not double-write")
|
||||||
|
}
|
||||||
|
if !strings.Contains(reply, "не получилось") {
|
||||||
|
t.Errorf("reply = %q, want an honest failure", reply)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestQueryTasksRecitesTheLiveList(t *testing.T) {
|
||||||
|
api := &taskAPI{tasks: []ipc.Task{
|
||||||
|
{ID: 1, Text: "купить молоко", Status: "open"},
|
||||||
|
{ID: 2, Text: "продлить страховку", Status: "candidate"},
|
||||||
|
}}
|
||||||
|
h := taskHandler(api)
|
||||||
|
reply, ok := h.queryTasks(context.Background(), &queryTurn{
|
||||||
|
dec: router.Decision{Intent: router.IntentQuery, Utterance: "какие у меня задачи?"},
|
||||||
|
})
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("the task source must claim a task-list question")
|
||||||
|
}
|
||||||
|
if api.listArg != "live" {
|
||||||
|
t.Errorf("ListTasks(%q), want \"live\" — a resolved task is not outstanding work", api.listArg)
|
||||||
|
}
|
||||||
|
if !strings.Contains(reply, "купить молоко") || !strings.Contains(reply, "продлить страховку") {
|
||||||
|
t.Errorf("reply = %q, want both tasks", reply)
|
||||||
|
}
|
||||||
|
// The candidate must be named as unconfirmed, not recited as his work.
|
||||||
|
openIdx := strings.Index(reply, "купить молоко")
|
||||||
|
candIdx := strings.Index(reply, "продлить страховку")
|
||||||
|
if !(openIdx < candIdx) {
|
||||||
|
t.Errorf("reply = %q, want confirmed work before candidates", reply)
|
||||||
|
}
|
||||||
|
if !strings.Contains(reply, "не подтвердил") {
|
||||||
|
t.Errorf("reply = %q, want the candidate flagged as unconfirmed", reply)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The stated urgency rides through capture as a weight, so the ranker can use
|
||||||
|
// it later (Vikunja #129). "срочно" is not part of the task text.
|
||||||
|
func TestCaptureTaskCarriesStatedUrgency(t *testing.T) {
|
||||||
|
api := &taskAPI{created: true}
|
||||||
|
h := taskHandler(api)
|
||||||
|
if _, ok := h.captureTaskFromNote(context.Background(), router.Decision{
|
||||||
|
Utterance: "добавь в задачи срочно оплатить интернет",
|
||||||
|
}); !ok {
|
||||||
|
t.Fatal("expected a capture")
|
||||||
|
}
|
||||||
|
got := api.captured[0]
|
||||||
|
if got.Text != "оплатить интернет" {
|
||||||
|
t.Errorf("text = %q, want the urgency word out of the task", got.Text)
|
||||||
|
}
|
||||||
|
if got.Weight == 0 {
|
||||||
|
t.Error("weight = 0 — he said срочно and it was dropped")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The recital is ordered by the ranker, not by insertion: a deadline he named
|
||||||
|
// comes before undated work.
|
||||||
|
func TestQueryTasksRecitesInPriorityOrder(t *testing.T) {
|
||||||
|
due := taskNow()
|
||||||
|
api := &taskAPI{tasks: []ipc.Task{
|
||||||
|
{ID: 1, Text: "купить молоко", Status: "open", CreatedTs: taskNow()},
|
||||||
|
{ID: 2, Text: "оплатить интернет", Status: "open", CreatedTs: taskNow(), Due: &due},
|
||||||
|
}}
|
||||||
|
h := taskHandler(api)
|
||||||
|
reply, _ := h.queryTasks(context.Background(), &queryTurn{
|
||||||
|
dec: router.Decision{Utterance: "какие у меня задачи?"},
|
||||||
|
})
|
||||||
|
if strings.Index(reply, "оплатить интернет") > strings.Index(reply, "купить молоко") {
|
||||||
|
t.Errorf("reply = %q, want the dated task first", reply)
|
||||||
|
}
|
||||||
|
if !strings.Contains(reply, "сегодня") {
|
||||||
|
t.Errorf("reply = %q, want the reason named", reply)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestQueryTasksEmptyList(t *testing.T) {
|
||||||
|
h := taskHandler(&taskAPI{})
|
||||||
|
reply, ok := h.queryTasks(context.Background(), &queryTurn{
|
||||||
|
dec: router.Decision{Utterance: "что мне нужно сделать?"},
|
||||||
|
})
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("expected the task source to claim it")
|
||||||
|
}
|
||||||
|
if reply != "задач нет." {
|
||||||
|
t.Errorf("reply = %q", reply)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestQueryTasksPassesOtherQuestions(t *testing.T) {
|
||||||
|
api := &taskAPI{}
|
||||||
|
h := taskHandler(api)
|
||||||
|
for _, u := range []string{"как дела?", "какая погода в москве?", "что у меня сегодня?"} {
|
||||||
|
if _, ok := h.queryTasks(context.Background(), &queryTurn{dec: router.Decision{Utterance: u}}); ok {
|
||||||
|
t.Errorf("the task source claimed %q", u)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if api.listArg != "" {
|
||||||
|
t.Error("a non-task question must not read the task list")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The chain must reach the task source before the recall sources, or "что мне
|
||||||
|
// нужно сделать?" gets answered by whatever note is nearest.
|
||||||
|
func TestQuerySourcesOrderTasksBeforeRecall(t *testing.T) {
|
||||||
|
var tasksAt, notesAt = -1, -1
|
||||||
|
for i, src := range querySources {
|
||||||
|
switch src.name {
|
||||||
|
case "tasks":
|
||||||
|
tasksAt = i
|
||||||
|
case "notes":
|
||||||
|
notesAt = i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if tasksAt < 0 || notesAt < 0 {
|
||||||
|
t.Fatalf("sources missing: tasks=%d notes=%d", tasksAt, notesAt)
|
||||||
|
}
|
||||||
|
if tasksAt > notesAt {
|
||||||
|
t.Errorf("tasks source at %d, after notes at %d", tasksAt, notesAt)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,216 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"log"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/router"
|
||||||
|
)
|
||||||
|
|
||||||
|
// pendingHexisExec — a mutating Hexis capability parked awaiting a spoken
|
||||||
|
// confirm. The confirmation is bound to the resolved capability + canonical
|
||||||
|
// target entity so a later "да" can only execute exactly what was proposed
|
||||||
|
// (ecosystem invariant: protected actions require bound confirmation).
|
||||||
|
type pendingHexisExec struct {
|
||||||
|
capabilityID string
|
||||||
|
capName string
|
||||||
|
entityID string
|
||||||
|
displayName string
|
||||||
|
expiry time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
// pendingRoutineConfirm — a proposed routine awaiting a spoken y/n to become
|
||||||
|
// a recurring reminder. Set by detectPattern after creating a proposal.
|
||||||
|
type pendingRoutineConfirm struct {
|
||||||
|
routineID int64
|
||||||
|
action string
|
||||||
|
object string
|
||||||
|
interval float64
|
||||||
|
phrase string
|
||||||
|
expiry time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
// pendingAct — a destructive act awaiting a spoken confirm.
|
||||||
|
type pendingAct struct {
|
||||||
|
fn string
|
||||||
|
args []string
|
||||||
|
phrase string
|
||||||
|
expiry time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
// confirmTTL — how long a parked destructive confirm stays answerable. Short:
|
||||||
|
// a confirm is a same-breath gesture; a stale prompt shouldn't fire on an
|
||||||
|
// unrelated later "да".
|
||||||
|
const confirmTTL = 90 * time.Second
|
||||||
|
|
||||||
|
// park stores a destructive act awaiting confirmation. Overwrites any prior
|
||||||
|
// pending (last-asked wins — single-user box).
|
||||||
|
func (h *reactiveHandler) park(fn string, args []string, phrase string) {
|
||||||
|
h.mu.Lock()
|
||||||
|
h.pending = &pendingAct{fn: fn, args: args, phrase: phrase, expiry: h.now().Add(confirmTTL)}
|
||||||
|
h.mu.Unlock()
|
||||||
|
}
|
||||||
|
|
||||||
|
// resolveConfirm interprets an utterance as the answer to a parked destructive
|
||||||
|
// act OR a parked routine proposal. Returns (reply, true) when it consumed the
|
||||||
|
// utterance as a y/n answer; ("", false) when there's nothing pending (or the
|
||||||
|
// parked act expired), so the caller routes the utterance normally. An
|
||||||
|
// unrecognised answer cancels the pending and routes normally — a confirm that
|
||||||
|
// can't be answered clearly is safer abandoned than left armed.
|
||||||
|
func (h *reactiveHandler) resolveConfirm(ctx context.Context, text string) (string, bool) {
|
||||||
|
h.mu.Lock()
|
||||||
|
defer h.mu.Unlock()
|
||||||
|
|
||||||
|
for _, r := range h.confirmResolvers(ctx) {
|
||||||
|
if !r.claim() {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// The slot is already cleared by claim(): every branch below drops the
|
||||||
|
// pending, including the unclear one — a confirm that can't be
|
||||||
|
// answered clearly is safer abandoned than left armed.
|
||||||
|
switch classifyConfirm(text) {
|
||||||
|
case confirmYes:
|
||||||
|
return r.yes(), true
|
||||||
|
case confirmNo:
|
||||||
|
return r.no(), true
|
||||||
|
default:
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
|
||||||
|
// confirmResolver — one parked-confirm slot in the chain. claim() reports
|
||||||
|
// whether this slot holds a live pending, taking it (and dropping an expired
|
||||||
|
// one) as it goes; yes/no then run the answer. Only ever called with h.mu held.
|
||||||
|
type confirmResolver struct {
|
||||||
|
claim func() bool
|
||||||
|
yes func() string
|
||||||
|
no func() string
|
||||||
|
}
|
||||||
|
|
||||||
|
// confirmResolvers builds the ordered chain resolveConfirm walks. Order is
|
||||||
|
// deliberate: the routine proposal is checked before the tool confirm so a
|
||||||
|
// routine confirm doesn't get eaten by a stale tool pending.
|
||||||
|
func (h *reactiveHandler) confirmResolvers(ctx context.Context) []confirmResolver {
|
||||||
|
var pr *pendingRoutineConfirm
|
||||||
|
var hx *pendingHexisExec
|
||||||
|
var p *pendingAct
|
||||||
|
|
||||||
|
return []confirmResolver{
|
||||||
|
// Routine proposal.
|
||||||
|
{
|
||||||
|
claim: func() bool {
|
||||||
|
pr, h.pendingRoutine = h.pendingRoutine, nil
|
||||||
|
return pr != nil && !h.now().After(pr.expiry)
|
||||||
|
},
|
||||||
|
yes: func() string {
|
||||||
|
// Only record the acceptance. The tick loop reads accepted
|
||||||
|
// routines and nudges on their own interval. Building a
|
||||||
|
// reminder here made a routine fire exactly once (Vikunja #366).
|
||||||
|
if err := h.dataStore.AcceptProposedRoutine(ctx, pr.routineID, h.now()); err != nil {
|
||||||
|
log.Printf("voice: accept proposed routine: %v", err)
|
||||||
|
return "не получилось запомнить рутину."
|
||||||
|
}
|
||||||
|
return "буду напоминать."
|
||||||
|
},
|
||||||
|
no: func() string {
|
||||||
|
if err := h.dataStore.DismissProposedRoutine(ctx, pr.routineID); err != nil {
|
||||||
|
log.Printf("voice: dismiss proposed routine: %v", err)
|
||||||
|
}
|
||||||
|
return "хорошо, не буду."
|
||||||
|
},
|
||||||
|
},
|
||||||
|
// Hexis execution confirm. Bound to the exact capability + target that
|
||||||
|
// was proposed; a stray "да" can only run that, nothing else.
|
||||||
|
{
|
||||||
|
claim: func() bool {
|
||||||
|
hx, h.pendingHexis = h.pendingHexis, nil
|
||||||
|
return hx != nil && !h.now().After(hx.expiry)
|
||||||
|
},
|
||||||
|
yes: func() string {
|
||||||
|
return h.execHexis(ctx, hx.capabilityID, hx.capName, hx.entityID, hx.displayName)
|
||||||
|
},
|
||||||
|
no: func() string { return "отменила." },
|
||||||
|
},
|
||||||
|
// Tool confirm.
|
||||||
|
{
|
||||||
|
claim: func() bool {
|
||||||
|
p, h.pending = h.pending, nil
|
||||||
|
return p != nil && !h.now().After(p.expiry)
|
||||||
|
},
|
||||||
|
yes: func() string {
|
||||||
|
out, err := h.tools.Exec(ctx, p.fn, p.args, true) // confirmed
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("voice: tool %s (confirmed): %v", p.fn, err)
|
||||||
|
if out != "" {
|
||||||
|
return "не получилось выполнить команду: " + firstLine(out)
|
||||||
|
}
|
||||||
|
return "не получилось выполнить команду."
|
||||||
|
}
|
||||||
|
if out != "" {
|
||||||
|
return "готово: " + firstLine(out)
|
||||||
|
}
|
||||||
|
return "готово."
|
||||||
|
},
|
||||||
|
no: func() string { return "отменила." },
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// proposeGap scaffolds a 'proposed' tool for an act whose verb isn't enabled.
|
||||||
|
// maven drafts the registration (name = the verb, provenance = the utterance);
|
||||||
|
// a human enables it on the authed surface. She suggests, never enables.
|
||||||
|
func (h *reactiveHandler) proposeGap(ctx context.Context, dec router.Decision) string {
|
||||||
|
name := firstWord(stripWake(dec.Utterance))
|
||||||
|
if name == "" {
|
||||||
|
return "не разобрала команду — попробуй иначе."
|
||||||
|
}
|
||||||
|
newly, err := h.api.ProposeTool(ctx, name, dec.Utterance, "", h.now())
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("voice: propose tool %q: %v", name, err)
|
||||||
|
return "команды «" + name + "» нет в списке разрешённых."
|
||||||
|
}
|
||||||
|
if newly {
|
||||||
|
return "команды «" + name + "» нет в списке. Предложила её добавить — включи через клиент."
|
||||||
|
}
|
||||||
|
return "команды «" + name + "» пока нет в списке — она уже предложена, включи через клиент."
|
||||||
|
}
|
||||||
|
|
||||||
|
// confirmVerdict — the parse of a y/n confirm answer.
|
||||||
|
type confirmVerdict int
|
||||||
|
|
||||||
|
const (
|
||||||
|
confirmUnknown confirmVerdict = iota
|
||||||
|
confirmYes
|
||||||
|
confirmNo
|
||||||
|
)
|
||||||
|
|
||||||
|
// classifyConfirm reads a short ru/en yes-or-no answer. Substring match on the
|
||||||
|
// stems so inflections/fillers ("да, давай", "нет, отмени") still land.
|
||||||
|
func classifyConfirm(text string) confirmVerdict {
|
||||||
|
t := strings.ToLower(strings.TrimSpace(text))
|
||||||
|
// negatives first — "не надо" contains no "да", but check no-stems before
|
||||||
|
// yes so a leading "нет" isn't shadowed.
|
||||||
|
for _, no := range []string{"нет", "не надо", "отмен", "стоп", "no", "cancel", "stop", "don't"} {
|
||||||
|
if strings.Contains(t, no) {
|
||||||
|
return confirmNo
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, yes := range []string{"да", "ага", "давай", "подтвер", "конечно", "yes", "yeah", "yep", "confirm", "ок", "okay", "ok"} {
|
||||||
|
if strings.Contains(t, yes) {
|
||||||
|
return confirmYes
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return confirmUnknown
|
||||||
|
}
|
||||||
|
|
||||||
|
// actPhrase renders "fn arg1 arg2" for the confirm prompt.
|
||||||
|
func actPhrase(fn string, args []string) string {
|
||||||
|
if len(args) == 0 {
|
||||||
|
return fn
|
||||||
|
}
|
||||||
|
return fn + " " + strings.Join(args, " ")
|
||||||
|
}
|
||||||
@@ -0,0 +1,227 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
"github.com/kami/maven/internal/router"
|
||||||
|
)
|
||||||
|
|
||||||
|
// planAPI answers only DayPlan; every other call is unimplemented, which is
|
||||||
|
// exactly the assertion that the plan source needs nothing else.
|
||||||
|
type planAPI struct {
|
||||||
|
ipc.UnimplementedCoreAPI
|
||||||
|
plan ipc.DayPlan
|
||||||
|
err error
|
||||||
|
calls int
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *planAPI) DayPlan(context.Context) (ipc.DayPlan, error) {
|
||||||
|
a.calls++
|
||||||
|
if a.err != nil {
|
||||||
|
return ipc.DayPlan{}, a.err
|
||||||
|
}
|
||||||
|
return a.plan, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func planDay() time.Time { return time.Date(2026, 8, 3, 12, 0, 0, 0, time.UTC) }
|
||||||
|
|
||||||
|
func samplePlan() ipc.DayPlan {
|
||||||
|
day := planDay()
|
||||||
|
mid := time.Date(2026, 8, 3, 0, 0, 0, 0, time.UTC)
|
||||||
|
return ipc.DayPlan{
|
||||||
|
Date: mid,
|
||||||
|
Items: []ipc.DayPlanItem{
|
||||||
|
{At: day.Add(-2 * time.Hour), Text: "Standup @ 10:00-10:30", Kind: "event"},
|
||||||
|
{At: day.Add(2 * time.Hour), Text: "Планёрка @ 14:00-14:30", Kind: "event", Uncertain: true},
|
||||||
|
{At: day.Add(6 * time.Hour), Text: "позвонить маме", Kind: "reminder"},
|
||||||
|
},
|
||||||
|
Spoken: "план на 03.08.2026: 10:00 — Standup @ 10:00-10:30; " +
|
||||||
|
"похоже, 14:00 — Планёрка @ 14:00-14:30; 18:00 — позвонить маме.",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func planHandler(api ipc.CoreAPI) *reactiveHandler {
|
||||||
|
return &reactiveHandler{api: api, now: planDay}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestQueryDayPlanRecitesTheDay(t *testing.T) {
|
||||||
|
api := &planAPI{plan: samplePlan()}
|
||||||
|
h := planHandler(api)
|
||||||
|
reply, ok := h.queryDayPlan(context.Background(), &queryTurn{
|
||||||
|
dec: router.Decision{Intent: router.IntentQuery, Utterance: "какие планы на сегодня?"},
|
||||||
|
})
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("the plan source must claim a plan question")
|
||||||
|
}
|
||||||
|
if reply != api.plan.Spoken {
|
||||||
|
t.Errorf("reply = %q, want the core's spoken plan %q", reply, api.plan.Spoken)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// "что дальше?" is the rest of the day, not the whole day: what has already
|
||||||
|
// happened is not a plan.
|
||||||
|
func TestQueryDayPlanTrimsToRestOfDay(t *testing.T) {
|
||||||
|
h := planHandler(&planAPI{plan: samplePlan()})
|
||||||
|
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, "Standup") {
|
||||||
|
t.Errorf("a passed item must not be read back: %q", reply)
|
||||||
|
}
|
||||||
|
if !strings.Contains(reply, "Планёрка") || !strings.Contains(reply, "позвонить маме") {
|
||||||
|
t.Errorf("the rest of the day is missing: %q", reply)
|
||||||
|
}
|
||||||
|
// Provenance survives the trim.
|
||||||
|
if !strings.Contains(reply, "похоже,") {
|
||||||
|
t.Errorf("a relayed event must stay hedged: %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{
|
||||||
|
"что у меня сегодня?",
|
||||||
|
"какие планы на завтра?",
|
||||||
|
"когда планёрка?",
|
||||||
|
"какая погода?",
|
||||||
|
"",
|
||||||
|
} {
|
||||||
|
api := &planAPI{plan: samplePlan()}
|
||||||
|
reply, ok := planHandler(api).queryDayPlan(context.Background(), &queryTurn{
|
||||||
|
dec: router.Decision{Intent: router.IntentQuery, Utterance: q},
|
||||||
|
})
|
||||||
|
if ok {
|
||||||
|
t.Errorf("%q was claimed by the plan source (reply %q)", q, reply)
|
||||||
|
}
|
||||||
|
if api.calls != 0 {
|
||||||
|
t.Errorf("%q hit the core for a plan it does not want", q)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestQueryDayPlanCoreFailure(t *testing.T) {
|
||||||
|
h := planHandler(&planAPI{err: errors.New("socket closed")})
|
||||||
|
reply, ok := h.queryDayPlan(context.Background(), &queryTurn{
|
||||||
|
dec: router.Decision{Intent: router.IntentQuery, Utterance: "план на сегодня"},
|
||||||
|
})
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("a failed plan read must still answer, not fall through to RAG")
|
||||||
|
}
|
||||||
|
if reply != "не получилось собрать план." {
|
||||||
|
t.Errorf("reply = %q", reply)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The day plan must sit before the calendar listing: both match "…на сегодня",
|
||||||
|
// and the more specific matcher has to get first refusal (see #373 for what
|
||||||
|
// happens when the order is wrong).
|
||||||
|
func TestDayPlanSourcePrecedesCalendar(t *testing.T) {
|
||||||
|
plan, cal := -1, -1
|
||||||
|
for i, s := range querySources {
|
||||||
|
switch s.name {
|
||||||
|
case "day-plan":
|
||||||
|
plan = i
|
||||||
|
case "calendar":
|
||||||
|
cal = i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if plan < 0 || cal < 0 {
|
||||||
|
t.Fatalf("sources missing: day-plan=%d calendar=%d", plan, cal)
|
||||||
|
}
|
||||||
|
if plan > cal {
|
||||||
|
t.Errorf("day-plan at %d must come before calendar at %d", plan, cal)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// habitAPI answers only RecentFacts — the whole input the behaviour profile
|
||||||
|
// needs (Vikunja #254). Nothing is asked of the LLM, so nothing else is wired.
|
||||||
|
type habitAPI struct {
|
||||||
|
ipc.UnimplementedCoreAPI
|
||||||
|
facts []ipc.Fact
|
||||||
|
err error
|
||||||
|
calls int
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *habitAPI) RecentFacts(_ context.Context, _ int) ([]ipc.Fact, error) {
|
||||||
|
a.calls++
|
||||||
|
return a.facts, a.err
|
||||||
|
}
|
||||||
|
|
||||||
|
// tuesdayFacts — n weekly Tuesday rows for key, ending before now.
|
||||||
|
func tuesdayFacts(key string, hh, weeks int, now time.Time) []ipc.Fact {
|
||||||
|
d := now
|
||||||
|
for d.Weekday() != time.Tuesday {
|
||||||
|
d = d.AddDate(0, 0, -1)
|
||||||
|
}
|
||||||
|
var out []ipc.Fact
|
||||||
|
for i := 0; i < weeks; i++ {
|
||||||
|
day := d.AddDate(0, 0, -7*i)
|
||||||
|
out = append(out, ipc.Fact{
|
||||||
|
Ts: time.Date(day.Year(), day.Month(), day.Day(), hh, 0, 0, 0, now.Location()),
|
||||||
|
Kind: "self",
|
||||||
|
Key: key,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestQueryHabitsAnswersFromCountedFacts(t *testing.T) {
|
||||||
|
now := planDay() // a Monday
|
||||||
|
api := &habitAPI{facts: tuesdayFacts("workout", 19, 4, now)}
|
||||||
|
h := &reactiveHandler{api: api, now: func() time.Time { return now }}
|
||||||
|
|
||||||
|
reply, ok := h.queryHabits(context.Background(), &queryTurn{
|
||||||
|
dec: router.Decision{Intent: router.IntentQuery, Utterance: "что я обычно делаю по вторникам?"},
|
||||||
|
})
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("the habit source must claim a habit question")
|
||||||
|
}
|
||||||
|
if want := "по вторникам ты обычно тренируешься около 19:00."; reply != want {
|
||||||
|
t.Errorf("reply = %q, want %q", reply, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestQueryHabitsPassesOnEverythingElse(t *testing.T) {
|
||||||
|
now := planDay()
|
||||||
|
for _, q := range []string{"что я делаю в среду?", "что у меня сегодня?", "какие планы на сегодня?", ""} {
|
||||||
|
api := &habitAPI{}
|
||||||
|
h := &reactiveHandler{api: api, now: func() time.Time { return now }}
|
||||||
|
if reply, ok := h.queryHabits(context.Background(), &queryTurn{
|
||||||
|
dec: router.Decision{Intent: router.IntentQuery, Utterance: q},
|
||||||
|
}); ok {
|
||||||
|
t.Errorf("%q was claimed by the habit source (reply %q)", q, reply)
|
||||||
|
}
|
||||||
|
if api.calls != 0 {
|
||||||
|
t.Errorf("%q scanned the fact log for a profile it does not want", q)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Both specific sources must precede the calendar listing, which matches any
|
||||||
|
// utterance naming a day.
|
||||||
|
func TestHabitSourcePrecedesCalendar(t *testing.T) {
|
||||||
|
habits, cal := -1, -1
|
||||||
|
for i, s := range querySources {
|
||||||
|
switch s.name {
|
||||||
|
case "habits":
|
||||||
|
habits = i
|
||||||
|
case "calendar":
|
||||||
|
cal = i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if habits < 0 || cal < 0 {
|
||||||
|
t.Fatalf("sources missing: habits=%d calendar=%d", habits, cal)
|
||||||
|
}
|
||||||
|
if habits > cal {
|
||||||
|
t.Errorf("habits at %d must come before calendar at %d", habits, cal)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,158 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/loop"
|
||||||
|
"github.com/kami/maven/internal/store"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Vikunja #281 — the fourth delivery outcome: a care candidate the restraint
|
||||||
|
// gate suppresses (quiet hours / away / calendar-busy) is not necessarily
|
||||||
|
// lost. If it's worth resurfacing (loop.DigestEligible), it's durably held
|
||||||
|
// (internal/store's digest_entries) and spoken as one bundle once speaking
|
||||||
|
// is appropriate again — never while the suppression reason still holds.
|
||||||
|
|
||||||
|
func breakTrace(blockedBy string) *loop.TickTrace {
|
||||||
|
return &loop.TickTrace{
|
||||||
|
RuleTraces: []loop.RuleTrace{{
|
||||||
|
RuleName: "break",
|
||||||
|
Severity: loop.Sev2,
|
||||||
|
PredicateResult: true,
|
||||||
|
GateResult: false,
|
||||||
|
GateBlockedBy: blockedBy,
|
||||||
|
}},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSuppressedCareDigestsAcrossQuietHours — a Sev2 care candidate blocked
|
||||||
|
// by quiet hours is enqueued into the durable digest, and is spoken as a
|
||||||
|
// "digest" nudge only once quiet hours actually end — never while still
|
||||||
|
// suppressed (that would just be a second way to nag through quiet hours).
|
||||||
|
func TestSuppressedCareDigestsAcrossQuietHours(t *testing.T) {
|
||||||
|
st := newTestStore(t)
|
||||||
|
sink := &fakeSink{}
|
||||||
|
tl := newTestTickLoop(t, st, sink, nil)
|
||||||
|
ctx := context.Background()
|
||||||
|
now := refNow()
|
||||||
|
|
||||||
|
quiet := loop.State{Now: now, QuietHours: true, Presence: store.Present}
|
||||||
|
tl.enqueueSuppressedDigest(ctx, breakTrace("quiet_hours"), quiet, now)
|
||||||
|
|
||||||
|
entries, err := st.PendingDigestEntries(ctx, now)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("pending: %v", err)
|
||||||
|
}
|
||||||
|
if len(entries) != 1 || entries[0].Rule != "break" {
|
||||||
|
t.Fatalf("want 1 pending digest entry for break, got %+v", entries)
|
||||||
|
}
|
||||||
|
|
||||||
|
// still quiet hours: draining now must not speak — the same restraint
|
||||||
|
// that suppressed the live nudge must suppress the bundle too.
|
||||||
|
tl.maybeDrainDigest(ctx, quiet, now)
|
||||||
|
if len(sink.sends) != 0 {
|
||||||
|
t.Fatalf("digest must not drain while quiet hours holds, got %+v", sink.sends)
|
||||||
|
}
|
||||||
|
|
||||||
|
// quiet hours end: this is the moment speaking is appropriate again.
|
||||||
|
after := now.Add(time.Hour)
|
||||||
|
clear := loop.State{Now: after, QuietHours: false, Presence: store.Present}
|
||||||
|
tl.maybeDrainDigest(ctx, clear, after)
|
||||||
|
|
||||||
|
if len(sink.sends) != 1 {
|
||||||
|
t.Fatalf("want exactly 1 dispatched digest bundle, got %d: %+v", len(sink.sends), sink.sends)
|
||||||
|
}
|
||||||
|
if sink.sends[0].RuleName != "digest" {
|
||||||
|
t.Fatalf("want RuleName digest, got %q", sink.sends[0].RuleName)
|
||||||
|
}
|
||||||
|
|
||||||
|
remaining, err := st.PendingDigestEntries(ctx, after)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("pending after drain: %v", err)
|
||||||
|
}
|
||||||
|
if len(remaining) != 0 {
|
||||||
|
t.Fatalf("drained entry must no longer be pending, got %+v", remaining)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSuppressedCareDigestDedupesAcrossTicks — quiet hours holding for
|
||||||
|
// several ticks must not enqueue several copies of the same suppressed
|
||||||
|
// nudge; he hears it once when the bundle finally drains.
|
||||||
|
func TestSuppressedCareDigestDedupesAcrossTicks(t *testing.T) {
|
||||||
|
st := newTestStore(t)
|
||||||
|
sink := &fakeSink{}
|
||||||
|
tl := newTestTickLoop(t, st, sink, nil)
|
||||||
|
ctx := context.Background()
|
||||||
|
now := refNow()
|
||||||
|
|
||||||
|
quiet := loop.State{Now: now, QuietHours: true, Presence: store.Present}
|
||||||
|
for i := 0; i < 3; i++ {
|
||||||
|
tl.enqueueSuppressedDigest(ctx, breakTrace("quiet_hours"), quiet, now.Add(time.Duration(i)*time.Minute))
|
||||||
|
}
|
||||||
|
|
||||||
|
entries, err := st.PendingDigestEntries(ctx, now)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("pending: %v", err)
|
||||||
|
}
|
||||||
|
if len(entries) != 1 {
|
||||||
|
t.Fatalf("3 suppressions of the same nudge must collapse to 1 pending entry, got %d", len(entries))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSuppressedCareDigestExpiresRatherThanDeliveringLate — an entry that
|
||||||
|
// aged out before the suppression cleared is dropped, not spoken late: a
|
||||||
|
// two-day-old "you skipped a break" is noise, not news.
|
||||||
|
func TestSuppressedCareDigestExpiresRatherThanDeliveringLate(t *testing.T) {
|
||||||
|
st := newTestStore(t)
|
||||||
|
sink := &fakeSink{}
|
||||||
|
tl := newTestTickLoop(t, st, sink, nil)
|
||||||
|
ctx := context.Background()
|
||||||
|
now := refNow()
|
||||||
|
|
||||||
|
quiet := loop.State{Now: now, QuietHours: true, Presence: store.Present}
|
||||||
|
tl.enqueueSuppressedDigest(ctx, breakTrace("quiet_hours"), quiet, now)
|
||||||
|
|
||||||
|
// well past digestExpiry (24h) before the suppression ever clears.
|
||||||
|
stale := now.Add(48 * time.Hour)
|
||||||
|
tl.expireStaleDigest(ctx, stale)
|
||||||
|
|
||||||
|
clear := loop.State{Now: stale, QuietHours: false, Presence: store.Present}
|
||||||
|
tl.maybeDrainDigest(ctx, clear, stale)
|
||||||
|
|
||||||
|
if len(sink.sends) != 0 {
|
||||||
|
t.Fatalf("a stale digest entry must be dropped, not delivered late; got %+v", sink.sends)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestSuppressedCareDigestIgnoresHighSeverity — defense in depth at the
|
||||||
|
// wiring layer: even if a RuleTrace somehow showed a high-severity rule
|
||||||
|
// blocked by a care-only gate reason, the tick driver must not durably
|
||||||
|
// digest it. Alarms bypass the gate and deliver now, unchanged; they must
|
||||||
|
// never be silently delayed into a bundle.
|
||||||
|
func TestSuppressedCareDigestIgnoresHighSeverity(t *testing.T) {
|
||||||
|
st := newTestStore(t)
|
||||||
|
sink := &fakeSink{}
|
||||||
|
tl := newTestTickLoop(t, st, sink, nil)
|
||||||
|
ctx := context.Background()
|
||||||
|
now := refNow()
|
||||||
|
|
||||||
|
trace := &loop.TickTrace{RuleTraces: []loop.RuleTrace{{
|
||||||
|
RuleName: "service_down",
|
||||||
|
Severity: loop.Sev4,
|
||||||
|
PredicateResult: true,
|
||||||
|
GateResult: false,
|
||||||
|
GateBlockedBy: "quiet_hours",
|
||||||
|
}}}
|
||||||
|
quiet := loop.State{Now: now, QuietHours: true, Presence: store.Present}
|
||||||
|
tl.enqueueSuppressedDigest(ctx, trace, quiet, now)
|
||||||
|
|
||||||
|
entries, err := st.PendingDigestEntries(ctx, now)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("pending: %v", err)
|
||||||
|
}
|
||||||
|
if len(entries) != 0 {
|
||||||
|
t.Fatalf("high severity must never be digested, got %+v", entries)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,312 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"log"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
hexisclient "github.com/kami/hexis/pkg/client"
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
"github.com/kami/maven/internal/router"
|
||||||
|
)
|
||||||
|
|
||||||
|
// praxisCapability is one arm of the Praxis act dispatch. This is an interface
|
||||||
|
// rather than a map[string]func because each arm carries its own state: the
|
||||||
|
// verb aliases it answers to, the trace name it records, and its own reply
|
||||||
|
// formatting. The dispatch grows an arm per Praxis capability, so a new one is
|
||||||
|
// added to praxisCapabilities below and nothing else changes.
|
||||||
|
type praxisCapability interface {
|
||||||
|
// aliases are the verbs (router fn slots, EN and RU) this capability answers to.
|
||||||
|
aliases() []string
|
||||||
|
// handle runs the capability and returns the user-facing reply.
|
||||||
|
handle(ctx context.Context, h *reactiveHandler, px *praxisClient, dec router.Decision) string
|
||||||
|
}
|
||||||
|
|
||||||
|
// praxisCapabilities is the registry handlePraxisAct consults, in order.
|
||||||
|
var praxisCapabilities = []praxisCapability{
|
||||||
|
listAttentionCapability{},
|
||||||
|
praxisItemAction{
|
||||||
|
verbs: []string{"acknowledge_item", "принято", "понял", "поняла"},
|
||||||
|
ask: "какой пункт отметить принятым?",
|
||||||
|
op: "acknowledge",
|
||||||
|
failure: "не получилось отметить принятым.",
|
||||||
|
success: "принято.",
|
||||||
|
call: func(ctx context.Context, px *praxisClient, id string) error {
|
||||||
|
_, err := px.Acknowledge(ctx, id)
|
||||||
|
return err
|
||||||
|
},
|
||||||
|
},
|
||||||
|
praxisItemAction{
|
||||||
|
verbs: []string{"resolve_item", "сделано", "готово", "решено"},
|
||||||
|
ask: "какой пункт отметить сделанным?",
|
||||||
|
op: "resolve",
|
||||||
|
failure: "не получилось отметить сделанным.",
|
||||||
|
success: "отмечено как сделано.",
|
||||||
|
call: func(ctx context.Context, px *praxisClient, id string) error {
|
||||||
|
_, err := px.Resolve(ctx, id)
|
||||||
|
return err
|
||||||
|
},
|
||||||
|
},
|
||||||
|
praxisItemAction{
|
||||||
|
verbs: []string{"ignore_item", "игнорировать", "неважно"},
|
||||||
|
ask: "какой пункт игнорировать?",
|
||||||
|
op: "ignore",
|
||||||
|
failure: "не получилось проигнорировать.",
|
||||||
|
success: "проигнорировано.",
|
||||||
|
call: func(ctx context.Context, px *praxisClient, id string) error {
|
||||||
|
_, err := px.Ignore(ctx, id)
|
||||||
|
return err
|
||||||
|
},
|
||||||
|
},
|
||||||
|
praxisItemAction{
|
||||||
|
verbs: []string{"pin_item", "закрепить"},
|
||||||
|
ask: "какой пункт закрепить?",
|
||||||
|
op: "pin",
|
||||||
|
failure: "не получилось закрепить.",
|
||||||
|
success: "закреплено.",
|
||||||
|
call: func(ctx context.Context, px *praxisClient, id string) error {
|
||||||
|
_, err := px.Pin(ctx, id, true)
|
||||||
|
return err
|
||||||
|
},
|
||||||
|
},
|
||||||
|
listChangesCapability{},
|
||||||
|
}
|
||||||
|
|
||||||
|
// handlePraxisAct — dispatches ecosystem tool acts through the Praxis tools API.
|
||||||
|
// Returns "" when the act is not a Praxis verb (the caller falls through to the
|
||||||
|
// system command executor). Returns a reply string otherwise.
|
||||||
|
func (h *reactiveHandler) handlePraxisAct(ctx context.Context, dec router.Decision) string {
|
||||||
|
if h.ecosystem == nil || h.ecosystem.praxis == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
px := h.ecosystem.praxis
|
||||||
|
for _, capability := range praxisCapabilities {
|
||||||
|
for _, alias := range capability.aliases() {
|
||||||
|
if alias == dec.Slots.Fn {
|
||||||
|
return capability.handle(ctx, h, px, dec)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Not a Praxis verb — let the caller fall through.
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// praxisItemAction is the shared shape of the item-lifecycle capabilities: take
|
||||||
|
// an item id from the value slot, call one Praxis endpoint, trace the result.
|
||||||
|
type praxisItemAction struct {
|
||||||
|
verbs []string
|
||||||
|
ask string // reply when no item id was given
|
||||||
|
op string // trace + log name of the operation
|
||||||
|
failure string // reply when the Praxis call errors
|
||||||
|
success string
|
||||||
|
call func(ctx context.Context, px *praxisClient, id string) error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a praxisItemAction) aliases() []string { return a.verbs }
|
||||||
|
|
||||||
|
func (a praxisItemAction) handle(ctx context.Context, h *reactiveHandler, px *praxisClient, dec router.Decision) string {
|
||||||
|
id := dec.Slots.Value
|
||||||
|
if id == "" {
|
||||||
|
return a.ask
|
||||||
|
}
|
||||||
|
if err := a.call(ctx, px, id); err != nil {
|
||||||
|
log.Printf("ecosystem: praxis %s %s: %v", a.op, id, err)
|
||||||
|
return a.failure
|
||||||
|
}
|
||||||
|
h.recordPraxisTrace(ctx, a.op, map[string]any{"item_id": id})
|
||||||
|
return a.success
|
||||||
|
}
|
||||||
|
|
||||||
|
// listAttentionCapability reads the attention digest and surfaces every item it speaks.
|
||||||
|
type listAttentionCapability struct{}
|
||||||
|
|
||||||
|
func (listAttentionCapability) aliases() []string {
|
||||||
|
return []string{"list_attention", "attention", "внимание", "что требует внимания", "что нового"}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (listAttentionCapability) handle(ctx context.Context, h *reactiveHandler, px *praxisClient, _ router.Decision) string {
|
||||||
|
items, err := px.ListAttention(ctx, 20)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("ecosystem: praxis attention: %v", err)
|
||||||
|
return "не могу сейчас узнать, что требует внимания."
|
||||||
|
}
|
||||||
|
if len(items) == 0 {
|
||||||
|
return "ничего не требует внимания."
|
||||||
|
}
|
||||||
|
h.recordPraxisTrace(ctx, "list_attention", map[string]any{"count": len(items)})
|
||||||
|
var parts []string
|
||||||
|
for _, item := range items {
|
||||||
|
title, _ := item["title"].(string)
|
||||||
|
// importance arrives as JSON number ⇒ float64 over the HTTP contract.
|
||||||
|
importance, _ := item["importance"].(float64)
|
||||||
|
rule, _ := item["rule"].(string)
|
||||||
|
s := title
|
||||||
|
if importance > 0 {
|
||||||
|
s += fmt.Sprintf(" (важность %d", int(importance))
|
||||||
|
if rule != "" {
|
||||||
|
s += ": " + rule
|
||||||
|
}
|
||||||
|
s += ")"
|
||||||
|
}
|
||||||
|
parts = append(parts, s)
|
||||||
|
|
||||||
|
// Speaking an item surfaces it, it does not acknowledge it
|
||||||
|
// (ECOSYSTEM-SPEC.md §2.3: surfaced != acknowledged). Best-effort:
|
||||||
|
// a failed surface call must not block delivering the digest.
|
||||||
|
if id, ok := item["id"].(string); ok && id != "" {
|
||||||
|
if _, err := px.Surface(ctx, id); err != nil {
|
||||||
|
log.Printf("ecosystem: praxis surface %s: %v", id, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "требует внимания: " + strings.Join(parts, "; ")
|
||||||
|
}
|
||||||
|
|
||||||
|
// listChangesCapability reads the recent-changes feed.
|
||||||
|
type listChangesCapability struct{}
|
||||||
|
|
||||||
|
func (listChangesCapability) aliases() []string {
|
||||||
|
return []string{"list_changes", "changes", "изменения", "что изменилось"}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (listChangesCapability) handle(ctx context.Context, h *reactiveHandler, px *praxisClient, _ router.Decision) string {
|
||||||
|
changes, err := px.ListChanges(ctx, 20)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("ecosystem: praxis changes: %v", err)
|
||||||
|
return "не могу сейчас узнать об изменениях."
|
||||||
|
}
|
||||||
|
if len(changes) == 0 {
|
||||||
|
return "нет изменений."
|
||||||
|
}
|
||||||
|
h.recordPraxisTrace(ctx, "list_changes", map[string]any{"count": len(changes)})
|
||||||
|
var parts []string
|
||||||
|
for _, c := range changes {
|
||||||
|
title, _ := c["title"].(string)
|
||||||
|
typ, _ := c["change_type"].(string)
|
||||||
|
parts = append(parts, fmt.Sprintf("%s (%s)", title, typ))
|
||||||
|
}
|
||||||
|
return "изменения: " + strings.Join(parts, "; ")
|
||||||
|
}
|
||||||
|
|
||||||
|
// recordPraxisTrace — writes a fact recording a cross-service ecosystem call.
|
||||||
|
// The fact is stored with source "praxis:trace" so the proactive loop can
|
||||||
|
// reference it and the dashboard can display recent ecosystem activity.
|
||||||
|
func (h *reactiveHandler) recordPraxisTrace(ctx context.Context, operation string, details map[string]any) {
|
||||||
|
now := h.now()
|
||||||
|
value := operation
|
||||||
|
if len(details) > 0 {
|
||||||
|
if b, err := json.Marshal(details); err == nil {
|
||||||
|
value = operation + " " + string(b)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_, _ = h.api.WriteFact(ctx, ipc.WriteFactReq{
|
||||||
|
Ts: now,
|
||||||
|
Kind: "system",
|
||||||
|
Key: "praxis:" + operation,
|
||||||
|
Value: value,
|
||||||
|
Source: "praxis:trace",
|
||||||
|
Confidence: 1.0,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleHexisAct — resolves entity references through Nexus and executes
|
||||||
|
// matching capabilities through Hexis. Returns a reply string when handled,
|
||||||
|
// or "" to fall through to the system command executor.
|
||||||
|
func (h *reactiveHandler) handleHexisAct(ctx context.Context, dec router.Decision) string {
|
||||||
|
if h.ecosystem == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// Resolve the utterance text as an entity reference through Nexus. An
|
||||||
|
// ambiguous match must stop and clarify — never guess a mutation target.
|
||||||
|
entityID, displayName, ambiguous, err := h.ecosystem.resolveEntityReference(ctx, dec.Slots.Text, nil)
|
||||||
|
if err != nil {
|
||||||
|
// A genuine Nexus dependency failure, not "no such entity" — stop here
|
||||||
|
// and report degradation rather than silently falling through to the
|
||||||
|
// local command executor (ECOSYSTEM-SPEC.md: services degrade
|
||||||
|
// independently, never a silent all-clear).
|
||||||
|
return "экосистема недоступна, попробуй ещё раз."
|
||||||
|
}
|
||||||
|
if len(ambiguous) > 0 {
|
||||||
|
return "уточни, что именно: " + strings.Join(ambiguous, ", ") + "?"
|
||||||
|
}
|
||||||
|
if entityID == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// Discover Hexis capabilities for this entity. A resolved entity with a
|
||||||
|
// genuine Hexis failure must not be treated as "no capabilities" and
|
||||||
|
// fall through to unrelated local execution.
|
||||||
|
caps, err := h.ecosystem.discoverCapabilities(ctx, entityID)
|
||||||
|
if err != nil {
|
||||||
|
return "экосистема недоступна, попробуй ещё раз."
|
||||||
|
}
|
||||||
|
if len(caps) == 0 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// Match the user's verb to a capability by name/description. Collect all
|
||||||
|
// matches: more than one is itself ambiguous, so we ask rather than pick
|
||||||
|
// the first (ecosystem invariant: no arbitrary target for mutation).
|
||||||
|
verb := dec.Slots.Fn
|
||||||
|
if verb == "" {
|
||||||
|
verb = dec.Slots.Text
|
||||||
|
}
|
||||||
|
verbLower := strings.ToLower(verb)
|
||||||
|
|
||||||
|
var matches []*hexisclient.Capability
|
||||||
|
for i, c := range caps {
|
||||||
|
if strings.Contains(strings.ToLower(c.Name), verbLower) ||
|
||||||
|
(c.Description != "" && strings.Contains(strings.ToLower(c.Description), verbLower)) {
|
||||||
|
matches = append(matches, &caps[i])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(matches) == 0 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if len(matches) > 1 {
|
||||||
|
var names []string
|
||||||
|
for _, m := range matches {
|
||||||
|
names = append(names, m.Name)
|
||||||
|
}
|
||||||
|
return "какую команду для " + displayName + ": " + strings.Join(names, ", ") + "?"
|
||||||
|
}
|
||||||
|
matched := matches[0]
|
||||||
|
|
||||||
|
// Read-only capabilities run immediately; mutating ones are parked for an
|
||||||
|
// explicit spoken confirm bound to this capability + target.
|
||||||
|
if !matched.ReadOnly {
|
||||||
|
h.mu.Lock()
|
||||||
|
h.pendingHexis = &pendingHexisExec{
|
||||||
|
capabilityID: matched.ID,
|
||||||
|
capName: matched.Name,
|
||||||
|
entityID: entityID,
|
||||||
|
displayName: displayName,
|
||||||
|
expiry: h.now().Add(confirmTTL),
|
||||||
|
}
|
||||||
|
h.mu.Unlock()
|
||||||
|
return "выполнить «" + matched.Name + "» для " + displayName + "? скажи «да» или «нет»."
|
||||||
|
}
|
||||||
|
|
||||||
|
return h.execHexis(ctx, matched.ID, matched.Name, entityID, displayName)
|
||||||
|
}
|
||||||
|
|
||||||
|
// execHexis runs a resolved capability and records a cross-service trace with
|
||||||
|
// the correlation ID. It reports command success, never operational recovery
|
||||||
|
// (Praxis observes recovery independently).
|
||||||
|
func (h *reactiveHandler) execHexis(ctx context.Context, capID, capName, entityID, displayName string) string {
|
||||||
|
correlationID, err := h.ecosystem.executeCapability(ctx, capID, entityID, nil)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("ecosystem: hexis execute error (cor=%s): %v", correlationID, err)
|
||||||
|
return "не получилось выполнить команду для " + displayName + "."
|
||||||
|
}
|
||||||
|
h.recordPraxisTrace(ctx, "hexis:"+capName, map[string]any{
|
||||||
|
"entity_id": entityID,
|
||||||
|
"entity_name": displayName,
|
||||||
|
"capability": capName,
|
||||||
|
"correlation_id": correlationID,
|
||||||
|
})
|
||||||
|
return "команда выполнена для " + displayName + "."
|
||||||
|
}
|
||||||
@@ -0,0 +1,158 @@
|
|||||||
|
// mavend/mail.go — core's half of the email reader (Vikunja #246,
|
||||||
|
// docs/plans/01-email-reader.md).
|
||||||
|
//
|
||||||
|
// The split: cmd/mavmaild holds the IMAP credential, connects to the mailbox
|
||||||
|
// and converts messages to plaintext; it hands each message to core over
|
||||||
|
// ipc.MethodIngestMail. Core runs the extraction on the resident model —
|
||||||
|
// llama-server lives in this process, spawned by the phraser — and writes what
|
||||||
|
// comes back through the one task intake seam.
|
||||||
|
//
|
||||||
|
// What this file may produce is exactly one thing: rows in `tasks` with status
|
||||||
|
// "candidate". No fact, no reminder, no note, no nudge, no calendar event. A
|
||||||
|
// 1.7B misreading a mail can therefore put a wrong line on a review page and
|
||||||
|
// nothing else; it can never make Maven speak, and it can never make her
|
||||||
|
// recite something out of an advert as true.
|
||||||
|
//
|
||||||
|
// Off unless configured twice over: no `email` block in mavend.json ⇒ the IPC
|
||||||
|
// method does not exist; no llama-server phraser ⇒ same. A reader pointed at a
|
||||||
|
// core that is not set up for mail gets ErrUnknownMethod rather than silence.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"log"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/config"
|
||||||
|
"github.com/kami/maven/internal/email"
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
"github.com/kami/maven/internal/llm"
|
||||||
|
"github.com/kami/maven/internal/phraser"
|
||||||
|
"github.com/kami/maven/internal/store"
|
||||||
|
)
|
||||||
|
|
||||||
|
// evidenceMaxChars — how much of the subject line is kept as a candidate's
|
||||||
|
// evidence. Enough to recognise the mail on /tasks, not enough to turn the task
|
||||||
|
// list into a copy of his mailbox.
|
||||||
|
const evidenceMaxChars = 160
|
||||||
|
|
||||||
|
// mailIntake — extraction + capture for one message at a time.
|
||||||
|
type mailIntake struct {
|
||||||
|
st *store.Store
|
||||||
|
ex *email.Extractor
|
||||||
|
timeout time.Duration
|
||||||
|
now func() time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
// newMailIntake returns nil when mail ingestion must not be available, which is
|
||||||
|
// the default. Both preconditions are real:
|
||||||
|
//
|
||||||
|
// - no cfg.Email ⇒ not configured, and a capability is off unless configured;
|
||||||
|
// - no llama-server phraser ⇒ nothing to extract with. There is deliberately
|
||||||
|
// no keyword fallback: "the subject line became a task" is not extraction,
|
||||||
|
// it is a mailbox rendered as a to-do list, and it would fill the review
|
||||||
|
// page faster than he could clear it.
|
||||||
|
func newMailIntake(st *store.Store, phr phraser.Phraser, cfg *config.Config) *mailIntake {
|
||||||
|
if cfg.Email == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
lp, ok := phr.(*phraser.LLMPhraser)
|
||||||
|
if !ok {
|
||||||
|
log.Printf("mail intake: configured but no llama-server phraser — mail ingestion disabled")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
timeout := time.Duration(cfg.Email.Timeout)
|
||||||
|
if timeout <= 0 {
|
||||||
|
timeout = config.DefaultEmailTimeout
|
||||||
|
}
|
||||||
|
ex := email.NewExtractor(llm.New(lp.BaseURL(), timeout), cfg.Email.MaxTasks, contextBlockFn(cfg, time.Now))
|
||||||
|
log.Printf("mail intake: enabled (max %d candidates per message, timeout %s)", cfg.Email.MaxTasks, timeout)
|
||||||
|
return &mailIntake{st: st, ex: ex, timeout: timeout, now: time.Now}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ingest handles one ipc.MethodIngestMail call.
|
||||||
|
//
|
||||||
|
// Junk and empty messages are answered Skipped without touching the model — the
|
||||||
|
// reader's header filter is what keeps the resident model off newsletters.
|
||||||
|
//
|
||||||
|
// Every candidate is captured with Status "candidate", Source "email:<mailbox>"
|
||||||
|
// and the subject as Evidence. CaptureTask dedupes on normalised text among
|
||||||
|
// live rows, so a mailbox re-read after a restart produces Created=0 rather
|
||||||
|
// than a second copy of every task.
|
||||||
|
func (m *mailIntake) ingest(ctx context.Context, req ipc.IngestMailReq) (ipc.IngestMailResp, error) {
|
||||||
|
msg := email.Message{
|
||||||
|
UID: req.UID,
|
||||||
|
From: req.From,
|
||||||
|
Subject: req.Subject,
|
||||||
|
Date: req.Date,
|
||||||
|
Body: req.Body,
|
||||||
|
Junk: req.Junk,
|
||||||
|
}
|
||||||
|
if msg.Junk || (msg.Subject == "" && msg.Body == "") {
|
||||||
|
return ipc.IngestMailResp{Skipped: true}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx, cancel := context.WithTimeout(ctx, m.timeout)
|
||||||
|
defer cancel()
|
||||||
|
cands, err := m.ex.Extract(ctx, msg)
|
||||||
|
if err != nil {
|
||||||
|
// The error from internal/email never carries mail text; keep it that way
|
||||||
|
// by not adding the subject here.
|
||||||
|
return ipc.IngestMailResp{}, fmt.Errorf("mail intake: uid %d: %w", req.UID, err)
|
||||||
|
}
|
||||||
|
if len(cands) == 0 {
|
||||||
|
return ipc.IngestMailResp{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
source := email.SourcePrefix + req.Mailbox
|
||||||
|
evidence := truncateRunes(req.Subject, evidenceMaxChars)
|
||||||
|
now := m.now()
|
||||||
|
var resp ipc.IngestMailResp
|
||||||
|
for _, c := range cands {
|
||||||
|
t := store.Task{
|
||||||
|
CreatedTs: now,
|
||||||
|
Text: c.Text,
|
||||||
|
Source: source,
|
||||||
|
Evidence: evidence,
|
||||||
|
// The one status this path may ever write. Anything Maven derived from
|
||||||
|
// something she read is a suggestion until he confirms it on /tasks.
|
||||||
|
Status: store.TaskCandidate,
|
||||||
|
}
|
||||||
|
if due, ok := email.ParseDue(c.Due); ok {
|
||||||
|
t.Due = &due
|
||||||
|
}
|
||||||
|
id, created, err := m.st.CaptureTask(ctx, t)
|
||||||
|
if err != nil {
|
||||||
|
return resp, fmt.Errorf("mail intake: capture: %w", err)
|
||||||
|
}
|
||||||
|
resp.TaskIDs = append(resp.TaskIDs, id)
|
||||||
|
if created {
|
||||||
|
resp.Created++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Counts only: the log line names the mailbox and the UID, never the subject,
|
||||||
|
// the sender or the task text. Reviewing a candidate is what /tasks is for.
|
||||||
|
log.Printf("mail intake: %s uid %d → %d candidate(s), %d new", source, req.UID, len(cands), resp.Created)
|
||||||
|
return resp, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// wireMailIntake installs the IPC hook, or leaves it nil so the method reports
|
||||||
|
// ErrUnknownMethod. Called on both startup paths (unlocked boot and passkey
|
||||||
|
// unlock) so mail behaves the same either way.
|
||||||
|
func wireMailIntake(srv *ipc.Server, st *store.Store, phr phraser.Phraser, cfg *config.Config) {
|
||||||
|
mi := newMailIntake(st, phr, cfg)
|
||||||
|
if mi == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
srv.IngestMailFn = mi.ingest
|
||||||
|
}
|
||||||
|
|
||||||
|
// truncateRunes cuts a string to n runes, marking the cut.
|
||||||
|
func truncateRunes(s string, n int) string {
|
||||||
|
r := []rune(s)
|
||||||
|
if len(r) <= n {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
return string(r[:n]) + "…"
|
||||||
|
}
|
||||||
@@ -0,0 +1,182 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/config"
|
||||||
|
"github.com/kami/maven/internal/email"
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
"github.com/kami/maven/internal/llm"
|
||||||
|
"github.com/kami/maven/internal/store"
|
||||||
|
)
|
||||||
|
|
||||||
|
// mailLLM — a canned extraction reply.
|
||||||
|
type mailLLM struct {
|
||||||
|
reply string
|
||||||
|
calls int
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *mailLLM) Complete(_ context.Context, _ llm.Req) (string, error) {
|
||||||
|
m.calls++
|
||||||
|
return m.reply, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func newTestIntake(t *testing.T, reply string) (*mailIntake, *store.Store, *mailLLM) {
|
||||||
|
t.Helper()
|
||||||
|
st := newTestStore(t)
|
||||||
|
fake := &mailLLM{reply: reply}
|
||||||
|
return &mailIntake{
|
||||||
|
st: st,
|
||||||
|
ex: email.NewExtractor(fake, 0, nil),
|
||||||
|
timeout: 5 * time.Second,
|
||||||
|
now: func() time.Time { return time.Date(2026, 8, 1, 10, 0, 0, 0, time.UTC) },
|
||||||
|
}, st, fake
|
||||||
|
}
|
||||||
|
|
||||||
|
func ingestReq() ipc.IngestMailReq {
|
||||||
|
return ipc.IngestMailReq{
|
||||||
|
Mailbox: "INBOX", UID: 42,
|
||||||
|
From: "billing@isp.example",
|
||||||
|
Subject: "Счёт за интернет",
|
||||||
|
Body: "Оплатите счёт до 5 августа.",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The one property that matters: a mail-derived task is a candidate, attributed
|
||||||
|
// to the mailbox, with the subject as reviewable evidence — and nothing else is
|
||||||
|
// written.
|
||||||
|
func TestIngestCapturesCandidates(t *testing.T) {
|
||||||
|
mi, st, _ := newTestIntake(t, `[{"text":"оплатить счёт за интернет","due":"2026-08-05"}]`)
|
||||||
|
resp, err := mi.ingest(context.Background(), ingestReq())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("ingest: %v", err)
|
||||||
|
}
|
||||||
|
if resp.Created != 1 || len(resp.TaskIDs) != 1 {
|
||||||
|
t.Fatalf("resp = %+v, want one created task", resp)
|
||||||
|
}
|
||||||
|
tasks, err := st.ListTasks(context.Background(), "")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("list: %v", err)
|
||||||
|
}
|
||||||
|
if len(tasks) != 1 {
|
||||||
|
t.Fatalf("got %d tasks, want 1", len(tasks))
|
||||||
|
}
|
||||||
|
got := tasks[0]
|
||||||
|
if got.Status != store.TaskCandidate {
|
||||||
|
t.Errorf("status = %q, want %q — mail may only produce candidates", got.Status, store.TaskCandidate)
|
||||||
|
}
|
||||||
|
if got.Source != "email:INBOX" {
|
||||||
|
t.Errorf("source = %q, want email:INBOX", got.Source)
|
||||||
|
}
|
||||||
|
if got.Evidence != "Счёт за интернет" {
|
||||||
|
t.Errorf("evidence = %q, want the subject line", got.Evidence)
|
||||||
|
}
|
||||||
|
if got.Due == nil || got.Due.Format("2006-01-02") != "2026-08-05" {
|
||||||
|
t.Errorf("due = %v, want 2026-08-05", got.Due)
|
||||||
|
}
|
||||||
|
// Nothing else may have been written: no reminder, no fact.
|
||||||
|
rem, err := st.ListReminders(context.Background(), 10)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("list reminders: %v", err)
|
||||||
|
}
|
||||||
|
if len(rem) != 0 {
|
||||||
|
t.Errorf("mail created %d reminders; a misread mail must never be able to fire", len(rem))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Re-reading a mailbox must not grow the list — CaptureTask dedupes among live
|
||||||
|
// rows, and the intake relies on exactly that.
|
||||||
|
func TestIngestSameMailTwiceIsIdempotent(t *testing.T) {
|
||||||
|
mi, st, _ := newTestIntake(t, `[{"text":"оплатить счёт","due":""}]`)
|
||||||
|
if _, err := mi.ingest(context.Background(), ingestReq()); err != nil {
|
||||||
|
t.Fatalf("first ingest: %v", err)
|
||||||
|
}
|
||||||
|
resp, err := mi.ingest(context.Background(), ingestReq())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("second ingest: %v", err)
|
||||||
|
}
|
||||||
|
if resp.Created != 0 || len(resp.TaskIDs) != 1 {
|
||||||
|
t.Errorf("resp = %+v, want the existing row and Created=0", resp)
|
||||||
|
}
|
||||||
|
tasks, _ := st.ListTasks(context.Background(), "")
|
||||||
|
if len(tasks) != 1 {
|
||||||
|
t.Errorf("got %d tasks after two reads, want 1", len(tasks))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIngestJunkSkipsTheModel(t *testing.T) {
|
||||||
|
mi, st, fake := newTestIntake(t, `[{"text":"купить со скидкой","due":""}]`)
|
||||||
|
req := ingestReq()
|
||||||
|
req.Junk = true
|
||||||
|
resp, err := mi.ingest(context.Background(), req)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("ingest: %v", err)
|
||||||
|
}
|
||||||
|
if !resp.Skipped || resp.Created != 0 {
|
||||||
|
t.Errorf("resp = %+v, want skipped", resp)
|
||||||
|
}
|
||||||
|
if fake.calls != 0 {
|
||||||
|
t.Errorf("model called %d times for junk, want 0", fake.calls)
|
||||||
|
}
|
||||||
|
if tasks, _ := st.ListTasks(context.Background(), ""); len(tasks) != 0 {
|
||||||
|
t.Errorf("junk produced %d tasks, want 0", len(tasks))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIngestEmptyMessageSkipped(t *testing.T) {
|
||||||
|
mi, _, fake := newTestIntake(t, "[]")
|
||||||
|
resp, err := mi.ingest(context.Background(), ipc.IngestMailReq{Mailbox: "INBOX", UID: 1})
|
||||||
|
if err != nil || !resp.Skipped {
|
||||||
|
t.Fatalf("resp = %+v, err = %v; want skipped", resp, err)
|
||||||
|
}
|
||||||
|
if fake.calls != 0 {
|
||||||
|
t.Errorf("model called %d times for an empty message, want 0", fake.calls)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIngestNoTasksWritesNothing(t *testing.T) {
|
||||||
|
mi, st, _ := newTestIntake(t, "[]")
|
||||||
|
resp, err := mi.ingest(context.Background(), ingestReq())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("ingest: %v", err)
|
||||||
|
}
|
||||||
|
if resp.Created != 0 || len(resp.TaskIDs) != 0 || resp.Skipped {
|
||||||
|
t.Errorf("resp = %+v, want nothing captured and not skipped", resp)
|
||||||
|
}
|
||||||
|
if tasks, _ := st.ListTasks(context.Background(), ""); len(tasks) != 0 {
|
||||||
|
t.Errorf("got %d tasks, want 0", len(tasks))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIngestTruncatesEvidence(t *testing.T) {
|
||||||
|
mi, st, _ := newTestIntake(t, `[{"text":"дело","due":""}]`)
|
||||||
|
req := ingestReq()
|
||||||
|
req.Subject = strings.Repeat("щ", 400)
|
||||||
|
if _, err := mi.ingest(context.Background(), req); err != nil {
|
||||||
|
t.Fatalf("ingest: %v", err)
|
||||||
|
}
|
||||||
|
tasks, _ := st.ListTasks(context.Background(), "")
|
||||||
|
if len(tasks) != 1 {
|
||||||
|
t.Fatalf("got %d tasks, want 1", len(tasks))
|
||||||
|
}
|
||||||
|
if n := len([]rune(tasks[0].Evidence)); n > evidenceMaxChars+1 {
|
||||||
|
t.Errorf("evidence kept %d runes, want ≤ %d", n, evidenceMaxChars)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Off unless configured: no email block ⇒ no intake, so the IPC method does not
|
||||||
|
// exist at all.
|
||||||
|
func TestNewMailIntakeOffWithoutConfig(t *testing.T) {
|
||||||
|
st := newTestStore(t)
|
||||||
|
if mi := newMailIntake(st, nil, &config.Config{}); mi != nil {
|
||||||
|
t.Error("no email block must mean no mail intake")
|
||||||
|
}
|
||||||
|
// Configured but with a non-LLM phraser: still off — there is no fallback
|
||||||
|
// extraction, by design.
|
||||||
|
if mi := newMailIntake(st, nil, &config.Config{Email: &config.EmailConfig{}}); mi != nil {
|
||||||
|
t.Error("without a llama-server phraser there is nothing to extract with")
|
||||||
|
}
|
||||||
|
}
|
||||||
+48
-96
@@ -97,96 +97,6 @@ func main() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// lockedAPI is a dummy CoreAPI used while the daemon is locked. Every method
|
|
||||||
// returns errLocked. The wire protocol's StoreAPI methods all go through the
|
|
||||||
// Server dispatch on CoreAPI, so returning errLocked from each is correct.
|
|
||||||
type lockedAPI struct{}
|
|
||||||
|
|
||||||
var _ ipc.CoreAPI = (*lockedAPI)(nil)
|
|
||||||
|
|
||||||
func (l *lockedAPI) WriteFact(ctx context.Context, req ipc.WriteFactReq) (int64, error) {
|
|
||||||
return 0, errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) LatestFact(ctx context.Context, key string) (ipc.Fact, error) {
|
|
||||||
return ipc.Fact{}, errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) LatestFactBySource(ctx context.Context, key, source string) (ipc.Fact, error) {
|
|
||||||
return ipc.Fact{}, errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) Since(ctx context.Context, key string, now time.Time) (time.Duration, error) {
|
|
||||||
return 0, errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) Presence(ctx context.Context) (ipc.Presence, error) {
|
|
||||||
return ipc.Presence{}, errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) CreateReminder(ctx context.Context, fire time.Time, payload, cron string) (int64, error) {
|
|
||||||
return 0, errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) MarkReminder(ctx context.Context, id int64, status string) error {
|
|
||||||
return errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) ListReminders(ctx context.Context, n int) ([]ipc.Reminder, error) {
|
|
||||||
return nil, errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) RecordNudge(ctx context.Context, rule, channel, message string, ts time.Time) (int64, error) {
|
|
||||||
return 0, errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) ResolveNudge(ctx context.Context, id int64, outcome string, ts time.Time) error {
|
|
||||||
return errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) RecentOutcomes(ctx context.Context, rule string, n int) ([]string, error) {
|
|
||||||
return nil, errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) RecentFacts(ctx context.Context, n int) ([]ipc.Fact, error) {
|
|
||||||
return nil, errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) CalendarEvents(ctx context.Context, from, to time.Time) ([]ipc.Fact, error) {
|
|
||||||
return nil, errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) RecentNudges(ctx context.Context, n int) ([]ipc.Nudge, error) {
|
|
||||||
return nil, errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) WriteNote(ctx context.Context, ts time.Time, text string, embedding []float32, source string) (int64, error) {
|
|
||||||
return 0, errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) QueryNotes(ctx context.Context, embedding []float32, k int) ([]ipc.Note, error) {
|
|
||||||
return nil, errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) RecentNotes(ctx context.Context, n int) ([]ipc.Note, error) {
|
|
||||||
return nil, errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) ProposeTool(ctx context.Context, name, utterance, scope string, ts time.Time) (bool, error) {
|
|
||||||
return false, errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) EnableTool(ctx context.Context, name string, cmd []string, destructive bool, scope string, ts time.Time) error {
|
|
||||||
return errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) DisableTool(ctx context.Context, name string) error { return errLocked }
|
|
||||||
func (l *lockedAPI) DeleteTool(ctx context.Context, name string) error { return errLocked }
|
|
||||||
func (l *lockedAPI) ListProposedRoutines(ctx context.Context) ([]ipc.ProposedRoutine, error) {
|
|
||||||
return nil, errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) DismissProposedRoutine(ctx context.Context, id int64) error { return errLocked }
|
|
||||||
func (l *lockedAPI) AcceptProposedRoutine(ctx context.Context, id int64) error {
|
|
||||||
return errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) LookupTool(ctx context.Context, name string) (ipc.Tool, error) {
|
|
||||||
return ipc.Tool{}, errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) ListTools(ctx context.Context, status string) ([]ipc.Tool, error) {
|
|
||||||
return nil, errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) RevertFact(ctx context.Context, key string) (int64, error) { return 0, errLocked }
|
|
||||||
func (l *lockedAPI) Chat(ctx context.Context, text string) (string, error) {
|
|
||||||
return "", errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) TickTrace(ctx context.Context) (ipc.TickTrace, error) {
|
|
||||||
return ipc.TickTrace{}, errLocked
|
|
||||||
}
|
|
||||||
func (l *lockedAPI) MorningStatus(ctx context.Context) ([]ipc.MorningRoutineStatus, error) {
|
|
||||||
return nil, errLocked
|
|
||||||
}
|
|
||||||
|
|
||||||
func run(args []string) error {
|
func run(args []string) error {
|
||||||
cfgPath := flag.String("config", defaultConfigPath(), "path to mavend JSON config")
|
cfgPath := flag.String("config", defaultConfigPath(), "path to mavend JSON config")
|
||||||
wrappedKeyPath := flag.String("wrapped-key-file", "", "path to wrapped encryption key blob (enables cold-start unlock)")
|
wrappedKeyPath := flag.String("wrapped-key-file", "", "path to wrapped encryption key blob (enables cold-start unlock)")
|
||||||
@@ -259,6 +169,7 @@ func run(args []string) error {
|
|||||||
coreAPI ipc.CoreAPI
|
coreAPI ipc.CoreAPI
|
||||||
eco *ecosystemWiring
|
eco *ecosystemWiring
|
||||||
factWorker *factEnrichmentWorker
|
factWorker *factEnrichmentWorker
|
||||||
|
evalWorker *memoryEvalWorker // nil ⇒ memory evaluation off (the default)
|
||||||
)
|
)
|
||||||
|
|
||||||
if !locked {
|
if !locked {
|
||||||
@@ -351,21 +262,28 @@ func run(args []string) error {
|
|||||||
tickInterval := time.Duration(cfg.TickInterval)
|
tickInterval := time.Duration(cfg.TickInterval)
|
||||||
repeatInterval := time.Duration(cfg.RepeatInterval)
|
repeatInterval := time.Duration(cfg.RepeatInterval)
|
||||||
autotuneInterval := time.Duration(cfg.AutotuneInterval)
|
autotuneInterval := time.Duration(cfg.AutotuneInterval)
|
||||||
tl = newTickLoop(st, gatherer, dispatcher, phr, rules, tickInterval, repeatInterval, autotuneInterval, cfg.Digest, routinesFromConfig(cfg.Routines), config.MorningRoutinesFromConfig(cfg.MorningRoutines))
|
tl = newTickLoop(st, gatherer, dispatcher, phr, rules, tickInterval, repeatInterval, autotuneInterval, cfg.Digest, routinesFromConfig(cfg.Routines), config.MorningRoutinesFromConfig(cfg.MorningRoutines), cfg.PatternProposals)
|
||||||
factWorker = newFactEnrichmentWorker(st, eco, time.Duration(cfg.FactEnrichmentInterval))
|
factWorker = newFactEnrichmentWorker(st, eco, time.Duration(cfg.FactEnrichmentInterval))
|
||||||
|
evalWorker = newMemoryEvalWorker(st, phr, cfg)
|
||||||
|
|
||||||
coreAPI = &daemonAPI{
|
coreAPI = &daemonAPI{
|
||||||
CoreAPI: ipc.NewStoreAPI(st),
|
CoreAPI: ipc.NewStoreAPI(st),
|
||||||
getTrace: tl.trace,
|
getTrace: tl.trace,
|
||||||
getMorningStatus: func(ctx context.Context) []ipc.MorningRoutineStatus { return tl.morningStatus(ctx, time.Now()) },
|
getMorningStatus: func(ctx context.Context) []ipc.MorningRoutineStatus { return tl.morningStatus(ctx, time.Now()) },
|
||||||
|
getDayPlan: func(ctx context.Context) ipc.DayPlan { return tl.dayPlan(ctx, time.Now()) },
|
||||||
}
|
}
|
||||||
if voiceW != nil && voiceW.handler != nil {
|
if voiceW != nil && voiceW.handler != nil {
|
||||||
api := coreAPI.(*daemonAPI)
|
api := coreAPI.(*daemonAPI)
|
||||||
api.chatFn = voiceW.handler.handleText
|
api.chatFn = voiceW.handler.handleText
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// locked mode: dummy CoreAPI that returns errLocked for everything
|
// locked mode: no real store yet, so there's no meaningful CoreAPI to
|
||||||
coreAPI = &lockedAPI{}
|
// serve. srv.Check below is the actual guard — every CoreAPI call is
|
||||||
|
// refused before it reaches this value. This is just a safe non-nil
|
||||||
|
// placeholder: if the guard is ever bypassed by a bug, calls land
|
||||||
|
// here and fail loudly with ipc.ErrNotImplemented instead of a nil
|
||||||
|
// dereference or, worse, silently succeeding.
|
||||||
|
coreAPI = ipc.UnimplementedCoreAPI{}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ----- IPC boundary (core ↔ modules) -----
|
// ----- IPC boundary (core ↔ modules) -----
|
||||||
@@ -376,7 +294,17 @@ func run(args []string) error {
|
|||||||
|
|
||||||
passkeySess := webauthn.NewPasskeySession(5 * time.Minute)
|
passkeySess := webauthn.NewPasskeySession(5 * time.Minute)
|
||||||
|
|
||||||
// Set Server.Check — in locked mode, block everything except unlock-path methods.
|
// Set Server.Check — the single authorization guard, run once by
|
||||||
|
// Server.dispatch before any CoreAPI method is called (see
|
||||||
|
// internal/ipc/server.go). In locked mode this is the ONLY thing
|
||||||
|
// standing between an unauthenticated caller and the store: it must
|
||||||
|
// default-deny, with an explicit allowlist for the two methods the
|
||||||
|
// unlock flow itself needs (MethodAssertStepUp, MethodUnlock — neither
|
||||||
|
// of which touches CoreAPI; dispatch handles them directly via
|
||||||
|
// srv.StepUp/srv.UnlockFn). Forgetting to allowlist a new unlock-path
|
||||||
|
// method fails safe (denied); forgetting to guard a new CoreAPI method
|
||||||
|
// is impossible because there is nothing left to forget — every method
|
||||||
|
// not in the allowlist is refused by construction.
|
||||||
if locked {
|
if locked {
|
||||||
srv.Check = func(ctx context.Context, m ipc.Method, _ json.RawMessage) error {
|
srv.Check = func(ctx context.Context, m ipc.Method, _ json.RawMessage) error {
|
||||||
switch m {
|
switch m {
|
||||||
@@ -392,6 +320,13 @@ func run(args []string) error {
|
|||||||
|
|
||||||
srv.StepUp = func(ctx context.Context) error { return passkeySess.Assert(ctx, auth.Scope{}) }
|
srv.StepUp = func(ctx context.Context) error { return passkeySess.Assert(ctx, auth.Scope{}) }
|
||||||
|
|
||||||
|
// Mail ingestion (Vikunja #246): the hook stays nil unless an email block is
|
||||||
|
// configured and there is a llama-server to extract with, in which case
|
||||||
|
// ipc.MethodIngestMail reports ErrUnknownMethod.
|
||||||
|
if !locked {
|
||||||
|
wireMailIntake(srv, st, phr, cfg)
|
||||||
|
}
|
||||||
|
|
||||||
// WrapKeyFn — wraps the env key with a passkey credential public key and
|
// WrapKeyFn — wraps the env key with a passkey credential public key and
|
||||||
// persists the wrapped blob. Only wired when the daemon has the key in
|
// persists the wrapped blob. Only wired when the daemon has the key in
|
||||||
// memory (env key mode). Called by mavweb after passkey enrollment.
|
// memory (env key mode). Called by mavweb after passkey enrollment.
|
||||||
@@ -513,20 +448,23 @@ func run(args []string) error {
|
|||||||
tickInterval := time.Duration(cfg.TickInterval)
|
tickInterval := time.Duration(cfg.TickInterval)
|
||||||
repeatInterval := time.Duration(cfg.RepeatInterval)
|
repeatInterval := time.Duration(cfg.RepeatInterval)
|
||||||
autotuneInterval := time.Duration(cfg.AutotuneInterval)
|
autotuneInterval := time.Duration(cfg.AutotuneInterval)
|
||||||
tl = newTickLoop(st, gatherer, dispatcher, phr, rules, tickInterval, repeatInterval, autotuneInterval, cfg.Digest, routinesFromConfig(cfg.Routines), config.MorningRoutinesFromConfig(cfg.MorningRoutines))
|
tl = newTickLoop(st, gatherer, dispatcher, phr, rules, tickInterval, repeatInterval, autotuneInterval, cfg.Digest, routinesFromConfig(cfg.Routines), config.MorningRoutinesFromConfig(cfg.MorningRoutines), cfg.PatternProposals)
|
||||||
factWorker = newFactEnrichmentWorker(st, eco, time.Duration(cfg.FactEnrichmentInterval))
|
factWorker = newFactEnrichmentWorker(st, eco, time.Duration(cfg.FactEnrichmentInterval))
|
||||||
|
evalWorker = newMemoryEvalWorker(st, phr, cfg)
|
||||||
|
|
||||||
// Swap the CoreAPI from lockedAPI to the real store adapter.
|
// Swap the CoreAPI from the locked placeholder to the real store adapter.
|
||||||
newAPI := &daemonAPI{
|
newAPI := &daemonAPI{
|
||||||
CoreAPI: ipc.NewStoreAPI(st),
|
CoreAPI: ipc.NewStoreAPI(st),
|
||||||
getTrace: tl.trace,
|
getTrace: tl.trace,
|
||||||
getMorningStatus: func(ctx context.Context) []ipc.MorningRoutineStatus { return tl.morningStatus(ctx, time.Now()) },
|
getMorningStatus: func(ctx context.Context) []ipc.MorningRoutineStatus { return tl.morningStatus(ctx, time.Now()) },
|
||||||
|
getDayPlan: func(ctx context.Context) ipc.DayPlan { return tl.dayPlan(ctx, time.Now()) },
|
||||||
}
|
}
|
||||||
if voiceW != nil && voiceW.handler != nil {
|
if voiceW != nil && voiceW.handler != nil {
|
||||||
newAPI.chatFn = voiceW.handler.handleText
|
newAPI.chatFn = voiceW.handler.handleText
|
||||||
}
|
}
|
||||||
srv.SetAPI(newAPI)
|
srv.SetAPI(newAPI)
|
||||||
srv.Check = (&auth.Gate{Enrollment: auth.NewFloorEnrollment(), Session: passkeySess}).Check
|
srv.Check = (&auth.Gate{Enrollment: auth.NewFloorEnrollment(), Session: passkeySess}).Check
|
||||||
|
wireMailIntake(srv, st, phr, cfg)
|
||||||
|
|
||||||
// Start voice server.
|
// Start voice server.
|
||||||
if voiceW != nil {
|
if voiceW != nil {
|
||||||
@@ -551,6 +489,13 @@ func run(args []string) error {
|
|||||||
factWorker.run(ctx)
|
factWorker.run(ctx)
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
// Start background memory evaluation (nil unless configured).
|
||||||
|
if evalWorker != nil {
|
||||||
|
go func() {
|
||||||
|
evalWorker.run(ctx)
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
dl.unlock()
|
dl.unlock()
|
||||||
log.Printf("mavend: unlocked via passkey assertion")
|
log.Printf("mavend: unlocked via passkey assertion")
|
||||||
return nil
|
return nil
|
||||||
@@ -589,6 +534,13 @@ func run(args []string) error {
|
|||||||
defer wg.Done()
|
defer wg.Done()
|
||||||
factWorker.run(ctx)
|
factWorker.run(ctx)
|
||||||
}()
|
}()
|
||||||
|
if evalWorker != nil {
|
||||||
|
wg.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
evalWorker.run(ctx)
|
||||||
|
}()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
<-ctx.Done()
|
<-ctx.Done()
|
||||||
|
|||||||
@@ -0,0 +1,88 @@
|
|||||||
|
// mavend/memoryeval.go — the driver for background memory evaluation
|
||||||
|
// (Vikunja #248). The evaluator itself is pure-ish and lives in
|
||||||
|
// internal/memeval; this is the one impure part: a ticker, the store, and the
|
||||||
|
// resident model's base URL.
|
||||||
|
//
|
||||||
|
// It is its own goroutine and NOT a step on the main tick, deliberately. The
|
||||||
|
// tick runs every 60s and has a delivery deadline behind it; an evaluation is
|
||||||
|
// a multi-second LLM round-trip on the same llama-server that answers voice
|
||||||
|
// turns, and it happens hourly at most. Bolting it onto the tick would make
|
||||||
|
// every hour's tick the slow one for no benefit.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"log"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/config"
|
||||||
|
"github.com/kami/maven/internal/llm"
|
||||||
|
"github.com/kami/maven/internal/memeval"
|
||||||
|
"github.com/kami/maven/internal/phraser"
|
||||||
|
"github.com/kami/maven/internal/store"
|
||||||
|
)
|
||||||
|
|
||||||
|
// memoryEvalWorker — ticker + evaluator.
|
||||||
|
type memoryEvalWorker struct {
|
||||||
|
eval *memeval.Evaluator
|
||||||
|
interval time.Duration
|
||||||
|
}
|
||||||
|
|
||||||
|
// newMemoryEvalWorker wires the evaluation loop, or returns nil when it should
|
||||||
|
// not run at all. nil is the normal case and every caller must handle it:
|
||||||
|
//
|
||||||
|
// - no memory_eval config block ⇒ off (a capability is off unless configured);
|
||||||
|
// - no LLM phraser ⇒ nothing to evaluate with. There is no template fallback
|
||||||
|
// here on purpose: a "memory evaluation" assembled from string templates
|
||||||
|
// would be a fixed sentence pretending to be an observation.
|
||||||
|
func newMemoryEvalWorker(st *store.Store, phr phraser.Phraser, cfg *config.Config) *memoryEvalWorker {
|
||||||
|
if cfg.MemoryEval == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
lp, ok := phr.(*phraser.LLMPhraser)
|
||||||
|
if !ok {
|
||||||
|
log.Printf("memory eval: configured but no llama-server phraser — evaluation disabled")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
interval := time.Duration(cfg.MemoryEval.Interval)
|
||||||
|
if interval <= 0 {
|
||||||
|
interval = config.DefaultMemoryEvalInterval
|
||||||
|
}
|
||||||
|
// A generous per-request timeout: this is a long prompt to a Thinking model
|
||||||
|
// and nobody is waiting on the answer.
|
||||||
|
client := llm.New(lp.BaseURL(), 5*time.Minute)
|
||||||
|
ev := memeval.NewEvaluator(st, st, client, memeval.Config{
|
||||||
|
MaxItems: cfg.MemoryEval.MaxItems,
|
||||||
|
MinConfidence: cfg.MemoryEval.MinConfidence,
|
||||||
|
ContextBlock: contextBlockFn(cfg, time.Now),
|
||||||
|
})
|
||||||
|
log.Printf("memory eval: enabled, every %s", interval)
|
||||||
|
return &memoryEvalWorker{eval: ev, interval: interval}
|
||||||
|
}
|
||||||
|
|
||||||
|
// run evaluates every interval until ctx is canceled.
|
||||||
|
//
|
||||||
|
// The first evaluation waits a full interval rather than firing at startup, the
|
||||||
|
// opposite of the tick loop's cold-start behaviour. A tick that fires late is a
|
||||||
|
// nudge that arrives late; an evaluation that fires late is nothing at all, and
|
||||||
|
// the alternative is a heavy LLM call competing with startup — including with
|
||||||
|
// the first voice turn after a restart.
|
||||||
|
func (w *memoryEvalWorker) run(ctx context.Context) {
|
||||||
|
ticker := time.NewTicker(w.interval)
|
||||||
|
defer ticker.Stop()
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
return
|
||||||
|
case now := <-ticker.C:
|
||||||
|
obs, err := w.eval.Evaluate(ctx, now)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("memory eval: %v", err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for _, o := range obs {
|
||||||
|
log.Printf("memory eval: noted (%.2f, %s): %s", o.Conf, o.Action, o.Text)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,120 @@
|
|||||||
|
// mavend/patterns.go — the shared detect+propose step of pattern inference
|
||||||
|
// (Vikunja #43). Event *extraction* (fact -> action/object) happens at fact-
|
||||||
|
// write time in detectPattern below, tied to whichever channel wrote the
|
||||||
|
// fact. Detection — turning a run of events into a proposed routine — is
|
||||||
|
// channel-agnostic: it only needs what's already in the events table, so it
|
||||||
|
// runs both right after a voice fact-write (for the immediate "напоминать?"
|
||||||
|
// confirmation) and, proactively, from the digestion tick (tick.go's
|
||||||
|
// detectPatterns) over every action+object pair on record, not just the one
|
||||||
|
// that was just talked about.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"log"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/pattern"
|
||||||
|
"github.com/kami/maven/internal/store"
|
||||||
|
)
|
||||||
|
|
||||||
|
// detectAndPropose runs the pattern detector over every recorded event for
|
||||||
|
// action+object and, if a stable pattern is found and nothing has been
|
||||||
|
// proposed/accepted/dismissed for this pair yet, creates a proposed_routines
|
||||||
|
// row. Returns (nil, 0, nil) — not an error — whenever there is nothing new
|
||||||
|
// to report: too few events, irregular intervals, or a pair that already has
|
||||||
|
// a row in any status. That last case is the one that matters most: it is
|
||||||
|
// how a routine the owner already DISMISSED stays dismissed forever, because
|
||||||
|
// the row survives dismissal (status flips in place, see
|
||||||
|
// store.DismissProposedRoutine) and both the Lookup check here and the
|
||||||
|
// table's UNIQUE(action, object) constraint refuse to create a second one.
|
||||||
|
func detectAndPropose(ctx context.Context, ds *store.Store, action, object string, ts time.Time) (*pattern.ProposedRoutine, int64, error) {
|
||||||
|
events, err := ds.EventsFor(ctx, action, object)
|
||||||
|
if err != nil {
|
||||||
|
return nil, 0, fmt.Errorf("events for %s/%s: %w", action, object, err)
|
||||||
|
}
|
||||||
|
patEvents := make([]pattern.Event, len(events))
|
||||||
|
for i, e := range events {
|
||||||
|
patEvents[i] = pattern.Event{
|
||||||
|
FactID: e.FactID,
|
||||||
|
Action: e.Action,
|
||||||
|
Object: e.Object,
|
||||||
|
Ts: e.Ts,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
r, err := pattern.Detect(patEvents)
|
||||||
|
if err != nil {
|
||||||
|
return nil, 0, fmt.Errorf("detect %s/%s: %w", action, object, err)
|
||||||
|
}
|
||||||
|
if r == nil {
|
||||||
|
return nil, 0, nil // not enough data or intervals too irregular
|
||||||
|
}
|
||||||
|
|
||||||
|
// Belt: check first so the common "nothing new" case never even attempts
|
||||||
|
// an insert. Suspenders: CreateProposedRoutine's ON CONFLICT DO NOTHING
|
||||||
|
// (backed by the UNIQUE(action,object) constraint) is the actual
|
||||||
|
// guarantee — this Lookup is an optimization, not the source of truth.
|
||||||
|
existing, err := ds.LookupProposedRoutine(ctx, r.Action, r.Object)
|
||||||
|
if err != nil {
|
||||||
|
return nil, 0, fmt.Errorf("lookup proposed routine %s/%s: %w", action, object, err)
|
||||||
|
}
|
||||||
|
if existing != nil {
|
||||||
|
return nil, 0, nil // already proposed, accepted, or dismissed — say nothing
|
||||||
|
}
|
||||||
|
|
||||||
|
id, err := ds.CreateProposedRoutine(ctx, r.Action, r.Object, r.IntervalDays, ts)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, store.ErrProposedRoutineExists) {
|
||||||
|
return nil, 0, nil // lost a race with another caller — not an error
|
||||||
|
}
|
||||||
|
return nil, 0, fmt.Errorf("create proposed routine %s/%s: %w", action, object, err)
|
||||||
|
}
|
||||||
|
return r, id, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// detectPattern extracts an event from the written fact and runs the pattern
|
||||||
|
// detector. If a stable recurring pattern is found and no proposed routine
|
||||||
|
// exists for this action+object yet, one is created and the user is prompted
|
||||||
|
// to confirm via the park() mechanism. Returns the suggestion phrase when a
|
||||||
|
// new proposal was created and parked; "" otherwise.
|
||||||
|
func (h *reactiveHandler) detectPattern(ctx context.Context, factID int64, key, value string, ts time.Time) string {
|
||||||
|
ev := pattern.Extract(factID, key, value, ts)
|
||||||
|
if ev == nil {
|
||||||
|
return "" // not an actionable event
|
||||||
|
}
|
||||||
|
if _, err := h.dataStore.CreateEvent(ctx, factID, ev.Action, ev.Object, ts); err != nil {
|
||||||
|
log.Printf("voice: create event: %v", err)
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
// Detect+propose (Vikunja #43) is shared with the digestion tick's
|
||||||
|
// proactive scan — see detectAndPropose above. Event *extraction* stays
|
||||||
|
// here, tied to this fact write; detection over the accumulated history does
|
||||||
|
// not need to happen right now for the voice path to have already done
|
||||||
|
// its job — it's dedupe-safe to also let the next tick find the same
|
||||||
|
// pattern independently.
|
||||||
|
r, id, err := detectAndPropose(ctx, h.dataStore, ev.Action, ev.Object, ts)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("voice: detect pattern %s/%s: %v", ev.Action, ev.Object, err)
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if r == nil {
|
||||||
|
return "" // not enough data, too irregular, or already proposed/decided
|
||||||
|
}
|
||||||
|
log.Printf("voice: proposed routine: %s/%s every %.1f days", r.Action, r.Object, r.IntervalDays)
|
||||||
|
|
||||||
|
// Park the proposal for voice confirmation.
|
||||||
|
phrase := pattern.PhraseRoutine(r)
|
||||||
|
h.mu.Lock()
|
||||||
|
h.pendingRoutine = &pendingRoutineConfirm{
|
||||||
|
routineID: id,
|
||||||
|
action: r.Action,
|
||||||
|
object: r.Object,
|
||||||
|
interval: r.IntervalDays,
|
||||||
|
phrase: phrase,
|
||||||
|
expiry: ts.Add(confirmTTL),
|
||||||
|
}
|
||||||
|
h.mu.Unlock()
|
||||||
|
return phrase
|
||||||
|
}
|
||||||
@@ -0,0 +1,285 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/config"
|
||||||
|
"github.com/kami/maven/internal/delivery"
|
||||||
|
"github.com/kami/maven/internal/loop"
|
||||||
|
"github.com/kami/maven/internal/pattern"
|
||||||
|
"github.com/kami/maven/internal/store"
|
||||||
|
)
|
||||||
|
|
||||||
|
// seedRefillEvents writes N weekly "refill/cat_water" events straight to the
|
||||||
|
// events table — this is what the tick reads, independent of any utterance.
|
||||||
|
func seedRefillEvents(t *testing.T, st *store.Store, ctx context.Context, base time.Time, n int) {
|
||||||
|
t.Helper()
|
||||||
|
for i := 0; i < n; i++ {
|
||||||
|
factID, err := st.WriteFact(ctx, base.Add(time.Duration(i)*7*24*time.Hour), store.KindSelf,
|
||||||
|
"cat_water", "refill", "test", 1.0, sql.NullInt64{})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("write fact %d: %v", i, err)
|
||||||
|
}
|
||||||
|
if _, err := st.CreateEvent(ctx, factID, "refill", "cat_water", base.Add(time.Duration(i)*7*24*time.Hour)); err != nil {
|
||||||
|
t.Fatalf("create event %d: %v", i, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestTickDetectsPatternFromStoredEvents proves the tick notices a pattern on
|
||||||
|
// its own, reading straight from the store — not as a side effect of a live
|
||||||
|
// utterance (Vikunja #43). MinEvents weekly events with no voice turn in
|
||||||
|
// sight must produce exactly one proposed routine.
|
||||||
|
func TestTickDetectsPatternFromStoredEvents(t *testing.T) {
|
||||||
|
st := newTestStore(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
now := refNow()
|
||||||
|
seedRefillEvents(t, st, ctx, now, pattern.MinEvents)
|
||||||
|
|
||||||
|
tl := newTestTickLoop(t, st, &fakeSink{}, nil)
|
||||||
|
tl.detectPatterns(ctx, now, loop.State{})
|
||||||
|
|
||||||
|
rows, err := st.ListProposedRoutines(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("list proposed routines: %v", err)
|
||||||
|
}
|
||||||
|
if len(rows) != 1 {
|
||||||
|
t.Fatalf("proposed routines = %d, want 1: %+v", len(rows), rows)
|
||||||
|
}
|
||||||
|
if rows[0].Action != "refill" || rows[0].Object != "cat_water" {
|
||||||
|
t.Errorf("proposed routine = %s/%s, want refill/cat_water", rows[0].Action, rows[0].Object)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestTickPatternDetectionIsIdempotent proves running the tick's pattern scan
|
||||||
|
// twice does not spam a second proposal for the same pair, and that the store
|
||||||
|
// itself is what stops the duplicate (not tick-local state) — the whole point
|
||||||
|
// of the guard, since the tick has no memory of what it proposed last time.
|
||||||
|
func TestTickPatternDetectionIsIdempotent(t *testing.T) {
|
||||||
|
st := newTestStore(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
now := refNow()
|
||||||
|
seedRefillEvents(t, st, ctx, now, pattern.MinEvents)
|
||||||
|
|
||||||
|
tl := newTestTickLoop(t, st, &fakeSink{}, nil)
|
||||||
|
tl.detectPatterns(ctx, now, loop.State{})
|
||||||
|
tl.detectPatterns(ctx, now.Add(time.Hour), loop.State{})
|
||||||
|
|
||||||
|
rows, err := st.ListProposedRoutines(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("list proposed routines: %v", err)
|
||||||
|
}
|
||||||
|
if len(rows) != 1 {
|
||||||
|
t.Fatalf("proposed routines after two ticks = %d, want 1 (no duplicate): %+v", len(rows), rows)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestTickPatternDetectionRespectsDismissal proves the single worst failure
|
||||||
|
// mode here — a proposal the owner already said no to coming back on the next
|
||||||
|
// tick — cannot happen. Dismissal flips the row's status in place; it must
|
||||||
|
// still be there to block re-proposal.
|
||||||
|
func TestTickPatternDetectionRespectsDismissal(t *testing.T) {
|
||||||
|
st := newTestStore(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
now := refNow()
|
||||||
|
seedRefillEvents(t, st, ctx, now, pattern.MinEvents)
|
||||||
|
|
||||||
|
tl := newTestTickLoop(t, st, &fakeSink{}, nil)
|
||||||
|
tl.detectPatterns(ctx, now, loop.State{})
|
||||||
|
|
||||||
|
rows, err := st.ListProposedRoutines(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("list proposed routines: %v", err)
|
||||||
|
}
|
||||||
|
if len(rows) != 1 {
|
||||||
|
t.Fatalf("setup: proposed routines = %d, want 1", len(rows))
|
||||||
|
}
|
||||||
|
if err := st.DismissProposedRoutine(ctx, rows[0].ID); err != nil {
|
||||||
|
t.Fatalf("dismiss: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// More events for the same pair arrive, and the tick runs again — a
|
||||||
|
// dismissed pattern must not resurface.
|
||||||
|
seedRefillEvents(t, st, ctx, now.Add(30*24*time.Hour), pattern.MinEvents)
|
||||||
|
tl.detectPatterns(ctx, now.Add(60*24*time.Hour), loop.State{})
|
||||||
|
|
||||||
|
proposed, err := st.ListProposedRoutinesByStatus(ctx, store.RoutineProposed)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("list proposed: %v", err)
|
||||||
|
}
|
||||||
|
if len(proposed) != 0 {
|
||||||
|
t.Fatalf("a dismissed pattern came back: %+v", proposed)
|
||||||
|
}
|
||||||
|
all, err := st.ListProposedRoutinesByStatus(ctx, "")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("list all: %v", err)
|
||||||
|
}
|
||||||
|
if len(all) != 1 {
|
||||||
|
t.Fatalf("total rows for the pair = %d, want 1 (still dismissed, not duplicated): %+v", len(all), all)
|
||||||
|
}
|
||||||
|
if all[0].Status != store.RoutineDismissed {
|
||||||
|
t.Errorf("status = %s, want dismissed", all[0].Status)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// proposalRule — the rule name announceProposal uses for the seeded pair.
|
||||||
|
const proposalRule = "proposal:refill cat_water"
|
||||||
|
|
||||||
|
// TestTickProposalSilentByDefault — detection is always on, announcing is not.
|
||||||
|
// With no pattern_proposals block the tick still records the proposal, and says
|
||||||
|
// nothing about it: Maven is not autonomous, so a behaviour that speaks without
|
||||||
|
// being asked stays off until it is configured.
|
||||||
|
func TestTickProposalSilentByDefault(t *testing.T) {
|
||||||
|
st := newTestStore(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
now := refNow()
|
||||||
|
seedRefillEvents(t, st, ctx, now, pattern.MinEvents)
|
||||||
|
markPresent(t, st, ctx, now)
|
||||||
|
|
||||||
|
sink := &fakeSink{}
|
||||||
|
tl := newTestTickLoop(t, st, sink, nil)
|
||||||
|
tl.tick(ctx, now)
|
||||||
|
|
||||||
|
if n := countSends(sink, proposalRule); n != 0 {
|
||||||
|
t.Fatalf("announced %d proposals with no config, want 0", n)
|
||||||
|
}
|
||||||
|
rows, err := st.ListProposedRoutinesByStatus(ctx, store.RoutineProposed)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("list proposed: %v", err)
|
||||||
|
}
|
||||||
|
if len(rows) != 1 {
|
||||||
|
t.Fatalf("proposed routines = %d, want 1 (silent, but recorded)", len(rows))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestTickAnnouncesProposalWhenConfigured — with notify on, the proposal goes
|
||||||
|
// out once through the ordinary delivery path, worded by the detector itself.
|
||||||
|
// Later ticks stay quiet because the pair is already proposed: one pattern is
|
||||||
|
// one announcement, ever.
|
||||||
|
func TestTickAnnouncesProposalWhenConfigured(t *testing.T) {
|
||||||
|
st := newTestStore(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
now := refNow()
|
||||||
|
seedRefillEvents(t, st, ctx, now, pattern.MinEvents)
|
||||||
|
markPresent(t, st, ctx, now)
|
||||||
|
|
||||||
|
sink := &fakeSink{}
|
||||||
|
tl := newTestTickLoop(t, st, sink, nil)
|
||||||
|
tl.proposalCfg = &config.PatternProposalConfig{Notify: true}
|
||||||
|
tl.tick(ctx, now)
|
||||||
|
|
||||||
|
var got *delivery.Sendable
|
||||||
|
for i := range sink.sends {
|
||||||
|
if sink.sends[i].RuleName == proposalRule {
|
||||||
|
got = &sink.sends[i]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if got == nil {
|
||||||
|
t.Fatalf("proposal was not announced; sends=%+v", sink.sends)
|
||||||
|
}
|
||||||
|
if !strings.Contains(got.Body, "напоминать?") {
|
||||||
|
t.Errorf("body = %q, want the detector's own question", got.Body)
|
||||||
|
}
|
||||||
|
if got.Channel != delivery.ChannelVoice {
|
||||||
|
t.Errorf("channel = %v, want voice (sev1, present)", got.Channel)
|
||||||
|
}
|
||||||
|
|
||||||
|
// A month of further ticks: the pair already has a row, so there is
|
||||||
|
// nothing new to detect and nothing more to say.
|
||||||
|
sink.sends = nil
|
||||||
|
later := now.Add(40 * 24 * time.Hour)
|
||||||
|
markPresent(t, st, ctx, later)
|
||||||
|
tl.tick(ctx, later)
|
||||||
|
if n := countSends(sink, proposalRule); n != 0 {
|
||||||
|
t.Fatalf("re-announced an existing proposal %d times, want 0", n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestTickProposalRespectsGate — a proposal is the least urgent thing Maven can
|
||||||
|
// say, so it is sev1 and the restraint gate suppresses it. Away presence means
|
||||||
|
// it is not announced at all: it is not held, not retried, it just lives on
|
||||||
|
// /routines. The proposal row is still written — noticing is never gated.
|
||||||
|
func TestTickProposalRespectsGate(t *testing.T) {
|
||||||
|
st := newTestStore(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
now := refNow()
|
||||||
|
seedRefillEvents(t, st, ctx, now, pattern.MinEvents)
|
||||||
|
// no presence probes ⇒ away ⇒ care-class gate blocks.
|
||||||
|
|
||||||
|
sink := &fakeSink{}
|
||||||
|
tl := newTestTickLoop(t, st, sink, nil)
|
||||||
|
tl.proposalCfg = &config.PatternProposalConfig{Notify: true}
|
||||||
|
tl.tick(ctx, now)
|
||||||
|
|
||||||
|
if n := countSends(sink, proposalRule); n != 0 {
|
||||||
|
t.Fatalf("away: announced %d proposals, want 0", n)
|
||||||
|
}
|
||||||
|
if !tl.lastProposalAt.IsZero() {
|
||||||
|
t.Error("cooldown clock advanced on a suppressed announcement")
|
||||||
|
}
|
||||||
|
rows, err := st.ListProposedRoutinesByStatus(ctx, store.RoutineProposed)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("list proposed: %v", err)
|
||||||
|
}
|
||||||
|
if len(rows) != 1 {
|
||||||
|
t.Fatalf("proposed routines = %d, want 1 (detection is never gated)", len(rows))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestTickProposalCooldownSpacesAnnouncements — two patterns detected on the
|
||||||
|
// same tick must not become two interruptions. The second one waits for the
|
||||||
|
// cooldown, and is on /routines meanwhile.
|
||||||
|
func TestTickProposalCooldownSpacesAnnouncements(t *testing.T) {
|
||||||
|
st := newTestStore(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
now := refNow()
|
||||||
|
seedRefillEvents(t, st, ctx, now, pattern.MinEvents)
|
||||||
|
for i := 0; i < pattern.MinEvents; i++ {
|
||||||
|
ts := now.Add(time.Duration(i) * 3 * 24 * time.Hour)
|
||||||
|
factID, err := st.WriteFact(ctx, ts, store.KindSelf, "litter_box", "clean", "test", 1.0, sql.NullInt64{})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("write fact: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := st.CreateEvent(ctx, factID, "clean", "litter_box", ts); err != nil {
|
||||||
|
t.Fatalf("create event: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
markPresent(t, st, ctx, now)
|
||||||
|
|
||||||
|
sink := &fakeSink{}
|
||||||
|
tl := newTestTickLoop(t, st, sink, nil)
|
||||||
|
tl.proposalCfg = &config.PatternProposalConfig{Notify: true, Cooldown: config.Duration(24 * time.Hour)}
|
||||||
|
tl.tick(ctx, now)
|
||||||
|
|
||||||
|
announced := 0
|
||||||
|
for _, s := range sink.sends {
|
||||||
|
if strings.HasPrefix(s.RuleName, "proposal:") {
|
||||||
|
announced++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if announced != 1 {
|
||||||
|
t.Fatalf("announced %d proposals on one tick, want exactly 1", announced)
|
||||||
|
}
|
||||||
|
rows, err := st.ListProposedRoutinesByStatus(ctx, store.RoutineProposed)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("list proposed: %v", err)
|
||||||
|
}
|
||||||
|
if len(rows) != 2 {
|
||||||
|
t.Fatalf("proposed routines = %d, want 2 (both recorded, one announced)", len(rows))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Still inside the cooldown: silence, even though a proposal is pending.
|
||||||
|
sink.sends = nil
|
||||||
|
soon := now.Add(time.Hour)
|
||||||
|
markPresent(t, st, ctx, soon)
|
||||||
|
tl.tick(ctx, soon)
|
||||||
|
for _, s := range sink.sends {
|
||||||
|
if strings.HasPrefix(s.RuleName, "proposal:") {
|
||||||
|
t.Fatalf("announced %q inside the cooldown", s.RuleName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,144 @@
|
|||||||
|
// Quiet-mode toggle recognition — the pre-route keyword check that lets
|
||||||
|
// "тихий режим" flip the daemon-wide quiet_hours config without going through
|
||||||
|
// the router. Moved out of voice.go unchanged (Vikunja #321); the tests live in
|
||||||
|
// quiet_toggle_test.go.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"log"
|
||||||
|
"strings"
|
||||||
|
"unicode"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
)
|
||||||
|
|
||||||
|
// resolveQuietToggle — pre-route keyword check. Returns (reply, true) when
|
||||||
|
// the utterance is a quiet-on/off command; ("", false) otherwise. Called from
|
||||||
|
// runTurn BEFORE the router so a classifier miscue can't drop it — which means
|
||||||
|
// both the voice path and the text path (mavweb /api/chat, telegram) reach it,
|
||||||
|
// so a false positive here is a network-reachable way to flip a daemon-wide
|
||||||
|
// setting. See classifyQuietToggle for the matching rule.
|
||||||
|
func (h *reactiveHandler) resolveQuietToggle(ctx context.Context, text string) (string, bool) {
|
||||||
|
on, off := classifyQuietToggle(text)
|
||||||
|
if !on && !off {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
val := "false"
|
||||||
|
reply := "тихий режим выключен."
|
||||||
|
if on {
|
||||||
|
val = "true"
|
||||||
|
reply = "тихий режим включён. буду реже напоминать."
|
||||||
|
}
|
||||||
|
if _, err := h.api.WriteFact(ctx, ipc.WriteFactReq{
|
||||||
|
Ts: h.now(),
|
||||||
|
Kind: "config",
|
||||||
|
Key: "quiet_hours",
|
||||||
|
Value: val,
|
||||||
|
Source: "tap:voice",
|
||||||
|
Confidence: 1.0,
|
||||||
|
}); err != nil {
|
||||||
|
log.Printf("voice: write quiet_hours: %v", err)
|
||||||
|
return "не получилось переключить тихий режим.", true
|
||||||
|
}
|
||||||
|
return reply, true
|
||||||
|
}
|
||||||
|
|
||||||
|
// quietInflections — the inflectional endings a stem may carry and still be
|
||||||
|
// the same word. Adjective/adverb/noun/verb endings, all ≤3 letters. This is
|
||||||
|
// what separates "тихий"/"тихом"/"тихо" (stem "тих" + a real ending) from
|
||||||
|
// "тихонько"/"потихоньку", which are different words: "онько" is not an
|
||||||
|
// ending, and "потихоньку" doesn't start with the stem at all.
|
||||||
|
var quietInflections = []string{
|
||||||
|
"", "а", "е", "и", "й", "о", "у", "ы", "ю", "я",
|
||||||
|
"ая", "ее", "ей", "ем", "ие", "ий", "им", "их", "ия", "ию", "ое", "ой", "ом", "ую", "ые", "ый", "ым", "ых", "ья",
|
||||||
|
"ами", "ого", "ому", "ыми", "ать", "ить", "ять",
|
||||||
|
}
|
||||||
|
|
||||||
|
// quietStem reports whether tok is the given stem carrying at most one
|
||||||
|
// inflectional ending. Word boundaries come from tokenisation (see
|
||||||
|
// quietTokens), not from a regexp — Go's \b is ASCII-oriented and treats every
|
||||||
|
// Cyrillic letter as a non-word character, so `\bтих\b` would happily match
|
||||||
|
// inside "тихонько". Comparing whole tokens sidesteps that entirely.
|
||||||
|
func quietStem(tok, stem string) bool {
|
||||||
|
if !strings.HasPrefix(tok, stem) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
suffix := tok[len(stem):]
|
||||||
|
for _, e := range quietInflections {
|
||||||
|
if suffix == e {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// quietTokens splits an utterance into lowercase word tokens, dropping
|
||||||
|
// punctuation and spacing. Unicode-aware, so Cyrillic words tokenise the same
|
||||||
|
// way ASCII ones do.
|
||||||
|
func quietTokens(text string) []string {
|
||||||
|
return strings.FieldsFunc(strings.ToLower(strings.TrimSpace(text)), func(r rune) bool {
|
||||||
|
return !unicode.IsLetter(r) && !unicode.IsDigit(r)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// quietPhrase matches a pattern (a sequence of stems) against the token list.
|
||||||
|
// Multi-word patterns match any contiguous run of tokens — "включи тихий
|
||||||
|
// режим" carries "тихий режим". Single-word patterns match ONLY when they are
|
||||||
|
// the whole utterance: bare "тихо" is a command, but "в комнате тихо" is a
|
||||||
|
// remark about the room and must not flip a daemon-wide setting.
|
||||||
|
func quietPhrase(tokens, pattern []string) bool {
|
||||||
|
if len(pattern) == 0 || len(tokens) < len(pattern) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if len(pattern) == 1 {
|
||||||
|
return len(tokens) == 1 && quietStem(tokens[0], pattern[0])
|
||||||
|
}
|
||||||
|
for i := 0; i+len(pattern) <= len(tokens); i++ {
|
||||||
|
hit := true
|
||||||
|
for j, stem := range pattern {
|
||||||
|
if !quietStem(tokens[i+j], stem) {
|
||||||
|
hit = false
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if hit {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// quietOffPhrases / quietOnPhrases — the toggle vocabulary, as stem sequences.
|
||||||
|
var (
|
||||||
|
quietOffPhrases = [][]string{
|
||||||
|
{"quiet", "off"}, {"quiet", "end"},
|
||||||
|
{"громк", "режим"}, {"шумн", "режим"},
|
||||||
|
{"отмен", "тих"}, {"выключ", "тих"}, {"не", "тих"},
|
||||||
|
}
|
||||||
|
quietOnPhrases = [][]string{
|
||||||
|
{"quiet", "on"}, {"quiet", "mode"},
|
||||||
|
{"тих", "режим"}, {"не", "шум"}, {"не", "беспоко"},
|
||||||
|
{"тих"},
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
// classifyQuietToggle reads an utterance as a quiet-mode command. OFF is
|
||||||
|
// resolved before ON for the same reason classifyConfirm checks negatives
|
||||||
|
// first: the OFF phrases are built out of the ON words ("выключи тихий"
|
||||||
|
// contains "тихий"), so scanning ON first would shadow them and "выключи
|
||||||
|
// тихий режим" would turn quiet mode on. Negation wins.
|
||||||
|
func classifyQuietToggle(text string) (on, off bool) {
|
||||||
|
tokens := quietTokens(text)
|
||||||
|
for _, p := range quietOffPhrases {
|
||||||
|
if quietPhrase(tokens, p) {
|
||||||
|
return false, true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, p := range quietOnPhrases {
|
||||||
|
if quietPhrase(tokens, p) {
|
||||||
|
return true, false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false, false
|
||||||
|
}
|
||||||
@@ -0,0 +1,114 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
)
|
||||||
|
|
||||||
|
// quietFakeAPI records the WriteFact the toggle performs.
|
||||||
|
type quietFakeAPI struct {
|
||||||
|
ipc.UnimplementedCoreAPI
|
||||||
|
got ipc.WriteFactReq
|
||||||
|
call int
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *quietFakeAPI) WriteFact(_ context.Context, req ipc.WriteFactReq) (int64, error) {
|
||||||
|
a.got, a.call = req, a.call+1
|
||||||
|
return 1, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// quietVerdict — what a phrase should do to the setting.
|
||||||
|
type quietVerdict int
|
||||||
|
|
||||||
|
const (
|
||||||
|
quietNone quietVerdict = iota
|
||||||
|
quietOn
|
||||||
|
quietOff
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestResolveQuietToggle(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
text string
|
||||||
|
want quietVerdict
|
||||||
|
}{
|
||||||
|
// ON vocabulary.
|
||||||
|
{"quiet on", quietOn},
|
||||||
|
{"quiet mode", quietOn},
|
||||||
|
{"тихий режим", quietOn},
|
||||||
|
{"тихий", quietOn},
|
||||||
|
{"не шуми", quietOn},
|
||||||
|
{"не беспокоить", quietOn},
|
||||||
|
{"тихо", quietOn},
|
||||||
|
// ON, inflected / embedded in a sentence.
|
||||||
|
{"включи тихий режим", quietOn},
|
||||||
|
{"побудь в тихом режиме", quietOn},
|
||||||
|
{"Тихий Режим!", quietOn},
|
||||||
|
{"тихая", quietOn},
|
||||||
|
|
||||||
|
// OFF vocabulary — all seven, incl. the three that used to say ON.
|
||||||
|
{"quiet off", quietOff},
|
||||||
|
{"quiet end", quietOff},
|
||||||
|
{"громкий режим", quietOff},
|
||||||
|
{"шумный режим", quietOff},
|
||||||
|
{"отмени тихий", quietOff},
|
||||||
|
{"выключи тихий", quietOff},
|
||||||
|
{"не тихо", quietOff},
|
||||||
|
// OFF wins over the ON words it contains.
|
||||||
|
{"выключи тихий режим", quietOff},
|
||||||
|
{"отмени тихий режим пожалуйста", quietOff},
|
||||||
|
{"верни громкий режим", quietOff},
|
||||||
|
|
||||||
|
// False positives: "тихо"/"тихий" as ordinary Russian.
|
||||||
|
{"очень тихий сегодня день", quietNone},
|
||||||
|
{"в комнате тихо", quietNone},
|
||||||
|
{"тихонько напомни", quietNone},
|
||||||
|
{"потихоньку", quietNone},
|
||||||
|
{"тихонько", quietNone},
|
||||||
|
{"он говорил тихим голосом весь вечер", quietNone},
|
||||||
|
|
||||||
|
// Unrelated.
|
||||||
|
{"напомни завтра позвонить маме", quietNone},
|
||||||
|
{"какая погода", quietNone},
|
||||||
|
{"", quietNone},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tc := range cases {
|
||||||
|
t.Run(tc.text, func(t *testing.T) {
|
||||||
|
api := &quietFakeAPI{}
|
||||||
|
h := &reactiveHandler{api: api, now: func() time.Time { return time.Unix(0, 0).UTC() }}
|
||||||
|
reply, handled := h.resolveQuietToggle(context.Background(), tc.text)
|
||||||
|
|
||||||
|
if tc.want == quietNone {
|
||||||
|
if handled || reply != "" {
|
||||||
|
t.Fatalf("%q: got (%q, %v), want no match", tc.text, reply, handled)
|
||||||
|
}
|
||||||
|
if api.call != 0 {
|
||||||
|
t.Fatalf("%q: wrote a fact on a non-match", tc.text)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !handled {
|
||||||
|
t.Fatalf("%q: not handled, want %v", tc.text, tc.want)
|
||||||
|
}
|
||||||
|
wantReply, wantVal := "тихий режим выключен.", "false"
|
||||||
|
if tc.want == quietOn {
|
||||||
|
wantReply, wantVal = "тихий режим включён. буду реже напоминать.", "true"
|
||||||
|
}
|
||||||
|
if reply != wantReply {
|
||||||
|
t.Errorf("%q: reply = %q, want %q", tc.text, reply, wantReply)
|
||||||
|
}
|
||||||
|
if api.call != 1 {
|
||||||
|
t.Fatalf("%q: WriteFact called %d times, want 1", tc.text, api.call)
|
||||||
|
}
|
||||||
|
if api.got.Kind != "config" || api.got.Key != "quiet_hours" || api.got.Source != "tap:voice" || api.got.Confidence != 1.0 {
|
||||||
|
t.Errorf("%q: request shape = %+v", tc.text, api.got)
|
||||||
|
}
|
||||||
|
if api.got.Value != wantVal {
|
||||||
|
t.Errorf("%q: value = %q, want %q", tc.text, api.got.Value, wantVal)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,180 @@
|
|||||||
|
// Package main — ruwords.go holds Russian language + calendar/time formatting
|
||||||
|
// helpers used by the voice reply paths (replySystem, the reminder/routine
|
||||||
|
// phrasing, etc). Pure functions, no receivers: weekday/month name tables,
|
||||||
|
// plural agreement, clock/date rendering, and the "do I actually know this
|
||||||
|
// place/day" guards that pick an honest reply over a confidently wrong one.
|
||||||
|
// Extend this file rather than voice.go for anything in that shape.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
var ruWeekdays = []string{
|
||||||
|
"воскресенье", "понедельник", "вторник", "среда",
|
||||||
|
"четверг", "пятница", "суббота",
|
||||||
|
}
|
||||||
|
|
||||||
|
var ruMonths = []string{
|
||||||
|
"января", "февраля", "марта", "апреля", "мая", "июня",
|
||||||
|
"июля", "августа", "сентября", "октября", "ноября", "декабря",
|
||||||
|
}
|
||||||
|
|
||||||
|
// onlyLocalTimeReply — the honest answer when the user asks the time somewhere
|
||||||
|
// other than here. She only keeps one clock, and saying so is better than
|
||||||
|
// naming the wrong city's time.
|
||||||
|
//
|
||||||
|
// There used to be a city→time-zone table here. It was removed on purpose: the
|
||||||
|
// user only ever asks for local time, so the table was a second list of cities
|
||||||
|
// to keep in step with the weather one for no gain.
|
||||||
|
const onlyLocalTimeReply = "я знаю только местное время, про другие города пока не скажу."
|
||||||
|
|
||||||
|
// notPlaceAfterV — words that follow "в" without naming a place, so
|
||||||
|
// mentionsUnknownPlace does not mistake them for a city.
|
||||||
|
var notPlaceAfterV = map[string]bool{
|
||||||
|
"данный": true, "данную": true, "этот": true, "эту": true,
|
||||||
|
"котором": true, "какое": true, "какой": true, "который": true,
|
||||||
|
"общем": true, "точности": true, "курсе": true, "сутках": true,
|
||||||
|
"часах": true, "минутах": true, "секундах": true, "неделе": true,
|
||||||
|
}
|
||||||
|
|
||||||
|
// mentionsUnknownPlace reports whether the question has a "в <слово>" phrase
|
||||||
|
// that looks like a place we do not know ("который час в киеве"). Used only to
|
||||||
|
// pick the honest "local time only" reply instead of answering local time as
|
||||||
|
// if it were the city's.
|
||||||
|
func mentionsUnknownPlace(u string) bool {
|
||||||
|
toks := strings.Fields(u)
|
||||||
|
for i := 0; i+1 < len(toks); i++ {
|
||||||
|
if toks[i] != "в" && toks[i] != "во" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
next := strings.Trim(toks[i+1], ".,?!")
|
||||||
|
if next == "" || notPlaceAfterV[next] {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// A number after "в" is a clock ("в 5 часов"), not a place.
|
||||||
|
if _, err := strconv.Atoi(strings.SplitN(next, ":", 2)[0]); err == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// onlyNearDaysReply — she can work out today, tomorrow, the day after and
|
||||||
|
// yesterday, and nothing further. Said out loud instead of answering today's
|
||||||
|
// date for a day she did not understand.
|
||||||
|
const onlyNearDaysReply = "я считаю только сегодня, завтра, послезавтра и вчера — про другие дни пока не скажу."
|
||||||
|
|
||||||
|
// dayWords — day references the calendar parser cannot resolve. A weekday name
|
||||||
|
// or a "через …" phrase means he asked about a specific other day.
|
||||||
|
var dayWords = []string{
|
||||||
|
"понедельник", "вторник", "сред", "четверг", "пятниц", "суббот", "воскресен",
|
||||||
|
"через", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday",
|
||||||
|
}
|
||||||
|
|
||||||
|
// mentionsUnknownDay reports whether the question names a day the calendar
|
||||||
|
// parser could not resolve. Mirror of mentionsUnknownPlace: it exists only to
|
||||||
|
// pick an honest reply over a confidently wrong one.
|
||||||
|
//
|
||||||
|
// Only called after ParseCalendarDate has already failed, so "завтра" and the
|
||||||
|
// other words it does know never reach here.
|
||||||
|
func mentionsUnknownDay(u string) bool {
|
||||||
|
for _, w := range dayWords {
|
||||||
|
if strings.Contains(u, w) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// ruClock renders the clock part of the time reply: "15 часов 4 минуты".
|
||||||
|
func ruClock(t time.Time) string {
|
||||||
|
h, m := t.Hour(), t.Minute()
|
||||||
|
hourWord := ruPlural(h, "час", "часа", "часов")
|
||||||
|
if m == 0 {
|
||||||
|
return fmt.Sprintf("%d %s ровно", h, hourWord)
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("%d %s %d %s", h, hourWord, m, ruPlural(m, "минута", "минуты", "минут"))
|
||||||
|
}
|
||||||
|
|
||||||
|
// dayPrefix names the day relative to now ("завтра", "вчера", …) so the date
|
||||||
|
// reply opens the way a person would say it.
|
||||||
|
func dayPrefix(now, day time.Time) string {
|
||||||
|
base := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
|
||||||
|
switch int(day.Sub(base).Hours() / 24) {
|
||||||
|
case -1:
|
||||||
|
return "вчера"
|
||||||
|
case 0:
|
||||||
|
return "сегодня"
|
||||||
|
case 1:
|
||||||
|
return "завтра"
|
||||||
|
case 2:
|
||||||
|
return "послезавтра"
|
||||||
|
}
|
||||||
|
return "это"
|
||||||
|
}
|
||||||
|
|
||||||
|
func ruPlural(n int, one, two, many string) string {
|
||||||
|
n = n % 100
|
||||||
|
if n > 10 && n < 20 {
|
||||||
|
return many
|
||||||
|
}
|
||||||
|
n = n % 10
|
||||||
|
switch n {
|
||||||
|
case 1:
|
||||||
|
return one
|
||||||
|
case 2, 3, 4:
|
||||||
|
return two
|
||||||
|
default:
|
||||||
|
return many
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// hasDurationWords checks whether u is asking about elapsed/remaining time
|
||||||
|
// rather than the current clock — guards replySystem from replying "сейчас
|
||||||
|
// X часов" to "сколько времени прошло". Mirrors the stage0.go build filter.
|
||||||
|
func hasDurationWords(u string) bool {
|
||||||
|
s := strings.ToLower(strings.TrimSpace(u))
|
||||||
|
// First-word duration markers (same keywords as timeQueryBuild in stage0).
|
||||||
|
first := strings.Fields(s)
|
||||||
|
if len(first) > 0 {
|
||||||
|
switch first[0] {
|
||||||
|
case "прошло", "осталось", "пройдет", "минуло", "проходит":
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Broader duration keywords appearing anywhere in the utterance.
|
||||||
|
if strings.Contains(s, "прошло") || strings.Contains(s, "осталось") {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if strings.Contains(s, " до ") {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// formatTime returns a human-readable Russian time string for a fact timestamp.
|
||||||
|
// Used by the query handler when answering "когда я это сделал?"-style questions.
|
||||||
|
func formatTime(t time.Time) string {
|
||||||
|
now := time.Now()
|
||||||
|
if t.After(now.Add(-2*time.Minute)) && t.Before(now.Add(2*time.Minute)) {
|
||||||
|
return "только что"
|
||||||
|
}
|
||||||
|
diff := now.Sub(t)
|
||||||
|
switch {
|
||||||
|
case diff < 10*time.Minute:
|
||||||
|
return "несколько минут назад"
|
||||||
|
case diff < 60*time.Minute:
|
||||||
|
return fmt.Sprintf("%d минут назад", int(diff.Minutes()))
|
||||||
|
case diff < 2*time.Hour:
|
||||||
|
return "час назад"
|
||||||
|
case diff < 24*time.Hour:
|
||||||
|
return fmt.Sprintf("%d часа назад", int(diff.Hours()))
|
||||||
|
default:
|
||||||
|
return t.Format("2 января 15:04")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
// Package main — strutil.go holds small, receiver-free string utilities used
|
||||||
|
// across the voice reply paths: trimming a wake token, pulling out the first
|
||||||
|
// word or first line, and a minimal JSON string encoder for the one payload
|
||||||
|
// shape that needs it. Extend this file rather than voice.go for anything in
|
||||||
|
// that shape.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/router"
|
||||||
|
)
|
||||||
|
|
||||||
|
// stripWake removes a leading wake token (any script the STT phonetically
|
||||||
|
// transcribes "Maven" as) so the verb is the first word.
|
||||||
|
func stripWake(u string) string {
|
||||||
|
stripped, had := router.StripWakeToken(u)
|
||||||
|
if !had {
|
||||||
|
return strings.TrimSpace(u)
|
||||||
|
}
|
||||||
|
return stripped
|
||||||
|
}
|
||||||
|
|
||||||
|
// firstWord returns the first whitespace-delimited token (lowercased) — the
|
||||||
|
// proposed tool's name.
|
||||||
|
func firstWord(s string) string {
|
||||||
|
f := strings.Fields(s)
|
||||||
|
if len(f) == 0 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return strings.ToLower(f[0])
|
||||||
|
}
|
||||||
|
|
||||||
|
// firstLine — the first non-empty line of a tool's output, for a short spoken
|
||||||
|
// reply (the full output goes to the log, not the TTS). Trimmed to keep the
|
||||||
|
// utterance sane if a command dumps a wall of text.
|
||||||
|
func firstLine(s string) string {
|
||||||
|
for _, line := range strings.Split(s, "\n") {
|
||||||
|
line = strings.TrimSpace(line)
|
||||||
|
if line != "" {
|
||||||
|
if len(line) > 200 {
|
||||||
|
line = line[:200]
|
||||||
|
}
|
||||||
|
return line
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// jsonString — a one-line JSON string encoder without dragging encoding/json
|
||||||
|
// into the top of this file. Used to wrap a reminder payload's text field;
|
||||||
|
// the router's reminder Slots are already absolute (DateTimeParser resolved
|
||||||
|
// relative→absolute), the payload shape is conventional {"text":...}.
|
||||||
|
func jsonString(s string) string {
|
||||||
|
// minimal JSON string escape — quotes + backslash + control chars.
|
||||||
|
// adequate for the reminder payload's text field; not a general JSON
|
||||||
|
// encoder. The chroma / RAG modules (when they land) use a real json
|
||||||
|
// encoder for richer payloads. Keep it inline here so the import
|
||||||
|
// direction stays narrow.
|
||||||
|
var b []byte
|
||||||
|
b = append(b, '"')
|
||||||
|
for _, r := range s {
|
||||||
|
switch r {
|
||||||
|
case '"':
|
||||||
|
b = append(b, '\\', '"')
|
||||||
|
case '\\':
|
||||||
|
b = append(b, '\\', '\\')
|
||||||
|
case '\n':
|
||||||
|
b = append(b, '\\', 'n')
|
||||||
|
case '\r':
|
||||||
|
b = append(b, '\\', 'r')
|
||||||
|
case '\t':
|
||||||
|
b = append(b, '\\', 't')
|
||||||
|
default:
|
||||||
|
if r < 0x20 {
|
||||||
|
b = append(b, []byte(fmt.Sprintf("\\u%04x", r))...)
|
||||||
|
} else {
|
||||||
|
b = append(b, []byte(string(r))...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
b = append(b, '"')
|
||||||
|
return string(b)
|
||||||
|
}
|
||||||
@@ -24,6 +24,7 @@ import (
|
|||||||
"github.com/kami/maven/internal/ipc"
|
"github.com/kami/maven/internal/ipc"
|
||||||
"github.com/kami/maven/internal/loop"
|
"github.com/kami/maven/internal/loop"
|
||||||
"github.com/kami/maven/internal/morning"
|
"github.com/kami/maven/internal/morning"
|
||||||
|
"github.com/kami/maven/internal/pattern"
|
||||||
"github.com/kami/maven/internal/phraser"
|
"github.com/kami/maven/internal/phraser"
|
||||||
"github.com/kami/maven/internal/routine"
|
"github.com/kami/maven/internal/routine"
|
||||||
"github.com/kami/maven/internal/store"
|
"github.com/kami/maven/internal/store"
|
||||||
@@ -67,6 +68,14 @@ type tickLoop struct {
|
|||||||
morningRoutines []morning.Routine
|
morningRoutines []morning.Routine
|
||||||
morningLast map[string]time.Time
|
morningLast map[string]time.Time
|
||||||
|
|
||||||
|
// proposalCfg — announcement policy for routines the tick inferred itself.
|
||||||
|
// nil ⇒ detect silently, never announce (the default). lastProposalAt is
|
||||||
|
// the cooldown clock, in-memory on purpose: a restart is allowed to permit
|
||||||
|
// one more announcement, and a restart-per-day loop is a bigger problem
|
||||||
|
// than a duplicate proposal notice.
|
||||||
|
proposalCfg *config.PatternProposalConfig
|
||||||
|
lastProposalAt time.Time
|
||||||
|
|
||||||
// digestQ — in-memory queue of eligible nudges waiting for batch flush.
|
// digestQ — in-memory queue of eligible nudges waiting for batch flush.
|
||||||
// populated when digestCfg != nil && digestCfg.Enabled.
|
// populated when digestCfg != nil && digestCfg.Enabled.
|
||||||
digestQ []QueuedNudge
|
digestQ []QueuedNudge
|
||||||
@@ -92,6 +101,7 @@ func newTickLoop(
|
|||||||
digestCfg *config.DigestConfig,
|
digestCfg *config.DigestConfig,
|
||||||
routines []routine.Routine,
|
routines []routine.Routine,
|
||||||
morningRoutines []morning.Routine,
|
morningRoutines []morning.Routine,
|
||||||
|
proposalCfg *config.PatternProposalConfig,
|
||||||
) *tickLoop {
|
) *tickLoop {
|
||||||
return &tickLoop{
|
return &tickLoop{
|
||||||
store: st,
|
store: st,
|
||||||
@@ -108,6 +118,7 @@ func newTickLoop(
|
|||||||
routineLast: make(map[string]time.Time),
|
routineLast: make(map[string]time.Time),
|
||||||
morningRoutines: morningRoutines,
|
morningRoutines: morningRoutines,
|
||||||
morningLast: make(map[string]time.Time),
|
morningLast: make(map[string]time.Time),
|
||||||
|
proposalCfg: proposalCfg,
|
||||||
lastPhrase: make(map[string]delivery.PhrasedNudge),
|
lastPhrase: make(map[string]delivery.PhrasedNudge),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -180,6 +191,17 @@ func (t *tickLoop) tick(ctx context.Context, now time.Time) {
|
|||||||
// (with dedup) avoids re-queueing the same rule after a flush.
|
// (with dedup) avoids re-queueing the same rule after a flush.
|
||||||
t.maybeFlush(ctx, now, state)
|
t.maybeFlush(ctx, now, state)
|
||||||
|
|
||||||
|
// gate-suppressed digest (Vikunja #281): rules the restraint gate held
|
||||||
|
// back this tick (quiet hours / away / calendar-busy), not because they
|
||||||
|
// weren't due, but because it wasn't the moment. Some of those are worth
|
||||||
|
// resurfacing later instead of just being lost — loop.DigestEligible
|
||||||
|
// draws that line. This is a SEPARATE mechanism from the in-memory
|
||||||
|
// digestQ above: that one batches candidates the gate already ALLOWED to
|
||||||
|
// fire; this one durably holds candidates the gate BLOCKED.
|
||||||
|
t.enqueueSuppressedDigest(ctx, trace, state, now)
|
||||||
|
t.expireStaleDigest(ctx, now)
|
||||||
|
t.maybeDrainDigest(ctx, state, now)
|
||||||
|
|
||||||
// routines: operator-declared scheduled behaviors. fire the ones whose cron
|
// routines: operator-declared scheduled behaviors. fire the ones whose cron
|
||||||
// crossed since last fire, delivered through the normal routing (voice when
|
// crossed since last fire, delivered through the normal routing (voice when
|
||||||
// present, away channels otherwise). bodies are literal operator text — not
|
// present, away channels otherwise). bodies are literal operator text — not
|
||||||
@@ -195,6 +217,14 @@ func (t *tickLoop) tick(ctx context.Context, now time.Time) {
|
|||||||
// nudge time. See internal/morning for the "why not four timers" rationale.
|
// nudge time. See internal/morning for the "why not four timers" rationale.
|
||||||
t.fireMorningRoutines(ctx, now, state)
|
t.fireMorningRoutines(ctx, now, state)
|
||||||
|
|
||||||
|
// pattern detection: scan every action+object pair with recorded events
|
||||||
|
// and propose a routine for any stable one not already decided (Vikunja
|
||||||
|
// #43). This used to only run as a side effect of the voice fact-write
|
||||||
|
// path, so a pattern already sitting in history went unnoticed until he
|
||||||
|
// happened to mention it again by voice. See patterns.go and
|
||||||
|
// detectPatterns below for how idempotence and dismissal are respected.
|
||||||
|
t.detectPatterns(ctx, now, state)
|
||||||
|
|
||||||
// reminders: gate-bypassing class. fired once, marked after a successful
|
// reminders: gate-bypassing class. fired once, marked after a successful
|
||||||
// delivery. a failed send leaves the reminder pending — the next tick
|
// delivery. a failed send leaves the reminder pending — the next tick
|
||||||
// re-gathers and re-attempts.
|
// re-gathers and re-attempts.
|
||||||
@@ -342,6 +372,235 @@ func (t *tickLoop) flushDigest(ctx context.Context, now time.Time, state loop.St
|
|||||||
t.digestQ = nil
|
t.digestQ = nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// detectPatterns runs the pattern detector proactively over every
|
||||||
|
// action+object pair that has ever produced an event, independent of
|
||||||
|
// whichever fact write (or channel) last touched it (Vikunja #43). This is
|
||||||
|
// what makes pattern inference actually proactive: it fires on the daemon's
|
||||||
|
// own schedule reading accumulated history, not only as a side effect of a
|
||||||
|
// live voice turn.
|
||||||
|
//
|
||||||
|
// Idempotence and noise are handled by the store, not here — this function
|
||||||
|
// is safe to call every tick:
|
||||||
|
// - Same pattern, tick after tick: detectAndPropose's LookupProposedRoutine
|
||||||
|
// check plus proposed_routines' UNIQUE(action, object) constraint (with
|
||||||
|
// CreateProposedRoutine's ON CONFLICT DO NOTHING) mean a pair that
|
||||||
|
// already has a row — in ANY status — produces no second row and no log
|
||||||
|
// spam beyond the one line at genuine creation.
|
||||||
|
// - A DISMISSED proposal must never come back. DismissProposedRoutine flips
|
||||||
|
// status in place; the row is never deleted. So the same Lookup check
|
||||||
|
// that stops a duplicate "proposed" also stops a "dismissed" one from
|
||||||
|
// resurrecting — there is nothing tick-specific to get right here beyond
|
||||||
|
// calling the same shared path the voice route already used.
|
||||||
|
//
|
||||||
|
// By default this only creates a row for the /routines page to show: it does
|
||||||
|
// not notify, ring, or speak. Detection is not the same act as disturbing him
|
||||||
|
// about it, and Maven is "not a nag, not autonomous" (CLAUDE.md). Announcing
|
||||||
|
// is opt-in through the pattern_proposals config block — see announceProposal
|
||||||
|
// for the restraints that apply even then. A proposal only starts producing
|
||||||
|
// recurring nudges once he accepts it (fireAcceptedRoutines).
|
||||||
|
func (t *tickLoop) detectPatterns(ctx context.Context, now time.Time, state loop.State) {
|
||||||
|
pairs, err := t.store.DistinctEventPairs(ctx)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("tick: distinct event pairs: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
announced := false
|
||||||
|
for _, p := range pairs {
|
||||||
|
r, _, err := detectAndPropose(ctx, t.store, p.Action, p.Object, now)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("tick: detect pattern %s/%s: %v", p.Action, p.Object, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if r == nil {
|
||||||
|
continue // no stable pattern, or already proposed/accepted/dismissed
|
||||||
|
}
|
||||||
|
log.Printf("tick: proposed routine: %s/%s every %.1f days", r.Action, r.Object, r.IntervalDays)
|
||||||
|
// One announcement per tick at most, whatever the scan turned up. The
|
||||||
|
// rest are on /routines; they are not lost, they are just not shouted.
|
||||||
|
if announced {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
announced = t.announceProposal(ctx, r, now, state)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// announceProposal offers a freshly inferred routine through the ordinary
|
||||||
|
// care-delivery path, if announcing is switched on at all. Returns true when
|
||||||
|
// something was actually sent.
|
||||||
|
//
|
||||||
|
// Everything here is restraint. The feature is off unless configured; when on
|
||||||
|
// it is sev1 (the lowest severity, so quiet hours, away presence and snooze
|
||||||
|
// all suppress it via loop.Gate exactly like a care nudge); it is spaced by
|
||||||
|
// proposalCfg.Cooldown across every pair, not per pair; and a suppressed or
|
||||||
|
// dropped announcement is NOT retried — the cooldown clock advances only on a
|
||||||
|
// real send, but the proposal row already exists, so the next tick will not
|
||||||
|
// re-detect it and nothing queues up behind it. A missed announcement means
|
||||||
|
// he reads it on /routines instead, which is the whole point of the page.
|
||||||
|
//
|
||||||
|
// The body is the detector's own literal Russian phrasing (pattern.PhraseRoutine
|
||||||
|
// — "ты заправляешь поилку раз в 7 дней — напоминать?"), not LLM-generated, so
|
||||||
|
// an inferred routine cannot arrive worded as something Maven never observed.
|
||||||
|
func (t *tickLoop) announceProposal(ctx context.Context, r *pattern.ProposedRoutine, now time.Time, state loop.State) bool {
|
||||||
|
if !t.proposalCfg.AnnounceProposals() {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
cooldown := time.Duration(t.proposalCfg.Cooldown)
|
||||||
|
if cooldown <= 0 {
|
||||||
|
cooldown = config.DefaultProposalCooldown
|
||||||
|
}
|
||||||
|
if !t.lastProposalAt.IsZero() && now.Sub(t.lastProposalAt) < cooldown {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
rule := loop.Rule{Name: "proposal:" + r.Action + " " + r.Object, Severity: loop.Sev1}
|
||||||
|
if !loop.Gate(state, rule) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
body := pattern.PhraseRoutine(r)
|
||||||
|
pn := delivery.PhrasedNudge{
|
||||||
|
Candidate: loop.Candidate{Rule: rule, Severity: rule.Severity, State: state},
|
||||||
|
Body: body,
|
||||||
|
Summary: body,
|
||||||
|
}
|
||||||
|
sent, err := t.dispatcher.DispatchNudge(ctx, pn, now)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("tick: announce proposal %s/%s: %v", r.Action, r.Object, err)
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if len(sent) == 0 {
|
||||||
|
return false // routing dropped it — /routines still has it.
|
||||||
|
}
|
||||||
|
t.lastProposalAt = now
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
// digestExpiry — how long a gate-suppressed care nudge stays worth
|
||||||
|
// resurfacing. 24h: these are daily-cadence rules (water/meal/break run on
|
||||||
|
// hour-scale cooldowns and re-derive from facts that reset every day), so a
|
||||||
|
// digest entry that outlives one full day is describing a day that's already
|
||||||
|
// over — "you skipped a break yesterday" said tomorrow evening is noise, not
|
||||||
|
// news. Bounding at one day also means a digest can never silently span a
|
||||||
|
// weekend of quiet hours into an unbounded backlog.
|
||||||
|
const digestExpiry = 24 * time.Hour
|
||||||
|
|
||||||
|
// maxDigestSpokenItems — the bundle read-out is capped so "batched, not
|
||||||
|
// dropped" cannot regress into "she dumps twelve things on me the moment I
|
||||||
|
// walk in" — a digest that nags in bulk is worse than the drops it replaced.
|
||||||
|
// Anything beyond the cap is still marked drained (it did get its moment;
|
||||||
|
// the cap limits WORDS, not whether it counted) and folded into a trailing
|
||||||
|
// count instead of being spoken in full.
|
||||||
|
const maxDigestSpokenItems = 3
|
||||||
|
|
||||||
|
// enqueueSuppressedDigest scans this tick's trace for care candidates the
|
||||||
|
// gate blocked for a genuine restraint reason and durably records the
|
||||||
|
// digest-eligible ones (loop.DigestEligible). Phrasing happens once, here,
|
||||||
|
// at enqueue time — not re-derived at drain time — the same way queueNudge
|
||||||
|
// phrases once and caches, so a rule suppressed for hours isn't re-prompting
|
||||||
|
// the LLM every tick it stays blocked (EnqueueDigestEntry's rule+body dedupe
|
||||||
|
// makes repeat calls here harmless, but skipping the phrase call entirely
|
||||||
|
// when a pending entry already exists avoids the LLM round-trip too).
|
||||||
|
func (t *tickLoop) enqueueSuppressedDigest(ctx context.Context, trace *loop.TickTrace, state loop.State, now time.Time) {
|
||||||
|
if trace == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for _, tr := range trace.RuleTraces {
|
||||||
|
if !tr.PredicateResult || tr.GateResult {
|
||||||
|
continue // didn't want to fire, or wasn't suppressed
|
||||||
|
}
|
||||||
|
if !loop.DigestEligible(tr.Severity, tr.GateBlockedBy) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
rule := loop.Rule{Name: tr.RuleName, Severity: tr.Severity}
|
||||||
|
cand := loop.Candidate{Rule: rule, Severity: tr.Severity, State: state}
|
||||||
|
pn, err := t.phraser.PhraseNudge(ctx, cand)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("tick: phrase digest candidate %s: %v", tr.RuleName, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
expires := now.Add(digestExpiry)
|
||||||
|
if _, deduped, err := t.store.EnqueueDigestEntry(ctx, tr.RuleName, int(tr.Severity), pn.Body, now, expires); err != nil {
|
||||||
|
log.Printf("tick: enqueue digest entry %s: %v", tr.RuleName, err)
|
||||||
|
} else if deduped {
|
||||||
|
// same suppressed nudge already pending — nothing new to say.
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// expireStaleDigest sweeps entries past their expiry once per tick — cheap
|
||||||
|
// bookkeeping, mirrors ReconcileStaleDeliveryAttempts's shape.
|
||||||
|
func (t *tickLoop) expireStaleDigest(ctx context.Context, now time.Time) {
|
||||||
|
n, err := t.store.ExpireStaleDigestEntries(ctx, now)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("tick: expire stale digest entries: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if n > 0 {
|
||||||
|
log.Printf("tick: expired %d stale digest entr(y/ies) unspoken", n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// maybeDrainDigest speaks the pending digest bundle once the gate's
|
||||||
|
// suppression reasons have actually cleared — quiet hours over, back from
|
||||||
|
// away, out of the meeting. Draining while still suppressed would just be a
|
||||||
|
// second way to nag through quiet hours; the bundle waits for the same "is
|
||||||
|
// it allowed right now" condition a live nudge already waits for.
|
||||||
|
func (t *tickLoop) maybeDrainDigest(ctx context.Context, state loop.State, now time.Time) {
|
||||||
|
if state.QuietHours || state.CalendarBusy || state.Presence == store.Away {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
entries, err := t.store.PendingDigestEntries(ctx, now)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("tick: pending digest entries: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if len(entries) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
spoken := entries
|
||||||
|
extra := 0
|
||||||
|
if len(spoken) > maxDigestSpokenItems {
|
||||||
|
spoken = entries[:maxDigestSpokenItems]
|
||||||
|
extra = len(entries) - maxDigestSpokenItems
|
||||||
|
}
|
||||||
|
var b strings.Builder
|
||||||
|
maxSev := 0
|
||||||
|
for i, e := range spoken {
|
||||||
|
if i > 0 {
|
||||||
|
b.WriteString(" · ")
|
||||||
|
}
|
||||||
|
b.WriteString(e.Body)
|
||||||
|
if e.Severity > maxSev {
|
||||||
|
maxSev = e.Severity
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if extra > 0 {
|
||||||
|
fmt.Fprintf(&b, " · и ещё %d", extra)
|
||||||
|
}
|
||||||
|
body := b.String()
|
||||||
|
summary := fmt.Sprintf("%d отложенных уведомлений", len(entries))
|
||||||
|
|
||||||
|
cand := loop.Candidate{
|
||||||
|
Rule: loop.Rule{Name: "digest", Severity: loop.Severity(maxSev)},
|
||||||
|
Severity: loop.Severity(maxSev),
|
||||||
|
State: state,
|
||||||
|
}
|
||||||
|
pn := delivery.PhrasedNudge{Candidate: cand, Body: body, Summary: summary}
|
||||||
|
t.cachePhrase(pn)
|
||||||
|
if _, err := t.dispatcher.DispatchNudge(ctx, pn, now); err != nil {
|
||||||
|
log.Printf("tick: dispatch digest bundle: %v", err)
|
||||||
|
return // leave entries pending; retried next tick
|
||||||
|
}
|
||||||
|
ids := make([]int64, len(entries))
|
||||||
|
for i, e := range entries {
|
||||||
|
ids[i] = e.ID
|
||||||
|
}
|
||||||
|
if err := t.store.DrainDigestEntries(ctx, ids, now); err != nil {
|
||||||
|
log.Printf("tick: drain digest entries: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// routinesFromConfig maps the config's routine blocks to the engine type.
|
// routinesFromConfig maps the config's routine blocks to the engine type.
|
||||||
// Validation (cron parses, name/body present, severity defaulted) already ran
|
// Validation (cron parses, name/body present, severity defaulted) already ran
|
||||||
// in config.Load, so this is a pure field copy.
|
// in config.Load, so this is a pure field copy.
|
||||||
@@ -530,6 +789,77 @@ func (t *tickLoop) morningStatus(ctx context.Context, now time.Time) []ipc.Morni
|
|||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// dayPlan is the read-only "what does today hold" query (Vikunja #128). It is
|
||||||
|
// the impure half of morning.BuildPlan: it reads the calendar events, the
|
||||||
|
// pending reminders and the checklist facts, and the pure builder orders them.
|
||||||
|
//
|
||||||
|
// It never dispatches. Asking for the plan is a query like any other; the only
|
||||||
|
// unprompted delivery in maven stays with the morning nudge and the
|
||||||
|
// dispatcher's policy.
|
||||||
|
func (t *tickLoop) dayPlan(ctx context.Context, now time.Time) ipc.DayPlan {
|
||||||
|
y, m, d := now.Date()
|
||||||
|
dayStart := time.Date(y, m, d, 0, 0, 0, 0, now.Location())
|
||||||
|
dayEnd := dayStart.AddDate(0, 0, 1)
|
||||||
|
|
||||||
|
var events []morning.PlanEntry
|
||||||
|
facts, err := t.store.CalendarEvents(ctx, dayStart, dayEnd)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("tick: day plan: calendar events: %v", err)
|
||||||
|
}
|
||||||
|
for _, f := range facts {
|
||||||
|
events = append(events, morning.PlanEntry{
|
||||||
|
At: f.Ts,
|
||||||
|
Text: f.Value,
|
||||||
|
Kind: morning.PlanEvent,
|
||||||
|
// Provenance below a calendar read (an ambient relay, #126) is
|
||||||
|
// hedged rather than recited as fact.
|
||||||
|
Uncertain: f.Confidence < 1.0,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
var reminders []morning.PlanEntry
|
||||||
|
rems, err := t.store.ListReminders(ctx, dayPlanMaxReminders)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("tick: day plan: list reminders: %v", err)
|
||||||
|
}
|
||||||
|
for _, r := range rems {
|
||||||
|
if r.Status != "pending" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
fire := r.NextFireTs
|
||||||
|
if fire.IsZero() {
|
||||||
|
fire = r.FireTs
|
||||||
|
}
|
||||||
|
reminders = append(reminders, morning.PlanEntry{
|
||||||
|
At: fire,
|
||||||
|
Text: strings.TrimSpace(r.Payload),
|
||||||
|
Kind: morning.PlanReminder,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
var checklistFacts map[string]store.Fact
|
||||||
|
if len(t.morningRoutines) > 0 {
|
||||||
|
checklistFacts = t.gatherMorningFacts(ctx)
|
||||||
|
}
|
||||||
|
plan := morning.BuildPlan(t.morningRoutines, checklistFacts, events, reminders, now)
|
||||||
|
|
||||||
|
out := ipc.DayPlan{Date: plan.Date, Spoken: plan.FormatRU()}
|
||||||
|
out.Items = make([]ipc.DayPlanItem, len(plan.Items))
|
||||||
|
for i, it := range plan.Items {
|
||||||
|
out.Items[i] = ipc.DayPlanItem{
|
||||||
|
At: it.At,
|
||||||
|
Text: it.Text,
|
||||||
|
Kind: string(it.Kind),
|
||||||
|
Uncertain: it.Uncertain,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
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
|
// 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
|
// (autotuneInterval, see run) so it doesn't write a fact every tick. for each
|
||||||
// rule:
|
// rule:
|
||||||
@@ -609,6 +939,7 @@ type daemonAPI struct {
|
|||||||
ipc.CoreAPI
|
ipc.CoreAPI
|
||||||
getTrace func() *loop.TickTrace
|
getTrace func() *loop.TickTrace
|
||||||
getMorningStatus func(ctx context.Context) []ipc.MorningRoutineStatus
|
getMorningStatus func(ctx context.Context) []ipc.MorningRoutineStatus
|
||||||
|
getDayPlan func(ctx context.Context) ipc.DayPlan
|
||||||
chatFn func(ctx context.Context, text string) string
|
chatFn func(ctx context.Context, text string) string
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -634,6 +965,13 @@ func (d *daemonAPI) MorningStatus(ctx context.Context) ([]ipc.MorningRoutineStat
|
|||||||
return d.getMorningStatus(ctx), nil
|
return d.getMorningStatus(ctx), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (d *daemonAPI) DayPlan(ctx context.Context) (ipc.DayPlan, error) {
|
||||||
|
if d.getDayPlan == nil {
|
||||||
|
return ipc.DayPlan{}, errors.New("mavend: day plan not available")
|
||||||
|
}
|
||||||
|
return d.getDayPlan(ctx), nil
|
||||||
|
}
|
||||||
|
|
||||||
func toIPCTickTrace(t loop.TickTrace) ipc.TickTrace {
|
func toIPCTickTrace(t loop.TickTrace) ipc.TickTrace {
|
||||||
rules := make([]ipc.RuleTrace, len(t.RuleTraces))
|
rules := make([]ipc.RuleTrace, len(t.RuleTraces))
|
||||||
for i, r := range t.RuleTraces {
|
for i, r := range t.RuleTraces {
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ func newTestTickLoop(t *testing.T, st *store.Store, sink delivery.Sink, digestCf
|
|||||||
Nudges: st,
|
Nudges: st,
|
||||||
Reminders: st,
|
Reminders: st,
|
||||||
})
|
})
|
||||||
return newTickLoop(st, g, d, phraser.NewStub(), rules, time.Second, 5*time.Minute, 0, digestCfg, nil, nil)
|
return newTickLoop(st, g, d, phraser.NewStub(), rules, time.Second, 5*time.Minute, 0, digestCfg, nil, nil, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestTickFiresRoutineWhenScheduleCrosses(t *testing.T) {
|
func TestTickFiresRoutineWhenScheduleCrosses(t *testing.T) {
|
||||||
@@ -63,7 +63,7 @@ func TestTickFiresRoutineWhenScheduleCrosses(t *testing.T) {
|
|||||||
sink := &fakeSink{}
|
sink := &fakeSink{}
|
||||||
d := delivery.NewDispatcher(delivery.Config{Voice: sink, Ntfy: sink, Telegram: sink, Nudges: st, Reminders: st})
|
d := delivery.NewDispatcher(delivery.Config{Voice: sink, Ntfy: sink, Telegram: sink, Nudges: st, Reminders: st})
|
||||||
rs := []routine.Routine{{Name: "morning", Cron: "0 12 * * *", Body: "полдень, время воды", Severity: 1}}
|
rs := []routine.Routine{{Name: "morning", Cron: "0 12 * * *", Body: "полдень, время воды", Severity: 1}}
|
||||||
tl := newTickLoop(st, g, d, phraser.NewStub(), rules, time.Second, 5*time.Minute, 0, nil, rs, nil)
|
tl := newTickLoop(st, g, d, phraser.NewStub(), rules, time.Second, 5*time.Minute, 0, nil, rs, nil, nil)
|
||||||
|
|
||||||
// first tick: seeds, does not fire the routine.
|
// first tick: seeds, does not fire the routine.
|
||||||
tl.tick(ctx, now)
|
tl.tick(ctx, now)
|
||||||
|
|||||||
+44
-1625
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,434 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"log"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/config"
|
||||||
|
"github.com/kami/maven/internal/delivery"
|
||||||
|
"github.com/kami/maven/internal/delivery/voicesink"
|
||||||
|
"github.com/kami/maven/internal/dialogue"
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
"github.com/kami/maven/internal/llm"
|
||||||
|
"github.com/kami/maven/internal/memory"
|
||||||
|
"github.com/kami/maven/internal/phraser"
|
||||||
|
"github.com/kami/maven/internal/router"
|
||||||
|
"github.com/kami/maven/internal/store"
|
||||||
|
"github.com/kami/maven/internal/stt"
|
||||||
|
"github.com/kami/maven/internal/tool"
|
||||||
|
"github.com/kami/maven/internal/tts"
|
||||||
|
"github.com/kami/maven/internal/voice"
|
||||||
|
"github.com/kami/maven/internal/weather"
|
||||||
|
"github.com/kami/maven/internal/worker"
|
||||||
|
)
|
||||||
|
|
||||||
|
// voiceWiring — everything the daemon needs to run the audio path. Held by
|
||||||
|
// cmd/mavend/main.go alongside the other wirings; closed on shutdown.
|
||||||
|
type voiceWiring struct {
|
||||||
|
server *voice.Server
|
||||||
|
sessions *voice.Sessions
|
||||||
|
voiceSink delivery.Sink
|
||||||
|
embedder router.Embedder
|
||||||
|
handler *reactiveHandler // the reactive handler for IPC Chat
|
||||||
|
// worker clients (set when configured as Remote): closed on shutdown so
|
||||||
|
// mavsttd / mavttsd don't keep a stale conn into a restarting daemon.
|
||||||
|
sttClient *worker.Client
|
||||||
|
ttsClient *worker.Client
|
||||||
|
}
|
||||||
|
|
||||||
|
// close releases the listener + worker conns. Safe to call on nil (when
|
||||||
|
// voice is not wired — wireVoice returns nil,nil).
|
||||||
|
func (w *voiceWiring) close() {
|
||||||
|
if w == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if w.embedder != nil {
|
||||||
|
_ = w.embedder.Close()
|
||||||
|
}
|
||||||
|
if w.server != nil {
|
||||||
|
_ = w.server.Close()
|
||||||
|
}
|
||||||
|
if w.sttClient != nil {
|
||||||
|
_ = w.sttClient.Close()
|
||||||
|
}
|
||||||
|
if w.ttsClient != nil {
|
||||||
|
_ = w.ttsClient.Close()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// wireVoice builds the audio path from cfg + a CoreAPI + a router. Returns
|
||||||
|
// nil wiring + nil error when voice isn't enabled (the caller's voice sink
|
||||||
|
// stays nil; the dispatcher's ChannelVoice routing drops silently).
|
||||||
|
//
|
||||||
|
// When voice is enabled, MUST wire a voicesink into the dispatcher's Voice
|
||||||
|
// slot using w.sessions (the caller does that — see main.go).
|
||||||
|
func wireVoice(cfg *config.Config, coreAPI ipc.CoreAPI, phr phraser.Phraser, memStore memory.Store, dataStore *store.Store, eco *ecosystemWiring) (*voiceWiring, error) {
|
||||||
|
if cfg.Voice == nil || !cfg.Voice.Enabled {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
w := &voiceWiring{}
|
||||||
|
|
||||||
|
// ----- stt (Stub in-process OR Remote via worker socket) -----
|
||||||
|
var transcriber stt.Transcriber
|
||||||
|
if cfg.Voice.Stt != nil && cfg.Voice.Stt.Socket != "" {
|
||||||
|
c := worker.Dial(cfg.Voice.Stt.Socket)
|
||||||
|
w.sttClient = c
|
||||||
|
lang := cfg.Voice.Stt.Lang
|
||||||
|
if lang == "" {
|
||||||
|
lang = cfg.Voice.Lang
|
||||||
|
}
|
||||||
|
transcriber = stt.NewRemote(c, lang)
|
||||||
|
} else {
|
||||||
|
transcriber = stt.NewStub()
|
||||||
|
}
|
||||||
|
|
||||||
|
// ----- tts (Stub in-process OR Remote) -----
|
||||||
|
var synthesizer tts.Synthesizer
|
||||||
|
if cfg.Voice.Tts != nil && cfg.Voice.Tts.Socket != "" {
|
||||||
|
c := worker.Dial(cfg.Voice.Tts.Socket)
|
||||||
|
w.ttsClient = c
|
||||||
|
lang := cfg.Voice.Tts.Lang
|
||||||
|
if lang == "" {
|
||||||
|
lang = cfg.Voice.Lang
|
||||||
|
}
|
||||||
|
synthesizer = tts.NewRemote(c, lang, cfg.Voice.Tts.Voice)
|
||||||
|
} else {
|
||||||
|
synthesizer = tts.NewStub()
|
||||||
|
}
|
||||||
|
|
||||||
|
// ----- router: embedder (ONNX when configured, floor HashEmbedder otherwise) -----
|
||||||
|
var emb router.Embedder
|
||||||
|
if cfg.Voice.Embedder != nil {
|
||||||
|
onnx, err := router.NewONNXEmbedder(
|
||||||
|
cfg.Voice.Embedder.ModelPath,
|
||||||
|
cfg.Voice.Embedder.TokenizerPath,
|
||||||
|
cfg.Voice.Embedder.LibPath,
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
w.close()
|
||||||
|
return nil, fmt.Errorf("embedder: %w", err)
|
||||||
|
}
|
||||||
|
log.Printf("voice: onnx embedder loaded (%d dim)", onnx.Dim())
|
||||||
|
emb = onnx
|
||||||
|
} else {
|
||||||
|
log.Printf("voice: embedder not configured, using HashEmbedder floor")
|
||||||
|
emb = router.NewHashEmbedder(1024)
|
||||||
|
}
|
||||||
|
w.embedder = emb
|
||||||
|
checkStoredEmbedder(dataStore, emb)
|
||||||
|
|
||||||
|
// ----- tool executor (the enabled act allowlist, store-backed) -----
|
||||||
|
// Config tools are the declarative bootstrap: seed them into the store as
|
||||||
|
// enabled (editing mavend.json IS the human enable act). Ad-hoc tools are
|
||||||
|
// enabled later through the authed mavweb surface. The executor + matcher
|
||||||
|
// both read the store live, so a newly-enabled tool is runnable without a
|
||||||
|
// daemon restart.
|
||||||
|
seedTools(coreAPI, cfg.Voice.Tools)
|
||||||
|
exec := tool.NewExecutor(coreAPI, time.Duration(cfg.Voice.ToolTimeout))
|
||||||
|
matcher := tool.NewMatcher(coreAPI)
|
||||||
|
|
||||||
|
// ----- weather provider (Open-Meteo when configured, Stub otherwise) -----
|
||||||
|
var weatherProvider weather.Provider
|
||||||
|
var weatherLocation string
|
||||||
|
if cfg.Voice.Weather != nil && cfg.Voice.Weather.Provider == "open-meteo" {
|
||||||
|
weatherProvider = weather.NewOpenMeteoProvider()
|
||||||
|
weatherLocation = cfg.Voice.Weather.DefaultLocation
|
||||||
|
log.Printf("voice: weather provider: open-meteo (default location: %s)", cfg.Voice.Weather.DefaultLocation)
|
||||||
|
} else {
|
||||||
|
weatherProvider = weather.NewStubProvider()
|
||||||
|
log.Printf("voice: weather provider: stub (not configured)")
|
||||||
|
}
|
||||||
|
|
||||||
|
// The replier uses the same llama-server as the phraser.
|
||||||
|
var llmClient *llm.Client
|
||||||
|
if lp, ok := phr.(*phraser.LLMPhraser); ok {
|
||||||
|
llmClient = llm.New(lp.BaseURL(), 60*time.Second)
|
||||||
|
}
|
||||||
|
// ----- router (the cascade; floor examples seed the classifier) -----
|
||||||
|
// The act matcher's allowlist is exactly the enabled tool names — the
|
||||||
|
// router only matches acts the executor can run (one source of truth).
|
||||||
|
threshold := cfg.Voice.RouterThreshold
|
||||||
|
if threshold <= 0 {
|
||||||
|
threshold = config.DefaultRouterThreshold
|
||||||
|
}
|
||||||
|
// The resident model routes by default: 63.2% of held-out intents right
|
||||||
|
// against the classifier's 50.0%, at about 1s a turn instead of 30ms (see
|
||||||
|
// config.VoiceConfig.LLMRouter). The classifier always stays wired as the
|
||||||
|
// fallback, so a model error never breaks a turn.
|
||||||
|
rtr := buildRouter(emb, matcher, threshold, pickLLMRouter(cfg.Voice.UseLLMRouter(), llmClient))
|
||||||
|
|
||||||
|
// ----- sessions registry (shared with voicesink) -----
|
||||||
|
sessions := voice.NewSessions()
|
||||||
|
w.sessions = sessions
|
||||||
|
|
||||||
|
// ----- voice sink (proactive nudges: dispatcher → voicesink → tts → push to client) -----
|
||||||
|
w.voiceSink = voicesink.New(synthesizer, sessions)
|
||||||
|
|
||||||
|
// ----- memory (long-term vector storage) -----
|
||||||
|
// Persistent (store-backed, survives restarts) when the daemon passes one;
|
||||||
|
// falls back to the in-memory floor otherwise (tests / no-store paths).
|
||||||
|
if memStore == nil {
|
||||||
|
memStore = memory.NewInMemoryStore()
|
||||||
|
}
|
||||||
|
|
||||||
|
// ----- dialogue (multi-turn slot carry-over; 2-min follow-up window) -----
|
||||||
|
// Store-backed when the daemon passes a store, so a restart mid-conversation
|
||||||
|
// keeps the thread (Vikunja #363). Sessions past their TTL are dropped on
|
||||||
|
// load, never revived. Clarify's parked question stays in memory only.
|
||||||
|
var dialogueSessions *dialogue.SessionStore
|
||||||
|
if dataStore != nil {
|
||||||
|
dialogueSessions = dialogue.NewPersistentSessionStore(2*time.Minute, dataStore)
|
||||||
|
if err := dialogueSessions.Load(context.Background(), time.Now()); err != nil {
|
||||||
|
log.Printf("dialogue: load saved sessions: %v", err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
dialogueSessions = dialogue.NewSessionStore(2 * time.Minute)
|
||||||
|
}
|
||||||
|
clarifyStore := dialogue.NewClarifyStore(clarifyTTL)
|
||||||
|
timeParser := router.NewPythonDateParser()
|
||||||
|
|
||||||
|
// ----- replier (LLM-backed when the engine is on, Stub floor otherwise) -----
|
||||||
|
replier := voice.Replier(voice.NewStubReplier())
|
||||||
|
if llmClient != nil {
|
||||||
|
replier = newLLMReplier(llmClient, contextBlockFn(cfg, time.Now))
|
||||||
|
}
|
||||||
|
|
||||||
|
// ----- the handler (the reactive path; closes over stt / tts / router / coreAPI / memory) -----
|
||||||
|
h := &reactiveHandler{
|
||||||
|
stt: transcriber,
|
||||||
|
tts: synthesizer,
|
||||||
|
router: rtr,
|
||||||
|
embedder: emb,
|
||||||
|
api: coreAPI,
|
||||||
|
tools: exec,
|
||||||
|
matcher: matcher,
|
||||||
|
replier: replier,
|
||||||
|
phraser: phr,
|
||||||
|
now: time.Now,
|
||||||
|
weatherProvider: weatherProvider,
|
||||||
|
weatherLocation: weatherLocation,
|
||||||
|
memStore: memStore,
|
||||||
|
dataStore: dataStore,
|
||||||
|
dialogueSessions: dialogueSessions,
|
||||||
|
clarifyStore: clarifyStore,
|
||||||
|
// 0 here (unset config) ⇒ the dialogue default.
|
||||||
|
clarifyMaxAttempts: cfg.Voice.ClarifyMaxAttempts,
|
||||||
|
extractor: router.Extractor{Time: timeParser, Acts: matcher, Facts: router.DefaultFactParser{}},
|
||||||
|
queryMinScore: cfg.Voice.QueryMinScore,
|
||||||
|
queryMinMargin: cfg.Voice.QueryMinMargin,
|
||||||
|
timeParser: timeParser,
|
||||||
|
ecosystem: eco,
|
||||||
|
}
|
||||||
|
|
||||||
|
// ----- the server (TCP listener) -----
|
||||||
|
srv := voice.NewServer(cfg.Voice.Bind, h, sessions)
|
||||||
|
if err := srv.Listen(); err != nil {
|
||||||
|
w.close()
|
||||||
|
return nil, fmt.Errorf("voice listen: %w", err)
|
||||||
|
}
|
||||||
|
w.server = srv
|
||||||
|
w.handler = h
|
||||||
|
|
||||||
|
return w, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// pickLLMRouter returns the LLM router when the operator asked for it and there
|
||||||
|
// is a llama-server to talk to, and nil otherwise. nil is safe: the cascade then
|
||||||
|
// routes with the classifier, so an unusable setting costs accuracy, not turns.
|
||||||
|
func pickLLMRouter(enabled bool, c *llm.Client) *router.LLMRouter {
|
||||||
|
if !enabled {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if c == nil {
|
||||||
|
log.Printf("voice: voice.llm_router is on but there is no llama-server to route with (the phraser is not an LLM phraser) — using the classifier instead")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
log.Printf("voice: LLM router enabled")
|
||||||
|
return router.NewLLMRouter(c)
|
||||||
|
}
|
||||||
|
|
||||||
|
// buildRouter constructs the reactive-path router with the given embedder
|
||||||
|
// and confidence threshold.
|
||||||
|
// - stage-0 grammars from DefaultActMatcher whose fn allowlist is exactly
|
||||||
|
// the enabled tool names (actFns) — the router only matches acts the
|
||||||
|
// executor can run. Empty ⇒ every act refuses at the matcher.
|
||||||
|
// - The embedder is provided by wireVoice: HashEmbedder (floor) when no
|
||||||
|
// embedder config is present, or the ONNX multilingual model when
|
||||||
|
// configured — same interface, one constructor change.
|
||||||
|
// - 6 bootstrap examples covering the 5 intents + one compound-capture
|
||||||
|
// placeholder. Spec calls for ~10 per intent at production; this is the
|
||||||
|
// bootstrapping floor swapped by tuning the seed set later.
|
||||||
|
// - Threshold is from voice.router_threshold config (default 0.55).
|
||||||
|
func buildRouter(emb router.Embedder, acts router.ActMatcher, threshold float64, llmR *router.LLMRouter) *router.Router {
|
||||||
|
cls := router.NewClassifier(emb)
|
||||||
|
seedClassifier(cls)
|
||||||
|
grammars := router.DefaultGrammars(acts)
|
||||||
|
grammars = append(grammars, router.SystemTimeDateGrammars()...)
|
||||||
|
grammars = append(grammars, router.ReminderGrammar())
|
||||||
|
return router.New(router.Config{
|
||||||
|
Grammars: grammars,
|
||||||
|
Classifier: cls,
|
||||||
|
Extractor: router.Extractor{
|
||||||
|
Time: router.NewPythonDateParser(),
|
||||||
|
Acts: acts,
|
||||||
|
Facts: router.DefaultFactParser{},
|
||||||
|
},
|
||||||
|
Threshold: threshold,
|
||||||
|
LLM: llmR,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// seedDir is the directory containing intent seed files. Each file is named
|
||||||
|
// <intent>.txt and contains one training example per line (blank lines and
|
||||||
|
// lines starting with # are ignored). Relative to the working directory.
|
||||||
|
const seedDir = "models/seeds"
|
||||||
|
|
||||||
|
// seedClassifier floors the embedded examples so the cold-boot path
|
||||||
|
// doesn't return ErrNoIntents. Loads examples from seedDir — one file per
|
||||||
|
// intent (act.txt, reminder.txt, fact.txt, note.txt, query.txt). When the
|
||||||
|
// classifier can't decide it falls through to Clarify — the last-resort
|
||||||
|
// path asks the user to rephrase rather than guessing wrong.
|
||||||
|
func seedClassifier(c *router.Classifier) {
|
||||||
|
intents := []router.Intent{
|
||||||
|
router.IntentAct,
|
||||||
|
router.IntentReminder,
|
||||||
|
router.IntentFact,
|
||||||
|
router.IntentNote,
|
||||||
|
router.IntentQuery,
|
||||||
|
router.IntentChat,
|
||||||
|
router.IntentSystem,
|
||||||
|
}
|
||||||
|
total := 0
|
||||||
|
for _, intent := range intents {
|
||||||
|
n, err := loadSeedFile(c, intent)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("voice: seed %s: %v", intent, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
total += n
|
||||||
|
}
|
||||||
|
log.Printf("voice: loaded %d seed examples from %s", total, seedDir)
|
||||||
|
}
|
||||||
|
|
||||||
|
func loadSeedFile(c *router.Classifier, intent router.Intent) (int, error) {
|
||||||
|
path := filepath.Join(seedDir, string(intent)+".txt")
|
||||||
|
f, err := os.Open(path)
|
||||||
|
if err != nil {
|
||||||
|
return 0, fmt.Errorf("open %s: %w", path, err)
|
||||||
|
}
|
||||||
|
defer f.Close()
|
||||||
|
|
||||||
|
var count int
|
||||||
|
sc := bufio.NewScanner(f)
|
||||||
|
for sc.Scan() {
|
||||||
|
line := strings.TrimSpace(sc.Text())
|
||||||
|
if line == "" || strings.HasPrefix(line, "#") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if err := c.AddExample(context.Background(), intent, line); err != nil {
|
||||||
|
log.Printf("voice: seed %s: skipping %q: %v", intent, line, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
count++
|
||||||
|
}
|
||||||
|
if err := sc.Err(); err != nil {
|
||||||
|
return count, fmt.Errorf("scan %s: %w", path, err)
|
||||||
|
}
|
||||||
|
return count, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// seedTools upserts the config-declared tools into the store as enabled. Editing
|
||||||
|
// mavend.json is a human act, so a config tool is enabled by definition; this
|
||||||
|
// makes the declarative config the reproducible bootstrap while the store stays
|
||||||
|
// the single runtime source of truth (mavweb enables ad-hoc ones on top).
|
||||||
|
func seedTools(api ipc.CoreAPI, tools []config.ToolConfig) {
|
||||||
|
ctx := context.Background()
|
||||||
|
now := time.Now()
|
||||||
|
n := 0
|
||||||
|
for _, tc := range tools {
|
||||||
|
if tc.Name == "" || len(tc.Cmd) == 0 {
|
||||||
|
log.Printf("voice: skipping malformed tool config %+v", tc)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if err := api.EnableTool(ctx, tc.Name, tc.Cmd, tc.Destructive, tc.Scope, now); err != nil {
|
||||||
|
log.Printf("voice: seed tool %q: %v", tc.Name, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
n++
|
||||||
|
}
|
||||||
|
log.Printf("voice: seeded %d act tools from config", n)
|
||||||
|
}
|
||||||
|
|
||||||
|
// reembedOnStart is the -reembed flag (set in run()). Opt-in on purpose: see
|
||||||
|
// runReembed.
|
||||||
|
var reembedOnStart bool
|
||||||
|
|
||||||
|
// checkStoredEmbedder compares the embedder we just loaded with the one that
|
||||||
|
// wrote the vectors already in the DB (Vikunja #378).
|
||||||
|
//
|
||||||
|
// The two models we have both make 384-dim vectors, so a size check catches
|
||||||
|
// nothing: after a swap, recall silently compares vectors from different
|
||||||
|
// spaces and the scores are noise. So we say it out loud. Recall itself is not
|
||||||
|
// changed here — the fix is `mavend -reembed`.
|
||||||
|
func checkStoredEmbedder(dataStore *store.Store, emb router.Embedder) {
|
||||||
|
if dataStore == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
current := router.EmbedderID(emb)
|
||||||
|
if reembedOnStart {
|
||||||
|
runReembed(dataStore, emb, current)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
stored, mismatch, err := dataStore.CheckEmbedder(context.Background(), current)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("voice: embedder marker check failed: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if mismatch {
|
||||||
|
log.Printf("voice: WARNING embedder MISMATCH — stored vectors were written by %q but the configured embedder is %q; recall scores are noise until the notes and facts are re-embedded — run `mavend -reembed` once (Vikunja #378)", stored, current)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
log.Printf("voice: embedder marker ok (%s)", current)
|
||||||
|
}
|
||||||
|
|
||||||
|
// runReembed is the one-shot backfill behind -reembed.
|
||||||
|
//
|
||||||
|
// Why a flag and not automatic on mismatch: the embedder is ONNX on the
|
||||||
|
// laptop's CPU, so a few thousand notes is minutes of work. Doing that silently
|
||||||
|
// inside a normal start would look like the daemon hanging on boot. So the user
|
||||||
|
// runs it once, deliberately, after an embedder swap; the mismatch warning
|
||||||
|
// above tells them to. It re-embeds, logs what it did, and then the daemon
|
||||||
|
// carries on serving as usual — no separate binary, no second start needed.
|
||||||
|
func runReembed(dataStore *store.Store, emb router.Embedder, current string) {
|
||||||
|
log.Printf("voice: re-embedding stored notes and facts with %s — this can take a few minutes, do not interrupt", current)
|
||||||
|
res, err := dataStore.ReembedAll(context.Background(), current,
|
||||||
|
// EmbedPassage, not EmbedQuery: these are stored texts being searched
|
||||||
|
// FOR, which is the side they were written with.
|
||||||
|
func(ctx context.Context, text string) ([]float32, error) {
|
||||||
|
return router.EmbedPassage(ctx, emb, text)
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("voice: re-embed FAILED, nothing was changed and no marker was written — safe to run again: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if res.Skipped {
|
||||||
|
log.Printf("voice: re-embed skipped — the stored vectors were already written by %s", current)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
log.Printf("voice: re-embed done — %d notes in the notes table, %d notes and %d facts in the memory index, took %s; stored vectors now belong to %s",
|
||||||
|
res.Notes, res.MemNotes, res.Facts, res.Took.Round(time.Second), current)
|
||||||
|
|
||||||
|
// A row with no text cannot be re-embedded, so its vector is still the old
|
||||||
|
// model's noise while the marker now says everything is current. Both write
|
||||||
|
// paths always store the text, so this should be zero — say it loudly
|
||||||
|
// rather than bury it in the line above if it ever isn't.
|
||||||
|
if res.NoText > 0 {
|
||||||
|
log.Printf("voice: WARNING %d stored rows had no text, so their vectors could not be re-embedded and are still noise; they will never match anything useful (Vikunja #378)", res.NoText)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
// Package main — weatherq.go holds the weather-query keyword helpers: does
|
||||||
|
// this utterance ask about weather at all, and which city (if any) did it
|
||||||
|
// name. Both are plain substring/lookup matching, not NLU — extend this file
|
||||||
|
// rather than voice.go for anything in that shape.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import "strings"
|
||||||
|
|
||||||
|
// isWeatherQuery returns true if the utterance is about weather.
|
||||||
|
func isWeatherQuery(u string) bool {
|
||||||
|
lower := strings.ToLower(u)
|
||||||
|
return strings.Contains(lower, "погод") ||
|
||||||
|
strings.Contains(lower, "градус") ||
|
||||||
|
strings.Contains(lower, "температур") ||
|
||||||
|
strings.Contains(lower, "дожд") ||
|
||||||
|
strings.Contains(lower, "холод") ||
|
||||||
|
strings.Contains(lower, "тепл") ||
|
||||||
|
strings.Contains(lower, "weather") ||
|
||||||
|
strings.Contains(lower, "temperature")
|
||||||
|
}
|
||||||
|
|
||||||
|
// extractWeatherLocation parses a location from the utterance, or falls back
|
||||||
|
// to the configured default. Very basic: just checks for known city names.
|
||||||
|
func extractWeatherLocation(u, defaultLoc string) string {
|
||||||
|
lower := strings.ToLower(u)
|
||||||
|
cities := map[string]string{
|
||||||
|
"москв": "Moscow",
|
||||||
|
"moscow": "Moscow",
|
||||||
|
"питер": "Saint Petersburg",
|
||||||
|
"spb": "Saint Petersburg",
|
||||||
|
"петербур": "Saint Petersburg",
|
||||||
|
"лондон": "London",
|
||||||
|
"london": "London",
|
||||||
|
"париж": "Paris",
|
||||||
|
"paris": "Paris",
|
||||||
|
"берлин": "Berlin",
|
||||||
|
"berlin": "Berlin",
|
||||||
|
"нью-йорк": "New York",
|
||||||
|
"new york": "New York",
|
||||||
|
}
|
||||||
|
for substr, name := range cities {
|
||||||
|
if strings.Contains(lower, substr) {
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if defaultLoc != "" {
|
||||||
|
return defaultLoc
|
||||||
|
}
|
||||||
|
return "Moscow"
|
||||||
|
}
|
||||||
+124
-3
@@ -9,6 +9,12 @@
|
|||||||
// Two sources, each its own provenance (the loop's rules trust source):
|
// Two sources, each its own provenance (the loop's rules trust source):
|
||||||
// - netdata → poll:netdata resource alarms (disk/mem/cert/temp)
|
// - netdata → poll:netdata resource alarms (disk/mem/cert/temp)
|
||||||
// - kuma → poll:uptimekuma service up/down (the source of truth for it)
|
// - kuma → poll:uptimekuma service up/down (the source of truth for it)
|
||||||
|
// - zenmoney → poll:zenmoney spending/income totals (Vikunja #125)
|
||||||
|
//
|
||||||
|
// The zenmoney source is why the token lives HERE and not in core: the poller
|
||||||
|
// already owns every other third-party credential, it holds no store key, and
|
||||||
|
// core never needs to know an account exists to answer a question about a fact
|
||||||
|
// the poller wrote. It is off unless -zenmoney-token-file is given.
|
||||||
//
|
//
|
||||||
// Netdata needs no auth over the wg-fronted net. Kuma's /metrics needs an API
|
// Netdata needs no auth over the wg-fronted net. Kuma's /metrics needs an API
|
||||||
// key (basic-auth); without -kuma the whole kuma path is skipped (netdata-only
|
// key (basic-auth); without -kuma the whole kuma path is skipped (netdata-only
|
||||||
@@ -37,6 +43,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/kami/maven/internal/ipc"
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
"github.com/kami/maven/internal/zenmoney"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
@@ -52,6 +59,9 @@ func run(args []string) error {
|
|||||||
netdataURL := fs.String("netdata", "http://127.0.0.1:19999", "netdata base URL ('' to disable)")
|
netdataURL := fs.String("netdata", "http://127.0.0.1:19999", "netdata base URL ('' to disable)")
|
||||||
kumaURL := fs.String("kuma", "", "uptime-kuma metrics URL, e.g. http://127.0.0.1:3001/metrics ('' to disable)")
|
kumaURL := fs.String("kuma", "", "uptime-kuma metrics URL, e.g. http://127.0.0.1:3001/metrics ('' to disable)")
|
||||||
kumaKey := fs.String("kuma-key", "", "uptime-kuma API key (basic-auth username)")
|
kumaKey := fs.String("kuma-key", "", "uptime-kuma API key (basic-auth username)")
|
||||||
|
zenTokenFile := fs.String("zenmoney-token-file", "", "file holding the zenmoney API token ('' disables money tracking)")
|
||||||
|
zenURL := fs.String("zenmoney-url", zenmoney.DefaultBaseURL, "zenmoney API base URL (tests/self-hosted proxies)")
|
||||||
|
zenInterval := fs.Duration("zenmoney-interval", time.Hour, "how often to read zenmoney (money does not move every minute)")
|
||||||
wgIface := fs.String("wg", "", "wireguard interface for the presence signal, e.g. wg0 or 'all' ('' to disable)")
|
wgIface := fs.String("wg", "", "wireguard interface for the presence signal, e.g. wg0 or 'all' ('' to disable)")
|
||||||
wgCmd := fs.String("wg-cmd", "wg", "wg binary (use e.g. 'sudo wg' if the poller lacks CAP_NET_ADMIN)")
|
wgCmd := fs.String("wg-cmd", "wg", "wg binary (use e.g. 'sudo wg' if the poller lacks CAP_NET_ADMIN)")
|
||||||
interval := fs.Duration("interval", 60*time.Second, "poll cadence")
|
interval := fs.Duration("interval", 60*time.Second, "poll cadence")
|
||||||
@@ -62,8 +72,24 @@ func run(args []string) error {
|
|||||||
if *socket == "" {
|
if *socket == "" {
|
||||||
return fmt.Errorf("-socket is required")
|
return fmt.Errorf("-socket is required")
|
||||||
}
|
}
|
||||||
if *netdataURL == "" && *kumaURL == "" && *wgIface == "" {
|
if *netdataURL == "" && *kumaURL == "" && *wgIface == "" && *zenTokenFile == "" {
|
||||||
return fmt.Errorf("nothing to poll: set -netdata, -kuma and/or -wg")
|
return fmt.Errorf("nothing to poll: set -netdata, -kuma, -wg and/or -zenmoney-token-file")
|
||||||
|
}
|
||||||
|
|
||||||
|
// The token is read from a file, never taken as a flag value: an argv token
|
||||||
|
// is visible in `ps` to every user on the box and lands in the compose file
|
||||||
|
// and the shell history. Read once at start — a rotated token means a
|
||||||
|
// restart, which is cheaper than re-reading his credential every hour.
|
||||||
|
var zen *zenmoney.Client
|
||||||
|
if *zenTokenFile != "" {
|
||||||
|
raw, err := os.ReadFile(*zenTokenFile)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("read zenmoney token: %w", err)
|
||||||
|
}
|
||||||
|
zen, err = zenmoney.New(strings.TrimSpace(string(raw)), *zenURL, *timeout*3)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
|
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
|
||||||
@@ -83,9 +109,13 @@ func run(args []string) error {
|
|||||||
kumaKey: *kumaKey,
|
kumaKey: *kumaKey,
|
||||||
wgIface: *wgIface,
|
wgIface: *wgIface,
|
||||||
wgCmd: *wgCmd,
|
wgCmd: *wgCmd,
|
||||||
|
zen: zen,
|
||||||
|
zenEvery: *zenInterval,
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Printf("mavpoll: polling every %s (netdata=%q kuma=%q wg=%q)", *interval, *netdataURL, *kumaURL, *wgIface)
|
// The token is never logged, not even its length.
|
||||||
|
log.Printf("mavpoll: polling every %s (netdata=%q kuma=%q wg=%q zenmoney=%v every %s)",
|
||||||
|
*interval, *netdataURL, *kumaURL, *wgIface, zen != nil, *zenInterval)
|
||||||
p.pollOnce(ctx) // fire immediately; don't idle a full interval on start
|
p.pollOnce(ctx) // fire immediately; don't idle a full interval on start
|
||||||
t := time.NewTicker(*interval)
|
t := time.NewTicker(*interval)
|
||||||
defer t.Stop()
|
defer t.Stop()
|
||||||
@@ -108,6 +138,12 @@ type poller struct {
|
|||||||
kumaKey string
|
kumaKey string
|
||||||
wgIface string
|
wgIface string
|
||||||
wgCmd string
|
wgCmd string
|
||||||
|
|
||||||
|
// zen is nil unless a token file was configured — money tracking is a
|
||||||
|
// capability, off by default like weather and telegram.
|
||||||
|
zen *zenmoney.Client
|
||||||
|
zenEvery time.Duration
|
||||||
|
zenLast time.Time
|
||||||
}
|
}
|
||||||
|
|
||||||
// pollOnce — one sweep of both sources. A failure in one source logs and does
|
// pollOnce — one sweep of both sources. A failure in one source logs and does
|
||||||
@@ -129,6 +165,66 @@ func (p *poller) pollOnce(ctx context.Context) {
|
|||||||
log.Printf("mavpoll: wg: %v", err)
|
log.Printf("mavpoll: wg: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Money on its own, much slower cadence: a bank feed that updates hourly
|
||||||
|
// polled every minute is 60 pointless reads of his financial history.
|
||||||
|
if p.zen != nil && now.Sub(p.zenLast) >= p.zenEvery {
|
||||||
|
p.zenLast = now
|
||||||
|
if err := p.pollZenmoney(ctx, now); err != nil {
|
||||||
|
log.Printf("mavpoll: zenmoney: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- zenmoney: spending/income totals → money facts ------------------------
|
||||||
|
|
||||||
|
// pollZenmoney reads today's and this month's totals and writes them as
|
||||||
|
// facts(kind=env, source=poll:zenmoney) (Vikunja #125).
|
||||||
|
//
|
||||||
|
// Two properties this function exists to hold:
|
||||||
|
//
|
||||||
|
// - An empty or failed read writes NOTHING. zenmoney.Summary.Value() refuses
|
||||||
|
// to encode a summary built from zero transactions, so a poller that cannot
|
||||||
|
// reach the API leaves the last good fact in place rather than overwriting
|
||||||
|
// it with a zero Maven would then recite as fact.
|
||||||
|
// - Nothing about the money leaves the box except the diff request itself, to
|
||||||
|
// the service that already holds his bank sessions. The totals are written
|
||||||
|
// to the store and read back only when he asks; they are never search input
|
||||||
|
// and no tick rule fires on them.
|
||||||
|
//
|
||||||
|
// Both windows are read from one diff call each. Two calls an hour against an
|
||||||
|
// API whose whole job is this is not worth caching.
|
||||||
|
// moneyWindow — one fact key and the period it covers.
|
||||||
|
type moneyWindow struct {
|
||||||
|
key string
|
||||||
|
from, to time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *poller) pollZenmoney(ctx context.Context, now time.Time) error {
|
||||||
|
dFrom, dTo := zenmoney.DayWindow(now)
|
||||||
|
mFrom, mTo := zenmoney.MonthWindow(now)
|
||||||
|
windows := []moneyWindow{
|
||||||
|
{zenmoney.KeySpentToday, dFrom, dTo},
|
||||||
|
{zenmoney.KeySpentMonth, mFrom, mTo},
|
||||||
|
}
|
||||||
|
var firstErr error
|
||||||
|
for _, w := range windows {
|
||||||
|
sum, err := p.zen.Since(ctx, w.from, w.to)
|
||||||
|
if err != nil {
|
||||||
|
if firstErr == nil {
|
||||||
|
firstErr = err
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
val, ok := sum.Value()
|
||||||
|
if !ok {
|
||||||
|
// Nothing read. Silence, not a zero.
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if err := p.writeIfChangedRaw(ctx, w.key, zenmoney.Source, val, now); err != nil && firstErr == nil {
|
||||||
|
firstErr = err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return firstErr
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---- wireguard: latest handshake → presence signal -------------------------
|
// ---- wireguard: latest handshake → presence signal -------------------------
|
||||||
@@ -301,6 +397,31 @@ func (p *poller) writeIfChanged(ctx context.Context, key, source, val string, no
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// writeIfChangedRaw is writeIfChanged for values that are already JSON (the
|
||||||
|
// money facts store an object, not a string). Kept separate rather than
|
||||||
|
// generalising writeIfChanged, because the string-valued env facts encoding
|
||||||
|
// their own value is the convention the rules rely on.
|
||||||
|
//
|
||||||
|
// The log line names the key and the source, never the figures: mavpoll's log
|
||||||
|
// is not the place his spending ends up.
|
||||||
|
func (p *poller) writeIfChangedRaw(ctx context.Context, key, source, jsonVal string, now time.Time) error {
|
||||||
|
prev, err := p.core.LatestFactBySource(ctx, key, source)
|
||||||
|
switch {
|
||||||
|
case err == nil && prev.Value == jsonVal:
|
||||||
|
return nil
|
||||||
|
case err != nil && err != ipc.ErrNoFact && !isNoFact(err):
|
||||||
|
return fmt.Errorf("read %s: %w", key, err)
|
||||||
|
}
|
||||||
|
if _, err := p.core.WriteFact(ctx, ipc.WriteFactReq{
|
||||||
|
Ts: now, Kind: "env", Key: key, Value: jsonVal,
|
||||||
|
Source: source, Confidence: 1.0,
|
||||||
|
}); err != nil {
|
||||||
|
return fmt.Errorf("write %s: %w", key, err)
|
||||||
|
}
|
||||||
|
log.Printf("mavpoll: %s updated (%s)", key, source)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// isNoFact — ErrNoFact rehydrated over the wire is wrapped (fmt.Errorf %w), so
|
// isNoFact — ErrNoFact rehydrated over the wire is wrapped (fmt.Errorf %w), so
|
||||||
// errors.Is is the right check; keep a helper so the switch above reads clean.
|
// errors.Is is the right check; keep a helper so the switch above reads clean.
|
||||||
func isNoFact(err error) bool {
|
func isNoFact(err error) bool {
|
||||||
|
|||||||
@@ -1,8 +1,17 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
"github.com/kami/maven/internal/zenmoney"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestMaxSeverity(t *testing.T) {
|
func TestMaxSeverity(t *testing.T) {
|
||||||
@@ -62,3 +71,120 @@ func TestParseMaxHandshake(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ---- zenmoney (Vikunja #125) ----------------------------------------------
|
||||||
|
|
||||||
|
// factCore records the facts the poller wrote and answers "no fact yet".
|
||||||
|
type factCore struct {
|
||||||
|
ipc.UnimplementedCoreAPI
|
||||||
|
|
||||||
|
written []ipc.WriteFactReq
|
||||||
|
prev map[string]string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *factCore) LatestFactBySource(_ context.Context, key, source string) (ipc.Fact, error) {
|
||||||
|
if v, ok := c.prev[key+"|"+source]; ok {
|
||||||
|
return ipc.Fact{Key: key, Source: source, Value: v}, nil
|
||||||
|
}
|
||||||
|
return ipc.Fact{}, ipc.ErrNoFact
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *factCore) WriteFact(_ context.Context, req ipc.WriteFactReq) (int64, error) {
|
||||||
|
c.written = append(c.written, req)
|
||||||
|
return int64(len(c.written)), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func zenFixtureServer(t *testing.T, body []byte, status int) *httptest.Server {
|
||||||
|
t.Helper()
|
||||||
|
return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if status != http.StatusOK {
|
||||||
|
w.WriteHeader(status)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.Write(body)
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPollZenmoneyWritesMoneyFacts(t *testing.T) {
|
||||||
|
body, err := os.ReadFile("../../internal/zenmoney/testdata/diff.json")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
srv := zenFixtureServer(t, body, http.StatusOK)
|
||||||
|
defer srv.Close()
|
||||||
|
zen, err := zenmoney.New("tok", srv.URL, time.Second)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
core := &factCore{}
|
||||||
|
p := &poller{core: core, zen: zen}
|
||||||
|
now := time.Date(2026, 8, 1, 21, 0, 0, 0, time.UTC)
|
||||||
|
if err := p.pollZenmoney(context.Background(), now); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if len(core.written) != 2 {
|
||||||
|
t.Fatalf("wrote %d facts, want today + month", len(core.written))
|
||||||
|
}
|
||||||
|
for _, f := range core.written {
|
||||||
|
if f.Kind != "env" || f.Source != zenmoney.Source {
|
||||||
|
t.Errorf("fact = %+v, want kind=env source=%s", f, zenmoney.Source)
|
||||||
|
}
|
||||||
|
if _, err := zenmoney.ParseFactValue(f.Value); err != nil {
|
||||||
|
t.Errorf("fact value %q does not decode: %v", f.Value, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A read that returns nothing for the window writes NOTHING. Silence, not a
|
||||||
|
// zero: an invented 0 would be recited back to him as fact.
|
||||||
|
func TestPollZenmoneyWritesNothingWhenEmpty(t *testing.T) {
|
||||||
|
srv := zenFixtureServer(t, []byte(`{"serverTimestamp":1,"instrument":[],"transaction":[]}`), http.StatusOK)
|
||||||
|
defer srv.Close()
|
||||||
|
zen, _ := zenmoney.New("tok", srv.URL, time.Second)
|
||||||
|
core := &factCore{}
|
||||||
|
p := &poller{core: core, zen: zen}
|
||||||
|
if err := p.pollZenmoney(context.Background(), time.Now()); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if len(core.written) != 0 {
|
||||||
|
t.Errorf("wrote %+v, want no fact at all", core.written)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// An API failure must not overwrite the last good total either.
|
||||||
|
func TestPollZenmoneyFailureWritesNothing(t *testing.T) {
|
||||||
|
srv := zenFixtureServer(t, nil, http.StatusUnauthorized)
|
||||||
|
defer srv.Close()
|
||||||
|
zen, _ := zenmoney.New("bad", srv.URL, time.Second)
|
||||||
|
core := &factCore{}
|
||||||
|
p := &poller{core: core, zen: zen}
|
||||||
|
if err := p.pollZenmoney(context.Background(), time.Now()); err == nil {
|
||||||
|
t.Error("want the 401 reported")
|
||||||
|
}
|
||||||
|
if len(core.written) != 0 {
|
||||||
|
t.Errorf("wrote %+v on a failed read", core.written)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Unchanged totals do not churn the facts table.
|
||||||
|
func TestWriteIfChangedRawSkipsUnchanged(t *testing.T) {
|
||||||
|
core := &factCore{prev: map[string]string{
|
||||||
|
zenmoney.KeySpentToday + "|" + zenmoney.Source: `{"count":1}`,
|
||||||
|
}}
|
||||||
|
p := &poller{core: core}
|
||||||
|
if err := p.writeIfChangedRaw(context.Background(), zenmoney.KeySpentToday, zenmoney.Source, `{"count":1}`, time.Now()); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if len(core.written) != 0 {
|
||||||
|
t.Errorf("wrote %+v for an unchanged value", core.written)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Money tracking is off unless configured: no token file, no zenmoney client,
|
||||||
|
// and the poller still refuses to start with nothing at all to poll.
|
||||||
|
func TestRunRequiresSomethingToPoll(t *testing.T) {
|
||||||
|
err := run([]string{"-socket", "/tmp/nope.sock", "-netdata", "", "-kuma", "", "-wg", ""})
|
||||||
|
if err == nil || !strings.Contains(err.Error(), "nothing to poll") {
|
||||||
|
t.Errorf("err = %v, want a 'nothing to poll' refusal", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,135 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/subtle"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"io"
|
||||||
|
"log"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/calendar"
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
)
|
||||||
|
|
||||||
|
// POST /api/ambient — the work calendar read (Vikunja #126).
|
||||||
|
//
|
||||||
|
// Maven does not hold a work credential. A corp mail or calendar session on the
|
||||||
|
// homelab ties the box's blast radius to the employer's data, so the work
|
||||||
|
// calendar is read as a SIGNAL instead: an Android notification-listener on the
|
||||||
|
// owner's phone posts meeting notifications here over wg/LAN, and the ones that
|
||||||
|
// clearly describe a meeting become calendar events at source=ambient:notif,
|
||||||
|
// confidence below 1.0. Mail as a notification signal, not a mailbox.
|
||||||
|
//
|
||||||
|
// Off unless configured: no -ambient-token, no route. The token is a shared
|
||||||
|
// secret because the poster is a phone service, not a browser — WebAuthn has no
|
||||||
|
// answer for a background Android service. The endpoint is write-only and
|
||||||
|
// accepts exactly one shape of write; it cannot read anything back out.
|
||||||
|
//
|
||||||
|
// A notification with no recognisable clock reading stores NOTHING. Maven is
|
||||||
|
// not a guesser-of-truth, and a mailbox of noise rendered as invented meetings
|
||||||
|
// is worse than a gap.
|
||||||
|
|
||||||
|
// ambientMaxBody bounds the request. A notification is two short lines.
|
||||||
|
const ambientMaxBody = 8 << 10
|
||||||
|
|
||||||
|
type ambientResp struct {
|
||||||
|
Stored bool `json:"stored"`
|
||||||
|
Key string `json:"key,omitempty"`
|
||||||
|
Reason string `json:"reason,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleAmbient ingests one relayed notification. token is the configured
|
||||||
|
// shared secret; an empty token means the capability is off and the handler is
|
||||||
|
// never registered, so it is treated as a hard failure here too.
|
||||||
|
func handleAmbient(w http.ResponseWriter, r *http.Request, core ipc.CoreAPI, token string) {
|
||||||
|
if r.Method != http.MethodPost {
|
||||||
|
http.Error(w, "POST only", http.StatusMethodNotAllowed)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if token == "" {
|
||||||
|
http.Error(w, "ambient ingest disabled (no -ambient-token)", http.StatusServiceUnavailable)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !ambientAuthorized(r, token) {
|
||||||
|
http.Error(w, "unauthorized", http.StatusUnauthorized)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if core == nil {
|
||||||
|
http.Error(w, "ambient ingest disabled (no -core)", http.StatusServiceUnavailable)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var n calendar.Notification
|
||||||
|
body, err := io.ReadAll(io.LimitReader(r.Body, ambientMaxBody))
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "read failed", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(body, &n); err != nil {
|
||||||
|
http.Error(w, "bad json", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if n.Posted.IsZero() {
|
||||||
|
writeAmbient(w, http.StatusBadRequest, ambientResp{Reason: "posted_at is required"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ev, ok := calendar.EventFromNotification(n)
|
||||||
|
if !ok {
|
||||||
|
// Not an event. 202: the relay did its job, there is just nothing here
|
||||||
|
// worth remembering, and it must not retry.
|
||||||
|
writeAmbient(w, http.StatusAccepted, ambientResp{Reason: "no meeting time in notification"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
key := calendar.FactKey(ev)
|
||||||
|
val := calendar.FactValue(ev)
|
||||||
|
|
||||||
|
// Append-only discipline, same as cmd/mavcaldav: a phone reposts the same
|
||||||
|
// notification many times, and each repost is the same event.
|
||||||
|
if prev, err := core.LatestFactBySource(r.Context(), key, calendar.SourceAmbient); err == nil && prev.Value == val {
|
||||||
|
writeAmbient(w, http.StatusOK, ambientResp{Stored: false, Key: key, Reason: "unchanged"})
|
||||||
|
return
|
||||||
|
} else if err != nil && !errors.Is(err, ipc.ErrNoFact) {
|
||||||
|
log.Printf("ambient: read %s: %v", key, err)
|
||||||
|
http.Error(w, "read failed", http.StatusBadGateway)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// kind=env: an observation about the world, never a self-fact — a passive
|
||||||
|
// signal does not write truth about the owner. Confidence below 1.0 is the
|
||||||
|
// honest part: this is a notification about a meeting, not a reading of a
|
||||||
|
// calendar, and the query path hedges when it recites one.
|
||||||
|
if _, err := core.WriteFact(r.Context(), ipc.WriteFactReq{
|
||||||
|
Ts: ev.Start,
|
||||||
|
Kind: "env",
|
||||||
|
Key: key,
|
||||||
|
Value: val,
|
||||||
|
Source: calendar.SourceAmbient,
|
||||||
|
Confidence: calendar.AmbientConfidence,
|
||||||
|
}); err != nil {
|
||||||
|
log.Printf("ambient: write %s: %v", key, err)
|
||||||
|
http.Error(w, "write failed", http.StatusBadGateway)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
log.Printf("ambient: %s=%s (%s, pkg=%s)", key, val, calendar.SourceAmbient, n.Package)
|
||||||
|
writeAmbient(w, http.StatusCreated, ambientResp{Stored: true, Key: key})
|
||||||
|
}
|
||||||
|
|
||||||
|
// ambientAuthorized accepts the token as a bearer header or as an X-Maven-Token
|
||||||
|
// header, compared in constant time.
|
||||||
|
func ambientAuthorized(r *http.Request, token string) bool {
|
||||||
|
got := strings.TrimSpace(strings.TrimPrefix(r.Header.Get("Authorization"), "Bearer"))
|
||||||
|
if got == "" {
|
||||||
|
got = strings.TrimSpace(r.Header.Get("X-Maven-Token"))
|
||||||
|
}
|
||||||
|
return subtle.ConstantTimeCompare([]byte(got), []byte(token)) == 1
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeAmbient(w http.ResponseWriter, code int, resp ambientResp) {
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.WriteHeader(code)
|
||||||
|
json.NewEncoder(w).Encode(resp)
|
||||||
|
}
|
||||||
@@ -0,0 +1,223 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/calendar"
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
)
|
||||||
|
|
||||||
|
const ambientTestToken = "s3cret"
|
||||||
|
|
||||||
|
// ambientCore adds provenance-scoped reads to fakeCore, which the dedupe path
|
||||||
|
// needs.
|
||||||
|
type ambientCore struct {
|
||||||
|
fakeCore
|
||||||
|
latest map[string]ipc.Fact // "key|source" → fact
|
||||||
|
readErr error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *ambientCore) LatestFactBySource(_ context.Context, key, source string) (ipc.Fact, error) {
|
||||||
|
if c.readErr != nil {
|
||||||
|
return ipc.Fact{}, c.readErr
|
||||||
|
}
|
||||||
|
f, ok := c.latest[key+"|"+source]
|
||||||
|
if !ok {
|
||||||
|
return ipc.Fact{}, ipc.ErrNoFact
|
||||||
|
}
|
||||||
|
return f, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func postAmbient(t *testing.T, core ipc.CoreAPI, token string, n calendar.Notification) (*httptest.ResponseRecorder, ambientResp) {
|
||||||
|
t.Helper()
|
||||||
|
body, err := json.Marshal(n)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/api/ambient", strings.NewReader(string(body)))
|
||||||
|
req.Header.Set("Authorization", "Bearer "+ambientTestToken)
|
||||||
|
rr := httptest.NewRecorder()
|
||||||
|
handleAmbient(rr, req, core, token)
|
||||||
|
var resp ambientResp
|
||||||
|
json.Unmarshal(rr.Body.Bytes(), &resp)
|
||||||
|
return rr, resp
|
||||||
|
}
|
||||||
|
|
||||||
|
func meetingNotification() calendar.Notification {
|
||||||
|
return calendar.Notification{
|
||||||
|
Package: "com.google.android.gm",
|
||||||
|
Title: "Планёрка",
|
||||||
|
Text: "10:00-10:30",
|
||||||
|
Posted: time.Date(2026, 8, 3, 9, 40, 0, 0, time.UTC),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHandleAmbientStoresMeeting(t *testing.T) {
|
||||||
|
core := &ambientCore{}
|
||||||
|
rr, resp := postAmbient(t, core, ambientTestToken, meetingNotification())
|
||||||
|
|
||||||
|
if rr.Code != http.StatusCreated {
|
||||||
|
t.Fatalf("status = %d, want 201: %s", rr.Code, rr.Body)
|
||||||
|
}
|
||||||
|
if !resp.Stored {
|
||||||
|
t.Errorf("resp = %+v, want stored", resp)
|
||||||
|
}
|
||||||
|
if len(core.writeLog) != 1 {
|
||||||
|
t.Fatalf("expected 1 fact write, got %d", len(core.writeLog))
|
||||||
|
}
|
||||||
|
got := core.writeLog[0]
|
||||||
|
if got.Source != calendar.SourceAmbient {
|
||||||
|
t.Errorf("source = %q, want %q", got.Source, calendar.SourceAmbient)
|
||||||
|
}
|
||||||
|
if got.Confidence >= 1.0 {
|
||||||
|
t.Errorf("confidence = %v — a notification is not a calendar read", got.Confidence)
|
||||||
|
}
|
||||||
|
if got.Confidence != calendar.AmbientConfidence {
|
||||||
|
t.Errorf("confidence = %v, want %v", got.Confidence, calendar.AmbientConfidence)
|
||||||
|
}
|
||||||
|
if got.Kind != "env" {
|
||||||
|
t.Errorf("kind = %q — a passive signal never writes a self-fact", got.Kind)
|
||||||
|
}
|
||||||
|
if want := "calendar_event_20260803_"; !strings.HasPrefix(got.Key, want) {
|
||||||
|
t.Errorf("key = %q, want prefix %q", got.Key, want)
|
||||||
|
}
|
||||||
|
if got.Value != "Планёрка @ 10:00-10:30" {
|
||||||
|
t.Errorf("value = %q", got.Value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A phone reposts the same notification many times. Each repost is the same
|
||||||
|
// event, and the append-only log must not fill with duplicates.
|
||||||
|
func TestHandleAmbientDedupesReposts(t *testing.T) {
|
||||||
|
core := &ambientCore{}
|
||||||
|
postAmbient(t, core, ambientTestToken, meetingNotification())
|
||||||
|
if len(core.writeLog) != 1 {
|
||||||
|
t.Fatalf("first post did not write")
|
||||||
|
}
|
||||||
|
w := core.writeLog[0]
|
||||||
|
core.latest = map[string]ipc.Fact{w.Key + "|" + w.Source: {Value: w.Value}}
|
||||||
|
|
||||||
|
rr, resp := postAmbient(t, core, ambientTestToken, meetingNotification())
|
||||||
|
if rr.Code != http.StatusOK {
|
||||||
|
t.Errorf("status = %d, want 200 for an unchanged repost", rr.Code)
|
||||||
|
}
|
||||||
|
if resp.Stored {
|
||||||
|
t.Error("a repost must not be stored again")
|
||||||
|
}
|
||||||
|
if len(core.writeLog) != 1 {
|
||||||
|
t.Errorf("wrote %d facts, want 1", len(core.writeLog))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The conservative half: noise stores nothing at all.
|
||||||
|
func TestHandleAmbientIgnoresNonMeetings(t *testing.T) {
|
||||||
|
core := &ambientCore{}
|
||||||
|
rr, resp := postAmbient(t, core, ambientTestToken, calendar.Notification{
|
||||||
|
Package: "com.google.android.gm",
|
||||||
|
Title: "3 новых письма",
|
||||||
|
Posted: time.Now(),
|
||||||
|
})
|
||||||
|
if rr.Code != http.StatusAccepted {
|
||||||
|
t.Errorf("status = %d, want 202 (accepted, nothing to store — the relay must not retry)", rr.Code)
|
||||||
|
}
|
||||||
|
if resp.Stored {
|
||||||
|
t.Error("a notification with no meeting time must store nothing")
|
||||||
|
}
|
||||||
|
if len(core.writeLog) != 0 {
|
||||||
|
t.Fatalf("wrote %d facts for a non-meeting", len(core.writeLog))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHandleAmbientAuth(t *testing.T) {
|
||||||
|
body := `{"title":"Планёрка 10:00","posted_at":"2026-08-03T09:40:00Z"}`
|
||||||
|
|
||||||
|
newReq := func(hdr, val string) *http.Request {
|
||||||
|
r := httptest.NewRequest(http.MethodPost, "/api/ambient", strings.NewReader(body))
|
||||||
|
if hdr != "" {
|
||||||
|
r.Header.Set(hdr, val)
|
||||||
|
}
|
||||||
|
return r
|
||||||
|
}
|
||||||
|
|
||||||
|
t.Run("no token rejected", func(t *testing.T) {
|
||||||
|
core := &ambientCore{}
|
||||||
|
rr := httptest.NewRecorder()
|
||||||
|
handleAmbient(rr, newReq("", ""), core, ambientTestToken)
|
||||||
|
if rr.Code != http.StatusUnauthorized {
|
||||||
|
t.Errorf("status = %d, want 401", rr.Code)
|
||||||
|
}
|
||||||
|
if len(core.writeLog) != 0 {
|
||||||
|
t.Error("an unauthorized post must not write")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("wrong token rejected", func(t *testing.T) {
|
||||||
|
rr := httptest.NewRecorder()
|
||||||
|
handleAmbient(rr, newReq("Authorization", "Bearer nope"), &ambientCore{}, ambientTestToken)
|
||||||
|
if rr.Code != http.StatusUnauthorized {
|
||||||
|
t.Errorf("status = %d, want 401", rr.Code)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("X-Maven-Token accepted", func(t *testing.T) {
|
||||||
|
rr := httptest.NewRecorder()
|
||||||
|
handleAmbient(rr, newReq("X-Maven-Token", ambientTestToken), &ambientCore{}, ambientTestToken)
|
||||||
|
if rr.Code != http.StatusCreated {
|
||||||
|
t.Errorf("status = %d, want 201: %s", rr.Code, rr.Body)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("capability off", func(t *testing.T) {
|
||||||
|
rr := httptest.NewRecorder()
|
||||||
|
handleAmbient(rr, newReq("Authorization", "Bearer "+ambientTestToken), &ambientCore{}, "")
|
||||||
|
if rr.Code != http.StatusServiceUnavailable {
|
||||||
|
t.Errorf("status = %d, want 503 when no token is configured", rr.Code)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("GET rejected", func(t *testing.T) {
|
||||||
|
rr := httptest.NewRecorder()
|
||||||
|
r := httptest.NewRequest(http.MethodGet, "/api/ambient", nil)
|
||||||
|
handleAmbient(rr, r, &ambientCore{}, ambientTestToken)
|
||||||
|
if rr.Code != http.StatusMethodNotAllowed {
|
||||||
|
t.Errorf("status = %d, want 405 — the ingest is write-only", rr.Code)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHandleAmbientBadInput(t *testing.T) {
|
||||||
|
t.Run("bad json", func(t *testing.T) {
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/api/ambient", strings.NewReader("{nope"))
|
||||||
|
req.Header.Set("X-Maven-Token", ambientTestToken)
|
||||||
|
rr := httptest.NewRecorder()
|
||||||
|
handleAmbient(rr, req, &ambientCore{}, ambientTestToken)
|
||||||
|
if rr.Code != http.StatusBadRequest {
|
||||||
|
t.Errorf("status = %d, want 400", rr.Code)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("missing posted_at", func(t *testing.T) {
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/api/ambient", strings.NewReader(`{"title":"Планёрка 10:00"}`))
|
||||||
|
req.Header.Set("X-Maven-Token", ambientTestToken)
|
||||||
|
rr := httptest.NewRecorder()
|
||||||
|
handleAmbient(rr, req, &ambientCore{}, ambientTestToken)
|
||||||
|
if rr.Code != http.StatusBadRequest {
|
||||||
|
t.Errorf("status = %d, want 400", rr.Code)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("read error surfaces", func(t *testing.T) {
|
||||||
|
core := &ambientCore{readErr: fmt.Errorf("socket closed")}
|
||||||
|
rr, _ := postAmbient(t, core, ambientTestToken, meetingNotification())
|
||||||
|
if rr.Code != http.StatusBadGateway {
|
||||||
|
t.Errorf("status = %d, want 502", rr.Code)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -17,11 +17,12 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// fakeCore records the mutating calls handleTools makes and returns canned
|
// fakeCore records the mutating calls handleTools makes and returns canned
|
||||||
// tool lists / errors. Embedding ipc.CoreAPI (nil) satisfies the large
|
// tool lists / errors. Embedding ipc.UnimplementedCoreAPI satisfies the large
|
||||||
// interface — only the methods the handlers touch are overridden; any other
|
// interface — only the methods the handlers touch are overridden; any other
|
||||||
// call would nil-panic, which is fine since the handlers never make them.
|
// call returns ipc.ErrNotImplemented instead of nil-panicking, so a test that
|
||||||
|
// accidentally exercises an undeclared method fails loudly.
|
||||||
type fakeCore struct {
|
type fakeCore struct {
|
||||||
ipc.CoreAPI
|
ipc.UnimplementedCoreAPI
|
||||||
|
|
||||||
proposed, enabled []ipc.Tool
|
proposed, enabled []ipc.Tool
|
||||||
listErr error
|
listErr error
|
||||||
@@ -62,6 +63,18 @@ type fakeCore struct {
|
|||||||
// for handleTrace tests
|
// for handleTrace tests
|
||||||
tickTrace ipc.TickTrace
|
tickTrace ipc.TickTrace
|
||||||
traceErr error
|
traceErr error
|
||||||
|
|
||||||
|
// for handleChatAPI tests
|
||||||
|
chatText string
|
||||||
|
chatErr error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *fakeCore) Chat(_ context.Context, text string) (string, error) {
|
||||||
|
f.chatText = text
|
||||||
|
if f.chatErr != nil {
|
||||||
|
return "", f.chatErr
|
||||||
|
}
|
||||||
|
return "поняла", nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *fakeCore) EnableTool(_ context.Context, name string, cmd []string, destructive bool, scope string, _ time.Time) error {
|
func (f *fakeCore) EnableTool(_ context.Context, name string, cmd []string, destructive bool, scope string, _ time.Time) error {
|
||||||
@@ -1044,3 +1057,64 @@ func TestHandleRoutines_NilCore_503(t *testing.T) {
|
|||||||
t.Fatalf("status = %d, want 503", rr.Code)
|
t.Fatalf("status = %d, want 503", rr.Code)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// --- handleChatAPI step-up gate (Vikunja #317) ---
|
||||||
|
//
|
||||||
|
// POST /api/chat reaches the router, the LLM and the act path, so it carries
|
||||||
|
// the same gate as POST /tools and POST /api/revert.
|
||||||
|
|
||||||
|
func postChat(text string) *http.Request {
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/api/chat", strings.NewReader("text="+url.QueryEscape(text)))
|
||||||
|
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||||
|
return req
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHandleChatAPI_RequireStepUp_FailsClosed(t *testing.T) {
|
||||||
|
core := &fakeCore{}
|
||||||
|
rr := httptest.NewRecorder()
|
||||||
|
handleChatAPI(rr, postChat("выключи свет"), core, nil, true)
|
||||||
|
if rr.Code != http.StatusForbidden {
|
||||||
|
t.Fatalf("status = %d, want 403; body=%s", rr.Code, rr.Body.String())
|
||||||
|
}
|
||||||
|
if core.chatText != "" {
|
||||||
|
t.Errorf("core.Chat called with %q, but -require-stepup should deny", core.chatText)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHandleChatAPI_UnassertedSession_Denied(t *testing.T) {
|
||||||
|
core := &fakeCore{}
|
||||||
|
rr := httptest.NewRecorder()
|
||||||
|
handleChatAPI(rr, postChat("выключи свет"), core, webauthn.NewPasskeySession(5*time.Minute), false)
|
||||||
|
if rr.Code != http.StatusForbidden {
|
||||||
|
t.Fatalf("status = %d, want 403", rr.Code)
|
||||||
|
}
|
||||||
|
if core.chatText != "" {
|
||||||
|
t.Errorf("core.Chat called with %q despite an unasserted session", core.chatText)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHandleChatAPI_AssertedSession_PassesGate(t *testing.T) {
|
||||||
|
core := &fakeCore{}
|
||||||
|
rr := httptest.NewRecorder()
|
||||||
|
handleChatAPI(rr, postChat("привет"), core, stepUpSession(), true)
|
||||||
|
if rr.Code != http.StatusSeeOther {
|
||||||
|
t.Fatalf("status = %d, want 303; body=%s", rr.Code, rr.Body.String())
|
||||||
|
}
|
||||||
|
if core.chatText != "привет" {
|
||||||
|
t.Errorf("core.Chat text = %q, want %q", core.chatText, "привет")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Default deploy: WebAuthn unconfigured and -require-stepup off ⇒ chat keeps
|
||||||
|
// working, resting on the transport-level auth in front of mavweb.
|
||||||
|
func TestHandleChatAPI_FailOpenByDefault(t *testing.T) {
|
||||||
|
core := &fakeCore{}
|
||||||
|
rr := httptest.NewRecorder()
|
||||||
|
handleChatAPI(rr, postChat("привет"), core, nil, false)
|
||||||
|
if rr.Code != http.StatusSeeOther {
|
||||||
|
t.Fatalf("status = %d, want 303", rr.Code)
|
||||||
|
}
|
||||||
|
if core.chatText != "привет" {
|
||||||
|
t.Errorf("core.Chat text = %q, want %q", core.chatText, "привет")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
+262
-10
@@ -25,6 +25,7 @@ import (
|
|||||||
"github.com/kami/maven/internal/audio"
|
"github.com/kami/maven/internal/audio"
|
||||||
"github.com/kami/maven/internal/ipc"
|
"github.com/kami/maven/internal/ipc"
|
||||||
"github.com/kami/maven/internal/pattern"
|
"github.com/kami/maven/internal/pattern"
|
||||||
|
"github.com/kami/maven/internal/tasks"
|
||||||
"github.com/kami/maven/internal/voice"
|
"github.com/kami/maven/internal/voice"
|
||||||
"github.com/kami/maven/internal/webauthn"
|
"github.com/kami/maven/internal/webauthn"
|
||||||
)
|
)
|
||||||
@@ -58,6 +59,9 @@ var notificationsHTML string
|
|||||||
//go:embed reminders.html
|
//go:embed reminders.html
|
||||||
var remindersHTML string
|
var remindersHTML string
|
||||||
|
|
||||||
|
//go:embed tasks.html
|
||||||
|
var tasksHTML string
|
||||||
|
|
||||||
//go:embed voice.html
|
//go:embed voice.html
|
||||||
var voiceHTML string
|
var voiceHTML string
|
||||||
|
|
||||||
@@ -97,6 +101,7 @@ var sidebarSections = []struct {
|
|||||||
Pages: []struct{ Label, URL, Key string }{
|
Pages: []struct{ Label, URL, Key string }{
|
||||||
{Label: "Rule Trace", URL: "/trace", Key: "trace"},
|
{Label: "Rule Trace", URL: "/trace", Key: "trace"},
|
||||||
{Label: "Notifications", URL: "/notifications", Key: "notifications"},
|
{Label: "Notifications", URL: "/notifications", Key: "notifications"},
|
||||||
|
{Label: "Tasks", URL: "/tasks", Key: "tasks"},
|
||||||
{Label: "Reminders", URL: "/reminders", Key: "reminders"},
|
{Label: "Reminders", URL: "/reminders", Key: "reminders"},
|
||||||
{Label: "Routines", URL: "/routines", Key: "routines"},
|
{Label: "Routines", URL: "/routines", Key: "routines"},
|
||||||
{Label: "Morning", URL: "/morning", Key: "morning"},
|
{Label: "Morning", URL: "/morning", Key: "morning"},
|
||||||
@@ -170,6 +175,8 @@ func pageIcon(key string) string {
|
|||||||
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-wave"/></svg>`
|
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-wave"/></svg>`
|
||||||
case "notifications":
|
case "notifications":
|
||||||
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-bell"/></svg>`
|
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-bell"/></svg>`
|
||||||
|
case "tasks":
|
||||||
|
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-grid"/></svg>`
|
||||||
case "reminders":
|
case "reminders":
|
||||||
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-calendar"/></svg>`
|
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-calendar"/></svg>`
|
||||||
case "routines":
|
case "routines":
|
||||||
@@ -202,6 +209,8 @@ func pageTitle(key string) string {
|
|||||||
return "Rule Trace"
|
return "Rule Trace"
|
||||||
case "notifications":
|
case "notifications":
|
||||||
return "Notifications"
|
return "Notifications"
|
||||||
|
case "tasks":
|
||||||
|
return "Tasks"
|
||||||
case "reminders":
|
case "reminders":
|
||||||
return "Reminders"
|
return "Reminders"
|
||||||
case "routines":
|
case "routines":
|
||||||
@@ -314,7 +323,7 @@ func noCache(h http.Handler) http.Handler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
addr := flag.String("addr", ":9200", "HTTP listen address")
|
addr := flag.String("addr", "127.0.0.1:9200", "HTTP listen address (loopback by default; pass e.g. \":9200\" or a LAN IP deliberately for wider exposure — POST /chat and /routines are state-changing)")
|
||||||
voiceAddr := flag.String("voice", "127.0.0.1:9100", "voice server TCP addr (host:port)")
|
voiceAddr := flag.String("voice", "127.0.0.1:9100", "voice server TCP addr (host:port)")
|
||||||
// ntfyWS: the ntfy WebSocket subscribe URL the PWA connects to for in-app
|
// ntfyWS: the ntfy WebSocket subscribe URL the PWA connects to for in-app
|
||||||
// nudge delivery, e.g. wss://ntfy.kvmx.ru/maven/ws?auth=<base64-token>. The
|
// nudge delivery, e.g. wss://ntfy.kvmx.ru/maven/ws?auth=<base64-token>. The
|
||||||
@@ -329,11 +338,15 @@ func main() {
|
|||||||
coreSock := flag.String("core", "", "mavend IPC socket path for presence-signal ingest (empty = disabled)")
|
coreSock := flag.String("core", "", "mavend IPC socket path for presence-signal ingest (empty = disabled)")
|
||||||
pkOrigin := flag.String("webauthn-origin", "", "WebAuthn origin URL (e.g. https://maven.kvmx.ru)")
|
pkOrigin := flag.String("webauthn-origin", "", "WebAuthn origin URL (e.g. https://maven.kvmx.ru)")
|
||||||
pkRPID := flag.String("webauthn-rpid", "", "WebAuthn RP ID (e.g. maven.kvmx.ru)")
|
pkRPID := flag.String("webauthn-rpid", "", "WebAuthn RP ID (e.g. maven.kvmx.ru)")
|
||||||
requireStepUp := flag.Bool("require-stepup", false, "fail closed on step-up-gated actions (/tools POST, /api/revert) when WebAuthn step-up cannot be asserted; default false preserves the historical fail-open behaviour")
|
requireStepUp := flag.Bool("require-stepup", false, "fail closed on step-up-gated actions (POST /tools, /routines, /api/revert, /api/chat) when WebAuthn step-up cannot be asserted; default false preserves the historical fail-open behaviour")
|
||||||
pkFile := flag.String("passkey-file", "./passkeys.json", "path to WebAuthn credential store (JSON)")
|
pkFile := flag.String("passkey-file", "./passkeys.json", "path to WebAuthn credential store (JSON)")
|
||||||
nexusURL := flag.String("nexus", "", "Nexus base URL for the /ecosystem panel (empty = not configured)")
|
nexusURL := flag.String("nexus", "", "Nexus base URL for the /ecosystem panel (empty = not configured)")
|
||||||
praxisURL := flag.String("praxis", "", "Praxis base URL for the /ecosystem panel (empty = not configured)")
|
praxisURL := flag.String("praxis", "", "Praxis base URL for the /ecosystem panel (empty = not configured)")
|
||||||
hexisURL := flag.String("hexis", "", "Hexis base URL for the /ecosystem panel (empty = not configured)")
|
hexisURL := flag.String("hexis", "", "Hexis base URL for the /ecosystem panel (empty = not configured)")
|
||||||
|
// Shared secret for POST /api/ambient, the notification-relay ingest that
|
||||||
|
// reads the work calendar as a signal instead of holding a work credential
|
||||||
|
// (see ambient.go). Empty ⇒ the route is not registered at all.
|
||||||
|
ambientToken := flag.String("ambient-token", "", "shared secret for POST /api/ambient notification ingest (empty = ingest disabled, route not registered)")
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
var core ipc.CoreAPI
|
var core ipc.CoreAPI
|
||||||
@@ -381,6 +394,14 @@ func main() {
|
|||||||
mux.HandleFunc("/api/signal", func(w http.ResponseWriter, r *http.Request) {
|
mux.HandleFunc("/api/signal", func(w http.ResponseWriter, r *http.Request) {
|
||||||
handleSignal(w, r, core)
|
handleSignal(w, r, core)
|
||||||
})
|
})
|
||||||
|
// Off unless configured: no token, no route — an unconfigured ingest is not
|
||||||
|
// a 503 waiting to be probed, it does not exist.
|
||||||
|
if *ambientToken != "" {
|
||||||
|
mux.HandleFunc("/api/ambient", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
handleAmbient(w, r, core, *ambientToken)
|
||||||
|
})
|
||||||
|
log.Printf("mavweb: ambient notification ingest enabled at POST /api/ambient")
|
||||||
|
}
|
||||||
mux.HandleFunc("/dash", func(w http.ResponseWriter, r *http.Request) {
|
mux.HandleFunc("/dash", func(w http.ResponseWriter, r *http.Request) {
|
||||||
handleDash(w, r, core)
|
handleDash(w, r, core)
|
||||||
})
|
})
|
||||||
@@ -396,6 +417,11 @@ func main() {
|
|||||||
mux.HandleFunc("/reminders", func(w http.ResponseWriter, r *http.Request) {
|
mux.HandleFunc("/reminders", func(w http.ResponseWriter, r *http.Request) {
|
||||||
handleReminders(w, r, core)
|
handleReminders(w, r, core)
|
||||||
})
|
})
|
||||||
|
// /tasks — capture + review. POST is not step-up gated; see handleTasks for
|
||||||
|
// why a task write is not in the same class as /tools or /routines.
|
||||||
|
mux.HandleFunc("/tasks", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
handleTasks(w, r, core)
|
||||||
|
})
|
||||||
mux.HandleFunc("/morning", func(w http.ResponseWriter, r *http.Request) {
|
mux.HandleFunc("/morning", func(w http.ResponseWriter, r *http.Request) {
|
||||||
handleMorning(w, r, core)
|
handleMorning(w, r, core)
|
||||||
})
|
})
|
||||||
@@ -434,9 +460,9 @@ func main() {
|
|||||||
}
|
}
|
||||||
if stepUpSession == nil {
|
if stepUpSession == nil {
|
||||||
if *requireStepUp {
|
if *requireStepUp {
|
||||||
log.Printf("SECURITY: step-up verification is DISABLED (-webauthn-origin/-webauthn-rpid unset) and -require-stepup is set: POST /tools (tool enable/disable/dismiss — defines and executes arbitrary argv) and POST /api/revert will be DENIED (403). Set -webauthn-origin and -webauthn-rpid to enable passkey step-up.")
|
log.Printf("SECURITY: step-up verification is DISABLED (-webauthn-origin/-webauthn-rpid unset) and -require-stepup is set: POST /tools (tool enable/disable/dismiss — defines and executes arbitrary argv), POST /routines (accepting schedules recurring firing), POST /api/revert and POST /api/chat (reaches the router, the LLM and the act path) will be DENIED (403). Set -webauthn-origin and -webauthn-rpid to enable passkey step-up.")
|
||||||
} else {
|
} else {
|
||||||
log.Printf("SECURITY WARNING: step-up verification is DISABLED because -webauthn-origin/-webauthn-rpid are unset. UNGUARDED SURFACES: POST /tools (defines arbitrary argv via name+cmd, which internal/tool then EXECUTES) and POST /api/revert (voids the latest fact for a key). These are protected only by whatever transport-level auth sits in front of mavweb (wg+nginx+auth) — do NOT expose -addr on a public interface. Set -webauthn-origin and -webauthn-rpid to require passkey step-up, or pass -require-stepup to fail closed instead.")
|
log.Printf("SECURITY WARNING: step-up verification is DISABLED because -webauthn-origin/-webauthn-rpid are unset. UNGUARDED SURFACES: POST /tools (defines arbitrary argv via name+cmd, which internal/tool then EXECUTES), POST /routines (accepting schedules recurring firing), POST /api/revert (voids the latest fact for a key) and POST /api/chat (reaches the router, the LLM and, through applyAction, the act path). These are protected only by whatever transport-level auth sits in front of mavweb (wg+nginx+auth) — do NOT expose -addr on a public interface. Set -webauthn-origin and -webauthn-rpid to require passkey step-up, or pass -require-stepup to fail closed instead.")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -454,14 +480,26 @@ func main() {
|
|||||||
handleRoutines(w, r, core, stepUpSession, *requireStepUp)
|
handleRoutines(w, r, core, stepUpSession, *requireStepUp)
|
||||||
})
|
})
|
||||||
|
|
||||||
// /api/revert voids the latest fact for a key — a store mutation, so it
|
// State-changing routes on this server, and their gate (Vikunja #317):
|
||||||
// sits behind the same passkey step-up as tool enable (nil session ⇒
|
//
|
||||||
// WebAuthn unconfigured ⇒ transport-level auth only, same as /tools).
|
// POST /tools step-up — defines argv that internal/tool executes
|
||||||
|
// POST /routines step-up — accepting schedules recurring firing
|
||||||
|
// POST /api/revert step-up — voids the latest fact for a key
|
||||||
|
// POST /api/chat step-up — reaches the router, LLM and the act path
|
||||||
|
// POST /api/signal none — appends a presence fact, no argv, no act
|
||||||
|
// POST /api/ptt, /ws none — proxy audio to mavend's voice port, which
|
||||||
|
// is itself only reachable inside the deploy
|
||||||
|
//
|
||||||
|
// "step-up" means stepUpOK: asserted passkey when WebAuthn is configured,
|
||||||
|
// otherwise fail-open unless -require-stepup, which denies.
|
||||||
|
//
|
||||||
|
// GET /chat only renders the page and echoes back the q/r query params the
|
||||||
|
// POST redirect set — nothing to gate.
|
||||||
mux.HandleFunc("/chat", func(w http.ResponseWriter, r *http.Request) {
|
mux.HandleFunc("/chat", func(w http.ResponseWriter, r *http.Request) {
|
||||||
handleChatPage(w, r, core)
|
handleChatPage(w, r, core)
|
||||||
})
|
})
|
||||||
mux.HandleFunc("/api/chat", func(w http.ResponseWriter, r *http.Request) {
|
mux.HandleFunc("/api/chat", func(w http.ResponseWriter, r *http.Request) {
|
||||||
handleChatAPI(w, r, core)
|
handleChatAPI(w, r, core, stepUpSession, *requireStepUp)
|
||||||
})
|
})
|
||||||
mux.HandleFunc("/api/revert", func(w http.ResponseWriter, r *http.Request) {
|
mux.HandleFunc("/api/revert", func(w http.ResponseWriter, r *http.Request) {
|
||||||
handleRevert(w, r, core, stepUpSession, *requireStepUp)
|
handleRevert(w, r, core, stepUpSession, *requireStepUp)
|
||||||
@@ -720,6 +758,8 @@ var passkeyTmpl = template.Must(template.New("passkey").Funcs(shellFuncs()).Pars
|
|||||||
|
|
||||||
var voiceTmpl = template.Must(template.New("voice").Funcs(shellFuncs()).Parse(shellTopHTML + voiceHTML + shellBottomHTML))
|
var voiceTmpl = template.Must(template.New("voice").Funcs(shellFuncs()).Parse(shellTopHTML + voiceHTML + shellBottomHTML))
|
||||||
|
|
||||||
|
var tasksTmpl = template.Must(template.New("tasks").Funcs(shellFuncs()).Parse(shellTopHTML + tasksHTML + shellBottomHTML))
|
||||||
|
|
||||||
var routinesTmpl = template.Must(template.New("routines").Funcs(shellFuncs()).Parse(shellTopHTML + routinesHTML + shellBottomHTML))
|
var routinesTmpl = template.Must(template.New("routines").Funcs(shellFuncs()).Parse(shellTopHTML + routinesHTML + shellBottomHTML))
|
||||||
|
|
||||||
var traceTmpl = template.Must(template.New("trace").Funcs(func() template.FuncMap {
|
var traceTmpl = template.Must(template.New("trace").Funcs(func() template.FuncMap {
|
||||||
@@ -790,6 +830,187 @@ func handleReminders(w http.ResponseWriter, r *http.Request, core ipc.CoreAPI) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// taskRow is one line on /tasks, with every timestamp already formatted so the
|
||||||
|
// template holds no date logic.
|
||||||
|
type taskRow struct {
|
||||||
|
ID int64
|
||||||
|
Text string
|
||||||
|
Source string
|
||||||
|
Evidence string
|
||||||
|
Status string
|
||||||
|
Due string
|
||||||
|
Created string
|
||||||
|
Resolved string
|
||||||
|
// Why — the ranker's reason for this row's position (Vikunja #129), in
|
||||||
|
// Russian, empty when nothing distinguished the task. Blank is the honest
|
||||||
|
// rendering: he never said this one mattered more.
|
||||||
|
Why string
|
||||||
|
}
|
||||||
|
|
||||||
|
// handleTasks serves the task review surface (GET) and the four writes it
|
||||||
|
// offers (POST): add, confirm, done, drop.
|
||||||
|
//
|
||||||
|
// Not step-up gated, unlike /tools and /routines, and the difference is the
|
||||||
|
// point: enabling a tool defines argv Maven will execute, and accepting a
|
||||||
|
// routine hands the tick loop a new standing reason to interrupt him. A task is
|
||||||
|
// neither — nothing in the tick loop reads the tasks table, so the worst a
|
||||||
|
// weaker caller can do here is write a line onto a list he reads himself. It
|
||||||
|
// still sits behind whatever transport auth fronts mavweb, like every other
|
||||||
|
// page.
|
||||||
|
//
|
||||||
|
// "confirm" is the only interesting move: it promotes a candidate Maven derived
|
||||||
|
// from something she read into work he owns. That review step is why derived
|
||||||
|
// tasks are captured as candidates in the first place.
|
||||||
|
func handleTasks(w http.ResponseWriter, r *http.Request, core ipc.CoreAPI) {
|
||||||
|
if core == nil {
|
||||||
|
http.Error(w, "tasks disabled (no -core)", http.StatusServiceUnavailable)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx := r.Context()
|
||||||
|
var msg, errMsg string
|
||||||
|
if r.Method == http.MethodPost {
|
||||||
|
var err error
|
||||||
|
msg, err = applyTaskPost(ctx, core, r)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("tasks: %v", err)
|
||||||
|
errMsg = err.Error()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
all, err := core.ListTasks(ctx, "")
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("tasks: list: %v", err)
|
||||||
|
http.Error(w, "tasks error: "+err.Error(), http.StatusBadGateway)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Live rows are ordered by the same ranker the spoken list uses, so the page
|
||||||
|
// and the voice reply can never disagree about what comes first. Resolved
|
||||||
|
// rows keep store order (newest first) — ranking finished work is pointless.
|
||||||
|
var live []tasks.Item
|
||||||
|
var resolved []taskRow
|
||||||
|
for _, t := range all {
|
||||||
|
switch t.Status {
|
||||||
|
case "candidate", "open":
|
||||||
|
live = append(live, tasks.Item{
|
||||||
|
ID: t.ID, Text: t.Text, Status: t.Status,
|
||||||
|
Created: t.CreatedTs, Due: t.Due, Weight: t.Weight,
|
||||||
|
})
|
||||||
|
default:
|
||||||
|
resolved = append(resolved, taskRow{
|
||||||
|
ID: t.ID, Text: t.Text, Source: t.Source, Evidence: t.Evidence,
|
||||||
|
Status: t.Status, Created: fmtTaskTime(&t.CreatedTs),
|
||||||
|
Due: fmtTaskDate(t.Due), Resolved: fmtTaskTime(t.Resolved),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
byID := make(map[int64]ipc.Task, len(all))
|
||||||
|
for _, t := range all {
|
||||||
|
byID[t.ID] = t
|
||||||
|
}
|
||||||
|
var cands, open []taskRow
|
||||||
|
for _, r := range tasks.Rank(live, time.Now()) {
|
||||||
|
t := byID[r.ID]
|
||||||
|
row := taskRow{
|
||||||
|
ID: t.ID, Text: t.Text, Source: t.Source, Evidence: t.Evidence,
|
||||||
|
Status: t.Status, Created: fmtTaskTime(&t.CreatedTs),
|
||||||
|
Due: fmtTaskDate(t.Due), Resolved: fmtTaskTime(t.Resolved),
|
||||||
|
Why: r.Reason,
|
||||||
|
}
|
||||||
|
if t.Status == "candidate" {
|
||||||
|
// A candidate's due date is Maven's reading of a mail, so its
|
||||||
|
// ranking reason is not shown as if he had set a priority.
|
||||||
|
row.Why = ""
|
||||||
|
cands = append(cands, row)
|
||||||
|
} else {
|
||||||
|
open = append(open, row)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||||
|
if err := tasksTmpl.Execute(w, struct {
|
||||||
|
Msg, Err string
|
||||||
|
Candidates []taskRow
|
||||||
|
Open []taskRow
|
||||||
|
Resolved []taskRow
|
||||||
|
}{msg, errMsg, cands, open, resolved}); err != nil {
|
||||||
|
log.Printf("tasks render: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// applyTaskPost performs one write and returns the message to show. A bad
|
||||||
|
// request returns an error, which the page renders inline rather than as a
|
||||||
|
// bare 400 — this is a form surface, not an API.
|
||||||
|
func applyTaskPost(ctx context.Context, core ipc.CoreAPI, r *http.Request) (string, error) {
|
||||||
|
action := r.FormValue("action")
|
||||||
|
if action == "add" {
|
||||||
|
text := strings.TrimSpace(r.FormValue("text"))
|
||||||
|
if text == "" {
|
||||||
|
return "", errors.New("empty task text")
|
||||||
|
}
|
||||||
|
req := ipc.CaptureTaskReq{Text: text, Source: "tap:web", Status: "open", Ts: time.Now()}
|
||||||
|
// Importance is his, stated on the form. Out-of-range values are
|
||||||
|
// clamped rather than rejected — a bad select is not worth a 400.
|
||||||
|
if v := r.FormValue("weight"); v != "" {
|
||||||
|
var wgt int
|
||||||
|
if n, _ := fmt.Sscanf(v, "%d", &wgt); n != 1 || wgt < 0 {
|
||||||
|
return "", fmt.Errorf("bad weight %q", v)
|
||||||
|
}
|
||||||
|
if wgt > tasks.MaxWeight {
|
||||||
|
wgt = tasks.MaxWeight
|
||||||
|
}
|
||||||
|
req.Weight = wgt
|
||||||
|
}
|
||||||
|
if d := r.FormValue("due"); d != "" {
|
||||||
|
due, err := time.ParseInLocation("2006-01-02", d, time.Local)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("bad due date %q", d)
|
||||||
|
}
|
||||||
|
req.Due = &due
|
||||||
|
}
|
||||||
|
resp, err := core.CaptureTask(ctx, req)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if !resp.Created {
|
||||||
|
return "already on the list", nil
|
||||||
|
}
|
||||||
|
return "added task", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var id int64
|
||||||
|
if n, _ := fmt.Sscanf(r.FormValue("id"), "%d", &id); n != 1 {
|
||||||
|
return "", errors.New("invalid id")
|
||||||
|
}
|
||||||
|
var status, msg string
|
||||||
|
switch action {
|
||||||
|
case "confirm":
|
||||||
|
status, msg = "open", "confirmed task"
|
||||||
|
case "done":
|
||||||
|
status, msg = "done", "task done"
|
||||||
|
case "drop":
|
||||||
|
status, msg = "dropped", "dropped task"
|
||||||
|
default:
|
||||||
|
return "", fmt.Errorf("unknown action %q", action)
|
||||||
|
}
|
||||||
|
if err := core.SetTaskStatus(ctx, id, status, time.Now()); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return msg, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func fmtTaskTime(t *time.Time) string {
|
||||||
|
if t == nil || t.IsZero() {
|
||||||
|
return "—"
|
||||||
|
}
|
||||||
|
return t.Local().Format("02 Jan 15:04")
|
||||||
|
}
|
||||||
|
|
||||||
|
func fmtTaskDate(t *time.Time) string {
|
||||||
|
if t == nil || t.IsZero() {
|
||||||
|
return "—"
|
||||||
|
}
|
||||||
|
return t.Local().Format("02 Jan")
|
||||||
|
}
|
||||||
|
|
||||||
// routineRow is one line on the page: what maven noticed, in her words, and
|
// routineRow is one line on the page: what maven noticed, in her words, and
|
||||||
// how long ago she noticed it.
|
// how long ago she noticed it.
|
||||||
type routineRow struct {
|
type routineRow struct {
|
||||||
@@ -935,12 +1156,32 @@ func handleMorning(w http.ResponseWriter, r *http.Request, core ipc.CoreAPI) {
|
|||||||
http.Error(w, "core read failed", http.StatusBadGateway)
|
http.Error(w, "core read failed", http.StatusBadGateway)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
view := morningView{Routines: status}
|
||||||
|
// The day plan (#128) shows on this page because it is the same question at
|
||||||
|
// a different scale. A plan read that fails must not take the checklist
|
||||||
|
// down with it — the page degrades to what it had before.
|
||||||
|
plan, err := core.DayPlan(ctx)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("morning: day plan: %v", err)
|
||||||
|
view.PlanErr = err.Error()
|
||||||
|
} else {
|
||||||
|
view.Plan = &plan
|
||||||
|
}
|
||||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||||
if err := morningTmpl.Execute(w, status); err != nil {
|
if err := morningTmpl.Execute(w, view); err != nil {
|
||||||
log.Printf("morning render: %v", err)
|
log.Printf("morning render: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// morningView — what /morning renders: today's plan on top, the checklist
|
||||||
|
// state under it. PlanErr is set instead of Plan when the core could not build
|
||||||
|
// a plan, so the page says so rather than showing an empty day.
|
||||||
|
type morningView struct {
|
||||||
|
Plan *ipc.DayPlan
|
||||||
|
PlanErr string
|
||||||
|
Routines []ipc.MorningRoutineStatus
|
||||||
|
}
|
||||||
|
|
||||||
func handleVoice(w http.ResponseWriter, r *http.Request) {
|
func handleVoice(w http.ResponseWriter, r *http.Request) {
|
||||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||||
if err := voiceTmpl.Execute(w, nil); err != nil {
|
if err := voiceTmpl.Execute(w, nil); err != nil {
|
||||||
@@ -1258,7 +1499,14 @@ func handleChatPage(w http.ResponseWriter, r *http.Request, core ipc.CoreAPI) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// handleChatAPI processes a chat message POST and redirects back to /chat.
|
// handleChatAPI processes a chat message POST and redirects back to /chat.
|
||||||
func handleChatAPI(w http.ResponseWriter, r *http.Request, core ipc.CoreAPI) {
|
//
|
||||||
|
// State-changing, and the widest surface on this server: the text reaches the
|
||||||
|
// router, the LLM, and through mavend's applyAction the whole action path
|
||||||
|
// including `act` — so it is gated on the same step-up as POST /tools and
|
||||||
|
// POST /api/revert (Vikunja #317). With WebAuthn unconfigured the gate is
|
||||||
|
// fail-open exactly like the others (see stepUpOK); with -require-stepup it
|
||||||
|
// denies, which is the point of that flag.
|
||||||
|
func handleChatAPI(w http.ResponseWriter, r *http.Request, core ipc.CoreAPI, session *webauthn.PasskeySession, requireStepUp bool) {
|
||||||
if r.Method != http.MethodPost {
|
if r.Method != http.MethodPost {
|
||||||
http.Error(w, "POST only", http.StatusMethodNotAllowed)
|
http.Error(w, "POST only", http.StatusMethodNotAllowed)
|
||||||
return
|
return
|
||||||
@@ -1267,6 +1515,10 @@ func handleChatAPI(w http.ResponseWriter, r *http.Request, core ipc.CoreAPI) {
|
|||||||
http.Error(w, "chat disabled (no -core)", http.StatusServiceUnavailable)
|
http.Error(w, "chat disabled (no -core)", http.StatusServiceUnavailable)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if !stepUpOK(session, requireStepUp) {
|
||||||
|
http.Error(w, "step-up required: assert a passkey first", http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
text := strings.TrimSpace(r.FormValue("text"))
|
text := strings.TrimSpace(r.FormValue("text"))
|
||||||
if text == "" {
|
if text == "" {
|
||||||
http.Redirect(w, r, "/chat", http.StatusSeeOther)
|
http.Redirect(w, r, "/chat", http.StatusSeeOther)
|
||||||
|
|||||||
+20
-2
@@ -1,9 +1,27 @@
|
|||||||
{{template "shellTop" "morning"}}
|
{{template "shellTop" "morning"}}
|
||||||
|
<h1>Today</h1>
|
||||||
|
{{with .Plan}}
|
||||||
|
<div class=hint>{{.Date.Format "02.01.2006"}}</div>
|
||||||
|
{{if not .Items}}
|
||||||
|
<div class=hint>nothing planned</div>
|
||||||
|
{{else}}
|
||||||
|
<div class=scroll><table class=mono>
|
||||||
|
<tr><th>at<th>kind<th>what</tr>
|
||||||
|
{{range .Items}}<tr>
|
||||||
|
<td>{{.At.Format "15:04"}}</td>
|
||||||
|
<td class=gray>{{.Kind}}</td>
|
||||||
|
<td>{{if .Uncertain}}<span class=hint title="relayed notification, not a calendar read">похоже,</span> {{end}}{{.Text}}</td>
|
||||||
|
</tr>{{end}}
|
||||||
|
</table></div>
|
||||||
|
{{end}}
|
||||||
|
{{end}}
|
||||||
|
{{if .PlanErr}}<div class=hint>plan unavailable: {{.PlanErr}}</div>{{end}}
|
||||||
|
|
||||||
<h1>Morning Routines</h1>
|
<h1>Morning Routines</h1>
|
||||||
{{if not .}}
|
{{if not .Routines}}
|
||||||
<div class=hint>no morning routines configured</div>
|
<div class=hint>no morning routines configured</div>
|
||||||
{{else}}
|
{{else}}
|
||||||
{{range .}}
|
{{range .Routines}}
|
||||||
<div class="mb-4">
|
<div class="mb-4">
|
||||||
<div><strong>{{.Name}}</strong>
|
<div><strong>{{.Name}}</strong>
|
||||||
<span class={{if .Active}}green{{else}}gray{{end}}>{{if .Active}}active now{{else}}outside window{{end}}</span>
|
<span class={{if .Active}}green{{else}}gray{{end}}>{{if .Active}}active now{{else}}outside window{{end}}</span>
|
||||||
|
|||||||
@@ -0,0 +1,83 @@
|
|||||||
|
{{template "shellTop" "tasks"}}
|
||||||
|
<h1>Tasks</h1>
|
||||||
|
{{if .Msg}}<div class="msg msg-ok">{{.Msg}}</div>{{end}}
|
||||||
|
{{if .Err}}<div class="msg msg-err">{{.Err}}</div>{{end}}
|
||||||
|
|
||||||
|
<section class=card>
|
||||||
|
<h2 class=card-title>add</h2>
|
||||||
|
<form method=post action=/tasks class=inline-form>
|
||||||
|
<input type=hidden name=action value=add>
|
||||||
|
<input type=text name=text placeholder="что нужно сделать" size=44 required>
|
||||||
|
<input type=date name=due title="due date (optional)">
|
||||||
|
<select name=weight title="importance (optional)">
|
||||||
|
<option value=0>normal</option>
|
||||||
|
<option value=2>важно</option>
|
||||||
|
<option value=3>срочно</option>
|
||||||
|
</select>
|
||||||
|
<button class=btn>add</button>
|
||||||
|
</form>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
{{if .Candidates}}
|
||||||
|
<section class=card>
|
||||||
|
<h2 class=card-title>found, not confirmed <span class=badge>{{len .Candidates}}</span></h2>
|
||||||
|
<div class=hint>maven derived these from something she read. nothing counts as your work until you confirm it.</div>
|
||||||
|
<div class=scroll><table>
|
||||||
|
<tr><th>task</th><th>where from</th><th>due</th><th>captured</th><th></th><th></th></tr>
|
||||||
|
{{range .Candidates}}<tr>
|
||||||
|
<td class=text-max>{{.Text}}</td>
|
||||||
|
<td class=hint>{{.Source}}{{if .Evidence}} — {{.Evidence}}{{end}}</td>
|
||||||
|
<td>{{.Due}}</td>
|
||||||
|
<td class=muted>{{.Created}}</td>
|
||||||
|
<td><form method=post action=/tasks class=inline-form>
|
||||||
|
<input type=hidden name=id value="{{.ID}}">
|
||||||
|
<input type=hidden name=action value=confirm>
|
||||||
|
<button class=btn>confirm</button></form></td>
|
||||||
|
<td><form method=post action=/tasks class=inline-form>
|
||||||
|
<input type=hidden name=id value="{{.ID}}">
|
||||||
|
<input type=hidden name=action value=drop>
|
||||||
|
<button class="btn btn-muted">drop</button></form></td>
|
||||||
|
</tr>{{end}}</table></div>
|
||||||
|
</section>
|
||||||
|
{{end}}
|
||||||
|
|
||||||
|
<section class=card>
|
||||||
|
<h2 class=card-title>open <span class=badge>{{len .Open}}</span></h2>
|
||||||
|
<div class=hint>most pressing first — by the deadlines and the urgency you gave, nothing guessed.</div>
|
||||||
|
{{if .Open}}<div class=scroll><table>
|
||||||
|
<tr><th>task</th><th>why</th><th>from</th><th>due</th><th>captured</th><th></th><th></th></tr>
|
||||||
|
{{range .Open}}<tr>
|
||||||
|
<td class=text-max>{{.Text}}</td>
|
||||||
|
<td class=hint>{{.Why}}</td>
|
||||||
|
<td class=hint>{{.Source}}</td>
|
||||||
|
<td>{{.Due}}</td>
|
||||||
|
<td class=muted>{{.Created}}</td>
|
||||||
|
<td><form method=post action=/tasks class=inline-form>
|
||||||
|
<input type=hidden name=id value="{{.ID}}">
|
||||||
|
<input type=hidden name=action value=done>
|
||||||
|
<button class=btn>done</button></form></td>
|
||||||
|
<td><form method=post action=/tasks class=inline-form>
|
||||||
|
<input type=hidden name=id value="{{.ID}}">
|
||||||
|
<input type=hidden name=action value=drop>
|
||||||
|
<button class="btn btn-muted">drop</button></form></td>
|
||||||
|
</tr>{{end}}</table></div>
|
||||||
|
{{else}}<div class=empty>
|
||||||
|
<svg class=icon width="20" height="20"><use href="/ethos-icons.svg#i-grid"/></svg>
|
||||||
|
<div>no open tasks</div>
|
||||||
|
<div class=hint>add one above, or tell maven "добавь в задачи …"</div>
|
||||||
|
</div>{{end}}
|
||||||
|
</section>
|
||||||
|
|
||||||
|
{{if .Resolved}}
|
||||||
|
<section class=card>
|
||||||
|
<h2 class=card-title>resolved <span class=badge>{{len .Resolved}}</span></h2>
|
||||||
|
<div class=scroll><table>
|
||||||
|
<tr><th>task</th><th>status</th><th>when</th></tr>
|
||||||
|
{{range .Resolved}}<tr>
|
||||||
|
<td class=text-max>{{.Text}}</td>
|
||||||
|
<td><span class="badge {{.Status}}">{{.Status}}</span></td>
|
||||||
|
<td class=muted>{{.Resolved}}</td>
|
||||||
|
</tr>{{end}}</table></div>
|
||||||
|
</section>
|
||||||
|
{{end}}
|
||||||
|
{{template "shellBottom"}}
|
||||||
@@ -0,0 +1,225 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"net/url"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
"github.com/kami/maven/internal/tasks"
|
||||||
|
)
|
||||||
|
|
||||||
|
// fakeTaskCore serves the /tasks handler: a canned list plus a log of the
|
||||||
|
// writes the page made.
|
||||||
|
type fakeTaskCore struct {
|
||||||
|
ipc.UnimplementedCoreAPI
|
||||||
|
|
||||||
|
tasks []ipc.Task
|
||||||
|
listErr error
|
||||||
|
|
||||||
|
captured []ipc.CaptureTaskReq
|
||||||
|
created bool
|
||||||
|
captureErr error
|
||||||
|
|
||||||
|
statusID int64
|
||||||
|
statusVal string
|
||||||
|
statusErr error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *fakeTaskCore) ListTasks(_ context.Context, status string) ([]ipc.Task, error) {
|
||||||
|
if f.listErr != nil {
|
||||||
|
return nil, f.listErr
|
||||||
|
}
|
||||||
|
return f.tasks, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *fakeTaskCore) CaptureTask(_ context.Context, req ipc.CaptureTaskReq) (ipc.CaptureTaskResp, error) {
|
||||||
|
f.captured = append(f.captured, req)
|
||||||
|
if f.captureErr != nil {
|
||||||
|
return ipc.CaptureTaskResp{}, f.captureErr
|
||||||
|
}
|
||||||
|
return ipc.CaptureTaskResp{ID: 7, Created: f.created}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *fakeTaskCore) SetTaskStatus(_ context.Context, id int64, status string, _ time.Time) error {
|
||||||
|
f.statusID, f.statusVal = id, status
|
||||||
|
return f.statusErr
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHandleTasksSplitsCandidatesFromOpen(t *testing.T) {
|
||||||
|
now := time.Date(2026, 8, 1, 9, 0, 0, 0, time.UTC)
|
||||||
|
resolved := now.Add(time.Hour)
|
||||||
|
core := &fakeTaskCore{tasks: []ipc.Task{
|
||||||
|
{ID: 1, Text: "купить молоко", Source: "tap:voice", Status: "open", CreatedTs: now},
|
||||||
|
{ID: 2, Text: "продлить страховку", Source: "email:kami", Evidence: "полис истекает", Status: "candidate", CreatedTs: now},
|
||||||
|
{ID: 3, Text: "полить цветы", Source: "tap:web", Status: "done", CreatedTs: now, Resolved: &resolved},
|
||||||
|
}}
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
handleTasks(rec, httptest.NewRequest(http.MethodGet, "/tasks", nil), core)
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d", rec.Code)
|
||||||
|
}
|
||||||
|
body := rec.Body.String()
|
||||||
|
for _, want := range []string{
|
||||||
|
"купить молоко", "продлить страховку", "полить цветы",
|
||||||
|
"полис истекает", // the evidence trail is visible for review
|
||||||
|
"found, not confirmed", // candidates get their own section
|
||||||
|
} {
|
||||||
|
if !strings.Contains(body, want) {
|
||||||
|
t.Errorf("body missing %q", want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// The candidate must offer confirm, and the open task must not.
|
||||||
|
if !strings.Contains(body, "value=confirm") {
|
||||||
|
t.Error("candidate row has no confirm action")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHandleTasksAddCaptures(t *testing.T) {
|
||||||
|
core := &fakeTaskCore{created: true}
|
||||||
|
form := url.Values{"action": {"add"}, "text": {" позвонить в банк "}, "due": {"2026-08-05"}}
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/tasks", strings.NewReader(form.Encode()))
|
||||||
|
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
handleTasks(rec, req, core)
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d", rec.Code)
|
||||||
|
}
|
||||||
|
if len(core.captured) != 1 {
|
||||||
|
t.Fatalf("captured %d requests, want 1", len(core.captured))
|
||||||
|
}
|
||||||
|
got := core.captured[0]
|
||||||
|
if got.Text != "позвонить в банк" {
|
||||||
|
t.Errorf("text = %q, want trimmed", got.Text)
|
||||||
|
}
|
||||||
|
if got.Source != "tap:web" {
|
||||||
|
t.Errorf("source = %q, want tap:web", got.Source)
|
||||||
|
}
|
||||||
|
if got.Status != "open" {
|
||||||
|
t.Errorf("status = %q — a task he typed himself is open, not a candidate", got.Status)
|
||||||
|
}
|
||||||
|
if got.Due == nil || got.Due.Format("2006-01-02") != "2026-08-05" {
|
||||||
|
t.Errorf("due = %v", got.Due)
|
||||||
|
}
|
||||||
|
if !strings.Contains(rec.Body.String(), "added task") {
|
||||||
|
t.Error("no confirmation message")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHandleTasksAddSaysAlreadyOnTheList(t *testing.T) {
|
||||||
|
core := &fakeTaskCore{created: false}
|
||||||
|
form := url.Values{"action": {"add"}, "text": {"купить молоко"}}
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/tasks", strings.NewReader(form.Encode()))
|
||||||
|
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
handleTasks(rec, req, core)
|
||||||
|
if !strings.Contains(rec.Body.String(), "already on the list") {
|
||||||
|
t.Error("a deduped capture must not claim it saved something new")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHandleTasksStatusActions(t *testing.T) {
|
||||||
|
for _, tc := range []struct{ action, want string }{
|
||||||
|
{"confirm", "open"},
|
||||||
|
{"done", "done"},
|
||||||
|
{"drop", "dropped"},
|
||||||
|
} {
|
||||||
|
core := &fakeTaskCore{}
|
||||||
|
form := url.Values{"action": {tc.action}, "id": {"42"}}
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/tasks", strings.NewReader(form.Encode()))
|
||||||
|
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||||
|
handleTasks(httptest.NewRecorder(), req, core)
|
||||||
|
if core.statusID != 42 || core.statusVal != tc.want {
|
||||||
|
t.Errorf("%s → SetTaskStatus(%d, %q), want (42, %q)", tc.action, core.statusID, core.statusVal, tc.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHandleTasksRejectsBadPost(t *testing.T) {
|
||||||
|
core := &fakeTaskCore{}
|
||||||
|
form := url.Values{"action": {"explode"}, "id": {"1"}}
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/tasks", strings.NewReader(form.Encode()))
|
||||||
|
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
handleTasks(rec, req, core)
|
||||||
|
// The page still renders, with the error inline — and nothing was written.
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d", rec.Code)
|
||||||
|
}
|
||||||
|
if core.statusVal != "" || len(core.captured) != 0 {
|
||||||
|
t.Error("an unknown action must write nothing")
|
||||||
|
}
|
||||||
|
if !strings.Contains(rec.Body.String(), "unknown action") {
|
||||||
|
t.Error("error not surfaced on the page")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHandleTasksNoCore(t *testing.T) {
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
handleTasks(rec, httptest.NewRequest(http.MethodGet, "/tasks", nil), nil)
|
||||||
|
if rec.Code != http.StatusServiceUnavailable {
|
||||||
|
t.Errorf("status = %d, want 503", rec.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The open list is ordered by the ranker, and the reason is shown so the page
|
||||||
|
// says why a task is first instead of asking him to trust the order.
|
||||||
|
func TestHandleTasksOrdersOpenByRank(t *testing.T) {
|
||||||
|
now := time.Now()
|
||||||
|
due := now
|
||||||
|
core := &fakeTaskCore{tasks: []ipc.Task{
|
||||||
|
{ID: 1, Text: "купить молоко", Status: "open", CreatedTs: now},
|
||||||
|
{ID: 2, Text: "оплатить интернет", Status: "open", CreatedTs: now, Due: &due},
|
||||||
|
}}
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
handleTasks(rec, httptest.NewRequest(http.MethodGet, "/tasks", nil), core)
|
||||||
|
body := rec.Body.String()
|
||||||
|
if strings.Index(body, "оплатить интернет") > strings.Index(body, "купить молоко") {
|
||||||
|
t.Error("want the dated task rendered first")
|
||||||
|
}
|
||||||
|
if !strings.Contains(body, "сегодня") {
|
||||||
|
t.Error("want the ranker's reason shown in the why column")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A candidate is ranked into place but never carries a priority reason: its due
|
||||||
|
// date is Maven's reading of a mail, not something he stated.
|
||||||
|
func TestHandleTasksHidesCandidateReason(t *testing.T) {
|
||||||
|
now := time.Now()
|
||||||
|
due := now
|
||||||
|
core := &fakeTaskCore{tasks: []ipc.Task{
|
||||||
|
{ID: 1, Text: "продлить страховку", Status: "candidate", CreatedTs: now, Due: &due},
|
||||||
|
}}
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
handleTasks(rec, httptest.NewRequest(http.MethodGet, "/tasks", nil), core)
|
||||||
|
if strings.Contains(rec.Body.String(), "сегодня") {
|
||||||
|
t.Error("a candidate must not be shown with a priority reason")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestApplyTaskPostCarriesWeight(t *testing.T) {
|
||||||
|
core := &fakeTaskCore{created: true}
|
||||||
|
form := url.Values{"action": {"add"}, "text": {"оплатить интернет"}, "weight": {"3"}}
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/tasks", strings.NewReader(form.Encode()))
|
||||||
|
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||||
|
handleTasks(httptest.NewRecorder(), req, core)
|
||||||
|
if len(core.captured) != 1 || core.captured[0].Weight != 3 {
|
||||||
|
t.Fatalf("captured = %+v, want weight 3", core.captured)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Out of range clamps rather than 400s; a non-number is a real client error.
|
||||||
|
func TestApplyTaskPostClampsWeight(t *testing.T) {
|
||||||
|
core := &fakeTaskCore{created: true}
|
||||||
|
form := url.Values{"action": {"add"}, "text": {"что-то"}, "weight": {"99"}}
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/tasks", strings.NewReader(form.Encode()))
|
||||||
|
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||||
|
handleTasks(httptest.NewRecorder(), req, core)
|
||||||
|
if core.captured[0].Weight != tasks.MaxWeight {
|
||||||
|
t.Errorf("weight = %d, want the cap", core.captured[0].Weight)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,6 +8,18 @@
|
|||||||
#
|
#
|
||||||
# Maven's own compose joins this same network (add `ecosystem` as an external
|
# Maven's own compose joins this same network (add `ecosystem` as an external
|
||||||
# network there) to reach nexus:9740 / praxis:8989 / hexis:9741 directly.
|
# network there) to reach nexus:9740 / praxis:8989 / hexis:9741 directly.
|
||||||
|
#
|
||||||
|
# NO RELEASE PINNING (Vikunja #354): each `build:` below points at a sibling
|
||||||
|
# WORKING TREE, so `up --build` ships whatever is checked out there, including
|
||||||
|
# uncommitted edits. Before bringing this up, check what you are about to
|
||||||
|
# deploy:
|
||||||
|
#
|
||||||
|
# for r in nexus praxis hexis; do git -C ../../../$r status --short; \
|
||||||
|
# git -C ../../../$r log -1 --oneline; done
|
||||||
|
#
|
||||||
|
# The host nginx that fronts these is deploy/ecosystem/nginx.conf — it binds
|
||||||
|
# the wg and LAN addresses only, with allow/deny. Keep it that way: none of
|
||||||
|
# these containers has auth of its own.
|
||||||
name: ecosystem
|
name: ecosystem
|
||||||
|
|
||||||
services:
|
services:
|
||||||
|
|||||||
@@ -1,13 +1,71 @@
|
|||||||
# Reverse-proxy the three sibling admin UIs. Drop into your nginx sites (or the
|
# Reverse-proxy Maven's own web UI plus the three sibling admin UIs. Drop into
|
||||||
# nginx-panel app) and reload. Assumes the compose publishes each service on
|
# your nginx sites (or the nginx-panel app) and reload. Assumes the compose
|
||||||
# 127.0.0.1:<port>. Add TLS (certbot / your existing cert block) per server.
|
# publishes each service on 127.0.0.1:<port>. Add TLS (certbot / your existing
|
||||||
|
# cert block) per server.
|
||||||
#
|
#
|
||||||
# NOTE: hexis.<domain> previously pointed at the MCP tool — repoint that
|
# NOTE: hexis.<domain> previously pointed at the MCP tool — repoint that
|
||||||
# elsewhere first (the app now owns hexis.*).
|
# elsewhere first (the app now owns hexis.*).
|
||||||
|
#
|
||||||
|
# 10.42.0.1 and 192.168.1.104 below are THIS BOX's WireGuard and LAN
|
||||||
|
# addresses (homesrv) — these admin UIs have no auth of their own, so the
|
||||||
|
# explicit bind + allow/deny below is what keeps them off the open internet.
|
||||||
|
# On a different box, replace both addresses with that box's wg and LAN IPs.
|
||||||
|
# Do NOT "fix" a failed bind by reverting to `listen 80` (all interfaces) —
|
||||||
|
# that removes the only access control these containers have.
|
||||||
|
|
||||||
|
# maven.<domain> → mavweb (docker-compose.yml publishes it on 127.0.0.1:9201).
|
||||||
|
# Same bind + ACL as the siblings, and for a stronger reason: mavweb serves
|
||||||
|
# POST /tools, which defines argv that internal/tool EXECUTES, plus POST
|
||||||
|
# /routines, /api/revert and /api/chat (Vikunja #317). Without
|
||||||
|
# -webauthn-origin/-webauthn-rpid mavweb has no auth of its own, so this block
|
||||||
|
# is the auth. If you add TLS and a basic-auth/oauth2-proxy layer, keep the
|
||||||
|
# allow/deny anyway — belt and braces on an RCE surface.
|
||||||
|
#
|
||||||
|
# WebSocket upgrade matters here: /ws carries push-to-talk audio, so the
|
||||||
|
# Upgrade/Connection headers below are required, not decoration. The map keeps
|
||||||
|
# `Connection: upgrade` off plain requests; it sits in the http context, which
|
||||||
|
# is where sites-available files are included — if your nginx already defines
|
||||||
|
# $connection_upgrade, drop this block.
|
||||||
|
map $http_upgrade $connection_upgrade {
|
||||||
|
default upgrade;
|
||||||
|
'' close;
|
||||||
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 80;
|
listen 10.42.0.1:80;
|
||||||
|
listen 192.168.1.104:80;
|
||||||
|
server_name maven.kvmx.ru;
|
||||||
|
|
||||||
|
allow 10.42.0.0/24;
|
||||||
|
allow 192.168.1.0/24;
|
||||||
|
deny all;
|
||||||
|
|
||||||
|
# push-to-talk uploads raw PCM; the default 1m is enough for a short
|
||||||
|
# utterance but not for a long one.
|
||||||
|
client_max_body_size 32m;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
proxy_pass http://127.0.0.1:9201;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
|
proxy_set_header Connection $connection_upgrade;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_read_timeout 300s; # an LLM turn can take minutes on the iGPU
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 10.42.0.1:80;
|
||||||
|
listen 192.168.1.104:80;
|
||||||
server_name nexus.kvmx.ru;
|
server_name nexus.kvmx.ru;
|
||||||
|
|
||||||
|
allow 10.42.0.0/24;
|
||||||
|
allow 192.168.1.0/24;
|
||||||
|
deny all;
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
proxy_pass http://127.0.0.1:9740;
|
proxy_pass http://127.0.0.1:9740;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
@@ -18,8 +76,14 @@ server {
|
|||||||
}
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 80;
|
listen 10.42.0.1:80;
|
||||||
|
listen 192.168.1.104:80;
|
||||||
server_name praxis.kvmx.ru;
|
server_name praxis.kvmx.ru;
|
||||||
|
|
||||||
|
allow 10.42.0.0/24;
|
||||||
|
allow 192.168.1.0/24;
|
||||||
|
deny all;
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
proxy_pass http://127.0.0.1:8989;
|
proxy_pass http://127.0.0.1:8989;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
@@ -30,8 +94,14 @@ server {
|
|||||||
}
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 80;
|
listen 10.42.0.1:80;
|
||||||
|
listen 192.168.1.104:80;
|
||||||
server_name hexis.kvmx.ru;
|
server_name hexis.kvmx.ru;
|
||||||
|
|
||||||
|
allow 10.42.0.0/24;
|
||||||
|
allow 192.168.1.0/24;
|
||||||
|
deny all;
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
proxy_pass http://127.0.0.1:9741;
|
proxy_pass http://127.0.0.1:9741;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
|
|||||||
@@ -26,6 +26,11 @@
|
|||||||
"severity_ceiling": 2
|
"severity_ceiling": 2
|
||||||
},
|
},
|
||||||
|
|
||||||
|
"pattern_proposals": {
|
||||||
|
"notify": false,
|
||||||
|
"cooldown": "24h"
|
||||||
|
},
|
||||||
|
|
||||||
"nexus": { "url": "http://nexus:9740" },
|
"nexus": { "url": "http://nexus:9740" },
|
||||||
"praxis": { "url": "http://praxis:8989" },
|
"praxis": { "url": "http://praxis:8989" },
|
||||||
"hexis": { "url": "http://hexis:9741" },
|
"hexis": { "url": "http://hexis:9741" },
|
||||||
|
|||||||
@@ -101,9 +101,17 @@ services:
|
|||||||
"-netdata", "http://127.0.0.1:19999",
|
"-netdata", "http://127.0.0.1:19999",
|
||||||
"-kuma", "http://127.0.0.1:3001/metrics",
|
"-kuma", "http://127.0.0.1:3001/metrics",
|
||||||
"-kuma-key", "uk5_mavpoll-key"]
|
"-kuma-key", "uk5_mavpoll-key"]
|
||||||
|
# Money tracking (Vikunja #125) is OFF: it needs a zenmoney token,
|
||||||
|
# which mavpoll reads from a FILE so it never appears in `ps`, in
|
||||||
|
# this file, or in shell history. To enable, mount the token and
|
||||||
|
# append: "-zenmoney-token-file", "/run/secrets/zenmoney.token"
|
||||||
|
# (optionally "-zenmoney-interval", "1h"). Core never sees the
|
||||||
|
# token — the poller writes facts(kind=env, source=poll:zenmoney)
|
||||||
|
# and mavend only reads those back when he asks.
|
||||||
depends_on: [mavend]
|
depends_on: [mavend]
|
||||||
volumes:
|
volumes:
|
||||||
- sockets:/run/maven
|
- sockets:/run/maven
|
||||||
|
# - ./deploy/zenmoney.token:/run/secrets/zenmoney.token:ro
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
dbdata:
|
dbdata:
|
||||||
|
|||||||
@@ -25,3 +25,46 @@
|
|||||||
6. Add `/eval` API method to `ipc.CoreAPI` (or reuse `Chat` with system context) so mavweb can show evaluation history
|
6. Add `/eval` API method to `ipc.CoreAPI` (or reuse `Chat` with system context) so mavweb can show evaluation history
|
||||||
7. Add `memory_eval` block to `deploy/mavend.json`
|
7. Add `memory_eval` block to `deploy/mavend.json`
|
||||||
8. Test with synthetic store state — verify observations match expected patterns
|
8. Test with synthetic store state — verify observations match expected patterns
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Status 2026-08-01 — foundation shipped (Vikunja #248)
|
||||||
|
|
||||||
|
**Shipped:** `internal/memeval` (not `internal/memory/eval.go` — `internal/store`
|
||||||
|
imports `internal/memory` for the vector backend, so an evaluator that reads
|
||||||
|
`store.Fact` there would close an import cycle). `Evaluator.Evaluate` reads
|
||||||
|
`RecentFacts` / `RecentNotes` / `RecentNudges`, prompts the resident model under
|
||||||
|
a GBNF grammar for at most three `{observation, confidence, suggested_action}`
|
||||||
|
objects, drops anything under `min_confidence`, deduplicates against what earlier
|
||||||
|
evaluations wrote, and records the rest as notes with source `infer:memory-eval`.
|
||||||
|
Driver: `cmd/mavend/memoryeval.go`, its own goroutine on its own ticker. Config:
|
||||||
|
the `memory_eval` block — **absent ⇒ the loop does not run**. Visibility: `/dash`
|
||||||
|
already renders notes with their source, so evaluation output is visible with no
|
||||||
|
UI change.
|
||||||
|
|
||||||
|
**Deliberately not shipped — this is policy, not an unfinished edge:**
|
||||||
|
|
||||||
|
- *Dispatching observations as care nudges (plan step 4).* An hourly LLM loop
|
||||||
|
with permission to speak is a machine for generating interruptions, and the
|
||||||
|
content is model-generated text about his own life. The evaluator has no
|
||||||
|
dispatcher reference at all, so it cannot reach a channel by accident. Wiring
|
||||||
|
it to `delivery.Dispatcher` is a separate decision with its own opt-in.
|
||||||
|
- *Acting on `suggested_action`.* It is recorded inside the note text and
|
||||||
|
interpreted by nobody. No reminder, routine or fact is created.
|
||||||
|
- *Writing observation embeddings.* Notes are written with a nil embedding, so
|
||||||
|
they stay out of the RAG recall pool. Feeding generated text back into the pool
|
||||||
|
it came from is how a small model starts citing its own guesses as evidence.
|
||||||
|
|
||||||
|
**Deferred, wants a decision or another capability:**
|
||||||
|
|
||||||
|
- *Plan step 6, the `/eval` IPC method and an evaluation-history view.* `/dash`
|
||||||
|
covers reading the output; a dedicated trace surface is worth building once
|
||||||
|
there is real output to look at, and it should probably show the prompt too.
|
||||||
|
- *`RecentEvents`.* The plan lists it; the evaluator reads facts, notes and
|
||||||
|
nudges. Detected action/object events already drive pattern proposals (#43), and
|
||||||
|
duplicating them here would mostly re-derive that.
|
||||||
|
- *Output quality is unmeasured.* There is no fixture for "did she notice
|
||||||
|
something true". The tests cover the machinery — empty store, confidence floor,
|
||||||
|
dedupe, own-notes exclusion, error handling — not the observations. Until
|
||||||
|
someone reads a week of real output on `/dash`, treat the wording and the
|
||||||
|
`min_confidence` default as unvalidated.
|
||||||
|
|||||||
@@ -27,3 +27,36 @@
|
|||||||
6. Wire voice query — `"что я обычно делаю?"` routes to `IntentQuery` → behavior profile lookup → LLM-phrased answer
|
6. Wire voice query — `"что я обычно делаю?"` routes to `IntentQuery` → behavior profile lookup → LLM-phrased answer
|
||||||
7. Add IPC read method `MethodGetBehaviorProfile` so mavweb can display it on `/dash`
|
7. Add IPC read method `MethodGetBehaviorProfile` so mavweb can display it on `/dash`
|
||||||
8. Test with synthetic fact history — verify weekly schedule is correctly inferred
|
8. Test with synthetic fact history — verify weekly schedule is correctly inferred
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Status (2026-08-01) — partially shipped, deliberately narrowed
|
||||||
|
|
||||||
|
Shipped on `overnight/behavior-profile`:
|
||||||
|
|
||||||
|
- `internal/memory/behavior.go` — `BuildProfile` counts habits per weekday out of
|
||||||
|
self-facts: distinct-day counts (`MinHabitDays = 2`), a median time-of-day, and
|
||||||
|
`FormatWeekdayRU` / `FormatOverallRU` for the spoken answer.
|
||||||
|
- `internal/router/habit.go` — `ParseHabitQuery`, which requires a habit marker
|
||||||
|
("обычно", "каждую", "привычки", …) and parses the weekday deterministically.
|
||||||
|
- `cmd/mavend/actions_query.go` — a `habits` query source, so "что я обычно делаю
|
||||||
|
по вторникам?" is answered.
|
||||||
|
|
||||||
|
**Not shipped, and not to be shipped as written:**
|
||||||
|
|
||||||
|
- *Step 3, LLM-generated profile stored as a fact.* The profile is COUNTED, not
|
||||||
|
generated. A 1.7B asked to summarise a year of habits produces fluent claims
|
||||||
|
about the owner's life that no row supports, and a wrong claim about him is the
|
||||||
|
most expensive kind of wrong maven can be. Counting is verifiable and cheap.
|
||||||
|
- *Step 5, incremental updates on fact write.* There is no cache to keep fresh —
|
||||||
|
the profile is recomputed on the question, so a new fact is already in the next
|
||||||
|
answer. A cached profile that can disagree with its own rows is two truths.
|
||||||
|
- *Step 4, proactive daily plan proposals via the dispatcher.* Maven is not a nag,
|
||||||
|
and a nudge at 08:00 every day proposing the day is the definition of one. The
|
||||||
|
sanctioned path from "she noticed a pattern" to "she acts on it" already exists:
|
||||||
|
`internal/pattern/detector.go` proposes a routine, and the owner accepts it on
|
||||||
|
`/routines`. It goes through him.
|
||||||
|
|
||||||
|
Still open, if wanted later: `MethodGetBehaviorProfile` + a `/dash` panel (step 7).
|
||||||
|
The counted profile needs no new IPC method to be *asked* about — the query source
|
||||||
|
reads `RecentFacts` over the existing surface — so this is a display concern only.
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/kami/maven/internal/ipc"
|
"github.com/kami/maven/internal/ipc"
|
||||||
)
|
)
|
||||||
@@ -359,8 +358,12 @@ func TestGate_IpcServer_ChatAllowedForEnrolledCaller(t *testing.T) {
|
|||||||
|
|
||||||
// recordingAPI — a no-op CoreAPI that counts WriteFact invocations; the auth
|
// recordingAPI — a no-op CoreAPI that counts WriteFact invocations; the auth
|
||||||
// check must reject before reaching it, otherwise the refusal leaks into the
|
// check must reject before reaching it, otherwise the refusal leaks into the
|
||||||
// fake's counts and we fail.
|
// fake's counts and we fail. Embeds ipc.UnimplementedCoreAPI so every method
|
||||||
|
// this test doesn't exercise returns ipc.ErrNotImplemented loudly instead of
|
||||||
|
// being hand-stubbed to a canned value nobody checks.
|
||||||
type recordingAPI struct {
|
type recordingAPI struct {
|
||||||
|
ipc.UnimplementedCoreAPI
|
||||||
|
|
||||||
writes int
|
writes int
|
||||||
chats int
|
chats int
|
||||||
}
|
}
|
||||||
@@ -369,89 +372,7 @@ func (r *recordingAPI) WriteFact(_ context.Context, _ ipc.WriteFactReq) (int64,
|
|||||||
r.writes++
|
r.writes++
|
||||||
return int64(r.writes), nil
|
return int64(r.writes), nil
|
||||||
}
|
}
|
||||||
func (r *recordingAPI) LatestFact(_ context.Context, _ string) (ipc.Fact, error) {
|
|
||||||
return ipc.Fact{}, ipc.ErrNoFact
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) LatestFactBySource(_ context.Context, _, _ string) (ipc.Fact, error) {
|
|
||||||
return ipc.Fact{}, ipc.ErrNoFact
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) Since(_ context.Context, _ string, _ time.Time) (time.Duration, error) {
|
|
||||||
return 0, ipc.ErrNoFact
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) Presence(_ context.Context) (ipc.Presence, error) {
|
|
||||||
return ipc.Presence{}, nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) CreateReminder(_ context.Context, _ time.Time, _, _ string) (int64, error) {
|
|
||||||
return 1, nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) MarkReminder(_ context.Context, _ int64, _ string) error { return nil }
|
|
||||||
func (r *recordingAPI) ListReminders(_ context.Context, _ int) ([]ipc.Reminder, error) {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) TickTrace(_ context.Context) (ipc.TickTrace, error) {
|
|
||||||
return ipc.TickTrace{}, nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) MorningStatus(_ context.Context) ([]ipc.MorningRoutineStatus, error) {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) RecordNudge(_ context.Context, _, _, _ string, _ time.Time) (int64, error) {
|
|
||||||
return 1, nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) ResolveNudge(_ context.Context, _ int64, _ string, _ time.Time) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) RecentOutcomes(_ context.Context, _ string, _ int) ([]string, error) {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) RecentFacts(_ context.Context, _ int) ([]ipc.Fact, error) {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) CalendarEvents(_ context.Context, _, _ time.Time) ([]ipc.Fact, error) {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) RecentNudges(_ context.Context, _ int) ([]ipc.Nudge, error) {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) WriteNote(_ context.Context, _ time.Time, _ string, _ []float32, _ string) (int64, error) {
|
|
||||||
return 1, nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) QueryNotes(_ context.Context, _ []float32, _ int) ([]ipc.Note, error) {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) RecentNotes(_ context.Context, _ int) ([]ipc.Note, error) {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) ProposeTool(_ context.Context, _, _, _ string, _ time.Time) (bool, error) {
|
|
||||||
return false, nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) EnableTool(_ context.Context, _ string, _ []string, _ bool, _ string, _ time.Time) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) DisableTool(_ context.Context, _ string) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) DeleteTool(_ context.Context, _ string) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) LookupTool(_ context.Context, _ string) (ipc.Tool, error) {
|
|
||||||
return ipc.Tool{}, ipc.ErrToolNotFound
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) ListTools(_ context.Context, _ string) ([]ipc.Tool, error) {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *recordingAPI) RevertFact(_ context.Context, _ string) (int64, error) {
|
|
||||||
return 0, nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) ListProposedRoutines(_ context.Context) ([]ipc.ProposedRoutine, error) {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) AcceptProposedRoutine(_ context.Context, _ int64) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) DismissProposedRoutine(_ context.Context, _ int64) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
func (r *recordingAPI) Chat(_ context.Context, text string) (string, error) {
|
func (r *recordingAPI) Chat(_ context.Context, text string) (string, error) {
|
||||||
r.chats++
|
r.chats++
|
||||||
return "echo: " + text, nil
|
return "echo: " + text, nil
|
||||||
|
|||||||
+15
-1
@@ -65,7 +65,21 @@ func Requirement(m ipc.Method) Authority {
|
|||||||
ipc.MethodCreateReminder,
|
ipc.MethodCreateReminder,
|
||||||
ipc.MethodMarkReminder,
|
ipc.MethodMarkReminder,
|
||||||
ipc.MethodRecordNudge,
|
ipc.MethodRecordNudge,
|
||||||
ipc.MethodResolveNudge:
|
ipc.MethodResolveNudge,
|
||||||
|
// Task capture (Vikunja #130). Listed explicitly rather than left to
|
||||||
|
// the default so the intent is on the record: capturing a task is a
|
||||||
|
// module write, not an allowlist mutation and not a new standing reason
|
||||||
|
// for Maven to speak — nothing in the tick loop reads tasks. It stays
|
||||||
|
// at AuthRead, the same rung as CreateReminder, which is the closest
|
||||||
|
// existing analogue.
|
||||||
|
ipc.MethodCaptureTask,
|
||||||
|
ipc.MethodListTasks,
|
||||||
|
ipc.MethodSetTaskStatus,
|
||||||
|
// Mail ingestion (Vikunja #246). AuthRead because of what the method can
|
||||||
|
// produce: candidate tasks and nothing else. It cannot write a fact, set a
|
||||||
|
// reminder, or touch the tool allowlist, so a compromised mail reader can
|
||||||
|
// at worst put junk on a review page he clears in one click.
|
||||||
|
ipc.MethodIngestMail:
|
||||||
return AuthRead
|
return AuthRead
|
||||||
}
|
}
|
||||||
// Unknown method ⇒ AuthRead, but ipc.dispatch returns ErrUnknownMethod
|
// Unknown method ⇒ AuthRead, but ipc.dispatch returns ErrUnknownMethod
|
||||||
|
|||||||
@@ -0,0 +1,221 @@
|
|||||||
|
package calendar
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
"unicode"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Ambient events — the work calendar read (Vikunja #126).
|
||||||
|
//
|
||||||
|
// The work calendar is not read by holding a work credential. A corp mail or
|
||||||
|
// calendar session living on the homelab ties the box's blast radius to the
|
||||||
|
// employer's data, which is the thing the task exists to refuse. What maven
|
||||||
|
// reads instead is the SIGNAL: an Android notification-listener on the owner's
|
||||||
|
// phone relays meeting notifications over wg/LAN, and maven turns the ones that
|
||||||
|
// clearly describe a meeting into calendar events.
|
||||||
|
//
|
||||||
|
// That makes the provenance honest. A notification is evidence about an event,
|
||||||
|
// not a reading of the calendar, so it is stored under SourceAmbient at
|
||||||
|
// AmbientConfidence — never indistinguishable from a real CalDAV read, and the
|
||||||
|
// query path hedges when it recites one.
|
||||||
|
//
|
||||||
|
// The parse is deliberately conservative. A notification with no recognisable
|
||||||
|
// clock reading produces nothing at all: maven is not a guesser-of-truth, and a
|
||||||
|
// mailbox full of noise turned into invented events is worse than a gap. Mail
|
||||||
|
// as a notification signal, not a mailbox.
|
||||||
|
|
||||||
|
// Notification — one relayed Android notification. Package is the posting app
|
||||||
|
// (for the log and for the owner to see where a wrong event came from), Title
|
||||||
|
// and Text are the notification's two text lines, Posted is when the phone
|
||||||
|
// showed it. Nothing else off the notification is kept.
|
||||||
|
type Notification struct {
|
||||||
|
Package string `json:"package"`
|
||||||
|
Title string `json:"title"`
|
||||||
|
Text string `json:"text"`
|
||||||
|
Posted time.Time `json:"posted_at"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// EventFromNotification turns a notification into the event it describes, or
|
||||||
|
// reports false when it does not clearly describe one.
|
||||||
|
//
|
||||||
|
// It needs two things: a clock reading, and a summary that is not just that
|
||||||
|
// clock reading. Everything else is defaulted — the date is Posted's day (a
|
||||||
|
// meeting notification is about today or it would not be firing now), and a
|
||||||
|
// bare start time gets DefaultReminderDuration.
|
||||||
|
func EventFromNotification(n Notification) (Event, bool) {
|
||||||
|
if n.Posted.IsZero() {
|
||||||
|
return Event{}, false
|
||||||
|
}
|
||||||
|
line := strings.TrimSpace(n.Title + " " + n.Text)
|
||||||
|
start, end, ok := parseTimeRange(line)
|
||||||
|
if !ok {
|
||||||
|
return Event{}, false
|
||||||
|
}
|
||||||
|
summary := notificationSummary(n)
|
||||||
|
if summary == "" {
|
||||||
|
return Event{}, false
|
||||||
|
}
|
||||||
|
|
||||||
|
y, m, d := n.Posted.Date()
|
||||||
|
loc := n.Posted.Location()
|
||||||
|
s := time.Date(y, m, d, start.hour, start.min, 0, 0, loc)
|
||||||
|
var e time.Time
|
||||||
|
if end != nil {
|
||||||
|
e = time.Date(y, m, d, end.hour, end.min, 0, 0, loc)
|
||||||
|
// A range that ends before it starts crossed midnight.
|
||||||
|
if !e.After(s) {
|
||||||
|
e = e.AddDate(0, 0, 1)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
e = s.Add(DefaultReminderDuration)
|
||||||
|
}
|
||||||
|
return Event{Summary: summary, Start: s, End: e}, true
|
||||||
|
}
|
||||||
|
|
||||||
|
// notificationSummary picks the text that names the meeting: the title when it
|
||||||
|
// carries words, otherwise the body. The clock reading is stripped out — it
|
||||||
|
// already lives in the times, and FactValue renders it again.
|
||||||
|
func notificationSummary(n Notification) string {
|
||||||
|
for _, cand := range []string{n.Title, n.Text} {
|
||||||
|
s := strings.TrimSpace(stripClock(cand))
|
||||||
|
s = strings.Trim(s, " \t-–—,;:@|·")
|
||||||
|
s = strings.Join(strings.Fields(s), " ")
|
||||||
|
if hasLetters(s) {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
type clock struct{ hour, min int }
|
||||||
|
|
||||||
|
// parseTimeRange finds the first clock reading in s, and a second one if the
|
||||||
|
// text spells a range. Accepted separators between hours and minutes are ":"
|
||||||
|
// and "."; between the two ends of a range, "-", "–", "—" or "до".
|
||||||
|
//
|
||||||
|
// Bare hours ("в 14") are NOT accepted. Loose digits in a notification are far
|
||||||
|
// more often a count, a date or an unread badge than a meeting time, and an
|
||||||
|
// invented event is worse than no event.
|
||||||
|
func parseTimeRange(s string) (start clock, end *clock, ok bool) {
|
||||||
|
first, _, firstEnd, ok := nextClock(s, 0)
|
||||||
|
if !ok {
|
||||||
|
return clock{}, nil, false
|
||||||
|
}
|
||||||
|
sep := strings.TrimLeft(s[firstEnd:], " \t")
|
||||||
|
for _, p := range []string{"-", "–", "—", "до "} {
|
||||||
|
if !strings.HasPrefix(sep, p) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if second, _, _, ok2 := nextClock(strings.TrimPrefix(sep, p), 0); ok2 {
|
||||||
|
return first, &second, true
|
||||||
|
}
|
||||||
|
break
|
||||||
|
}
|
||||||
|
return first, nil, true
|
||||||
|
}
|
||||||
|
|
||||||
|
// nextClock scans s from byte offset `from` for the first HH:MM (or HH.MM) and
|
||||||
|
// returns it with the byte range it occupied. Digits and separators are ASCII,
|
||||||
|
// so byte offsets are safe over Cyrillic text.
|
||||||
|
func nextClock(s string, from int) (c clock, start, end int, ok bool) {
|
||||||
|
for i := from; i < len(s); i++ {
|
||||||
|
if !isDigit(s[i]) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
j := i
|
||||||
|
for j < len(s) && isDigit(s[j]) {
|
||||||
|
j++
|
||||||
|
}
|
||||||
|
// A run longer than two digits is a year, an id or an unread count.
|
||||||
|
if j-i > 2 {
|
||||||
|
i = j
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if j >= len(s) || (s[j] != ':' && s[j] != '.') {
|
||||||
|
i = j
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
k := j + 1
|
||||||
|
for k < len(s) && isDigit(s[k]) {
|
||||||
|
k++
|
||||||
|
}
|
||||||
|
if k-(j+1) != 2 {
|
||||||
|
i = j
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// Reject a group that is a link in a longer dotted or colon chain:
|
||||||
|
// "2026.08.15" would otherwise offer "08.15" as 08:15, and a deadline
|
||||||
|
// date invented as a meeting time is exactly the wrong kind of guess.
|
||||||
|
// A trailing ":ss" is fine — that is a time with seconds.
|
||||||
|
if i > 0 && (s[i-1] == '.' || s[i-1] == ':' || isDigit(s[i-1])) {
|
||||||
|
i = k
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if k < len(s) && s[k] == '.' && k+1 < len(s) && isDigit(s[k+1]) {
|
||||||
|
i = k
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
hour, min := atoi(s[i:j]), atoi(s[j+1:k])
|
||||||
|
if hour > 23 || min > 59 {
|
||||||
|
i = k
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
return clock{hour, min}, i, k, true
|
||||||
|
}
|
||||||
|
return clock{}, 0, 0, false
|
||||||
|
}
|
||||||
|
|
||||||
|
func isDigit(b byte) bool { return b >= '0' && b <= '9' }
|
||||||
|
|
||||||
|
func atoi(s string) int {
|
||||||
|
n := 0
|
||||||
|
for i := 0; i < len(s); i++ {
|
||||||
|
n = n*10 + int(s[i]-'0')
|
||||||
|
}
|
||||||
|
return n
|
||||||
|
}
|
||||||
|
|
||||||
|
// stripClock removes every clock reading from a summary candidate, along with
|
||||||
|
// the preposition or separator that introduced it.
|
||||||
|
func stripClock(s string) string {
|
||||||
|
for {
|
||||||
|
_, start, end, ok := nextClock(s, 0)
|
||||||
|
if !ok {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
head := trimTrailingPreposition(strings.TrimRight(s[:start], "0123456789:.-–— \t"))
|
||||||
|
s = strings.TrimSpace(strings.TrimSpace(head) + " " + strings.TrimSpace(s[end:]))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// trimTrailingPreposition drops the word that introduced a clock reading, so
|
||||||
|
// "Встреча в 14:00" becomes "Встреча" and "с 11:30 до 12:15 Созвон" does not
|
||||||
|
// keep a dangling "с". It repeats, because a range has two of them.
|
||||||
|
func trimTrailingPreposition(s string) string {
|
||||||
|
preps := []string{"в", "с", "до", "от", "at", "from", "to"}
|
||||||
|
for again := true; again; {
|
||||||
|
again = false
|
||||||
|
s = strings.TrimRight(s, " \t")
|
||||||
|
for _, p := range preps {
|
||||||
|
if s == p {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if strings.HasSuffix(s, " "+p) {
|
||||||
|
s = s[:len(s)-len(p)-1]
|
||||||
|
again = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
||||||
|
func hasLetters(s string) bool {
|
||||||
|
for _, r := range s {
|
||||||
|
if unicode.IsLetter(r) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
@@ -0,0 +1,148 @@
|
|||||||
|
package calendar
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestEventFromNotification(t *testing.T) {
|
||||||
|
posted := time.Date(2026, 8, 3, 9, 40, 0, 0, time.FixedZone("+04", 4*3600))
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
title, text string
|
||||||
|
wantOK bool
|
||||||
|
wantSummary string
|
||||||
|
wantStart string // "15:04"
|
||||||
|
wantEnd string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "range in the body",
|
||||||
|
title: "Планёрка",
|
||||||
|
text: "10:00-10:30",
|
||||||
|
wantOK: true,
|
||||||
|
wantSummary: "Планёрка",
|
||||||
|
wantStart: "10:00", wantEnd: "10:30",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "russian preposition and single time",
|
||||||
|
title: "Встреча с подрядчиком в 14:00",
|
||||||
|
wantOK: true,
|
||||||
|
wantSummary: "Встреча с подрядчиком",
|
||||||
|
wantStart: "14:00", wantEnd: "14:30",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "en dash range",
|
||||||
|
title: "Sprint review",
|
||||||
|
text: "Today 16:00 – 17:00, Meet",
|
||||||
|
wantOK: true,
|
||||||
|
wantSummary: "Sprint review",
|
||||||
|
wantStart: "16:00", wantEnd: "17:00",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "до as a range separator",
|
||||||
|
title: "Созвон",
|
||||||
|
text: "с 11:30 до 12:15",
|
||||||
|
wantOK: true,
|
||||||
|
wantSummary: "Созвон",
|
||||||
|
wantStart: "11:30", wantEnd: "12:15",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "dotted clock",
|
||||||
|
title: "Обед 13.00",
|
||||||
|
wantOK: true,
|
||||||
|
wantSummary: "Обед",
|
||||||
|
wantStart: "13:00", wantEnd: "13:30",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "range crossing midnight",
|
||||||
|
title: "Ночной релиз",
|
||||||
|
text: "23:30-00:30",
|
||||||
|
wantOK: true,
|
||||||
|
wantSummary: "Ночной релиз",
|
||||||
|
wantStart: "23:30", wantEnd: "00:30",
|
||||||
|
},
|
||||||
|
// The conservative half: no clock reading, no event.
|
||||||
|
{name: "no time at all", title: "3 новых письма", wantOK: false},
|
||||||
|
{name: "bare hour is not a time", title: "Планёрка в 14", wantOK: false},
|
||||||
|
{name: "unread count", title: "Входящие", text: "12 непрочитанных", wantOK: false},
|
||||||
|
{name: "a date is not a clock", title: "Отчёт", text: "срок 2026.08.15", wantOK: false},
|
||||||
|
{name: "time but nothing named", title: "10:00-10:30", wantOK: false},
|
||||||
|
{name: "impossible clock", title: "Смена 99:99", wantOK: false},
|
||||||
|
{name: "empty", wantOK: false},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
ev, ok := EventFromNotification(Notification{
|
||||||
|
Package: "com.google.android.gm",
|
||||||
|
Title: tt.title,
|
||||||
|
Text: tt.text,
|
||||||
|
Posted: posted,
|
||||||
|
})
|
||||||
|
if ok != tt.wantOK {
|
||||||
|
t.Fatalf("ok = %v, want %v (event %+v)", ok, tt.wantOK, ev)
|
||||||
|
}
|
||||||
|
if !ok {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if ev.Summary != tt.wantSummary {
|
||||||
|
t.Errorf("summary = %q, want %q", ev.Summary, tt.wantSummary)
|
||||||
|
}
|
||||||
|
if got := ev.Start.Format("15:04"); got != tt.wantStart {
|
||||||
|
t.Errorf("start = %s, want %s", got, tt.wantStart)
|
||||||
|
}
|
||||||
|
if got := ev.End.Format("15:04"); got != tt.wantEnd {
|
||||||
|
t.Errorf("end = %s, want %s", got, tt.wantEnd)
|
||||||
|
}
|
||||||
|
if !ev.End.After(ev.Start) {
|
||||||
|
t.Errorf("end %v must be after start %v", ev.End, ev.Start)
|
||||||
|
}
|
||||||
|
// The event lands on the day the phone showed it, in the phone's
|
||||||
|
// location — not shifted into UTC.
|
||||||
|
if ev.Start.Location() != posted.Location() {
|
||||||
|
t.Errorf("location = %v, want %v", ev.Start.Location(), posted.Location())
|
||||||
|
}
|
||||||
|
if y, m, d := ev.Start.Date(); y != 2026 || m != time.August || d != 3 {
|
||||||
|
t.Errorf("date = %d-%02d-%02d, want 2026-08-03", y, m, d)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestEventFromNotificationNeedsPostedAt(t *testing.T) {
|
||||||
|
if _, ok := EventFromNotification(Notification{Title: "Планёрка 10:00"}); ok {
|
||||||
|
t.Error("a notification with no posted_at has no date to sit on")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// An ambient event must never be indistinguishable from a calendar read.
|
||||||
|
func TestAmbientEventsAreStoredAtReducedConfidence(t *testing.T) {
|
||||||
|
ev, ok := EventFromNotification(Notification{
|
||||||
|
Title: "Планёрка 10:00-10:30",
|
||||||
|
Posted: time.Date(2026, 8, 3, 9, 0, 0, 0, time.UTC),
|
||||||
|
})
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("expected an event")
|
||||||
|
}
|
||||||
|
if FactKey(ev) == "" || FactValue(ev) == "" {
|
||||||
|
t.Fatal("ambient events must use the shared fact encoding")
|
||||||
|
}
|
||||||
|
if AmbientConfidence >= 1.0 {
|
||||||
|
t.Fatal("ambient confidence must be below a calendar read's")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestStripClock(t *testing.T) {
|
||||||
|
tests := []struct{ in, want string }{
|
||||||
|
{"Встреча в 14:00", "Встреча"},
|
||||||
|
{"Планёрка 10:00-10:30", "Планёрка"},
|
||||||
|
{"с 11:30 до 12:15 Созвон", "Созвон"},
|
||||||
|
{"Ничего", "Ничего"},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
if got := stripClock(tt.in); got != tt.want {
|
||||||
|
t.Errorf("stripClock(%q) = %q, want %q", tt.in, got, tt.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,129 @@
|
|||||||
|
// Package calendar is the one calendar data model the rest of maven shares:
|
||||||
|
// an Event, the iCal text it is parsed from and rendered to, and the fact
|
||||||
|
// encoding that puts it in the store.
|
||||||
|
//
|
||||||
|
// It exists because three separate features read or write the same events and
|
||||||
|
// must agree on their shape: the CalDAV read side (cmd/mavcaldav, Vikunja
|
||||||
|
// #126/#127), the write-only render target that publishes maven's own
|
||||||
|
// reminders as a calendar (#127), and the day plan that recites them (#128).
|
||||||
|
// Before this package the parse lived inline in cmd/mavcaldav and the fact key
|
||||||
|
// format was a Sprintf in two places.
|
||||||
|
//
|
||||||
|
// The package is pure: no HTTP, no store, no clock of its own. Callers own the
|
||||||
|
// impurity, the way internal/morning and internal/loop do.
|
||||||
|
package calendar
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Fact sources. A calendar event reaches the store as a
|
||||||
|
// `facts (kind=env, key=calendar_event_..., source=<one of these>)` row, and
|
||||||
|
// the source is the whole provenance story:
|
||||||
|
//
|
||||||
|
// - SourcePersonal — maven's own Radicale, read AND rendered to. Canonical
|
||||||
|
// state stays in sqlite; the calendar is a render target (#127).
|
||||||
|
// - SourceWork — a work calendar, read-only by definition (#126). Nothing in
|
||||||
|
// maven ever writes to it: no code path pairs this source with a PUT.
|
||||||
|
// - SourceAmbient — inferred from an Android notification-listener relay
|
||||||
|
// rather than read from a server (#126). Confidence is below 1.0 because a
|
||||||
|
// notification is a signal about an event, not the event.
|
||||||
|
const (
|
||||||
|
SourcePersonal = "poll:caldav"
|
||||||
|
SourceWork = "poll:caldav:work"
|
||||||
|
SourceAmbient = "ambient:notif"
|
||||||
|
)
|
||||||
|
|
||||||
|
// AmbientConfidence — the confidence a notification-derived event is stored
|
||||||
|
// with. A parsed notification line is evidence, not a reading of the calendar,
|
||||||
|
// so it must never be indistinguishable from one (#126).
|
||||||
|
const AmbientConfidence = 0.6
|
||||||
|
|
||||||
|
// Sources lists every source a calendar event may legitimately carry, for the
|
||||||
|
// store query that reads the calendar back out. Ordered from most to least
|
||||||
|
// trusted.
|
||||||
|
func Sources() []string {
|
||||||
|
return []string{SourcePersonal, SourceWork, SourceAmbient}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReadOnlySource reports whether events from this source may never be written
|
||||||
|
// back. The work calendar is read-only by definition — see #126: maven holding
|
||||||
|
// a credential that can write to an employer's calendar is the thing the task
|
||||||
|
// exists to avoid.
|
||||||
|
func ReadOnlySource(source string) bool {
|
||||||
|
return source == SourceWork || source == SourceAmbient
|
||||||
|
}
|
||||||
|
|
||||||
|
// Event — one calendar entry. UID is the iCal UID when the event was parsed
|
||||||
|
// from a server and the identity maven renders under when it publishes one;
|
||||||
|
// Start/End are instants. All-day events are not modelled: the busy gate and
|
||||||
|
// the day plan both need a time of day, and an all-day marker answers neither.
|
||||||
|
type Event struct {
|
||||||
|
UID string
|
||||||
|
Summary string
|
||||||
|
Start time.Time
|
||||||
|
End time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
// FactKey is the store key for an event: one key per day per summary, stable
|
||||||
|
// across polls so re-reading an unchanged calendar rewrites nothing.
|
||||||
|
//
|
||||||
|
// The date prefix is load-bearing — store.CalendarEvents selects a day range
|
||||||
|
// by key prefix, not by a timestamp column.
|
||||||
|
func FactKey(e Event) string {
|
||||||
|
return fmt.Sprintf("calendar_event_%s_%s", e.Start.Format("20060102"), safeKey(e.Summary))
|
||||||
|
}
|
||||||
|
|
||||||
|
// FactValue is the human-readable rendering stored as the fact value, and the
|
||||||
|
// string the day plan and the query path read back.
|
||||||
|
func FactValue(e Event) string {
|
||||||
|
return fmt.Sprintf("%s @ %s-%s", e.Summary, e.Start.Format("15:04"), e.End.Format("15:04"))
|
||||||
|
}
|
||||||
|
|
||||||
|
// KeyPrefixForDay is the fact-key prefix covering one calendar day. The store
|
||||||
|
// range-scans between two of these.
|
||||||
|
func KeyPrefixForDay(day time.Time) string {
|
||||||
|
return fmt.Sprintf("calendar_event_%s", day.Format("20060102"))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Busy reports whether any event covers the instant now — the read the loop
|
||||||
|
// gate uses to suppress nudges during a meeting.
|
||||||
|
func Busy(events []Event, now time.Time) bool {
|
||||||
|
for _, e := range events {
|
||||||
|
if !now.Before(e.Start) && now.Before(e.End) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// Overlapping returns the events intersecting [from, to), sorted by start.
|
||||||
|
func Overlapping(events []Event, from, to time.Time) []Event {
|
||||||
|
var out []Event
|
||||||
|
for _, e := range events {
|
||||||
|
if e.End.After(from) && e.Start.Before(to) {
|
||||||
|
out = append(out, e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sort.Slice(out, func(i, j int) bool { return out[i].Start.Before(out[j].Start) })
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// safeKey makes a summary safe to use inside a fact key (ASCII alphanumerics
|
||||||
|
// and dashes). Non-Latin summaries collapse to their punctuation, which is why
|
||||||
|
// the day prefix carries the identity and this only disambiguates within a day.
|
||||||
|
func safeKey(s string) string {
|
||||||
|
var b strings.Builder
|
||||||
|
for _, r := range s {
|
||||||
|
switch {
|
||||||
|
case (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') || (r >= '0' && r <= '9') || r == '-':
|
||||||
|
b.WriteRune(r)
|
||||||
|
case r == ' ' || r == '_':
|
||||||
|
b.WriteRune('-')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return b.String()
|
||||||
|
}
|
||||||
@@ -0,0 +1,202 @@
|
|||||||
|
package calendar
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestParseICalDayKeepsOnlyToday(t *testing.T) {
|
||||||
|
now := time.Date(2026, 7, 3, 12, 0, 0, 0, time.UTC)
|
||||||
|
|
||||||
|
body := []byte(`BEGIN:VCALENDAR
|
||||||
|
BEGIN:VEVENT
|
||||||
|
UID:a@example
|
||||||
|
DTSTART:20260703T090000Z
|
||||||
|
DTEND:20260703T100000Z
|
||||||
|
SUMMARY:Morning standup
|
||||||
|
END:VEVENT
|
||||||
|
BEGIN:VEVENT
|
||||||
|
DTSTART:20260703T140000Z
|
||||||
|
DTEND:20260703T150000Z
|
||||||
|
SUMMARY:Team sync
|
||||||
|
END:VEVENT
|
||||||
|
BEGIN:VEVENT
|
||||||
|
DTSTART:20260702T140000Z
|
||||||
|
DTEND:20260702T150000Z
|
||||||
|
SUMMARY:Yesterday retro
|
||||||
|
END:VEVENT
|
||||||
|
BEGIN:VEVENT
|
||||||
|
DTSTART:20260704T090000Z
|
||||||
|
DTEND:20260704T100000Z
|
||||||
|
SUMMARY:Tomorrow standup
|
||||||
|
END:VEVENT
|
||||||
|
BEGIN:VEVENT
|
||||||
|
DTSTART;VALUE=DATE:20260704
|
||||||
|
DTEND;VALUE=DATE:20260705
|
||||||
|
SUMMARY:All-day event
|
||||||
|
END:VEVENT
|
||||||
|
END:VCALENDAR`)
|
||||||
|
|
||||||
|
events := ParseICalDay(body, now)
|
||||||
|
if len(events) != 2 {
|
||||||
|
t.Fatalf("got %d events, want 2 (today only, no all-day/past/future)", len(events))
|
||||||
|
}
|
||||||
|
if events[0].Summary != "Morning standup" || events[0].UID != "a@example" {
|
||||||
|
t.Errorf("events[0] = %+v", events[0])
|
||||||
|
}
|
||||||
|
if !events[0].Start.Equal(time.Date(2026, 7, 3, 9, 0, 0, 0, time.UTC)) {
|
||||||
|
t.Errorf("events[0].Start = %v", events[0].Start)
|
||||||
|
}
|
||||||
|
if !events[0].End.Equal(time.Date(2026, 7, 3, 10, 0, 0, 0, time.UTC)) {
|
||||||
|
t.Errorf("events[0].End = %v", events[0].End)
|
||||||
|
}
|
||||||
|
if events[1].Summary != "Team sync" {
|
||||||
|
t.Errorf("events[1].Summary = %q", events[1].Summary)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Regression: "today" is the owner's day, in the owner's location. Taking the
|
||||||
|
// day number off a local clock but building the boundaries in UTC made the
|
||||||
|
// evening fall outside the window on any box east of Greenwich.
|
||||||
|
func TestParseICalDayUsesOwnersDay(t *testing.T) {
|
||||||
|
plus4 := time.FixedZone("+04", 4*60*60)
|
||||||
|
// 01:00 on Aug 1 local is 21:00 on Jul 31 UTC.
|
||||||
|
now := time.Date(2026, 8, 1, 1, 0, 0, 0, plus4)
|
||||||
|
body := []byte("BEGIN:VCALENDAR\nBEGIN:VEVENT\n" +
|
||||||
|
"DTSTART:20260731T195406Z\nDTEND:20260731T235406Z\nSUMMARY:Current meeting\n" +
|
||||||
|
"END:VEVENT\nEND:VCALENDAR")
|
||||||
|
|
||||||
|
events := ParseICalDay(body, now)
|
||||||
|
if len(events) != 1 {
|
||||||
|
t.Fatalf("got %d events, want the in-progress one", len(events))
|
||||||
|
}
|
||||||
|
if !Busy(events, now.UTC()) {
|
||||||
|
t.Error("an event in progress right now must read as busy")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseVEVENT(t *testing.T) {
|
||||||
|
block := "DTSTART;TZID=Europe/Moscow:20260703T130000\nDTEND:20260703T140000Z\nSUMMARY:Stand up meeting"
|
||||||
|
e, ok := parseVEVENT(block)
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("expected a parsed event")
|
||||||
|
}
|
||||||
|
if !e.Start.Equal(time.Date(2026, 7, 3, 13, 0, 0, 0, time.UTC)) {
|
||||||
|
t.Errorf("start = %v", e.Start)
|
||||||
|
}
|
||||||
|
if !e.End.Equal(time.Date(2026, 7, 3, 14, 0, 0, 0, time.UTC)) {
|
||||||
|
t.Errorf("end = %v", e.End)
|
||||||
|
}
|
||||||
|
if e.Summary != "Stand up meeting" {
|
||||||
|
t.Errorf("summary = %q", e.Summary)
|
||||||
|
}
|
||||||
|
|
||||||
|
allDay := "DTSTART;VALUE=DATE:20260703\nDTEND;VALUE=DATE:20260704\nSUMMARY:All-day"
|
||||||
|
if _, ok := parseVEVENT(allDay); ok {
|
||||||
|
t.Error("all-day event should be rejected")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseDT(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
line string
|
||||||
|
want time.Time
|
||||||
|
wantOK bool
|
||||||
|
}{
|
||||||
|
{"UTC", "DTEND:20260703T100000Z", time.Date(2026, 7, 3, 10, 0, 0, 0, time.UTC), true},
|
||||||
|
{"local", "DTSTART;TZID=Europe/Moscow:20260703T130000", time.Date(2026, 7, 3, 13, 0, 0, 0, time.UTC), true},
|
||||||
|
{"all-day", "DTSTART;VALUE=DATE:20260703", time.Time{}, false},
|
||||||
|
{"garbage", "DTSTART:garbage", time.Time{}, false},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
got, ok := parseDT(tt.line)
|
||||||
|
if ok != tt.wantOK {
|
||||||
|
t.Errorf("ok = %v, want %v", ok, tt.wantOK)
|
||||||
|
}
|
||||||
|
if !got.Equal(tt.want) {
|
||||||
|
t.Errorf("got %v, want %v", got, tt.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSafeKey(t *testing.T) {
|
||||||
|
tests := []struct{ in, want string }{
|
||||||
|
{"Stand up meeting", "Stand-up-meeting"},
|
||||||
|
{"Hello_World", "Hello-World"},
|
||||||
|
{"special@#$chars!!", "specialchars"},
|
||||||
|
{"ALL_CAPS_123", "ALL-CAPS-123"},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
if got := safeKey(tt.in); got != tt.want {
|
||||||
|
t.Errorf("safeKey(%q) = %q, want %q", tt.in, got, tt.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFactKeyAndValue(t *testing.T) {
|
||||||
|
e := Event{
|
||||||
|
Summary: "Team sync",
|
||||||
|
Start: time.Date(2026, 7, 3, 14, 0, 0, 0, time.UTC),
|
||||||
|
End: time.Date(2026, 7, 3, 15, 0, 0, 0, time.UTC),
|
||||||
|
}
|
||||||
|
if got, want := FactKey(e), "calendar_event_20260703_Team-sync"; got != want {
|
||||||
|
t.Errorf("FactKey = %q, want %q", got, want)
|
||||||
|
}
|
||||||
|
if got, want := FactValue(e), "Team sync @ 14:00-15:00"; got != want {
|
||||||
|
t.Errorf("FactValue = %q, want %q", got, want)
|
||||||
|
}
|
||||||
|
if got, want := KeyPrefixForDay(e.Start), "calendar_event_20260703"; got != want {
|
||||||
|
t.Errorf("KeyPrefixForDay = %q, want %q", got, want)
|
||||||
|
}
|
||||||
|
if !strings.HasPrefix(FactKey(e), KeyPrefixForDay(e.Start)) {
|
||||||
|
t.Error("FactKey must start with the day prefix the store range-scans on")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestBusyAndOverlapping(t *testing.T) {
|
||||||
|
base := time.Date(2026, 7, 3, 0, 0, 0, 0, time.UTC)
|
||||||
|
events := []Event{
|
||||||
|
{Summary: "late", Start: base.Add(15 * time.Hour), End: base.Add(16 * time.Hour)},
|
||||||
|
{Summary: "early", Start: base.Add(9 * time.Hour), End: base.Add(10 * time.Hour)},
|
||||||
|
}
|
||||||
|
if !Busy(events, base.Add(9*time.Hour+30*time.Minute)) {
|
||||||
|
t.Error("should be busy inside the early event")
|
||||||
|
}
|
||||||
|
if Busy(events, base.Add(12*time.Hour)) {
|
||||||
|
t.Error("should be free at noon")
|
||||||
|
}
|
||||||
|
// Half-open: the end instant is free.
|
||||||
|
if Busy(events, base.Add(10*time.Hour)) {
|
||||||
|
t.Error("the end instant should not count as busy")
|
||||||
|
}
|
||||||
|
got := Overlapping(events, base.Add(8*time.Hour), base.Add(11*time.Hour))
|
||||||
|
if len(got) != 1 || got[0].Summary != "early" {
|
||||||
|
t.Fatalf("Overlapping = %+v", got)
|
||||||
|
}
|
||||||
|
all := Overlapping(events, base, base.AddDate(0, 0, 1))
|
||||||
|
if len(all) != 2 || all[0].Summary != "early" {
|
||||||
|
t.Fatalf("Overlapping must sort by start: %+v", all)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSourceTrust(t *testing.T) {
|
||||||
|
if ReadOnlySource(SourcePersonal) {
|
||||||
|
t.Error("the personal calendar is the one maven may render to")
|
||||||
|
}
|
||||||
|
if !ReadOnlySource(SourceWork) {
|
||||||
|
t.Error("the work calendar must be read-only")
|
||||||
|
}
|
||||||
|
if !ReadOnlySource(SourceAmbient) {
|
||||||
|
t.Error("an ambient notification is not a writable calendar")
|
||||||
|
}
|
||||||
|
if AmbientConfidence >= 1.0 {
|
||||||
|
t.Error("ambient events must be less trusted than a calendar read")
|
||||||
|
}
|
||||||
|
if len(Sources()) != 3 {
|
||||||
|
t.Errorf("Sources() = %v", Sources())
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,145 @@
|
|||||||
|
package calendar
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ParseICal scans iCal text for VEVENT components and returns the events
|
||||||
|
// overlapping [from, to). All-day events are skipped: parseDT reports no time
|
||||||
|
// for a VALUE=DATE value, and an event with no clock reading answers neither
|
||||||
|
// the busy gate nor the day plan.
|
||||||
|
func ParseICal(body []byte, from, to time.Time) []Event {
|
||||||
|
var events []Event
|
||||||
|
text := string(body)
|
||||||
|
for {
|
||||||
|
i := strings.Index(text, "BEGIN:VEVENT")
|
||||||
|
if i < 0 {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
text = text[i+len("BEGIN:VEVENT"):]
|
||||||
|
j := strings.Index(text, "END:VEVENT")
|
||||||
|
if j < 0 {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
block := text[:j]
|
||||||
|
text = text[j+len("END:VEVENT"):]
|
||||||
|
|
||||||
|
e, ok := parseVEVENT(block)
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if e.End.After(from) && e.Start.Before(to) {
|
||||||
|
events = append(events, e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return events
|
||||||
|
}
|
||||||
|
|
||||||
|
// ParseICalDay is ParseICal over the calendar day containing now, in now's own
|
||||||
|
// location — the window cmd/mavcaldav polls.
|
||||||
|
//
|
||||||
|
// The location matters. The old inline version took the day number off a local
|
||||||
|
// clock reading but built the boundaries in UTC, so east of Greenwich the
|
||||||
|
// window was shifted by the offset and part of the evening fell outside
|
||||||
|
// "today": on a +04 box after 20:00 UTC the poller saw an empty calendar. The
|
||||||
|
// owner's day is the day the day plan and the busy gate mean.
|
||||||
|
func ParseICalDay(body []byte, now time.Time) []Event {
|
||||||
|
y, m, d := now.Date()
|
||||||
|
start := time.Date(y, m, d, 0, 0, 0, 0, now.Location())
|
||||||
|
return ParseICal(body, start, start.AddDate(0, 0, 1))
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseVEVENT extracts UID, start, end and summary from a VEVENT block.
|
||||||
|
// Reports false for all-day events and parse failures.
|
||||||
|
func parseVEVENT(block string) (Event, bool) {
|
||||||
|
var e Event
|
||||||
|
for _, line := range strings.Split(block, "\n") {
|
||||||
|
line = strings.TrimSpace(line)
|
||||||
|
switch {
|
||||||
|
case strings.HasPrefix(line, "DTSTART"):
|
||||||
|
if t, ok := parseDT(line); ok {
|
||||||
|
e.Start = t
|
||||||
|
}
|
||||||
|
case strings.HasPrefix(line, "DTEND"):
|
||||||
|
if t, ok := parseDT(line); ok {
|
||||||
|
e.End = t
|
||||||
|
}
|
||||||
|
case strings.HasPrefix(line, "SUMMARY"):
|
||||||
|
e.Summary = afterColon(line)
|
||||||
|
case strings.HasPrefix(line, "UID"):
|
||||||
|
e.UID = afterColon(line)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if e.Start.IsZero() || e.End.IsZero() {
|
||||||
|
return Event{}, false
|
||||||
|
}
|
||||||
|
return e, true
|
||||||
|
}
|
||||||
|
|
||||||
|
func afterColon(line string) string {
|
||||||
|
if i := strings.Index(line, ":"); i >= 0 {
|
||||||
|
return strings.TrimSpace(line[i+1:])
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseDT parses a DTSTART/DTEND value:
|
||||||
|
//
|
||||||
|
// - UTC: DTEND:20260703T100000Z
|
||||||
|
// - Local: DTSTART;TZID=Europe/Moscow:20260703T130000
|
||||||
|
// - All-day: DTSTART;VALUE=DATE:20260703 (rejected)
|
||||||
|
//
|
||||||
|
// A local time is read as UTC, the behaviour cmd/mavcaldav has always had: the
|
||||||
|
// CalDAV server and the poller run in the same timezone, and the busy gate only
|
||||||
|
// needs busy/not-busy to be right.
|
||||||
|
func parseDT(line string) (time.Time, bool) {
|
||||||
|
if strings.Contains(line, "VALUE=DATE:") {
|
||||||
|
return time.Time{}, false
|
||||||
|
}
|
||||||
|
i := strings.LastIndex(line, ":")
|
||||||
|
if i < 0 {
|
||||||
|
return time.Time{}, false
|
||||||
|
}
|
||||||
|
val := strings.TrimSuffix(strings.TrimSpace(line[i+1:]), "Z")
|
||||||
|
t, err := time.Parse("20060102T150405", val)
|
||||||
|
if err != nil {
|
||||||
|
return time.Time{}, false
|
||||||
|
}
|
||||||
|
return t.UTC(), true
|
||||||
|
}
|
||||||
|
|
||||||
|
// RenderICal wraps events in a VCALENDAR body suitable for PUTting to a CalDAV
|
||||||
|
// collection. One event per file is the CalDAV convention, so callers normally
|
||||||
|
// pass a single event.
|
||||||
|
//
|
||||||
|
// This is the write half of #127 and it only ever renders: the canonical state
|
||||||
|
// is sqlite, the calendar is a view of it. Nothing reads a rendered file back.
|
||||||
|
func RenderICal(events []Event) string {
|
||||||
|
var b strings.Builder
|
||||||
|
b.WriteString("BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//maven//local calendar//RU\r\n")
|
||||||
|
for _, e := range events {
|
||||||
|
b.WriteString("BEGIN:VEVENT\r\n")
|
||||||
|
fmt.Fprintf(&b, "UID:%s\r\n", escapeText(e.UID))
|
||||||
|
fmt.Fprintf(&b, "DTSTAMP:%s\r\n", e.Start.UTC().Format("20060102T150405Z"))
|
||||||
|
fmt.Fprintf(&b, "DTSTART:%s\r\n", e.Start.UTC().Format("20060102T150405Z"))
|
||||||
|
fmt.Fprintf(&b, "DTEND:%s\r\n", e.End.UTC().Format("20060102T150405Z"))
|
||||||
|
fmt.Fprintf(&b, "SUMMARY:%s\r\n", escapeText(e.Summary))
|
||||||
|
b.WriteString("END:VEVENT\r\n")
|
||||||
|
}
|
||||||
|
b.WriteString("END:VCALENDAR\r\n")
|
||||||
|
return b.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
// escapeText applies RFC 5545 TEXT escaping and strips the line breaks that
|
||||||
|
// would otherwise let a reminder payload inject iCal properties.
|
||||||
|
func escapeText(s string) string {
|
||||||
|
s = strings.ReplaceAll(s, "\\", "\\\\")
|
||||||
|
s = strings.ReplaceAll(s, ";", "\\;")
|
||||||
|
s = strings.ReplaceAll(s, ",", "\\,")
|
||||||
|
s = strings.ReplaceAll(s, "\r\n", "\\n")
|
||||||
|
s = strings.ReplaceAll(s, "\n", "\\n")
|
||||||
|
s = strings.ReplaceAll(s, "\r", "\\n")
|
||||||
|
return s
|
||||||
|
}
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
package calendar
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestRenderICalRoundTrips(t *testing.T) {
|
||||||
|
e := ReminderEvent(7, time.Date(2026, 8, 1, 18, 30, 0, 0, time.UTC), "позвонить маме", 0)
|
||||||
|
if e.UID != "maven-reminder-7" {
|
||||||
|
t.Errorf("UID = %q", e.UID)
|
||||||
|
}
|
||||||
|
if got := e.End.Sub(e.Start); got != DefaultReminderDuration {
|
||||||
|
t.Errorf("duration = %v, want %v", got, DefaultReminderDuration)
|
||||||
|
}
|
||||||
|
if got, want := ReminderPath(7), "maven-reminder-7.ics"; got != want {
|
||||||
|
t.Errorf("ReminderPath = %q, want %q", got, want)
|
||||||
|
}
|
||||||
|
|
||||||
|
body := RenderICal([]Event{e})
|
||||||
|
if !strings.HasPrefix(body, "BEGIN:VCALENDAR\r\n") || !strings.HasSuffix(body, "END:VCALENDAR\r\n") {
|
||||||
|
t.Fatalf("not a VCALENDAR body:\n%s", body)
|
||||||
|
}
|
||||||
|
|
||||||
|
back := ParseICal([]byte(body), e.Start.Add(-time.Hour), e.Start.Add(time.Hour))
|
||||||
|
if len(back) != 1 {
|
||||||
|
t.Fatalf("got %d events back, want 1:\n%s", len(back), body)
|
||||||
|
}
|
||||||
|
if back[0].UID != e.UID || back[0].Summary != e.Summary {
|
||||||
|
t.Errorf("round trip lost identity: %+v", back[0])
|
||||||
|
}
|
||||||
|
if !back[0].Start.Equal(e.Start) || !back[0].End.Equal(e.End) {
|
||||||
|
t.Errorf("round trip lost times: %+v", back[0])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRenderICalIsDeterministic(t *testing.T) {
|
||||||
|
e := ReminderEvent(1, time.Date(2026, 8, 1, 9, 0, 0, 0, time.UTC), "выпить воды", 0)
|
||||||
|
if RenderICal([]Event{e}) != RenderICal([]Event{e}) {
|
||||||
|
t.Error("the same reminder must render byte-identically, or every poll re-PUTs it")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A reminder payload is owner-supplied text. It must not be able to close the
|
||||||
|
// VEVENT and inject properties of its own.
|
||||||
|
func TestRenderICalEscapesInjection(t *testing.T) {
|
||||||
|
e := ReminderEvent(2, time.Date(2026, 8, 1, 9, 0, 0, 0, time.UTC),
|
||||||
|
"обед\r\nEND:VEVENT\r\nBEGIN:VEVENT\r\nSUMMARY:injected", 0)
|
||||||
|
body := RenderICal([]Event{e})
|
||||||
|
// Count line-initial occurrences: the escaped text still contains the
|
||||||
|
// characters "BEGIN:VEVENT", it just can no longer start a line.
|
||||||
|
if n := strings.Count(body, "\r\nBEGIN:VEVENT\r\n"); n != 1 {
|
||||||
|
t.Fatalf("payload injected a second VEVENT (%d):\n%s", n, body)
|
||||||
|
}
|
||||||
|
if n := strings.Count(body, "\r\nEND:VEVENT\r\n"); n != 1 {
|
||||||
|
t.Fatalf("payload closed the VEVENT early (%d):\n%s", n, body)
|
||||||
|
}
|
||||||
|
if !strings.Contains(body, `SUMMARY:обед\nEND:VEVENT`) {
|
||||||
|
t.Errorf("newlines should be escaped, not dropped:\n%s", body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestReminderEventEmptyPayload(t *testing.T) {
|
||||||
|
e := ReminderEvent(3, time.Date(2026, 8, 1, 9, 0, 0, 0, time.UTC), " ", 0)
|
||||||
|
if e.Summary != "напоминание" {
|
||||||
|
t.Errorf("Summary = %q, want the neutral RU fallback", e.Summary)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
package calendar
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ReminderUIDPrefix namespaces every event maven publishes. Two reasons it is a
|
||||||
|
// fixed prefix and not a random UUID: the render is idempotent (the same
|
||||||
|
// reminder always lands on the same UID, so re-rendering overwrites instead of
|
||||||
|
// duplicating), and everything maven owns in the target collection is
|
||||||
|
// identifiable at a glance — she never touches a file she did not create.
|
||||||
|
const ReminderUIDPrefix = "maven-reminder-"
|
||||||
|
|
||||||
|
// DefaultReminderDuration — how long a rendered reminder occupies. A reminder
|
||||||
|
// is an instant, a calendar entry is a span, so one has to be invented; 30
|
||||||
|
// minutes reads as a block in a calendar app without swallowing the afternoon.
|
||||||
|
const DefaultReminderDuration = 30 * time.Minute
|
||||||
|
|
||||||
|
// ReminderEvent maps a reminder to the event that represents it. id and fire
|
||||||
|
// come from the store; payload is the RU text as the owner said it, rendered
|
||||||
|
// verbatim as the summary — the calendar is a view of sqlite, not a place to
|
||||||
|
// rephrase.
|
||||||
|
func ReminderEvent(id int64, fire time.Time, payload string, dur time.Duration) Event {
|
||||||
|
if dur <= 0 {
|
||||||
|
dur = DefaultReminderDuration
|
||||||
|
}
|
||||||
|
summary := strings.TrimSpace(payload)
|
||||||
|
if summary == "" {
|
||||||
|
summary = "напоминание"
|
||||||
|
}
|
||||||
|
return Event{
|
||||||
|
UID: fmt.Sprintf("%s%d", ReminderUIDPrefix, id),
|
||||||
|
Summary: summary,
|
||||||
|
Start: fire,
|
||||||
|
End: fire.Add(dur),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReminderPath is the collection-relative filename for a rendered reminder.
|
||||||
|
// One event per resource, per the CalDAV convention.
|
||||||
|
func ReminderPath(id int64) string {
|
||||||
|
return fmt.Sprintf("%s%d.ics", ReminderUIDPrefix, id)
|
||||||
|
}
|
||||||
@@ -140,6 +140,22 @@ type Config struct {
|
|||||||
// item. See internal/morning for the evaluation engine. Empty ⇒ disabled.
|
// item. See internal/morning for the evaluation engine. Empty ⇒ disabled.
|
||||||
MorningRoutines []MorningRoutineConfig `json:"morning_routines,omitempty"`
|
MorningRoutines []MorningRoutineConfig `json:"morning_routines,omitempty"`
|
||||||
|
|
||||||
|
// PatternProposals — whether a routine the digestion tick inferred on its
|
||||||
|
// own may be announced, and how often. nil / absent ⇒ silent detection
|
||||||
|
// only: proposals are written for /routines and never announced. See
|
||||||
|
// PatternProposalConfig.
|
||||||
|
PatternProposals *PatternProposalConfig `json:"pattern_proposals,omitempty"`
|
||||||
|
|
||||||
|
// MemoryEval — background memory evaluation (internal/memeval). nil /
|
||||||
|
// absent ⇒ no evaluation loop at all. See MemoryEvalConfig.
|
||||||
|
MemoryEval *MemoryEvalConfig `json:"memory_eval,omitempty"`
|
||||||
|
|
||||||
|
// Email — mail ingestion (Vikunja #246). nil / absent ⇒ core refuses
|
||||||
|
// ipc.MethodIngestMail outright, so a mail reader cannot make Maven read a
|
||||||
|
// mailbox by merely existing. See EmailConfig; the IMAP host and credential
|
||||||
|
// live in the reader (cmd/mavmaild), never here.
|
||||||
|
Email *EmailConfig `json:"email,omitempty"`
|
||||||
|
|
||||||
// Praxis — the ecosystem attention-state service. When configured, maven
|
// Praxis — the ecosystem attention-state service. When configured, maven
|
||||||
// calls the Praxis HTTP tools API for attention listing and item lifecycle.
|
// calls the Praxis HTTP tools API for attention listing and item lifecycle.
|
||||||
// Maven never touches Praxis's database directly (ecosystem invariant: no
|
// Maven never touches Praxis's database directly (ecosystem invariant: no
|
||||||
@@ -352,6 +368,82 @@ type DigestConfig struct {
|
|||||||
SeverityCeiling int `json:"severity_ceiling,omitempty"` // max sev batched
|
SeverityCeiling int `json:"severity_ceiling,omitempty"` // max sev batched
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// PatternProposalConfig — announcement policy for routines the digestion tick
|
||||||
|
// inferred by itself (Vikunja #247, #43).
|
||||||
|
//
|
||||||
|
// Detection is always on and always silent by default: the tick writes a
|
||||||
|
// proposed_routines row and the /routines page shows it. Notify is what turns
|
||||||
|
// "she noticed" into "she said something", and it is OFF unless configured —
|
||||||
|
// Maven is not a nag and not autonomous, so a behaviour that speaks without
|
||||||
|
// being asked has to be switched on deliberately, like weather and telegram.
|
||||||
|
//
|
||||||
|
// When Notify is on, the announcement is still heavily restrained:
|
||||||
|
// - at most one proposal per tick, however many were detected;
|
||||||
|
// - at most one per Cooldown across all pairs (not per pair), so a batch of
|
||||||
|
// freshly-detected patterns cannot turn into a queue of interruptions;
|
||||||
|
// - through the ordinary care-class gate (quiet hours / away / snooze), at
|
||||||
|
// sev1 — the lowest severity there is. A proposal is the least urgent
|
||||||
|
// thing Maven can say.
|
||||||
|
//
|
||||||
|
// A pair is only ever announced once, because it is only ever proposed once:
|
||||||
|
// proposed_routines is UNIQUE(action, object) and the row survives dismissal.
|
||||||
|
type PatternProposalConfig struct {
|
||||||
|
// Notify — announce newly inferred routines. Default false.
|
||||||
|
Notify bool `json:"notify,omitempty"`
|
||||||
|
|
||||||
|
// Cooldown — minimum spacing between two proposal announcements. 0 ⇒
|
||||||
|
// DefaultProposalCooldown (24h).
|
||||||
|
Cooldown Duration `json:"cooldown,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// AnnounceProposals reports whether inferred routines may be announced. Safe
|
||||||
|
// on a nil receiver — an absent config block means silent detection.
|
||||||
|
func (p *PatternProposalConfig) AnnounceProposals() bool {
|
||||||
|
return p != nil && p.Notify
|
||||||
|
}
|
||||||
|
|
||||||
|
// MemoryEvalConfig — the background memory-evaluation loop (Vikunja #248).
|
||||||
|
// Absent ⇒ off, like every other capability that costs something the owner did
|
||||||
|
// not ask for. Each evaluation is a full LLM round-trip on the one resident
|
||||||
|
// model, which is the same model answering him; running it hourly by default
|
||||||
|
// would put a multi-second stall in front of an occasional voice turn for a
|
||||||
|
// feature he may not want.
|
||||||
|
//
|
||||||
|
// The loop only ever writes notes (source infer:memory-eval, visible on
|
||||||
|
// /dash). It cannot speak — see internal/memeval.
|
||||||
|
type MemoryEvalConfig struct {
|
||||||
|
// Interval — how often to evaluate. 0 ⇒ DefaultMemoryEvalInterval.
|
||||||
|
Interval Duration `json:"interval,omitempty"`
|
||||||
|
|
||||||
|
// MaxItems — recent facts / notes / nudges fed into one evaluation.
|
||||||
|
// 0 ⇒ memeval.DefaultMaxItems.
|
||||||
|
MaxItems int `json:"max_items,omitempty"`
|
||||||
|
|
||||||
|
// MinConfidence — observations the model scores below this are dropped.
|
||||||
|
// 0 ⇒ memeval.DefaultMinConfidence.
|
||||||
|
MinConfidence float64 `json:"min_confidence,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// EmailConfig — core's half of the email reader: how many task candidates one
|
||||||
|
// message may produce, and how long the extraction call may take.
|
||||||
|
//
|
||||||
|
// There is deliberately nothing about a mailbox here. Core does not connect to
|
||||||
|
// IMAP, does not know an account exists, and holds no mail credential — the
|
||||||
|
// reader daemon does, the same split mavpoll uses for the zenmoney token. This
|
||||||
|
// block only says "extraction is allowed, with these bounds".
|
||||||
|
type EmailConfig struct {
|
||||||
|
// MaxTasks — candidates per message. 0 ⇒ email.MaxCandidates (3).
|
||||||
|
MaxTasks int `json:"max_tasks,omitempty"`
|
||||||
|
|
||||||
|
// Timeout — per-message extraction budget. 0 ⇒ DefaultEmailTimeout. This is
|
||||||
|
// a Thinking model reading a mail; nobody is waiting on the answer, but a
|
||||||
|
// hung llama-server must not pin the reader's connection forever.
|
||||||
|
Timeout Duration `json:"timeout,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// DefaultEmailTimeout — extraction budget per message.
|
||||||
|
const DefaultEmailTimeout = 2 * time.Minute
|
||||||
|
|
||||||
// PhraserConfig — the LLM-backed phraser seam. The daemon spawns llama-server
|
// PhraserConfig — the LLM-backed phraser seam. The daemon spawns llama-server
|
||||||
// as a managed subprocess and sends chat-completion requests to phrase nudge
|
// as a managed subprocess and sends chat-completion requests to phrase nudge
|
||||||
// and reminder messages. nil ⇒ the template-based Stub is used instead.
|
// and reminder messages. nil ⇒ the template-based Stub is used instead.
|
||||||
@@ -448,6 +540,15 @@ const (
|
|||||||
DefaultLLMRouter = true
|
DefaultLLMRouter = true
|
||||||
|
|
||||||
DefaultFactEnrichmentInterval = 30 * time.Second
|
DefaultFactEnrichmentInterval = 30 * time.Second
|
||||||
|
|
||||||
|
// DefaultProposalCooldown — one inferred-routine announcement per day at
|
||||||
|
// most. A proposal is never urgent; if two patterns surface in the same
|
||||||
|
// hour, the second one waits, and the /routines page has it either way.
|
||||||
|
DefaultProposalCooldown = 24 * time.Hour
|
||||||
|
|
||||||
|
// DefaultMemoryEvalInterval — the plan's cadence (1h) for the memory
|
||||||
|
// evaluation loop, applied only when the block is present at all.
|
||||||
|
DefaultMemoryEvalInterval = time.Hour
|
||||||
)
|
)
|
||||||
|
|
||||||
// Load reads the JSON config at path and applies defaults. A missing file is
|
// Load reads the JSON config at path and applies defaults. A missing file is
|
||||||
@@ -520,6 +621,24 @@ func (c *Config) applyDefaults() {
|
|||||||
c.Digest.SeverityCeiling = 2
|
c.Digest.SeverityCeiling = 2
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Absent block stays nil (⇒ silent detection). Present-but-partial gets the
|
||||||
|
// cooldown default, so `{"notify": true}` is enough to switch it on.
|
||||||
|
if c.PatternProposals != nil && c.PatternProposals.Cooldown <= 0 {
|
||||||
|
c.PatternProposals.Cooldown = Duration(DefaultProposalCooldown)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Same rule: absent stays nil (⇒ no evaluation loop), present gets defaults
|
||||||
|
// so `{}` is a valid "on with the plan's cadence".
|
||||||
|
if c.MemoryEval != nil && c.MemoryEval.Interval <= 0 {
|
||||||
|
c.MemoryEval.Interval = Duration(DefaultMemoryEvalInterval)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Same rule again: absent stays nil (⇒ mail ingestion refused), present gets
|
||||||
|
// the timeout default so `{}` is a valid "on with the defaults".
|
||||||
|
if c.Email != nil && c.Email.Timeout <= 0 {
|
||||||
|
c.Email.Timeout = Duration(DefaultEmailTimeout)
|
||||||
|
}
|
||||||
|
|
||||||
if c.Voice != nil {
|
if c.Voice != nil {
|
||||||
if c.Voice.RouterThreshold <= 0 {
|
if c.Voice.RouterThreshold <= 0 {
|
||||||
c.Voice.RouterThreshold = DefaultRouterThreshold
|
c.Voice.RouterThreshold = DefaultRouterThreshold
|
||||||
|
|||||||
@@ -243,3 +243,53 @@ func TestDurationRoundTrip(t *testing.T) {
|
|||||||
t.Errorf("round-trip = %v, want %v", d2, d)
|
t.Errorf("round-trip = %v, want %v", d2, d)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Both new opt-in capabilities follow the same rule: absent block ⇒ nil ⇒ the
|
||||||
|
// behaviour does not exist. Presence is the enable act, so a bare `{}` block is
|
||||||
|
// valid and gets the defaults filled in.
|
||||||
|
func TestOptInBlocksAbsentStayNil(t *testing.T) {
|
||||||
|
c, err := Load(writeConfig(t, `{}`))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Load: %v", err)
|
||||||
|
}
|
||||||
|
if c.PatternProposals != nil {
|
||||||
|
t.Errorf("pattern_proposals absent but got %+v", c.PatternProposals)
|
||||||
|
}
|
||||||
|
if c.PatternProposals.AnnounceProposals() {
|
||||||
|
t.Error("AnnounceProposals() true with no config block")
|
||||||
|
}
|
||||||
|
if c.MemoryEval != nil {
|
||||||
|
t.Errorf("memory_eval absent but got %+v", c.MemoryEval)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestOptInBlocksGetDefaultsWhenPresent(t *testing.T) {
|
||||||
|
c, err := Load(writeConfig(t, `{"pattern_proposals":{"notify":true},"memory_eval":{}}`))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Load: %v", err)
|
||||||
|
}
|
||||||
|
if !c.PatternProposals.AnnounceProposals() {
|
||||||
|
t.Error("notify:true did not enable announcements")
|
||||||
|
}
|
||||||
|
if time.Duration(c.PatternProposals.Cooldown) != DefaultProposalCooldown {
|
||||||
|
t.Errorf("proposal cooldown = %v, want %v", c.PatternProposals.Cooldown, DefaultProposalCooldown)
|
||||||
|
}
|
||||||
|
if time.Duration(c.MemoryEval.Interval) != DefaultMemoryEvalInterval {
|
||||||
|
t.Errorf("memory eval interval = %v, want %v", c.MemoryEval.Interval, DefaultMemoryEvalInterval)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Notify is off even when the block exists — the block is where you tune it,
|
||||||
|
// notify:true is the act that lets her speak.
|
||||||
|
func TestPatternProposalNotifyDefaultsOff(t *testing.T) {
|
||||||
|
c, err := Load(writeConfig(t, `{"pattern_proposals":{"cooldown":"6h"}}`))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Load: %v", err)
|
||||||
|
}
|
||||||
|
if c.PatternProposals.AnnounceProposals() {
|
||||||
|
t.Error("notify defaulted to on")
|
||||||
|
}
|
||||||
|
if time.Duration(c.PatternProposals.Cooldown) != 6*time.Hour {
|
||||||
|
t.Errorf("cooldown = %v, want 6h", c.PatternProposals.Cooldown)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,226 @@
|
|||||||
|
package email
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/llm"
|
||||||
|
"github.com/kami/maven/internal/persona"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Extraction — turning one mail into task CANDIDATES, and nothing else.
|
||||||
|
//
|
||||||
|
// The output of this file can only ever become rows in `tasks` with status
|
||||||
|
// "candidate" (store.TaskCandidate), written through the one intake seam
|
||||||
|
// (ipc.CaptureTaskReq, Vikunja #130). That bound is the whole design:
|
||||||
|
//
|
||||||
|
// - No reminder. A reminder FIRES; it speaks to him unprompted. A 1.7B that
|
||||||
|
// misreads "встреча была в четверг" as a future appointment would then wake
|
||||||
|
// him up about it. A candidate that is wrong is a line on a review page he
|
||||||
|
// dismisses in one click, which is the correct cost of a model being wrong
|
||||||
|
// about someone's mail.
|
||||||
|
// - No fact. A fact is a claim Maven will later recite as true. Nothing read
|
||||||
|
// out of a marketing mail deserves that standing.
|
||||||
|
// - No calendar event, no note, no action. Extraction writes candidates or
|
||||||
|
// writes nothing.
|
||||||
|
//
|
||||||
|
// The due date the model may return is stored on the candidate (tasks.due_ts),
|
||||||
|
// which no scheduler reads — it is there so the review page can sort by it.
|
||||||
|
//
|
||||||
|
// Privacy: the mail text goes to the resident model on this box and nowhere
|
||||||
|
// else. It is never search input (CLAUDE.md: "his notes and facts are never
|
||||||
|
// search input" — mail is the same class), and Evidence keeps only the subject
|
||||||
|
// line, so the review page shows him where a candidate came from without the
|
||||||
|
// store growing a copy of his mailbox.
|
||||||
|
|
||||||
|
// MaxCandidates — at most this many candidates per message, enforced by the
|
||||||
|
// grammar. A mail with four tasks in it is a mail he has to read himself; a
|
||||||
|
// model allowed ten will produce ten.
|
||||||
|
const MaxCandidates = 3
|
||||||
|
|
||||||
|
// SourcePrefix — provenance for everything this package captures. The mailbox
|
||||||
|
// name is appended: "email:INBOX". Same vocabulary as tap:voice / poll:netdata.
|
||||||
|
const SourcePrefix = "email:"
|
||||||
|
|
||||||
|
// Candidate — one piece of work the model thinks the mail is asking for.
|
||||||
|
type Candidate struct {
|
||||||
|
Text string `json:"text"`
|
||||||
|
// Due — "YYYY-MM-DD" or empty. A date the model read out of the text, not a
|
||||||
|
// date it computed: relative wording ("до пятницы") is left in Text, because
|
||||||
|
// a small model resolving "пятница" against today's date gets it wrong often
|
||||||
|
// enough that a stored wrong date is worse than no date.
|
||||||
|
Due string `json:"due"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Completer — the llama-server seam, same shape memeval and the router use, so
|
||||||
|
// the one resident model serves this caller too.
|
||||||
|
type Completer interface {
|
||||||
|
Complete(ctx context.Context, r llm.Req) (string, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Extractor reads a message and returns candidates. It holds no store and no
|
||||||
|
// writer on purpose: this type cannot persist anything, so "extraction never
|
||||||
|
// acts" is a property of the code, not of a review.
|
||||||
|
type Extractor struct {
|
||||||
|
llm Completer
|
||||||
|
// MaxCandidates — 0 ⇒ MaxCandidates.
|
||||||
|
max int
|
||||||
|
// ContextBlock — the shared persona block, optional. Extraction output is
|
||||||
|
// not spoken, so the persona matters less here than in the phraser; it is
|
||||||
|
// wired anyway so a candidate reads in her voice on the review page.
|
||||||
|
contextBlock func() string
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewExtractor(c Completer, max int, contextBlock func() string) *Extractor {
|
||||||
|
if max <= 0 || max > MaxCandidates {
|
||||||
|
max = MaxCandidates
|
||||||
|
}
|
||||||
|
return &Extractor{llm: c, max: max, contextBlock: contextBlock}
|
||||||
|
}
|
||||||
|
|
||||||
|
// extractGrammar — GBNF pinning the answer to a bounded array of fixed-shape
|
||||||
|
// candidates. Same reasoning as memeval's evalGrammar and the router's
|
||||||
|
// routeGrammar: the shape and the length bound are what keep a small model from
|
||||||
|
// drifting into prose or spending the token budget repeating one field.
|
||||||
|
//
|
||||||
|
// The empty array is reachable, deliberately: most mail contains no task, and a
|
||||||
|
// model with no way to say "nothing" invents something.
|
||||||
|
const extractGrammar = `
|
||||||
|
root ::= "[" ws (item ("," ws item){0,2})? ws "]"
|
||||||
|
item ::= "{" ws "\"text\"" ws ":" ws text "," ws "\"due\"" ws ":" ws due ws "}"
|
||||||
|
text ::= "\"" ([^"\\] | "\\" .){1,120} "\""
|
||||||
|
due ::= "\"\"" | "\"" [0-9]{4} "-" [0-9]{2} "-" [0-9]{2} "\""
|
||||||
|
ws ::= [ \t\n]*
|
||||||
|
`
|
||||||
|
|
||||||
|
// extractSystem — the extraction prompt.
|
||||||
|
//
|
||||||
|
// Written around the two failure modes a small model has on this task: it
|
||||||
|
// summarises when asked to extract (turning a mail into "письмо от Антона"),
|
||||||
|
// and it invents an obligation from any polite closing sentence. Hence the
|
||||||
|
// insistence on a verb phrase, and the explicit permission to return [].
|
||||||
|
const extractSystem = `Ты читаешь одно письмо из его почты и достаёшь из него дела, которые письмо от него требует.
|
||||||
|
|
||||||
|
Правила:
|
||||||
|
- Отвечай ТОЛЬКО массивом JSON. Каждый элемент: {"text": "...", "due": "ГГГГ-ММ-ДД" или ""}.
|
||||||
|
- text — короткая формулировка дела по-русски, с глаголом: "оплатить счёт за интернет", "отправить акт". Не пересказывай письмо и не описывай его.
|
||||||
|
- Дело — это то, что должен сделать ОН. Рассылка, реклама, уведомление, отчёт, письмо «просто к сведению» — дел не содержат.
|
||||||
|
- Если письмо ничего от него не требует, верни пустой массив []. Это нормальный ответ, так бывает чаще всего.
|
||||||
|
- Ничего не придумывай. Если срока в письме нет — "".
|
||||||
|
- due заполняй только когда в письме стоит конкретная дата. Слова вроде «до пятницы» оставь в text, дату не вычисляй.
|
||||||
|
- Максимум три дела. Лучше одно точное, чем три общих.`
|
||||||
|
|
||||||
|
// Extract returns the candidates in one message.
|
||||||
|
//
|
||||||
|
// Junk is refused without an LLM call — cheapest possible defence, and the
|
||||||
|
// reason the header filter exists. An empty message (no subject, no body) is
|
||||||
|
// likewise not worth a round trip.
|
||||||
|
//
|
||||||
|
// A parse failure is an error the caller logs and moves past. It is never
|
||||||
|
// silently turned into zero candidates, because "the model went off the rails"
|
||||||
|
// and "the mail contains no task" want different reactions from a human reading
|
||||||
|
// the log.
|
||||||
|
func (e *Extractor) Extract(ctx context.Context, msg Message) ([]Candidate, error) {
|
||||||
|
if msg.Junk {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
user := renderForModel(msg)
|
||||||
|
if user == "" {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
raw, err := e.llm.Complete(ctx, llm.Req{
|
||||||
|
System: persona.Prepend(e.contextBlock, extractSystem),
|
||||||
|
User: user,
|
||||||
|
Grammar: extractGrammar,
|
||||||
|
MaxTokens: 512,
|
||||||
|
RepeatPenalty: 1.1,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("email: extract: %w", err)
|
||||||
|
}
|
||||||
|
items, err := parseCandidates(raw)
|
||||||
|
if err != nil {
|
||||||
|
// The raw reply is NOT in the error: it is a transformation of his mail,
|
||||||
|
// and this error reaches the daemon log.
|
||||||
|
return nil, fmt.Errorf("email: extract: unparsable reply (%d bytes)", len(raw))
|
||||||
|
}
|
||||||
|
out := make([]Candidate, 0, len(items))
|
||||||
|
seen := map[string]bool{}
|
||||||
|
for _, it := range items {
|
||||||
|
it.Text = strings.TrimSpace(it.Text)
|
||||||
|
if it.Text == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
key := strings.ToLower(strings.Join(strings.Fields(it.Text), " "))
|
||||||
|
if seen[key] {
|
||||||
|
continue // the model repeating itself is not two tasks
|
||||||
|
}
|
||||||
|
seen[key] = true
|
||||||
|
if _, ok := ParseDue(it.Due); !ok {
|
||||||
|
it.Due = "" // a date the grammar allowed but the calendar does not
|
||||||
|
}
|
||||||
|
out = append(out, it)
|
||||||
|
if len(out) >= e.max {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// renderForModel is the user turn: subject, sender and body, labelled. Only
|
||||||
|
// these three fields — no headers, no recipient list, no message-id, nothing
|
||||||
|
// that would let the model start reasoning about routing metadata.
|
||||||
|
func renderForModel(msg Message) string {
|
||||||
|
var b strings.Builder
|
||||||
|
if msg.From != "" {
|
||||||
|
fmt.Fprintf(&b, "От: %s\n", msg.From)
|
||||||
|
}
|
||||||
|
if msg.Subject != "" {
|
||||||
|
fmt.Fprintf(&b, "Тема: %s\n", msg.Subject)
|
||||||
|
}
|
||||||
|
if msg.Body != "" {
|
||||||
|
fmt.Fprintf(&b, "\n%s\n", msg.Body)
|
||||||
|
}
|
||||||
|
if msg.Subject == "" && msg.Body == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return b.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseCandidates decodes the grammar-constrained reply, tolerating the
|
||||||
|
// wrappers a Thinking model sometimes leaves around it (a fenced block, or
|
||||||
|
// leading reasoning before the array).
|
||||||
|
func parseCandidates(raw string) ([]Candidate, error) {
|
||||||
|
s := strings.TrimSpace(raw)
|
||||||
|
if i := strings.Index(s, "["); i > 0 {
|
||||||
|
s = s[i:]
|
||||||
|
}
|
||||||
|
if j := strings.LastIndex(s, "]"); j >= 0 {
|
||||||
|
s = s[:j+1]
|
||||||
|
}
|
||||||
|
var out []Candidate
|
||||||
|
if err := json.Unmarshal([]byte(s), &out); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ParseDue turns the model's "YYYY-MM-DD" into a time in UTC. Exported because
|
||||||
|
// the daemon-side intake stores it on the candidate.
|
||||||
|
//
|
||||||
|
// The zero-value/empty case returns ok=false rather than an error: no date is
|
||||||
|
// the common answer, not a failure.
|
||||||
|
func ParseDue(s string) (time.Time, bool) {
|
||||||
|
s = strings.TrimSpace(s)
|
||||||
|
if s == "" {
|
||||||
|
return time.Time{}, false
|
||||||
|
}
|
||||||
|
t, err := time.Parse("2006-01-02", s)
|
||||||
|
if err != nil {
|
||||||
|
return time.Time{}, false
|
||||||
|
}
|
||||||
|
return t, true
|
||||||
|
}
|
||||||
@@ -0,0 +1,143 @@
|
|||||||
|
package email
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/llm"
|
||||||
|
)
|
||||||
|
|
||||||
|
// fakeLLM returns a canned reply and records the request, so a test can assert
|
||||||
|
// on the grammar and on what of the mail was sent.
|
||||||
|
type fakeLLM struct {
|
||||||
|
reply string
|
||||||
|
err error
|
||||||
|
got llm.Req
|
||||||
|
calls int
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *fakeLLM) Complete(_ context.Context, r llm.Req) (string, error) {
|
||||||
|
f.calls++
|
||||||
|
f.got = r
|
||||||
|
return f.reply, f.err
|
||||||
|
}
|
||||||
|
|
||||||
|
func msgFor(subject, body string) Message {
|
||||||
|
return Message{UID: 1, From: "anton@example.org", Subject: subject, Body: body}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestExtractCandidates(t *testing.T) {
|
||||||
|
f := &fakeLLM{reply: `[{"text":"отправить акт","due":""},{"text":"оплатить счёт","due":"2026-08-05"}]`}
|
||||||
|
e := NewExtractor(f, 0, nil)
|
||||||
|
got, err := e.Extract(context.Background(), msgFor("Акт и счёт", "Надо отправить акт и оплатить счёт до 5 августа."))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("extract: %v", err)
|
||||||
|
}
|
||||||
|
if len(got) != 2 {
|
||||||
|
t.Fatalf("got %d candidates, want 2: %+v", len(got), got)
|
||||||
|
}
|
||||||
|
if got[0].Text != "отправить акт" || got[1].Due != "2026-08-05" {
|
||||||
|
t.Errorf("candidates = %+v", got)
|
||||||
|
}
|
||||||
|
if f.got.Grammar == "" {
|
||||||
|
t.Error("extraction must be grammar-constrained")
|
||||||
|
}
|
||||||
|
// The subject and body go to the model; nothing else about the message does.
|
||||||
|
if !strings.Contains(f.got.User, "Акт и счёт") || !strings.Contains(f.got.User, "оплатить счёт") {
|
||||||
|
t.Errorf("user turn = %q", f.got.User)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestExtractEmptyArrayIsNotAnError(t *testing.T) {
|
||||||
|
f := &fakeLLM{reply: "[]"}
|
||||||
|
got, err := NewExtractor(f, 0, nil).Extract(context.Background(), msgFor("FYI", "Просто к сведению."))
|
||||||
|
if err != nil || len(got) != 0 {
|
||||||
|
t.Fatalf("got (%v, %v), want (empty, nil) — no task is the normal answer", got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Junk must never reach the model: the header filter exists so the resident
|
||||||
|
// model is not spent on newsletters.
|
||||||
|
func TestExtractSkipsJunkWithoutCallingModel(t *testing.T) {
|
||||||
|
f := &fakeLLM{reply: `[{"text":"купить всё со скидкой","due":""}]`}
|
||||||
|
msg := msgFor("Скидки", "Sale!")
|
||||||
|
msg.Junk = true
|
||||||
|
got, err := NewExtractor(f, 0, nil).Extract(context.Background(), msg)
|
||||||
|
if err != nil || got != nil {
|
||||||
|
t.Fatalf("got (%v, %v), want (nil, nil)", got, err)
|
||||||
|
}
|
||||||
|
if f.calls != 0 {
|
||||||
|
t.Errorf("model called %d times for junk, want 0", f.calls)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestExtractEmptyMessageIsNotSent(t *testing.T) {
|
||||||
|
f := &fakeLLM{reply: "[]"}
|
||||||
|
if _, err := NewExtractor(f, 0, nil).Extract(context.Background(), Message{UID: 3}); err != nil {
|
||||||
|
t.Fatalf("extract: %v", err)
|
||||||
|
}
|
||||||
|
if f.calls != 0 {
|
||||||
|
t.Errorf("model called %d times for an empty message, want 0", f.calls)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestExtractCaps(t *testing.T) {
|
||||||
|
f := &fakeLLM{reply: `[{"text":"a","due":""},{"text":"b","due":""},{"text":"c","due":""}]`}
|
||||||
|
got, err := NewExtractor(f, 2, nil).Extract(context.Background(), msgFor("s", "b"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("extract: %v", err)
|
||||||
|
}
|
||||||
|
if len(got) != 2 {
|
||||||
|
t.Errorf("got %d, want the configured cap of 2", len(got))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestExtractDropsRepeatsAndBadDates(t *testing.T) {
|
||||||
|
f := &fakeLLM{reply: `[{"text":"Отправить акт","due":"2026-02-31"},{"text":"отправить акт","due":""},{"text":" ","due":""}]`}
|
||||||
|
got, err := NewExtractor(f, 0, nil).Extract(context.Background(), msgFor("s", "b"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("extract: %v", err)
|
||||||
|
}
|
||||||
|
if len(got) != 1 {
|
||||||
|
t.Fatalf("got %d candidates, want 1 (repeat and blank dropped): %+v", len(got), got)
|
||||||
|
}
|
||||||
|
if got[0].Due != "" {
|
||||||
|
t.Errorf("due = %q, want empty — 2026-02-31 is not a date", got[0].Due)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A Thinking model sometimes wraps the array; and when it emits something
|
||||||
|
// unparsable the caller must hear about it rather than see "no tasks".
|
||||||
|
func TestParseCandidatesTolerance(t *testing.T) {
|
||||||
|
got, err := parseCandidates("думаю... [{\"text\":\"x\",\"due\":\"\"}] всё")
|
||||||
|
if err != nil || len(got) != 1 || got[0].Text != "x" {
|
||||||
|
t.Fatalf("got (%+v, %v)", got, err)
|
||||||
|
}
|
||||||
|
if _, err := parseCandidates("нет никакого JSON"); err == nil {
|
||||||
|
t.Error("unparsable output must be an error")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestExtractParseErrorHidesMailText(t *testing.T) {
|
||||||
|
f := &fakeLLM{reply: "он просил отправить акт, вот такой ответ"}
|
||||||
|
_, err := NewExtractor(f, 0, nil).Extract(context.Background(), msgFor("Акт", "секретный текст"))
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("want an error")
|
||||||
|
}
|
||||||
|
if strings.Contains(err.Error(), "акт") || strings.Contains(err.Error(), "секретный") {
|
||||||
|
t.Errorf("error text leaks mail content: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseDue(t *testing.T) {
|
||||||
|
if _, ok := ParseDue(""); ok {
|
||||||
|
t.Error("empty due must be (zero, false)")
|
||||||
|
}
|
||||||
|
if got, ok := ParseDue("2026-08-05"); !ok || got.Year() != 2026 || got.Month() != 8 || got.Day() != 5 {
|
||||||
|
t.Errorf("ParseDue = (%v, %v)", got, ok)
|
||||||
|
}
|
||||||
|
if _, ok := ParseDue("05.08.2026"); ok {
|
||||||
|
t.Error("a non-ISO date must not parse")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
package email
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// FetchSince is the whole read path in one call: connect, log in, examine the
|
||||||
|
// mailbox read-only, list what arrived since a date, fetch and parse the ones
|
||||||
|
// the caller has not seen, log out.
|
||||||
|
//
|
||||||
|
// It is a function rather than a long-lived object because a mail poller should
|
||||||
|
// not hold an authenticated session (and therefore his credential in a live TLS
|
||||||
|
// state) between polls. Connect, read, drop.
|
||||||
|
//
|
||||||
|
// skip decides which UIDs are already known — the poller's seen-set. max bounds
|
||||||
|
// one poll: a mailbox that received 400 messages overnight must not turn into
|
||||||
|
// 400 LLM calls, and the newest max are the ones a task could still be hiding
|
||||||
|
// in. Junk messages are returned too, flagged, so the caller can mark them seen
|
||||||
|
// without a second protocol round.
|
||||||
|
type FetchSince struct {
|
||||||
|
Addr string // host or host:993
|
||||||
|
User string
|
||||||
|
Mailbox string // e.g. "INBOX"
|
||||||
|
Timeout time.Duration
|
||||||
|
Since time.Time
|
||||||
|
Max int
|
||||||
|
Skip func(uid uint32) bool
|
||||||
|
|
||||||
|
// dial is the connection seam. nil means Dial (implicit TLS); the tests set
|
||||||
|
// it to an in-process fake. Unexported so no configuration path can point
|
||||||
|
// the reader at a non-TLS transport.
|
||||||
|
dial func(addr string, timeout time.Duration) (*Conn, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Run performs one read. password is passed here, not stored in the struct, so
|
||||||
|
// the configuration of a mailbox and the secret for it are never the same value
|
||||||
|
// sitting in the same place.
|
||||||
|
func (f FetchSince) Run(password string) ([]Message, error) {
|
||||||
|
if f.Addr == "" || f.User == "" || f.Mailbox == "" {
|
||||||
|
return nil, fmt.Errorf("email: mailbox not configured (addr/user/mailbox)")
|
||||||
|
}
|
||||||
|
dial := f.dial
|
||||||
|
if dial == nil {
|
||||||
|
dial = Dial
|
||||||
|
}
|
||||||
|
c, err := dial(f.Addr, f.Timeout)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer c.Close()
|
||||||
|
if err := c.Login(f.User, password); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer c.Logout()
|
||||||
|
if err := c.Select(f.Mailbox); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
uids, err := c.SearchSince(f.Since)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Newest UIDs first — IMAP hands them back ascending, and when Max clips the
|
||||||
|
// list the recent mail is what matters.
|
||||||
|
wanted := make([]uint32, 0, len(uids))
|
||||||
|
for i := len(uids) - 1; i >= 0; i-- {
|
||||||
|
if f.Skip != nil && f.Skip(uids[i]) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
wanted = append(wanted, uids[i])
|
||||||
|
if f.Max > 0 && len(wanted) >= f.Max {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
out := make([]Message, 0, len(wanted))
|
||||||
|
for _, uid := range wanted {
|
||||||
|
raw, err := c.Fetch(uid)
|
||||||
|
if err != nil {
|
||||||
|
// One unreadable message does not abandon the poll; the rest of the
|
||||||
|
// mailbox is still worth reading. The error names the UID, not the
|
||||||
|
// message.
|
||||||
|
return out, fmt.Errorf("email: fetch uid %d: %w", uid, err)
|
||||||
|
}
|
||||||
|
if len(raw) == 0 {
|
||||||
|
continue // vanished between SEARCH and FETCH
|
||||||
|
}
|
||||||
|
msg, err := ParseMessage(uid, raw)
|
||||||
|
if err != nil {
|
||||||
|
continue // unparsable headers — nothing to review, skip silently
|
||||||
|
}
|
||||||
|
out = append(out, msg)
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
package email
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestFetchSinceRun(t *testing.T) {
|
||||||
|
mk := func(subject string) string {
|
||||||
|
return "Subject: " + subject + "\r\nContent-Type: text/plain; charset=utf-8\r\n\r\nbody\r\n"
|
||||||
|
}
|
||||||
|
f := &fakeIMAP{
|
||||||
|
uids: []uint32{1, 2, 3},
|
||||||
|
msgs: map[uint32]string{1: mk("one"), 2: mk("two"), 3: mk("three")},
|
||||||
|
}
|
||||||
|
fs := FetchSince{
|
||||||
|
Addr: "mail.example:993", User: "kami", Mailbox: "INBOX",
|
||||||
|
Timeout: 5 * time.Second,
|
||||||
|
Since: time.Date(2026, 7, 30, 0, 0, 0, 0, time.UTC),
|
||||||
|
Max: 2,
|
||||||
|
Skip: func(uid uint32) bool { return uid == 3 },
|
||||||
|
dial: func(addr string, timeout time.Duration) (*Conn, error) {
|
||||||
|
cli, srv := net.Pipe()
|
||||||
|
go f.serve(t, srv)
|
||||||
|
return NewConn(cli, timeout)
|
||||||
|
},
|
||||||
|
}
|
||||||
|
msgs, err := fs.Run("secret")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("run: %v", err)
|
||||||
|
}
|
||||||
|
// Newest first, the already-seen UID skipped, Max respected.
|
||||||
|
if len(msgs) != 2 {
|
||||||
|
t.Fatalf("got %d messages, want 2: %+v", len(msgs), msgs)
|
||||||
|
}
|
||||||
|
if msgs[0].Subject != "two" || msgs[1].Subject != "one" {
|
||||||
|
t.Errorf("subjects = %q,%q, want two,one (newest first)", msgs[0].Subject, msgs[1].Subject)
|
||||||
|
}
|
||||||
|
if strings.Contains(strings.Join(f.cmds, " "), "UID FETCH 3") {
|
||||||
|
t.Error("a skipped UID must not be fetched again")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFetchSinceRequiresConfig(t *testing.T) {
|
||||||
|
if _, err := (FetchSince{}).Run("secret"); err == nil {
|
||||||
|
t.Fatal("an unconfigured mailbox must not be read")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,280 @@
|
|||||||
|
package email
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"crypto/tls"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net"
|
||||||
|
"regexp"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// A minimal IMAP4rev1 client — LOGIN, SELECT, UID SEARCH, UID FETCH with
|
||||||
|
// BODY.PEEK, LOGOUT, and nothing else.
|
||||||
|
//
|
||||||
|
// Why hand-rolled instead of go-imap: the whole surface Maven needs is five
|
||||||
|
// commands, and this is the one code path that holds his mailbox credential and
|
||||||
|
// reads his private mail. A ~200-line client with no dependencies is auditable
|
||||||
|
// in one sitting; a general-purpose IMAP library is a much larger amount of
|
||||||
|
// code doing much more than we asked, in the most sensitive place in the tree.
|
||||||
|
// If IDLE, CONDSTORE or server-side threading ever become worth having, that
|
||||||
|
// trade should be re-made deliberately.
|
||||||
|
//
|
||||||
|
// BODY.PEEK[] rather than BODY[] is load-bearing: Maven reads his mail and must
|
||||||
|
// leave no trace of having done so. Reading a message here does not mark it
|
||||||
|
// \Seen, so the unread state in his own mail client stays his.
|
||||||
|
|
||||||
|
// DefaultIMAPPort — implicit-TLS IMAP. There is no cleartext and no STARTTLS
|
||||||
|
// path in this client: an option to send his password over a plain socket is an
|
||||||
|
// option to get it wrong once.
|
||||||
|
const DefaultIMAPPort = "993"
|
||||||
|
|
||||||
|
// Conn — one authenticated IMAP connection. Not safe for concurrent use; the
|
||||||
|
// poller drives one connection at a time.
|
||||||
|
type Conn struct {
|
||||||
|
rwc io.ReadWriteCloser
|
||||||
|
r *bufio.Reader
|
||||||
|
tag int
|
||||||
|
timeout time.Duration
|
||||||
|
}
|
||||||
|
|
||||||
|
// Dial opens an implicit-TLS connection and reads the server greeting.
|
||||||
|
func Dial(addr string, timeout time.Duration) (*Conn, error) {
|
||||||
|
host, _, err := net.SplitHostPort(addr)
|
||||||
|
if err != nil {
|
||||||
|
host, addr = addr, net.JoinHostPort(addr, DefaultIMAPPort)
|
||||||
|
}
|
||||||
|
d := &net.Dialer{Timeout: timeout}
|
||||||
|
// ServerName is set from the host we asked for: certificate verification is
|
||||||
|
// the only thing standing between his password and a MITM on the way out.
|
||||||
|
c, err := tls.DialWithDialer(d, "tcp", addr, &tls.Config{ServerName: host, MinVersion: tls.VersionTLS12})
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("email: dial %s: %w", addr, err)
|
||||||
|
}
|
||||||
|
return NewConn(c, timeout)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewConn wraps an already-open stream (the tests speak IMAP over a pipe) and
|
||||||
|
// consumes the greeting.
|
||||||
|
func NewConn(rwc io.ReadWriteCloser, timeout time.Duration) (*Conn, error) {
|
||||||
|
c := &Conn{rwc: rwc, r: bufio.NewReaderSize(rwc, 64<<10), timeout: timeout}
|
||||||
|
line, err := c.readLine()
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("email: greeting: %w", err)
|
||||||
|
}
|
||||||
|
if !strings.HasPrefix(line, "* OK") && !strings.HasPrefix(line, "* PREAUTH") {
|
||||||
|
c.rwc.Close()
|
||||||
|
return nil, fmt.Errorf("email: server refused connection: %s", line)
|
||||||
|
}
|
||||||
|
return c, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Conn) Close() error { return c.rwc.Close() }
|
||||||
|
|
||||||
|
// Login authenticates with LOGIN. The password is passed as an argument and
|
||||||
|
// never stored on the Conn: nothing in this package keeps a credential alive
|
||||||
|
// past the command that uses it, so no struct dump or panic trace can carry it.
|
||||||
|
func (c *Conn) Login(user, pass string) error {
|
||||||
|
// The command line itself is never logged (see exec) — a LOGIN line IS the
|
||||||
|
// credential.
|
||||||
|
if _, err := c.exec(fmt.Sprintf("LOGIN %s %s", quote(user), quote(pass))); err != nil {
|
||||||
|
return fmt.Errorf("email: login: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Select opens a mailbox read-only. EXAMINE, not SELECT: read-only at the
|
||||||
|
// protocol level means no command in this session can change a flag, expunge a
|
||||||
|
// message, or move anything, even by mistake.
|
||||||
|
func (c *Conn) Select(mailbox string) error {
|
||||||
|
if _, err := c.exec(fmt.Sprintf("EXAMINE %s", quote(mailbox))); err != nil {
|
||||||
|
return fmt.Errorf("email: examine %s: %w", mailbox, err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// SearchSince returns the UIDs of messages received on or after since. An
|
||||||
|
// unlimited search is not offered: the first poll against a years-old mailbox
|
||||||
|
// would otherwise fetch everything and hand a decade of mail to the model.
|
||||||
|
//
|
||||||
|
// The IMAP SINCE key has date granularity (and compares the server's internal
|
||||||
|
// date), so the result can include messages slightly older than since. The
|
||||||
|
// caller dedupes by UID anyway, so a wider window costs one extra fetch.
|
||||||
|
func (c *Conn) SearchSince(since time.Time) ([]uint32, error) {
|
||||||
|
cmd := fmt.Sprintf("UID SEARCH SINCE %s", since.Format("2-Jan-2006"))
|
||||||
|
lines, err := c.exec(cmd)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("email: search: %w", err)
|
||||||
|
}
|
||||||
|
var uids []uint32
|
||||||
|
for _, l := range lines {
|
||||||
|
rest, ok := untagged(l, "SEARCH")
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for _, f := range strings.Fields(rest) {
|
||||||
|
n, err := strconv.ParseUint(f, 10, 32)
|
||||||
|
if err == nil {
|
||||||
|
uids = append(uids, uint32(n))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return uids, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var literalSize = regexp.MustCompile(`\{(\d+)\}$`)
|
||||||
|
|
||||||
|
// Fetch returns the raw RFC 5322 bytes of one message, by UID.
|
||||||
|
//
|
||||||
|
// Returns (nil, nil) when the UID no longer exists — a message he deleted
|
||||||
|
// between SEARCH and FETCH is normal, not an error.
|
||||||
|
func (c *Conn) Fetch(uid uint32) ([]byte, error) {
|
||||||
|
tag := c.nextTag()
|
||||||
|
if err := c.send(fmt.Sprintf("%s UID FETCH %d (BODY.PEEK[])", tag, uid)); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
var raw []byte
|
||||||
|
for {
|
||||||
|
line, err := c.readLine()
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("email: fetch %d: %w", uid, err)
|
||||||
|
}
|
||||||
|
if done, err := c.tagged(tag, line); done {
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("email: fetch %d: %w", uid, err)
|
||||||
|
}
|
||||||
|
return raw, nil
|
||||||
|
}
|
||||||
|
m := literalSize.FindStringSubmatch(strings.TrimSpace(line))
|
||||||
|
if m == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
n, err := strconv.Atoi(m[1])
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
buf := make([]byte, n)
|
||||||
|
if _, err := io.ReadFull(c.r, buf); err != nil {
|
||||||
|
return nil, fmt.Errorf("email: fetch %d: literal: %w", uid, err)
|
||||||
|
}
|
||||||
|
if raw == nil {
|
||||||
|
raw = buf
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Logout ends the session politely. A failure is not worth reporting — the
|
||||||
|
// connection is being closed either way.
|
||||||
|
func (c *Conn) Logout() {
|
||||||
|
_, _ = c.exec("LOGOUT")
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- protocol plumbing -----------------------------------------------------
|
||||||
|
|
||||||
|
func (c *Conn) nextTag() string {
|
||||||
|
c.tag++
|
||||||
|
return fmt.Sprintf("a%03d", c.tag)
|
||||||
|
}
|
||||||
|
|
||||||
|
// exec sends one command and returns the untagged response lines.
|
||||||
|
//
|
||||||
|
// Neither the command nor the response is ever logged here. LOGIN goes through
|
||||||
|
// this function, and a debug line "sent: a001 LOGIN ..." is how a credential
|
||||||
|
// ends up in a log file forever.
|
||||||
|
func (c *Conn) exec(cmd string) ([]string, error) {
|
||||||
|
tag := c.nextTag()
|
||||||
|
if err := c.send(tag + " " + cmd); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
var lines []string
|
||||||
|
for {
|
||||||
|
line, err := c.readLine()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if done, err := c.tagged(tag, line); done {
|
||||||
|
return lines, err
|
||||||
|
}
|
||||||
|
lines = append(lines, line)
|
||||||
|
// A response line may carry a literal (e.g. a header FETCH). Nothing we
|
||||||
|
// send asks for one outside Fetch, but skip it if it appears so the
|
||||||
|
// stream stays aligned.
|
||||||
|
if m := literalSize.FindStringSubmatch(strings.TrimSpace(line)); m != nil {
|
||||||
|
if n, err := strconv.Atoi(m[1]); err == nil {
|
||||||
|
if _, err := io.CopyN(io.Discard, c.r, int64(n)); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// tagged reports whether line completes the command with this tag, and turns a
|
||||||
|
// NO/BAD completion into an error. The error text is the server's, which never
|
||||||
|
// echoes a password.
|
||||||
|
func (c *Conn) tagged(tag, line string) (bool, error) {
|
||||||
|
if !strings.HasPrefix(line, tag+" ") {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
rest := strings.TrimSpace(line[len(tag):])
|
||||||
|
switch {
|
||||||
|
case strings.HasPrefix(rest, "OK"):
|
||||||
|
return true, nil
|
||||||
|
case strings.HasPrefix(rest, "NO"), strings.HasPrefix(rest, "BAD"):
|
||||||
|
return true, fmt.Errorf("server said: %s", rest)
|
||||||
|
default:
|
||||||
|
return true, fmt.Errorf("unexpected completion: %s", rest)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Conn) send(line string) error {
|
||||||
|
c.setDeadline()
|
||||||
|
if _, err := io.WriteString(c.rwc, line+"\r\n"); err != nil {
|
||||||
|
return fmt.Errorf("email: write: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Conn) readLine() (string, error) {
|
||||||
|
c.setDeadline()
|
||||||
|
line, err := c.r.ReadString('\n')
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return strings.TrimRight(line, "\r\n"), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// setDeadline applies the per-connection timeout when the transport supports
|
||||||
|
// one. A hung IMAP server must not park the poller forever.
|
||||||
|
func (c *Conn) setDeadline() {
|
||||||
|
if c.timeout <= 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if d, ok := c.rwc.(interface{ SetDeadline(time.Time) error }); ok {
|
||||||
|
_ = d.SetDeadline(time.Now().Add(c.timeout))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// untagged splits "* SEARCH 1 2 3" into its payload when the key matches.
|
||||||
|
func untagged(line, key string) (string, bool) {
|
||||||
|
if !strings.HasPrefix(line, "* ") {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
rest := strings.TrimSpace(line[2:])
|
||||||
|
if !strings.HasPrefix(rest, key) {
|
||||||
|
return "", false
|
||||||
|
}
|
||||||
|
return strings.TrimSpace(rest[len(key):]), true
|
||||||
|
}
|
||||||
|
|
||||||
|
// quote renders an IMAP quoted string. Passwords routinely contain characters
|
||||||
|
// that would otherwise end the argument early, and CR/LF are stripped rather
|
||||||
|
// than escaped because there is no legal way to send them — a credential file
|
||||||
|
// with a stray newline must not become a second command.
|
||||||
|
func quote(s string) string {
|
||||||
|
s = strings.NewReplacer("\r", "", "\n", "").Replace(s)
|
||||||
|
return `"` + strings.NewReplacer(`\`, `\\`, `"`, `\"`).Replace(s) + `"`
|
||||||
|
}
|
||||||
@@ -0,0 +1,162 @@
|
|||||||
|
package email
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// fakeIMAP is a scripted server: enough of IMAP to exercise the client, and
|
||||||
|
// nothing more. It records the commands it received so a test can assert on the
|
||||||
|
// protocol (BODY.PEEK rather than BODY, EXAMINE rather than SELECT).
|
||||||
|
type fakeIMAP struct {
|
||||||
|
msgs map[uint32]string
|
||||||
|
uids []uint32
|
||||||
|
cmds []string
|
||||||
|
failOn string // substring of a command to answer NO
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *fakeIMAP) serve(t *testing.T, c net.Conn) {
|
||||||
|
t.Helper()
|
||||||
|
defer c.Close()
|
||||||
|
fmt.Fprint(c, "* OK fake IMAP ready\r\n")
|
||||||
|
r := bufio.NewReader(c)
|
||||||
|
for {
|
||||||
|
line, err := r.ReadString('\n')
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
line = strings.TrimRight(line, "\r\n")
|
||||||
|
parts := strings.SplitN(line, " ", 2)
|
||||||
|
if len(parts) != 2 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
tag, cmd := parts[0], parts[1]
|
||||||
|
f.cmds = append(f.cmds, cmd)
|
||||||
|
if f.failOn != "" && strings.Contains(cmd, f.failOn) {
|
||||||
|
fmt.Fprintf(c, "%s NO computer says no\r\n", tag)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
upper := strings.ToUpper(cmd)
|
||||||
|
switch {
|
||||||
|
case strings.HasPrefix(upper, "LOGIN"), strings.HasPrefix(upper, "EXAMINE"):
|
||||||
|
fmt.Fprintf(c, "%s OK done\r\n", tag)
|
||||||
|
case strings.HasPrefix(upper, "UID SEARCH"):
|
||||||
|
var ids []string
|
||||||
|
for _, u := range f.uids {
|
||||||
|
ids = append(ids, strconv.FormatUint(uint64(u), 10))
|
||||||
|
}
|
||||||
|
fmt.Fprintf(c, "* SEARCH %s\r\n", strings.Join(ids, " "))
|
||||||
|
fmt.Fprintf(c, "%s OK search done\r\n", tag)
|
||||||
|
case strings.HasPrefix(upper, "UID FETCH"):
|
||||||
|
uid64, _ := strconv.ParseUint(strings.Fields(cmd)[2], 10, 32)
|
||||||
|
raw, ok := f.msgs[uint32(uid64)]
|
||||||
|
if ok {
|
||||||
|
fmt.Fprintf(c, "* 1 FETCH (UID %d BODY[] {%d}\r\n", uid64, len(raw))
|
||||||
|
fmt.Fprint(c, raw)
|
||||||
|
fmt.Fprint(c, ")\r\n")
|
||||||
|
}
|
||||||
|
fmt.Fprintf(c, "%s OK fetch done\r\n", tag)
|
||||||
|
case strings.HasPrefix(upper, "LOGOUT"):
|
||||||
|
fmt.Fprint(c, "* BYE\r\n")
|
||||||
|
fmt.Fprintf(c, "%s OK bye\r\n", tag)
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
fmt.Fprintf(c, "%s BAD unknown\r\n", tag)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// dialFake wires a client Conn to an in-process server over net.Pipe.
|
||||||
|
func dialFake(t *testing.T, f *fakeIMAP) *Conn {
|
||||||
|
t.Helper()
|
||||||
|
cli, srv := net.Pipe()
|
||||||
|
go f.serve(t, srv)
|
||||||
|
c, err := NewConn(cli, 5*time.Second)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("greeting: %v", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { c.Close() })
|
||||||
|
return c
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIMAPRoundTrip(t *testing.T) {
|
||||||
|
body := "Subject: hello\r\nContent-Type: text/plain; charset=utf-8\r\n\r\nCall the bank.\r\n"
|
||||||
|
f := &fakeIMAP{uids: []uint32{4, 9}, msgs: map[uint32]string{4: body, 9: body}}
|
||||||
|
c := dialFake(t, f)
|
||||||
|
|
||||||
|
if err := c.Login("kami", `pa"ss\word`); err != nil {
|
||||||
|
t.Fatalf("login: %v", err)
|
||||||
|
}
|
||||||
|
if err := c.Select("INBOX"); err != nil {
|
||||||
|
t.Fatalf("select: %v", err)
|
||||||
|
}
|
||||||
|
uids, err := c.SearchSince(time.Date(2026, 8, 1, 0, 0, 0, 0, time.UTC))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("search: %v", err)
|
||||||
|
}
|
||||||
|
if len(uids) != 2 || uids[0] != 4 || uids[1] != 9 {
|
||||||
|
t.Fatalf("uids = %v, want [4 9]", uids)
|
||||||
|
}
|
||||||
|
raw, err := c.Fetch(9)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("fetch: %v", err)
|
||||||
|
}
|
||||||
|
if string(raw) != body {
|
||||||
|
t.Errorf("fetched %q, want the literal verbatim", raw)
|
||||||
|
}
|
||||||
|
c.Logout()
|
||||||
|
|
||||||
|
joined := strings.Join(f.cmds, "\n")
|
||||||
|
// Read-only at the protocol level, and peeking — Maven must leave no trace
|
||||||
|
// of having read his mail.
|
||||||
|
if !strings.Contains(joined, "EXAMINE") || strings.Contains(joined, "SELECT ") {
|
||||||
|
t.Errorf("want EXAMINE (read-only), got:\n%s", joined)
|
||||||
|
}
|
||||||
|
if !strings.Contains(joined, "BODY.PEEK[]") {
|
||||||
|
t.Errorf("want BODY.PEEK, got:\n%s", joined)
|
||||||
|
}
|
||||||
|
// The password must have been quoted and escaped, not truncated at the quote.
|
||||||
|
if !strings.Contains(joined, `"pa\"ss\\word"`) {
|
||||||
|
t.Errorf("password not quoted correctly:\n%s", joined)
|
||||||
|
}
|
||||||
|
// SINCE must carry the IMAP date form.
|
||||||
|
if !strings.Contains(joined, "SINCE 1-Aug-2026") {
|
||||||
|
t.Errorf("want a SINCE date, got:\n%s", joined)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIMAPServerNoIsAnError(t *testing.T) {
|
||||||
|
f := &fakeIMAP{failOn: "LOGIN"}
|
||||||
|
c := dialFake(t, f)
|
||||||
|
err := c.Login("kami", "wrong")
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("a NO completion must be an error")
|
||||||
|
}
|
||||||
|
// The error is the server's text; it must not echo the credential.
|
||||||
|
if strings.Contains(err.Error(), "wrong") {
|
||||||
|
t.Errorf("error leaks the password: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIMAPFetchMissingUID(t *testing.T) {
|
||||||
|
f := &fakeIMAP{uids: []uint32{1}, msgs: map[uint32]string{}}
|
||||||
|
c := dialFake(t, f)
|
||||||
|
raw, err := c.Fetch(1)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("fetch: %v", err)
|
||||||
|
}
|
||||||
|
if raw != nil {
|
||||||
|
t.Errorf("a vanished UID should give nil, got %q", raw)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestQuoteStripsNewlines(t *testing.T) {
|
||||||
|
if got := quote("pass\r\nA1 LOGOUT"); strings.ContainsAny(got, "\r\n") {
|
||||||
|
t.Errorf("quote kept a line break: %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
package email
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/mail"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The junk filter — the cheapest and most important half of reading mail.
|
||||||
|
//
|
||||||
|
// A mailbox is mostly machine-generated: newsletters, receipts nobody acts on,
|
||||||
|
// social notifications, marketing. Sending all of it to a 1.7B and asking "is
|
||||||
|
// there a task here" produces confident nonsense at a rate proportional to the
|
||||||
|
// volume, so junk is decided by HEADERS, before any model sees the message.
|
||||||
|
//
|
||||||
|
// The rules are all bulk-mail markers that senders set on themselves, never
|
||||||
|
// guesses about content:
|
||||||
|
//
|
||||||
|
// - List-Unsubscribe / List-Id — by definition a mailing list. If he can
|
||||||
|
// unsubscribe from it, it is not asking him to do anything.
|
||||||
|
// - Precedence: bulk|junk|list — the sender declaring itself bulk.
|
||||||
|
// - Auto-Submitted other than "no" (RFC 3834) — generated by a machine.
|
||||||
|
// - X-Spam-Flag: YES, X-Spam-Status: Yes — the spam filter upstream already
|
||||||
|
// decided; we do not second-guess it in the other direction.
|
||||||
|
// - X-GM-LABELS / X-Gmail-Labels containing a Gmail category — Gmail's own
|
||||||
|
// Promotions/Social/Forums/Spam classification, when the server sends it.
|
||||||
|
//
|
||||||
|
// Deliberately NOT here: sender allow/deny lists and subject keyword matching.
|
||||||
|
// Both are configuration that ages badly and both would be a place for his
|
||||||
|
// contacts to end up in a config file. If a real correspondent's mail is being
|
||||||
|
// dropped, the fix is a rule about a header, not a list of names.
|
||||||
|
//
|
||||||
|
// A junk verdict never deletes anything and never touches a flag on the server.
|
||||||
|
// It means "do not spend the model on this", nothing more.
|
||||||
|
|
||||||
|
// junkHeaders — headers whose mere presence marks bulk mail.
|
||||||
|
var junkPresence = []string{"List-Unsubscribe", "List-Id", "List-Post"}
|
||||||
|
|
||||||
|
// gmailCategories — Gmail's category labels, lowercased as they appear in
|
||||||
|
// X-GM-LABELS. "important" and "inbox" are labels too, and are NOT categories.
|
||||||
|
// Matching is by these exact tokens (substring is fine — they are namespaced
|
||||||
|
// and cannot appear in a hand-made label by accident), so a user label named
|
||||||
|
// "Social Club" is not mistaken for Gmail's Social category.
|
||||||
|
var gmailCategories = []string{
|
||||||
|
"category_promotions", "category_social", "category_forums", "category_updates",
|
||||||
|
`\spam`, `\junk`,
|
||||||
|
}
|
||||||
|
|
||||||
|
// classifyJunk returns whether the message is bulk/automated and why. The
|
||||||
|
// reason is a short header name, safe to log — it names the marker, never the
|
||||||
|
// sender or the subject.
|
||||||
|
func classifyJunk(h mail.Header) (bool, string) {
|
||||||
|
for _, name := range junkPresence {
|
||||||
|
if strings.TrimSpace(h.Get(name)) != "" {
|
||||||
|
return true, strings.ToLower(name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
switch strings.ToLower(strings.TrimSpace(h.Get("Precedence"))) {
|
||||||
|
case "bulk", "junk", "list":
|
||||||
|
return true, "precedence"
|
||||||
|
}
|
||||||
|
if v := strings.ToLower(strings.TrimSpace(h.Get("Auto-Submitted"))); v != "" && v != "no" {
|
||||||
|
return true, "auto-submitted"
|
||||||
|
}
|
||||||
|
if strings.EqualFold(strings.TrimSpace(h.Get("X-Spam-Flag")), "yes") {
|
||||||
|
return true, "x-spam-flag"
|
||||||
|
}
|
||||||
|
if v := strings.ToLower(strings.TrimSpace(h.Get("X-Spam-Status"))); strings.HasPrefix(v, "yes") {
|
||||||
|
return true, "x-spam-status"
|
||||||
|
}
|
||||||
|
labels := strings.ToLower(h.Get("X-GM-LABELS") + " " + h.Get("X-Gmail-Labels"))
|
||||||
|
for _, c := range gmailCategories {
|
||||||
|
if c == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if strings.Contains(labels, c) {
|
||||||
|
return true, "gmail-category"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false, ""
|
||||||
|
}
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
package email
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/mail"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func headers(t *testing.T, raw string) mail.Header {
|
||||||
|
t.Helper()
|
||||||
|
m, err := mail.ReadMessage(strings.NewReader(strings.ReplaceAll(raw, "\n", "\r\n") + "\r\n\r\nbody\r\n"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read headers: %v", err)
|
||||||
|
}
|
||||||
|
return m.Header
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestClassifyJunk(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
raw string
|
||||||
|
junk bool
|
||||||
|
reason string
|
||||||
|
}{
|
||||||
|
{"personal", "From: a@b.c\nSubject: привет", false, ""},
|
||||||
|
{"list-unsubscribe", "From: a@b.c\nList-Unsubscribe: <mailto:u@b.c>", true, "list-unsubscribe"},
|
||||||
|
{"list-id", "From: a@b.c\nList-Id: <golang-nuts.example>", true, "list-id"},
|
||||||
|
{"precedence bulk", "From: a@b.c\nPrecedence: bulk", true, "precedence"},
|
||||||
|
{"auto-submitted", "From: a@b.c\nAuto-Submitted: auto-generated", true, "auto-submitted"},
|
||||||
|
{"auto-submitted no", "From: a@b.c\nAuto-Submitted: no", false, ""},
|
||||||
|
{"spam flag", "From: a@b.c\nX-Spam-Flag: YES", true, "x-spam-flag"},
|
||||||
|
{"spam status", "From: a@b.c\nX-Spam-Status: Yes, score=9.1", true, "x-spam-status"},
|
||||||
|
{"spam status no", "From: a@b.c\nX-Spam-Status: No, score=0.1", false, ""},
|
||||||
|
{"gmail promo", "From: a@b.c\nX-Gmail-Labels: Inbox,CATEGORY_PROMOTIONS", true, "gmail-category"},
|
||||||
|
{"user label", "From: a@b.c\nX-Gmail-Labels: Social Club,Important", false, ""},
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
t.Run(c.name, func(t *testing.T) {
|
||||||
|
junk, reason := classifyJunk(headers(t, c.raw))
|
||||||
|
if junk != c.junk || reason != c.reason {
|
||||||
|
t.Errorf("classifyJunk = (%v, %q), want (%v, %q)", junk, reason, c.junk, c.reason)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNewsletterFixtureIsJunk(t *testing.T) {
|
||||||
|
msg, err := ParseMessage(9, fixture(t, "newsletter.eml"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
if !msg.Junk {
|
||||||
|
t.Fatal("a newsletter with List-Unsubscribe + Precedence: bulk must be junk")
|
||||||
|
}
|
||||||
|
// The reason is what gets logged, so it must never carry mail content.
|
||||||
|
if strings.Contains(msg.JunkReason, "@") || strings.Contains(msg.JunkReason, "Скидки") {
|
||||||
|
t.Errorf("junk reason leaks content: %q", msg.JunkReason)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,258 @@
|
|||||||
|
// Package email is the reading half of the email reader (Vikunja #246,
|
||||||
|
// docs/plans/01-email-reader.md): a small IMAP client, a MIME-to-plaintext
|
||||||
|
// converter, and the junk filter that decides a message is not worth reading at
|
||||||
|
// all. Extraction lives in extract.go and writes nothing itself.
|
||||||
|
//
|
||||||
|
// Two constraints shape everything here, both from CLAUDE.md:
|
||||||
|
//
|
||||||
|
// - Mail is personal. Nothing in this package logs a body, a subject, or an
|
||||||
|
// address; callers get the text and decide. Mail text is never search input
|
||||||
|
// — no function here reaches the network except the IMAP connection itself.
|
||||||
|
// - Off unless configured. There is no default host, no default account, and
|
||||||
|
// no fallback that would make a mailbox get read because a field was empty.
|
||||||
|
//
|
||||||
|
// The IMAP subset is deliberately tiny (LOGIN, SELECT, UID SEARCH, UID FETCH
|
||||||
|
// with BODY.PEEK, LOGOUT). No IDLE: a poll every few minutes is what a task
|
||||||
|
// candidate needs, and IDLE would mean holding a connection and a credential
|
||||||
|
// open forever for latency nobody is waiting on.
|
||||||
|
package email
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/base64"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"mime"
|
||||||
|
"mime/multipart"
|
||||||
|
"mime/quotedprintable"
|
||||||
|
"net/mail"
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// MaxBodyBytes — how much of one message body is kept. A task hides in the
|
||||||
|
// first screenful; the rest is signature, quoted history and legal boilerplate,
|
||||||
|
// and it would only spend the resident model's 4096-token context.
|
||||||
|
const MaxBodyBytes = 4000
|
||||||
|
|
||||||
|
// Message — one mail, reduced to the fields extraction and review need.
|
||||||
|
//
|
||||||
|
// Raw is deliberately absent: once a message is parsed the original bytes are
|
||||||
|
// dropped, so no caller can accidentally log or forward the whole mail.
|
||||||
|
type Message struct {
|
||||||
|
UID uint32
|
||||||
|
From string
|
||||||
|
Subject string
|
||||||
|
Date string // as sent, unparsed — display only
|
||||||
|
Body string // plaintext, decoded, HTML-stripped, truncated
|
||||||
|
// Junk is set by the junk filter (see junk.go). A junk message is carried
|
||||||
|
// rather than dropped so the poller can count it and still mark it seen.
|
||||||
|
Junk bool
|
||||||
|
JunkReason string
|
||||||
|
}
|
||||||
|
|
||||||
|
// ParseMessage turns one RFC 5322 message into a Message.
|
||||||
|
//
|
||||||
|
// It never fails on a body it cannot understand: an unparsable or
|
||||||
|
// unsupported-charset body yields an empty Body and the headers still come
|
||||||
|
// through, because a subject line alone is often the whole task ("Счёт за
|
||||||
|
// интернет"). Only a message whose headers cannot be read at all is an error.
|
||||||
|
func ParseMessage(uid uint32, raw []byte) (Message, error) {
|
||||||
|
m, err := mail.ReadMessage(strings.NewReader(string(raw)))
|
||||||
|
if err != nil {
|
||||||
|
return Message{}, fmt.Errorf("email: parse message: %w", err)
|
||||||
|
}
|
||||||
|
msg := Message{
|
||||||
|
UID: uid,
|
||||||
|
From: decodeHeader(m.Header.Get("From")),
|
||||||
|
Subject: decodeHeader(m.Header.Get("Subject")),
|
||||||
|
Date: m.Header.Get("Date"),
|
||||||
|
}
|
||||||
|
msg.Junk, msg.JunkReason = classifyJunk(m.Header)
|
||||||
|
body, err := plaintextBody(m.Header.Get("Content-Type"), m.Header.Get("Content-Transfer-Encoding"), m.Body)
|
||||||
|
if err == nil {
|
||||||
|
msg.Body = truncate(collapse(body), MaxBodyBytes)
|
||||||
|
}
|
||||||
|
return msg, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// plaintextBody walks the MIME tree and returns the best plaintext it can.
|
||||||
|
//
|
||||||
|
// Preference order inside a multipart: text/plain first, text/html stripped
|
||||||
|
// only when there is no plain part. multipart/mixed attachments are skipped
|
||||||
|
// wholesale — an attachment is a file, not a sentence, and reading one would
|
||||||
|
// mean parsing arbitrary formats from the network.
|
||||||
|
func plaintextBody(contentType, encoding string, body io.Reader) (string, error) {
|
||||||
|
mediaType, params, err := mime.ParseMediaType(contentType)
|
||||||
|
if contentType == "" || err != nil {
|
||||||
|
// No Content-Type at all is legal and means text/plain; a broken one is
|
||||||
|
// treated the same rather than dropping the message.
|
||||||
|
mediaType, params = "text/plain", nil
|
||||||
|
}
|
||||||
|
switch {
|
||||||
|
case strings.HasPrefix(mediaType, "multipart/"):
|
||||||
|
boundary := params["boundary"]
|
||||||
|
if boundary == "" {
|
||||||
|
return "", fmt.Errorf("email: multipart without boundary")
|
||||||
|
}
|
||||||
|
return multipartText(multipart.NewReader(body, boundary))
|
||||||
|
case mediaType == "text/html":
|
||||||
|
raw, err := decodeBody(body, encoding, params["charset"])
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return stripHTML(raw), nil
|
||||||
|
case mediaType == "text/plain":
|
||||||
|
return decodeBody(body, encoding, params["charset"])
|
||||||
|
default:
|
||||||
|
// A single-part non-text message (a bare PDF, say). No body, headers only.
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// multipartText reads one multipart level, recursing into nested multiparts.
|
||||||
|
// Returns the plain part if any part yielded one, else the stripped HTML.
|
||||||
|
func multipartText(mr *multipart.Reader) (string, error) {
|
||||||
|
var plain, html string
|
||||||
|
for {
|
||||||
|
part, err := mr.NextPart()
|
||||||
|
if err == io.EOF {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
// A truncated multipart still gives up whatever came before it.
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if part.FileName() != "" {
|
||||||
|
part.Close()
|
||||||
|
continue // attachment
|
||||||
|
}
|
||||||
|
ct := part.Header.Get("Content-Type")
|
||||||
|
mediaType, _, _ := mime.ParseMediaType(ct)
|
||||||
|
text, err := plaintextBody(ct, part.Header.Get("Content-Transfer-Encoding"), part)
|
||||||
|
part.Close()
|
||||||
|
if err != nil || strings.TrimSpace(text) == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if mediaType == "text/html" && !strings.HasPrefix(mediaType, "multipart/") {
|
||||||
|
if html == "" {
|
||||||
|
html = text
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if plain == "" {
|
||||||
|
plain = text
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(plain) != "" {
|
||||||
|
return plain, nil
|
||||||
|
}
|
||||||
|
return html, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// decodeBody applies the transfer encoding, then the charset.
|
||||||
|
//
|
||||||
|
// Charset support is UTF-8 (and ASCII, its subset) only, on purpose: x/text's
|
||||||
|
// encoding tables are not vendored here, and guessing at windows-1251 bytes
|
||||||
|
// would feed the model mojibake it would happily extract a task from. An
|
||||||
|
// unsupported charset returns an error, which ParseMessage turns into an empty
|
||||||
|
// body — subject-only, which is honest.
|
||||||
|
func decodeBody(r io.Reader, encoding, charset string) (string, error) {
|
||||||
|
switch strings.ToLower(strings.TrimSpace(encoding)) {
|
||||||
|
case "quoted-printable":
|
||||||
|
r = quotedprintable.NewReader(r)
|
||||||
|
case "base64":
|
||||||
|
r = newBase64Reader(r)
|
||||||
|
}
|
||||||
|
b, err := io.ReadAll(io.LimitReader(r, 1<<20))
|
||||||
|
if err != nil && len(b) == 0 {
|
||||||
|
return "", fmt.Errorf("email: read body: %w", err)
|
||||||
|
}
|
||||||
|
switch cs := strings.ToLower(strings.TrimSpace(charset)); cs {
|
||||||
|
case "", "utf-8", "utf8", "us-ascii", "ascii":
|
||||||
|
return string(b), nil
|
||||||
|
default:
|
||||||
|
return "", fmt.Errorf("email: unsupported charset %q", cs)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// decodeHeader decodes RFC 2047 encoded words ("=?utf-8?B?...?="), which is how
|
||||||
|
// every Russian subject line arrives. Undecodable headers come back as-is
|
||||||
|
// rather than empty: a mangled subject is still a hint, and it is only ever
|
||||||
|
// shown to him as evidence.
|
||||||
|
func decodeHeader(v string) string {
|
||||||
|
dec := new(mime.WordDecoder)
|
||||||
|
out, err := dec.DecodeHeader(v)
|
||||||
|
if err != nil {
|
||||||
|
return collapse(v)
|
||||||
|
}
|
||||||
|
return collapse(out)
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
scriptStyle = regexp.MustCompile(`(?is)<(script|style)\b[^>]*>.*?</\s*(script|style)\s*>`)
|
||||||
|
htmlBreak = regexp.MustCompile(`(?i)<\s*(br\s*/?|/p|/div|/tr|/li|/h[1-6])\s*>`)
|
||||||
|
htmlTag = regexp.MustCompile(`(?s)<[^>]*>`)
|
||||||
|
htmlComment = regexp.MustCompile(`(?s)<!--.*?-->`)
|
||||||
|
)
|
||||||
|
|
||||||
|
// stripHTML reduces an HTML part to text. A regex stripper, not a parser:
|
||||||
|
// x/net/html is not vendored, and the consumer is a model reading prose — a
|
||||||
|
// stray angle bracket costs nothing, whereas a new dependency for the privacy-
|
||||||
|
// sensitive path costs review.
|
||||||
|
func stripHTML(s string) string {
|
||||||
|
s = scriptStyle.ReplaceAllString(s, " ")
|
||||||
|
s = htmlComment.ReplaceAllString(s, " ")
|
||||||
|
s = htmlBreak.ReplaceAllString(s, "\n")
|
||||||
|
s = htmlTag.ReplaceAllString(s, " ")
|
||||||
|
return unescapeEntities(s)
|
||||||
|
}
|
||||||
|
|
||||||
|
var entities = strings.NewReplacer(
|
||||||
|
" ", " ", "&", "&", "<", "<", ">", ">",
|
||||||
|
""", `"`, "'", "'", "'", "'", "—", "—", "–", "–",
|
||||||
|
)
|
||||||
|
|
||||||
|
func unescapeEntities(s string) string { return entities.Replace(s) }
|
||||||
|
|
||||||
|
// collapse squeezes runs of whitespace, keeping single newlines. Mail bodies
|
||||||
|
// arrive with hard-wrapped lines and blocks of blank space; the model does not
|
||||||
|
// need them and they are pure context budget.
|
||||||
|
func collapse(s string) string {
|
||||||
|
lines := strings.Split(strings.ReplaceAll(s, "\r\n", "\n"), "\n")
|
||||||
|
var out []string
|
||||||
|
blank := 0
|
||||||
|
for _, l := range lines {
|
||||||
|
l = strings.TrimSpace(strings.Join(strings.Fields(l), " "))
|
||||||
|
if l == "" {
|
||||||
|
blank++
|
||||||
|
if blank > 1 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
out = append(out, "")
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
blank = 0
|
||||||
|
out = append(out, l)
|
||||||
|
}
|
||||||
|
return strings.TrimSpace(strings.Join(out, "\n"))
|
||||||
|
}
|
||||||
|
|
||||||
|
// truncate cuts to n bytes on a rune boundary.
|
||||||
|
func truncate(s string, n int) string {
|
||||||
|
if len(s) <= n {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
cut := s[:n]
|
||||||
|
for len(cut) > 0 && !isRuneStart(cut[len(cut)-1]) {
|
||||||
|
cut = cut[:len(cut)-1]
|
||||||
|
}
|
||||||
|
return strings.TrimSpace(cut) + "…"
|
||||||
|
}
|
||||||
|
|
||||||
|
func isRuneStart(b byte) bool { return b&0xC0 != 0x80 }
|
||||||
|
|
||||||
|
// newBase64Reader — base64.NewDecoder already skips the CRLFs mail bodies wrap
|
||||||
|
// with, so this is only a named seam for decodeBody to read cleanly.
|
||||||
|
func newBase64Reader(r io.Reader) io.Reader {
|
||||||
|
return base64.NewDecoder(base64.StdEncoding, r)
|
||||||
|
}
|
||||||
@@ -0,0 +1,111 @@
|
|||||||
|
package email
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func fixture(t *testing.T, name string) []byte {
|
||||||
|
t.Helper()
|
||||||
|
b, err := os.ReadFile(filepath.Join("testdata", name))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read fixture %s: %v", name, err)
|
||||||
|
}
|
||||||
|
return b
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParsePlainRussian(t *testing.T) {
|
||||||
|
msg, err := ParseMessage(7, fixture(t, "plain_ru.eml"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
if msg.UID != 7 {
|
||||||
|
t.Errorf("uid = %d, want 7", msg.UID)
|
||||||
|
}
|
||||||
|
if want := "Нужно закрыть задачу"; msg.Subject != want {
|
||||||
|
t.Errorf("subject = %q, want %q", msg.Subject, want)
|
||||||
|
}
|
||||||
|
if !strings.Contains(msg.From, "Антон") {
|
||||||
|
t.Errorf("from = %q, want the decoded display name", msg.From)
|
||||||
|
}
|
||||||
|
if !strings.Contains(msg.Body, "Надо отправить акт до пятницы.") {
|
||||||
|
t.Errorf("body = %q, want the quoted-printable text decoded", msg.Body)
|
||||||
|
}
|
||||||
|
if msg.Junk {
|
||||||
|
t.Errorf("a personal mail must not be junk (%s)", msg.JunkReason)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseHTMLOnlyIsStripped(t *testing.T) {
|
||||||
|
msg, err := ParseMessage(1, fixture(t, "html_only.eml"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
if strings.Contains(msg.Body, "<") || strings.Contains(msg.Body, "color:red") || strings.Contains(msg.Body, "x()") {
|
||||||
|
t.Errorf("body still has markup/script/style: %q", msg.Body)
|
||||||
|
}
|
||||||
|
for _, want := range []string{"Счёт за интернет: 700", "Оплатить до 5 августа."} {
|
||||||
|
if !strings.Contains(msg.Body, want) {
|
||||||
|
t.Errorf("body = %q, want it to contain %q", msg.Body, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// must have become a real space, not vanished into the number.
|
||||||
|
if strings.Contains(msg.Body, " ") {
|
||||||
|
t.Errorf("entity left unescaped: %q", msg.Body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParsePrefersPlainAndSkipsAttachments(t *testing.T) {
|
||||||
|
msg, err := ParseMessage(2, fixture(t, "mixed_attachment.eml"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
if got := strings.TrimSpace(msg.Body); got != "Sign the contract before Monday." {
|
||||||
|
t.Errorf("body = %q, want the text/plain alternative only", got)
|
||||||
|
}
|
||||||
|
if strings.Contains(msg.Body, "PDF") {
|
||||||
|
t.Errorf("attachment bytes leaked into the body: %q", msg.Body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// An unsupported charset must degrade to headers-only rather than to mojibake
|
||||||
|
// the model would then extract a task from.
|
||||||
|
func TestParseUnsupportedCharsetKeepsHeaders(t *testing.T) {
|
||||||
|
msg, err := ParseMessage(3, fixture(t, "cp1251.eml"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
if msg.Subject != "Legacy" {
|
||||||
|
t.Errorf("subject = %q, want Legacy", msg.Subject)
|
||||||
|
}
|
||||||
|
if msg.Body != "" {
|
||||||
|
t.Errorf("body = %q, want empty for an undecodable charset", msg.Body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseTruncatesLongBody(t *testing.T) {
|
||||||
|
var b strings.Builder
|
||||||
|
b.WriteString("Subject: long\r\nContent-Type: text/plain; charset=utf-8\r\n\r\n")
|
||||||
|
for i := 0; i < 2000; i++ {
|
||||||
|
b.WriteString("длинная строка ")
|
||||||
|
}
|
||||||
|
msg, err := ParseMessage(4, []byte(b.String()))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
if len(msg.Body) > MaxBodyBytes+8 {
|
||||||
|
t.Errorf("body kept %d bytes, want ≤ %d", len(msg.Body), MaxBodyBytes)
|
||||||
|
}
|
||||||
|
if !strings.HasSuffix(msg.Body, "…") {
|
||||||
|
t.Errorf("truncated body should be marked: %q", msg.Body[len(msg.Body)-20:])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCollapseSqueezesBlankLines(t *testing.T) {
|
||||||
|
got := collapse(" a b \r\n\r\n\r\n\r\n c \r\n")
|
||||||
|
if got != "a b\n\nc" {
|
||||||
|
t.Errorf("collapse = %q, want %q", got, "a b\n\nc")
|
||||||
|
}
|
||||||
|
}
|
||||||
Vendored
+7
@@ -0,0 +1,7 @@
|
|||||||
|
From: legacy@example.org
|
||||||
|
To: kami@example.org
|
||||||
|
Subject: Legacy
|
||||||
|
Date: Fri, 01 Aug 2026 05:00:00 +0400
|
||||||
|
Content-Type: text/plain; charset="windows-1251"
|
||||||
|
|
||||||
|
Ï
|
||||||
+13
@@ -0,0 +1,13 @@
|
|||||||
|
From: billing@isp.example
|
||||||
|
To: kami@example.org
|
||||||
|
Subject: =?utf-8?B?0KHRh9GR0YIg0LfQsCDQuNC90YLQtdGA0L3QtdGC?=
|
||||||
|
Date: Fri, 01 Aug 2026 08:00:00 +0400
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: multipart/alternative; boundary="B1"
|
||||||
|
|
||||||
|
--B1
|
||||||
|
Content-Type: text/html; charset="utf-8"
|
||||||
|
Content-Transfer-Encoding: base64
|
||||||
|
|
||||||
|
PGh0bWw+PGhlYWQ+PHN0eWxlPnB7Y29sb3I6cmVkfTwvc3R5bGU+PC9oZWFkPjxib2R5PjxwPtCh0YfRkdGCINC30LAg0LjQvdGC0LXRgNC90LXRgjogNzAwJm5ic3A74oK9PC9wPjxwPtCe0L/Qu9Cw0YLQuNGC0Ywg0LTQviA1INCw0LLQs9GD0YHRgtCwLjwvcD48c2NyaXB0PngoKTwvc2NyaXB0PjwvYm9keT48L2h0bWw+
|
||||||
|
--B1--
|
||||||
+26
@@ -0,0 +1,26 @@
|
|||||||
|
From: hr@work.example
|
||||||
|
To: kami@example.org
|
||||||
|
Subject: Contract
|
||||||
|
Date: Fri, 01 Aug 2026 07:00:00 +0400
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: multipart/mixed; boundary="M1"
|
||||||
|
|
||||||
|
--M1
|
||||||
|
Content-Type: multipart/alternative; boundary="A1"
|
||||||
|
|
||||||
|
--A1
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
|
||||||
|
Sign the contract before Monday.
|
||||||
|
--A1
|
||||||
|
Content-Type: text/html; charset="utf-8"
|
||||||
|
|
||||||
|
<p>Sign the contract before Monday.</p>
|
||||||
|
--A1--
|
||||||
|
--M1
|
||||||
|
Content-Type: application/pdf; name="contract.pdf"
|
||||||
|
Content-Disposition: attachment; filename="contract.pdf"
|
||||||
|
Content-Transfer-Encoding: base64
|
||||||
|
|
||||||
|
JVBERi0xLjQgbm90IHJlYWxseSBhIHBkZg==
|
||||||
|
--M1--
|
||||||
+9
@@ -0,0 +1,9 @@
|
|||||||
|
From: news@shop.example
|
||||||
|
To: kami@example.org
|
||||||
|
Subject: =?utf-8?B?0KHQutC40LTQutC4INGC0L7Qu9GM0LrQviDRgdC10LPQvtC00L3Rjw==?=
|
||||||
|
Date: Fri, 01 Aug 2026 06:00:00 +0400
|
||||||
|
List-Unsubscribe: <mailto:unsub@shop.example>
|
||||||
|
Precedence: bulk
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
|
||||||
|
Sale!
|
||||||
Vendored
+14
@@ -0,0 +1,14 @@
|
|||||||
|
From: =?utf-8?B?0JDQvdGC0L7QvQ==?= <anton@example.org>
|
||||||
|
To: kami@example.org
|
||||||
|
Subject: =?utf-8?B?0J3Rg9C20L3QviDQt9Cw0LrRgNGL0YLRjCDQt9Cw0LTQsNGH0YM=?=
|
||||||
|
Date: Fri, 01 Aug 2026 09:12:00 +0400
|
||||||
|
Content-Type: text/plain; charset="utf-8"
|
||||||
|
Content-Transfer-Encoding: quoted-printable
|
||||||
|
Message-ID: <plain-ru@example.org>
|
||||||
|
|
||||||
|
=D0=9F=D1=80=D0=B8=D0=B2=D0=B5=D1=82! =D0=9D=D0=B0=D0=B4=D0=BE =D0=BE=D1=82=
|
||||||
|
=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D1=82=D1=8C =D0=B0=D0=BA=D1=82 =D0=B4=D0=BE =
|
||||||
|
=D0=BF=D1=8F=D1=82=D0=BD=D0=B8=D1=86=D1=8B.
|
||||||
|
|
||||||
|
--
|
||||||
|
Anton
|
||||||
@@ -93,6 +93,101 @@ type WriteFactReq struct {
|
|||||||
Subject string `json:"subject,omitempty"`
|
Subject string `json:"subject,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Task — one captured piece of work (Vikunja #130). Status is
|
||||||
|
// "candidate" (Maven derived it and it is unconfirmed), "open" (his work),
|
||||||
|
// "done" or "dropped". Source is provenance in the facts vocabulary:
|
||||||
|
// "tap:voice", "tap:web", "email:<account>". Evidence is the trail a derived
|
||||||
|
// task came from, empty for anything he stated himself.
|
||||||
|
type Task struct {
|
||||||
|
ID int64 `json:"id"`
|
||||||
|
CreatedTs time.Time `json:"created_ts"`
|
||||||
|
Text string `json:"text"`
|
||||||
|
Source string `json:"source"`
|
||||||
|
Evidence string `json:"evidence,omitempty"`
|
||||||
|
Status string `json:"status"`
|
||||||
|
Due *time.Time `json:"due,omitempty"`
|
||||||
|
Weight int `json:"weight,omitempty"`
|
||||||
|
Resolved *time.Time `json:"resolved,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// CaptureTaskReq — THE INTAKE SEAM. Everything that captures a task goes
|
||||||
|
// through this one shape: the voice path, the web form, and (Vikunja #246) the
|
||||||
|
// email reader, which has not been built yet.
|
||||||
|
//
|
||||||
|
// An extractor that reads mail sets Source "email:<account>", Status
|
||||||
|
// "candidate", and Evidence to whatever makes the task reviewable (the subject
|
||||||
|
// line). It must NOT set Status "open" — work Maven inferred from something she
|
||||||
|
// read is a suggestion until the owner confirms it on the /tasks page. Capture
|
||||||
|
// is idempotent on normalised text among live tasks, so re-reading the same
|
||||||
|
// mailbox is free.
|
||||||
|
type CaptureTaskReq struct {
|
||||||
|
Text string `json:"text"`
|
||||||
|
Source string `json:"source"`
|
||||||
|
Evidence string `json:"evidence,omitempty"`
|
||||||
|
Status string `json:"status,omitempty"` // "" ⇒ open
|
||||||
|
Due *time.Time `json:"due,omitempty"`
|
||||||
|
Weight int `json:"weight,omitempty"`
|
||||||
|
Ts time.Time `json:"ts"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// CaptureTaskResp — Created is false when the same live task already existed,
|
||||||
|
// in which case ID is the existing row. A caller tells the owner "уже в
|
||||||
|
// списке" rather than claiming it saved something new.
|
||||||
|
type CaptureTaskResp struct {
|
||||||
|
ID int64 `json:"id"`
|
||||||
|
Created bool `json:"created"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// IngestMailReq — one message a mail reader has fetched, handed to core for
|
||||||
|
// extraction (Vikunja #246).
|
||||||
|
//
|
||||||
|
// The mail reader (cmd/mavmaild) holds the IMAP credential and core never sees
|
||||||
|
// it, the same split mavpoll uses for the zenmoney token. What crosses this
|
||||||
|
// boundary is only the message text, because extraction runs on the resident
|
||||||
|
// model and llama-server lives inside core's process.
|
||||||
|
//
|
||||||
|
// Body is already plaintext and truncated by internal/email; core does not
|
||||||
|
// re-parse MIME and never stores the body. Junk means the reader's header
|
||||||
|
// filter already classified the message as bulk — core is told rather than
|
||||||
|
// asked, so a junk message can be counted without a model call.
|
||||||
|
//
|
||||||
|
// This method is available only when core has an email block configured AND a
|
||||||
|
// llama-server phraser; otherwise it answers ErrUnknownMethod, which is what
|
||||||
|
// "off unless configured" looks like at the wire.
|
||||||
|
type IngestMailReq struct {
|
||||||
|
Mailbox string `json:"mailbox"`
|
||||||
|
UID uint32 `json:"uid"`
|
||||||
|
From string `json:"from,omitempty"`
|
||||||
|
Subject string `json:"subject,omitempty"`
|
||||||
|
Date string `json:"date,omitempty"`
|
||||||
|
Body string `json:"body,omitempty"`
|
||||||
|
Junk bool `json:"junk,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// IngestMailResp — what core did with the message. TaskIDs are the rows
|
||||||
|
// CaptureTask returned; Created counts the ones that were new (a re-read
|
||||||
|
// mailbox dedupes to Created=0). Skipped is set when nothing was asked of the
|
||||||
|
// model at all — junk, or an empty message.
|
||||||
|
//
|
||||||
|
// Nothing here echoes the mail back. The reader logs counts.
|
||||||
|
type IngestMailResp struct {
|
||||||
|
TaskIDs []int64 `json:"task_ids,omitempty"`
|
||||||
|
Created int `json:"created"`
|
||||||
|
Skipped bool `json:"skipped,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type listTasksReq struct {
|
||||||
|
Status string `json:"status"` // "" all | "live" | candidate|open|done|dropped
|
||||||
|
}
|
||||||
|
type listTasksResp struct {
|
||||||
|
Tasks []Task `json:"tasks"`
|
||||||
|
}
|
||||||
|
type setTaskStatusReq struct {
|
||||||
|
ID int64 `json:"id"`
|
||||||
|
Status string `json:"status"`
|
||||||
|
Ts time.Time `json:"ts"`
|
||||||
|
}
|
||||||
|
|
||||||
// idReq — methods keyed by a single id.
|
// idReq — methods keyed by a single id.
|
||||||
type idReq struct {
|
type idReq struct {
|
||||||
ID int64 `json:"id"`
|
ID int64 `json:"id"`
|
||||||
@@ -294,6 +389,18 @@ type CoreAPI interface {
|
|||||||
// loop takes the schedule from there — no reminder is created (Vikunja #366).
|
// loop takes the schedule from there — no reminder is created (Vikunja #366).
|
||||||
AcceptProposedRoutine(ctx context.Context, id int64) error
|
AcceptProposedRoutine(ctx context.Context, id int64) error
|
||||||
|
|
||||||
|
// CaptureTask records a task. See CaptureTaskReq — this is the single
|
||||||
|
// intake seam for the voice path, the web form and the future email
|
||||||
|
// extractor. Idempotent per live normalised text; the response says
|
||||||
|
// whether a row was actually created.
|
||||||
|
CaptureTask(ctx context.Context, req CaptureTaskReq) (CaptureTaskResp, error)
|
||||||
|
// ListTasks returns tasks in one status, newest first. "" is every row,
|
||||||
|
// "live" is candidate + open (outstanding work).
|
||||||
|
ListTasks(ctx context.Context, status string) ([]Task, error)
|
||||||
|
// SetTaskStatus moves a task forward once: candidate→open|dropped,
|
||||||
|
// open→done|dropped. Any other move is refused.
|
||||||
|
SetTaskStatus(ctx context.Context, id int64, status string, ts time.Time) error
|
||||||
|
|
||||||
// TickTrace returns the most recent tick's rule trace. The daemon caches
|
// TickTrace returns the most recent tick's rule trace. The daemon caches
|
||||||
// this after every tick; the store adapter returns an error (trace is not
|
// this after every tick; the store adapter returns an error (trace is not
|
||||||
// persisted — it's a daemon-level cache).
|
// persisted — it's a daemon-level cache).
|
||||||
@@ -306,6 +413,14 @@ type CoreAPI interface {
|
|||||||
// TickTrace.
|
// TickTrace.
|
||||||
MorningStatus(ctx context.Context) ([]MorningRoutineStatus, error)
|
MorningStatus(ctx context.Context) ([]MorningRoutineStatus, error)
|
||||||
|
|
||||||
|
// DayPlan returns today's ordered plan — calendar events, pending
|
||||||
|
// reminders and any morning checklist still outstanding (see
|
||||||
|
// internal/morning.BuildPlan) — plus the spoken RU rendering of it.
|
||||||
|
// Read-only: asking for the plan never dispatches or schedules anything.
|
||||||
|
// The store adapter returns an error (the plan needs the daemon's routine
|
||||||
|
// config) — same shape as TickTrace and MorningStatus.
|
||||||
|
DayPlan(ctx context.Context) (DayPlan, error)
|
||||||
|
|
||||||
// Chat routes a text utterance through the reactive handler's core path
|
// Chat routes a text utterance through the reactive handler's core path
|
||||||
// (router → dialogue → action → replier) and returns the reply text.
|
// (router → dialogue → action → replier) and returns the reply text.
|
||||||
// No audio or stt/tts — for text channels (mavweb, telegram).
|
// No audio or stt/tts — for text channels (mavweb, telegram).
|
||||||
@@ -359,6 +474,26 @@ type MorningRoutineStatus struct {
|
|||||||
Items []MorningRoutineItem `json:"items"`
|
Items []MorningRoutineItem `json:"items"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DayPlanItem — one line of the day plan. Kind is "event", "reminder" or
|
||||||
|
// "checklist"; Uncertain marks an item whose provenance is below a full
|
||||||
|
// calendar read (a meeting relayed off a phone notification), so a UI can hedge
|
||||||
|
// the same way the spoken form does.
|
||||||
|
type DayPlanItem struct {
|
||||||
|
At time.Time `json:"at"`
|
||||||
|
Text string `json:"text"`
|
||||||
|
Kind string `json:"kind"`
|
||||||
|
Uncertain bool `json:"uncertain,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// DayPlan — the plan for one calendar day. Spoken is the RU sentence maven
|
||||||
|
// says when asked, rendered core-side so the voice reply and the web view can
|
||||||
|
// never drift apart.
|
||||||
|
type DayPlan struct {
|
||||||
|
Date time.Time `json:"date"`
|
||||||
|
Items []DayPlanItem `json:"items"`
|
||||||
|
Spoken string `json:"spoken"`
|
||||||
|
}
|
||||||
|
|
||||||
// storeEncryptionKeyReq — passkey credential public key for wrapping the store
|
// storeEncryptionKeyReq — passkey credential public key for wrapping the store
|
||||||
// encryption key at enrollment time. Called by mavweb after RegisterFinish.
|
// encryption key at enrollment time. Called by mavweb after RegisterFinish.
|
||||||
type storeEncryptionKeyReq struct {
|
type storeEncryptionKeyReq struct {
|
||||||
|
|||||||
@@ -69,8 +69,10 @@ var readOnlyMethods = map[Method]bool{
|
|||||||
MethodLookupTool: true,
|
MethodLookupTool: true,
|
||||||
MethodListTools: true,
|
MethodListTools: true,
|
||||||
MethodListProposedRoutines: true,
|
MethodListProposedRoutines: true,
|
||||||
|
MethodListTasks: true,
|
||||||
MethodTickTrace: true,
|
MethodTickTrace: true,
|
||||||
MethodMorningStatus: true,
|
MethodMorningStatus: true,
|
||||||
|
MethodDayPlan: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Dial connects to a core socket at path and returns a Client. The module
|
// Dial connects to a core socket at path and returns a Client. The module
|
||||||
@@ -426,6 +428,37 @@ func (c *Client) ListProposedRoutines(ctx context.Context) ([]ProposedRoutine, e
|
|||||||
return r.Routines, nil
|
return r.Routines, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *Client) CaptureTask(ctx context.Context, req CaptureTaskReq) (CaptureTaskResp, error) {
|
||||||
|
var r CaptureTaskResp
|
||||||
|
if err := c.call(ctx, MethodCaptureTask, req, &r); err != nil {
|
||||||
|
return CaptureTaskResp{}, err
|
||||||
|
}
|
||||||
|
return r, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) ListTasks(ctx context.Context, status string) ([]Task, error) {
|
||||||
|
var r listTasksResp
|
||||||
|
if err := c.call(ctx, MethodListTasks, listTasksReq{Status: status}, &r); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return r.Tasks, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) SetTaskStatus(ctx context.Context, id int64, status string, ts time.Time) error {
|
||||||
|
return c.call(ctx, MethodSetTaskStatus, setTaskStatusReq{ID: id, Status: status, Ts: ts}, nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
// IngestMail hands one fetched message to core for extraction. ErrUnknownMethod
|
||||||
|
// means core has no email block configured — the caller should stop asking, not
|
||||||
|
// retry.
|
||||||
|
func (c *Client) IngestMail(ctx context.Context, req IngestMailReq) (IngestMailResp, error) {
|
||||||
|
var r IngestMailResp
|
||||||
|
if err := c.call(ctx, MethodIngestMail, req, &r); err != nil {
|
||||||
|
return IngestMailResp{}, err
|
||||||
|
}
|
||||||
|
return r, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (c *Client) DismissProposedRoutine(ctx context.Context, id int64) error {
|
func (c *Client) DismissProposedRoutine(ctx context.Context, id int64) error {
|
||||||
return c.call(ctx, MethodDismissProposedRoutine, dismissProposedRoutineReq{ID: id}, nil)
|
return c.call(ctx, MethodDismissProposedRoutine, dismissProposedRoutineReq{ID: id}, nil)
|
||||||
}
|
}
|
||||||
@@ -458,6 +491,14 @@ func (c *Client) MorningStatus(ctx context.Context) ([]MorningRoutineStatus, err
|
|||||||
return s, nil
|
return s, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *Client) DayPlan(ctx context.Context) (DayPlan, error) {
|
||||||
|
var p DayPlan
|
||||||
|
if err := c.call(ctx, MethodDayPlan, nil, &p); err != nil {
|
||||||
|
return DayPlan{}, err
|
||||||
|
}
|
||||||
|
return p, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (c *Client) RevertFact(ctx context.Context, key string) (int64, error) {
|
func (c *Client) RevertFact(ctx context.Context, key string) (int64, error) {
|
||||||
var result struct {
|
var result struct {
|
||||||
NewID int64 `json:"new_id"`
|
NewID int64 `json:"new_id"`
|
||||||
|
|||||||
+38
-88
@@ -410,95 +410,12 @@ func TestChatViaClient(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// chatTestAPI — a minimal CoreAPI that only implements Chat for testing.
|
// chatTestAPI — a minimal CoreAPI that only implements Chat for testing.
|
||||||
type chatTestAPI struct{}
|
// Embeds UnimplementedCoreAPI so every other method fails loudly with
|
||||||
|
// ErrNotImplemented instead of needing 27 hand-written no-op stubs.
|
||||||
|
type chatTestAPI struct {
|
||||||
|
UnimplementedCoreAPI
|
||||||
|
}
|
||||||
|
|
||||||
func (a *chatTestAPI) WriteFact(ctx context.Context, req WriteFactReq) (int64, error) {
|
|
||||||
return 0, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) LatestFact(ctx context.Context, key string) (Fact, error) {
|
|
||||||
return Fact{}, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) LatestFactBySource(ctx context.Context, key, source string) (Fact, error) {
|
|
||||||
return Fact{}, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) Since(ctx context.Context, key string, now time.Time) (time.Duration, error) {
|
|
||||||
return 0, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) Presence(ctx context.Context) (Presence, error) {
|
|
||||||
return Presence{}, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) CreateReminder(ctx context.Context, fire time.Time, payload, cron string) (int64, error) {
|
|
||||||
return 0, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) MarkReminder(ctx context.Context, id int64, status string) error {
|
|
||||||
return ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) ListReminders(ctx context.Context, n int) ([]Reminder, error) {
|
|
||||||
return nil, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) RecordNudge(ctx context.Context, rule, channel, message string, ts time.Time) (int64, error) {
|
|
||||||
return 0, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) ResolveNudge(ctx context.Context, id int64, outcome string, ts time.Time) error {
|
|
||||||
return ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) RecentOutcomes(ctx context.Context, rule string, n int) ([]string, error) {
|
|
||||||
return nil, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) RecentFacts(ctx context.Context, n int) ([]Fact, error) {
|
|
||||||
return nil, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) CalendarEvents(ctx context.Context, from, to time.Time) ([]Fact, error) {
|
|
||||||
return nil, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) RecentNudges(ctx context.Context, n int) ([]Nudge, error) {
|
|
||||||
return nil, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) WriteNote(ctx context.Context, ts time.Time, text string, embedding []float32, source string) (int64, error) {
|
|
||||||
return 0, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) QueryNotes(ctx context.Context, embedding []float32, k int) ([]Note, error) {
|
|
||||||
return nil, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) RecentNotes(ctx context.Context, n int) ([]Note, error) {
|
|
||||||
return nil, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) ProposeTool(ctx context.Context, name, utterance, scope string, ts time.Time) (bool, error) {
|
|
||||||
return false, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) EnableTool(ctx context.Context, name string, cmd []string, destructive bool, scope string, ts time.Time) error {
|
|
||||||
return ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) DisableTool(ctx context.Context, name string) error {
|
|
||||||
return ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) DeleteTool(ctx context.Context, name string) error {
|
|
||||||
return ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) ListProposedRoutines(ctx context.Context) ([]ProposedRoutine, error) {
|
|
||||||
return nil, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) AcceptProposedRoutine(ctx context.Context, id int64) error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) DismissProposedRoutine(ctx context.Context, id int64) error {
|
|
||||||
return ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) LookupTool(ctx context.Context, name string) (Tool, error) {
|
|
||||||
return Tool{}, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) ListTools(ctx context.Context, status string) ([]Tool, error) {
|
|
||||||
return nil, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) RevertFact(ctx context.Context, key string) (int64, error) {
|
|
||||||
return 0, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) TickTrace(ctx context.Context) (TickTrace, error) {
|
|
||||||
return TickTrace{}, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) MorningStatus(ctx context.Context) ([]MorningRoutineStatus, error) {
|
|
||||||
return nil, ErrUnknownMethod
|
|
||||||
}
|
|
||||||
func (a *chatTestAPI) Chat(ctx context.Context, text string) (string, error) {
|
func (a *chatTestAPI) Chat(ctx context.Context, text string) (string, error) {
|
||||||
if text == "привет" {
|
if text == "привет" {
|
||||||
return "и тебе привет!", nil
|
return "и тебе привет!", nil
|
||||||
@@ -648,3 +565,36 @@ func mustJSON(v any) []byte {
|
|||||||
}
|
}
|
||||||
return b
|
return b
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestIngestMail_OffUnlessConfigured — with no IngestMailFn set (the default,
|
||||||
|
// and what an unconfigured core looks like) the method does not exist. A mail
|
||||||
|
// reader gets a refusal it can act on rather than a silent success.
|
||||||
|
func TestIngestMail_OffUnlessConfigured(t *testing.T) {
|
||||||
|
_, _, cli, _ := newServerWithStore(t)
|
||||||
|
if _, err := cli.IngestMail(context.Background(), IngestMailReq{Mailbox: "INBOX", UID: 1}); !errors.Is(err, ErrUnknownMethod) {
|
||||||
|
t.Fatalf("IngestMail error = %v, want ErrUnknownMethod", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestIngestMail_Hook — when the daemon wires the hook, the message crosses the
|
||||||
|
// boundary intact and the response comes back.
|
||||||
|
func TestIngestMail_Hook(t *testing.T) {
|
||||||
|
_, srv, cli, _ := newServerWithStore(t)
|
||||||
|
var got IngestMailReq
|
||||||
|
srv.IngestMailFn = func(_ context.Context, req IngestMailReq) (IngestMailResp, error) {
|
||||||
|
got = req
|
||||||
|
return IngestMailResp{TaskIDs: []int64{7}, Created: 1}, nil
|
||||||
|
}
|
||||||
|
resp, err := cli.IngestMail(context.Background(), IngestMailReq{
|
||||||
|
Mailbox: "INBOX", UID: 12, Subject: "Счёт", Body: "Оплатить.", Junk: false,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("IngestMail: %v", err)
|
||||||
|
}
|
||||||
|
if resp.Created != 1 || len(resp.TaskIDs) != 1 || resp.TaskIDs[0] != 7 {
|
||||||
|
t.Errorf("resp = %+v", resp)
|
||||||
|
}
|
||||||
|
if got.UID != 12 || got.Subject != "Счёт" || got.Body != "Оплатить." {
|
||||||
|
t.Errorf("req across the wire = %+v", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
+335
-306
@@ -211,6 +211,10 @@ func (a *storeAPI) MorningStatus(ctx context.Context) ([]MorningRoutineStatus, e
|
|||||||
return nil, errors.New("store: morning status not available via direct store API")
|
return nil, errors.New("store: morning status not available via direct store API")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) DayPlan(ctx context.Context) (DayPlan, error) {
|
||||||
|
return DayPlan{}, errors.New("store: day plan not available via direct store API")
|
||||||
|
}
|
||||||
|
|
||||||
func (a *storeAPI) ListTools(ctx context.Context, status string) ([]Tool, error) {
|
func (a *storeAPI) ListTools(ctx context.Context, status string) ([]Tool, error) {
|
||||||
ts, err := a.s.ListTools(ctx, status)
|
ts, err := a.s.ListTools(ctx, status)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -227,6 +231,48 @@ func (a *storeAPI) DeleteTool(ctx context.Context, name string) error {
|
|||||||
return mapErr(a.s.DeleteTool(ctx, name))
|
return mapErr(a.s.DeleteTool(ctx, name))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) CaptureTask(ctx context.Context, req CaptureTaskReq) (CaptureTaskResp, error) {
|
||||||
|
id, created, err := a.s.CaptureTask(ctx, store.Task{
|
||||||
|
CreatedTs: req.Ts,
|
||||||
|
Text: req.Text,
|
||||||
|
Source: req.Source,
|
||||||
|
Evidence: req.Evidence,
|
||||||
|
Status: req.Status,
|
||||||
|
Due: req.Due,
|
||||||
|
Weight: req.Weight,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return CaptureTaskResp{}, mapErr(err)
|
||||||
|
}
|
||||||
|
return CaptureTaskResp{ID: id, Created: created}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) ListTasks(ctx context.Context, status string) ([]Task, error) {
|
||||||
|
ts, err := a.s.ListTasks(ctx, status)
|
||||||
|
if err != nil {
|
||||||
|
return nil, mapErr(err)
|
||||||
|
}
|
||||||
|
out := make([]Task, len(ts))
|
||||||
|
for i, t := range ts {
|
||||||
|
out[i] = Task{
|
||||||
|
ID: t.ID,
|
||||||
|
CreatedTs: t.CreatedTs,
|
||||||
|
Text: t.Text,
|
||||||
|
Source: t.Source,
|
||||||
|
Evidence: t.Evidence,
|
||||||
|
Status: t.Status,
|
||||||
|
Due: t.Due,
|
||||||
|
Weight: t.Weight,
|
||||||
|
Resolved: t.ResolvedTs,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) SetTaskStatus(ctx context.Context, id int64, status string, ts time.Time) error {
|
||||||
|
return mapErr(a.s.SetTaskStatus(ctx, id, status, ts))
|
||||||
|
}
|
||||||
|
|
||||||
func (a *storeAPI) ListProposedRoutines(ctx context.Context) ([]ProposedRoutine, error) {
|
func (a *storeAPI) ListProposedRoutines(ctx context.Context) ([]ProposedRoutine, error) {
|
||||||
rs, err := a.s.ListProposedRoutines(ctx)
|
rs, err := a.s.ListProposedRoutines(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -375,6 +421,17 @@ type Server struct {
|
|||||||
// Set by the daemon; nil ⇒ MethodStoreEncryptionKey returns ErrUnknownMethod.
|
// Set by the daemon; nil ⇒ MethodStoreEncryptionKey returns ErrUnknownMethod.
|
||||||
WrapKeyFn WrapKeyFunc
|
WrapKeyFn WrapKeyFunc
|
||||||
|
|
||||||
|
// IngestMailFn — extracts task candidates from one fetched message. Set by
|
||||||
|
// the daemon only when an email block is configured AND there is a
|
||||||
|
// llama-server to extract with; nil ⇒ MethodIngestMail returns
|
||||||
|
// ErrUnknownMethod, so a mail reader pointed at a core that is not
|
||||||
|
// configured for mail is refused rather than silently ignored.
|
||||||
|
//
|
||||||
|
// Like StepUp/WrapKeyFn/UnlockFn this bypasses CoreAPI: it is not a store
|
||||||
|
// operation, it needs the resident model, and it must not become a method
|
||||||
|
// every CoreAPI implementation has to carry.
|
||||||
|
IngestMailFn IngestMailFunc
|
||||||
|
|
||||||
// UnlockFn — unwraps the store encryption key from the wrapped blob using
|
// UnlockFn — unwraps the store encryption key from the wrapped blob using
|
||||||
// the passkey credential public key, opens the encrypted store, and wires
|
// the passkey credential public key, opens the encrypted store, and wires
|
||||||
// the rest of the daemon (voice, loop, delivery). Set by the daemon when
|
// the rest of the daemon (voice, loop, delivery). Set by the daemon when
|
||||||
@@ -393,6 +450,9 @@ type WrapKeyFunc func(ctx context.Context, publicKey []byte) error
|
|||||||
// public key and completes daemon initialization.
|
// public key and completes daemon initialization.
|
||||||
type UnlockFunc func(ctx context.Context, publicKey []byte) error
|
type UnlockFunc func(ctx context.Context, publicKey []byte) error
|
||||||
|
|
||||||
|
// IngestMailFunc — core-side mail extraction. Returns what was captured.
|
||||||
|
type IngestMailFunc func(ctx context.Context, req IngestMailReq) (IngestMailResp, error)
|
||||||
|
|
||||||
// CheckFunc — the auth hook signature. Wired by the daemon (auth.Gate.Check
|
// CheckFunc — the auth hook signature. Wired by the daemon (auth.Gate.Check
|
||||||
// satisfies this); dispatch calls it once per request after param-unmarshal
|
// satisfies this); dispatch calls it once per request after param-unmarshal
|
||||||
// independence (it gets the raw params, may unmarshal what it needs — ipc
|
// independence (it gets the raw params, may unmarshal what it needs — ipc
|
||||||
@@ -501,6 +561,259 @@ func (s *Server) safeDispatch(ctx context.Context, req Request) (result json.Raw
|
|||||||
return s.dispatch(ctx, req)
|
return s.dispatch(ctx, req)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// handlerFunc — one table entry's shape: unmarshal req.Params (if it wants
|
||||||
|
// any), call the matching CoreAPI method against the api passed in, marshal
|
||||||
|
// the result. api is a parameter, not a closed-over field, precisely so a
|
||||||
|
// table built once at package init never pins a stale CoreAPI — see the note
|
||||||
|
// on methodTable below about SetAPI.
|
||||||
|
type handlerFunc func(ctx context.Context, api CoreAPI, raw json.RawMessage) (json.RawMessage, error)
|
||||||
|
|
||||||
|
// withParams adapts a (typed params, typed result) CoreAPI call into a
|
||||||
|
// handlerFunc: unmarshal into P, call fn, marshal R. On error the result is
|
||||||
|
// dropped (marshalResult's output is never read when err != nil — see
|
||||||
|
// serveConn) so every entry can uniformly return early on error without
|
||||||
|
// re-deriving what the pre-table per-arm code used to return in that case.
|
||||||
|
func withParams[P any, R any](fn func(ctx context.Context, api CoreAPI, p P) (R, error)) handlerFunc {
|
||||||
|
return func(ctx context.Context, api CoreAPI, raw json.RawMessage) (json.RawMessage, error) {
|
||||||
|
var p P
|
||||||
|
if err := unmarshalParams(raw, &p); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
r, err := fn(ctx, api, p)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return marshalResult(r), nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// withParamsVoid is withParams for the error-only methods (mark/resolve/
|
||||||
|
// enable/disable/...): params in, no result out, wire reply is always null.
|
||||||
|
func withParamsVoid[P any](fn func(ctx context.Context, api CoreAPI, p P) error) handlerFunc {
|
||||||
|
return func(ctx context.Context, api CoreAPI, raw json.RawMessage) (json.RawMessage, error) {
|
||||||
|
var p P
|
||||||
|
if err := unmarshalParams(raw, &p); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return marshalResult(nil), fn(ctx, api, p)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// withoutParams is withParams for the handful of methods that take no
|
||||||
|
// params at all (Presence, TickTrace, MorningStatus, ListProposedRoutines).
|
||||||
|
// It does NOT call unmarshalParams — matching the pre-table arms, which
|
||||||
|
// never touched req.Params for these four methods.
|
||||||
|
func withoutParams[R any](fn func(ctx context.Context, api CoreAPI) (R, error)) handlerFunc {
|
||||||
|
return func(ctx context.Context, api CoreAPI, _ json.RawMessage) (json.RawMessage, error) {
|
||||||
|
r, err := fn(ctx, api)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return marshalResult(r), nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// methodTable — one entry per CoreAPI-backed method. Built once at package
|
||||||
|
// init, not per-Server and not per-dispatch: entries close over nothing but
|
||||||
|
// the CoreAPI method being called, and dispatch passes in the *current*
|
||||||
|
// api (loaded fresh via s.api.Load() every call, same as before the table
|
||||||
|
// existed) as an argument — so SetAPI's runtime swap (the unlock transition)
|
||||||
|
// is still honored on the very next request with no extra plumbing here.
|
||||||
|
//
|
||||||
|
// MethodAssertStepUp, MethodStoreEncryptionKey, MethodUnlock and
|
||||||
|
// MethodIngestMail are NOT in this table: they bypass CoreAPI entirely
|
||||||
|
// (s.StepUp / s.WrapKeyFn / s.UnlockFn / s.IngestMailFn), so dispatch
|
||||||
|
// special-cases them before consulting the table.
|
||||||
|
var methodTable = map[Method]handlerFunc{
|
||||||
|
MethodWriteFact: withParams(func(ctx context.Context, api CoreAPI, p WriteFactReq) (idResp, error) {
|
||||||
|
id, err := api.WriteFact(ctx, p)
|
||||||
|
return idResp{ID: id}, err
|
||||||
|
}),
|
||||||
|
MethodLatestFact: withParams(func(ctx context.Context, api CoreAPI, p keyReq) (Fact, error) {
|
||||||
|
return api.LatestFact(ctx, p.Key)
|
||||||
|
}),
|
||||||
|
MethodLatestFactBySource: withParams(func(ctx context.Context, api CoreAPI, p keySourceReq) (Fact, error) {
|
||||||
|
return api.LatestFactBySource(ctx, p.Key, p.Source)
|
||||||
|
}),
|
||||||
|
MethodSince: withParams(func(ctx context.Context, api CoreAPI, p sinceReq) (sinceResp, error) {
|
||||||
|
d, err := api.Since(ctx, p.Key, p.Now)
|
||||||
|
return sinceResp{Dur: d}, err
|
||||||
|
}),
|
||||||
|
MethodPresence: withoutParams(func(ctx context.Context, api CoreAPI) (Presence, error) {
|
||||||
|
return api.Presence(ctx)
|
||||||
|
}),
|
||||||
|
MethodCreateReminder: withParams(func(ctx context.Context, api CoreAPI, p createReminderReq) (idResp, error) {
|
||||||
|
id, err := api.CreateReminder(ctx, p.Fire, p.Payload, p.Cron)
|
||||||
|
return idResp{ID: id}, err
|
||||||
|
}),
|
||||||
|
MethodMarkReminder: withParamsVoid(func(ctx context.Context, api CoreAPI, p markReminderReq) error {
|
||||||
|
return api.MarkReminder(ctx, p.ID, p.Status)
|
||||||
|
}),
|
||||||
|
MethodListReminders: withParams(func(ctx context.Context, api CoreAPI, p nReq) ([]Reminder, error) {
|
||||||
|
out, err := api.ListReminders(ctx, p.N)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if out == nil {
|
||||||
|
out = []Reminder{}
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}),
|
||||||
|
MethodRecordNudge: withParams(func(ctx context.Context, api CoreAPI, p recordNudgeReq) (idResp, error) {
|
||||||
|
id, err := api.RecordNudge(ctx, p.Rule, p.Channel, p.Message, p.Ts)
|
||||||
|
return idResp{ID: id}, err
|
||||||
|
}),
|
||||||
|
MethodResolveNudge: withParamsVoid(func(ctx context.Context, api CoreAPI, p resolveNudgeReq) error {
|
||||||
|
return api.ResolveNudge(ctx, p.ID, p.Outcome, p.Ts)
|
||||||
|
}),
|
||||||
|
MethodRecentOutcomes: withParams(func(ctx context.Context, api CoreAPI, p outcomesReq) ([]string, error) {
|
||||||
|
out, err := api.RecentOutcomes(ctx, p.Rule, p.N)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if out == nil {
|
||||||
|
out = []string{} // stable non-null on the wire
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}),
|
||||||
|
MethodRecentFacts: withParams(func(ctx context.Context, api CoreAPI, p nReq) ([]Fact, error) {
|
||||||
|
out, err := api.RecentFacts(ctx, p.N)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if out == nil {
|
||||||
|
out = []Fact{}
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}),
|
||||||
|
MethodCalendarEvents: withParams(func(ctx context.Context, api CoreAPI, p calendarEventsReq) ([]Fact, error) {
|
||||||
|
out, err := api.CalendarEvents(ctx, p.From, p.To)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if out == nil {
|
||||||
|
out = []Fact{}
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}),
|
||||||
|
MethodRecentNudges: withParams(func(ctx context.Context, api CoreAPI, p nReq) ([]Nudge, error) {
|
||||||
|
out, err := api.RecentNudges(ctx, p.N)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if out == nil {
|
||||||
|
out = []Nudge{}
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}),
|
||||||
|
MethodWriteNote: withParams(func(ctx context.Context, api CoreAPI, p writeNoteReq) (idResp, error) {
|
||||||
|
id, err := api.WriteNote(ctx, p.Ts, p.Text, p.Embedding, p.Source)
|
||||||
|
return idResp{ID: id}, err
|
||||||
|
}),
|
||||||
|
MethodQueryNotes: withParams(func(ctx context.Context, api CoreAPI, p queryNotesReq) ([]Note, error) {
|
||||||
|
out, err := api.QueryNotes(ctx, p.Embedding, p.K)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if out == nil {
|
||||||
|
out = []Note{}
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}),
|
||||||
|
MethodRecentNotes: withParams(func(ctx context.Context, api CoreAPI, p nReq) ([]Note, error) {
|
||||||
|
out, err := api.RecentNotes(ctx, p.N)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if out == nil {
|
||||||
|
out = []Note{}
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}),
|
||||||
|
MethodProposeTool: withParams(func(ctx context.Context, api CoreAPI, p proposeToolReq) (proposeToolResp, error) {
|
||||||
|
ok, err := api.ProposeTool(ctx, p.Name, p.Utterance, p.Scope, p.Ts)
|
||||||
|
return proposeToolResp{Proposed: ok}, err
|
||||||
|
}),
|
||||||
|
MethodEnableTool: withParamsVoid(func(ctx context.Context, api CoreAPI, p enableToolReq) error {
|
||||||
|
return api.EnableTool(ctx, p.Name, p.Cmd, p.Destructive, p.Scope, p.Ts)
|
||||||
|
}),
|
||||||
|
MethodDisableTool: withParamsVoid(func(ctx context.Context, api CoreAPI, p disableToolReq) error {
|
||||||
|
return api.DisableTool(ctx, p.Name)
|
||||||
|
}),
|
||||||
|
MethodLookupTool: withParams(func(ctx context.Context, api CoreAPI, p lookupToolReq) (Tool, error) {
|
||||||
|
return api.LookupTool(ctx, p.Name)
|
||||||
|
}),
|
||||||
|
MethodListTools: withParams(func(ctx context.Context, api CoreAPI, p listToolsReq) (listToolsResp, error) {
|
||||||
|
out, err := api.ListTools(ctx, p.Status)
|
||||||
|
if err != nil {
|
||||||
|
return listToolsResp{}, err
|
||||||
|
}
|
||||||
|
if out == nil {
|
||||||
|
out = []Tool{}
|
||||||
|
}
|
||||||
|
return listToolsResp{Tools: out}, nil
|
||||||
|
}),
|
||||||
|
// MethodDeleteTool shares disableToolReq — both take just a tool name.
|
||||||
|
MethodDeleteTool: withParamsVoid(func(ctx context.Context, api CoreAPI, p disableToolReq) error {
|
||||||
|
return api.DeleteTool(ctx, p.Name)
|
||||||
|
}),
|
||||||
|
MethodCaptureTask: withParams(func(ctx context.Context, api CoreAPI, p CaptureTaskReq) (CaptureTaskResp, error) {
|
||||||
|
return api.CaptureTask(ctx, p)
|
||||||
|
}),
|
||||||
|
MethodListTasks: withParams(func(ctx context.Context, api CoreAPI, p listTasksReq) (listTasksResp, error) {
|
||||||
|
out, err := api.ListTasks(ctx, p.Status)
|
||||||
|
if err != nil {
|
||||||
|
return listTasksResp{}, err
|
||||||
|
}
|
||||||
|
if out == nil {
|
||||||
|
out = []Task{}
|
||||||
|
}
|
||||||
|
return listTasksResp{Tasks: out}, nil
|
||||||
|
}),
|
||||||
|
MethodSetTaskStatus: withParamsVoid(func(ctx context.Context, api CoreAPI, p setTaskStatusReq) error {
|
||||||
|
return api.SetTaskStatus(ctx, p.ID, p.Status, p.Ts)
|
||||||
|
}),
|
||||||
|
MethodListProposedRoutines: withoutParams(func(ctx context.Context, api CoreAPI) (listProposedRoutinesResp, error) {
|
||||||
|
out, err := api.ListProposedRoutines(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return listProposedRoutinesResp{}, err
|
||||||
|
}
|
||||||
|
if out == nil {
|
||||||
|
out = []ProposedRoutine{}
|
||||||
|
}
|
||||||
|
return listProposedRoutinesResp{Routines: out}, nil
|
||||||
|
}),
|
||||||
|
MethodDismissProposedRoutine: withParamsVoid(func(ctx context.Context, api CoreAPI, p dismissProposedRoutineReq) error {
|
||||||
|
return api.DismissProposedRoutine(ctx, p.ID)
|
||||||
|
}),
|
||||||
|
MethodAcceptProposedRoutine: withParamsVoid(func(ctx context.Context, api CoreAPI, p acceptProposedRoutineReq) error {
|
||||||
|
return api.AcceptProposedRoutine(ctx, p.ID)
|
||||||
|
}),
|
||||||
|
MethodRevertFact: withParams(func(ctx context.Context, api CoreAPI, p revertReq) (map[string]int64, error) {
|
||||||
|
newID, err := api.RevertFact(ctx, p.Key)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return map[string]int64{"new_id": newID}, nil
|
||||||
|
}),
|
||||||
|
MethodChat: withParams(func(ctx context.Context, api CoreAPI, p chatReq) (chatResp, error) {
|
||||||
|
reply, err := api.Chat(ctx, p.Text)
|
||||||
|
return chatResp{Reply: reply}, err
|
||||||
|
}),
|
||||||
|
MethodTickTrace: withoutParams(func(ctx context.Context, api CoreAPI) (TickTrace, error) {
|
||||||
|
return api.TickTrace(ctx)
|
||||||
|
}),
|
||||||
|
// MorningStatus intentionally has no nil→[]T{} normalization here — the
|
||||||
|
// pre-table arm marshaled api.MorningStatus's result as-is (a nil slice
|
||||||
|
// serializes as JSON null), and this preserves that exact wire shape.
|
||||||
|
MethodDayPlan: withoutParams(func(ctx context.Context, api CoreAPI) (DayPlan, error) {
|
||||||
|
return api.DayPlan(ctx)
|
||||||
|
}),
|
||||||
|
MethodMorningStatus: withoutParams(func(ctx context.Context, api CoreAPI) ([]MorningRoutineStatus, error) {
|
||||||
|
return api.MorningStatus(ctx)
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
|
||||||
// dispatch unmarshals params for req.Method and calls the matching CoreAPI
|
// dispatch unmarshals params for req.Method and calls the matching CoreAPI
|
||||||
// method. Unknown method ⇒ ErrUnknownMethod; a malformed params payload ⇒
|
// method. Unknown method ⇒ ErrUnknownMethod; a malformed params payload ⇒
|
||||||
// ErrBadParams with the underlying text (local, server-side, not shipped to
|
// ErrBadParams with the underlying text (local, server-side, not shipped to
|
||||||
@@ -517,312 +830,11 @@ func (s *Server) dispatch(ctx context.Context, req Request) (json.RawMessage, er
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// These bypass CoreAPI entirely — they drive Server fields set
|
||||||
|
// directly by the daemon (StepUp / WrapKeyFn / UnlockFn), not store
|
||||||
|
// state, so they can never be table entries keyed on a CoreAPI method.
|
||||||
switch req.Method {
|
switch req.Method {
|
||||||
case MethodWriteFact:
|
|
||||||
var p WriteFactReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
id, err := api.WriteFact(ctx, p)
|
|
||||||
return marshalResult(idResp{ID: id}), err
|
|
||||||
|
|
||||||
case MethodLatestFact:
|
|
||||||
var p keyReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
f, err := api.LatestFact(ctx, p.Key)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return marshalResult(f), nil
|
|
||||||
|
|
||||||
case MethodLatestFactBySource:
|
|
||||||
var p keySourceReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
f, err := api.LatestFactBySource(ctx, p.Key, p.Source)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return marshalResult(f), nil
|
|
||||||
|
|
||||||
case MethodSince:
|
|
||||||
var p sinceReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
d, err := api.Since(ctx, p.Key, p.Now)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return marshalResult(sinceResp{Dur: d}), nil
|
|
||||||
|
|
||||||
case MethodPresence:
|
|
||||||
pres, err := api.Presence(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return marshalResult(pres), nil
|
|
||||||
|
|
||||||
case MethodCreateReminder:
|
|
||||||
var p createReminderReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
id, err := api.CreateReminder(ctx, p.Fire, p.Payload, p.Cron)
|
|
||||||
return marshalResult(idResp{ID: id}), err
|
|
||||||
|
|
||||||
case MethodMarkReminder:
|
|
||||||
var p markReminderReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
err := api.MarkReminder(ctx, p.ID, p.Status)
|
|
||||||
return marshalResult(nil), err
|
|
||||||
|
|
||||||
case MethodListReminders:
|
|
||||||
var p nReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
out, err := api.ListReminders(ctx, p.N)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if out == nil {
|
|
||||||
out = []Reminder{}
|
|
||||||
}
|
|
||||||
return marshalResult(out), nil
|
|
||||||
|
|
||||||
case MethodRecordNudge:
|
|
||||||
var p recordNudgeReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
id, err := api.RecordNudge(ctx, p.Rule, p.Channel, p.Message, p.Ts)
|
|
||||||
return marshalResult(idResp{ID: id}), err
|
|
||||||
|
|
||||||
case MethodResolveNudge:
|
|
||||||
var p resolveNudgeReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
err := api.ResolveNudge(ctx, p.ID, p.Outcome, p.Ts)
|
|
||||||
return marshalResult(nil), err
|
|
||||||
|
|
||||||
case MethodRecentOutcomes:
|
|
||||||
var p outcomesReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
out, err := api.RecentOutcomes(ctx, p.Rule, p.N)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if out == nil {
|
|
||||||
out = []string{} // stable non-null on the wire
|
|
||||||
}
|
|
||||||
return marshalResult(out), nil
|
|
||||||
|
|
||||||
case MethodRecentFacts:
|
|
||||||
var p nReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
out, err := api.RecentFacts(ctx, p.N)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if out == nil {
|
|
||||||
out = []Fact{}
|
|
||||||
}
|
|
||||||
return marshalResult(out), nil
|
|
||||||
|
|
||||||
case MethodCalendarEvents:
|
|
||||||
var p calendarEventsReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
out, err := api.CalendarEvents(ctx, p.From, p.To)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if out == nil {
|
|
||||||
out = []Fact{}
|
|
||||||
}
|
|
||||||
return marshalResult(out), nil
|
|
||||||
|
|
||||||
case MethodRecentNudges:
|
|
||||||
var p nReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
out, err := api.RecentNudges(ctx, p.N)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if out == nil {
|
|
||||||
out = []Nudge{}
|
|
||||||
}
|
|
||||||
return marshalResult(out), nil
|
|
||||||
|
|
||||||
case MethodWriteNote:
|
|
||||||
var p writeNoteReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
id, err := api.WriteNote(ctx, p.Ts, p.Text, p.Embedding, p.Source)
|
|
||||||
return marshalResult(idResp{ID: id}), err
|
|
||||||
|
|
||||||
case MethodQueryNotes:
|
|
||||||
var p queryNotesReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
out, err := api.QueryNotes(ctx, p.Embedding, p.K)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if out == nil {
|
|
||||||
out = []Note{}
|
|
||||||
}
|
|
||||||
return marshalResult(out), nil
|
|
||||||
|
|
||||||
case MethodRecentNotes:
|
|
||||||
var p nReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
out, err := api.RecentNotes(ctx, p.N)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if out == nil {
|
|
||||||
out = []Note{}
|
|
||||||
}
|
|
||||||
return marshalResult(out), nil
|
|
||||||
|
|
||||||
case MethodProposeTool:
|
|
||||||
var p proposeToolReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
ok, err := api.ProposeTool(ctx, p.Name, p.Utterance, p.Scope, p.Ts)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return marshalResult(proposeToolResp{Proposed: ok}), nil
|
|
||||||
|
|
||||||
case MethodEnableTool:
|
|
||||||
var p enableToolReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return marshalResult(nil), api.EnableTool(ctx, p.Name, p.Cmd, p.Destructive, p.Scope, p.Ts)
|
|
||||||
|
|
||||||
case MethodDisableTool:
|
|
||||||
var p disableToolReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return marshalResult(nil), api.DisableTool(ctx, p.Name)
|
|
||||||
|
|
||||||
case MethodLookupTool:
|
|
||||||
var p lookupToolReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
t, err := api.LookupTool(ctx, p.Name)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return marshalResult(t), nil
|
|
||||||
|
|
||||||
case MethodListTools:
|
|
||||||
var p listToolsReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
out, err := api.ListTools(ctx, p.Status)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if out == nil {
|
|
||||||
out = []Tool{}
|
|
||||||
}
|
|
||||||
return marshalResult(listToolsResp{Tools: out}), nil
|
|
||||||
|
|
||||||
case MethodDeleteTool:
|
|
||||||
var p disableToolReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return marshalResult(nil), api.DeleteTool(ctx, p.Name)
|
|
||||||
|
|
||||||
case MethodListProposedRoutines:
|
|
||||||
out, err := api.ListProposedRoutines(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if out == nil {
|
|
||||||
out = []ProposedRoutine{}
|
|
||||||
}
|
|
||||||
return marshalResult(listProposedRoutinesResp{Routines: out}), nil
|
|
||||||
|
|
||||||
case MethodDismissProposedRoutine:
|
|
||||||
var p dismissProposedRoutineReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return marshalResult(nil), api.DismissProposedRoutine(ctx, p.ID)
|
|
||||||
|
|
||||||
case MethodAcceptProposedRoutine:
|
|
||||||
var p acceptProposedRoutineReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return marshalResult(nil), api.AcceptProposedRoutine(ctx, p.ID)
|
|
||||||
|
|
||||||
case MethodRevertFact:
|
|
||||||
var p struct {
|
|
||||||
Key string `json:"key"`
|
|
||||||
}
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
newID, err := api.RevertFact(ctx, p.Key)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return marshalResult(map[string]int64{"new_id": newID}), nil
|
|
||||||
|
|
||||||
case MethodChat:
|
|
||||||
var p chatReq
|
|
||||||
if err := unmarshalParams(req.Params, &p); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
reply, err := api.Chat(ctx, p.Text)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return marshalResult(chatResp{Reply: reply}), nil
|
|
||||||
|
|
||||||
case MethodTickTrace:
|
|
||||||
t, err := api.TickTrace(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return marshalResult(t), nil
|
|
||||||
|
|
||||||
case MethodMorningStatus:
|
|
||||||
s, err := api.MorningStatus(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return marshalResult(s), nil
|
|
||||||
|
|
||||||
case MethodAssertStepUp:
|
case MethodAssertStepUp:
|
||||||
if s.StepUp != nil {
|
if s.StepUp != nil {
|
||||||
return marshalResult(nil), s.StepUp(ctx)
|
return marshalResult(nil), s.StepUp(ctx)
|
||||||
@@ -849,9 +861,26 @@ func (s *Server) dispatch(ctx context.Context, req Request) (json.RawMessage, er
|
|||||||
}
|
}
|
||||||
return nil, fmt.Errorf("%w: %s", ErrUnknownMethod, req.Method)
|
return nil, fmt.Errorf("%w: %s", ErrUnknownMethod, req.Method)
|
||||||
|
|
||||||
default:
|
case MethodIngestMail:
|
||||||
|
if s.IngestMailFn != nil {
|
||||||
|
var p IngestMailReq
|
||||||
|
if err := unmarshalParams(req.Params, &p); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
resp, err := s.IngestMailFn(ctx, p)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return marshalResult(resp), nil
|
||||||
|
}
|
||||||
return nil, fmt.Errorf("%w: %s", ErrUnknownMethod, req.Method)
|
return nil, fmt.Errorf("%w: %s", ErrUnknownMethod, req.Method)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
h, ok := methodTable[req.Method]
|
||||||
|
if !ok {
|
||||||
|
return nil, fmt.Errorf("%w: %s", ErrUnknownMethod, req.Method)
|
||||||
|
}
|
||||||
|
return h(ctx, api, req.Params)
|
||||||
}
|
}
|
||||||
|
|
||||||
func unmarshalParams(raw json.RawMessage, v any) error {
|
func unmarshalParams(raw json.RawMessage, v any) error {
|
||||||
|
|||||||
@@ -0,0 +1,130 @@
|
|||||||
|
package ipc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ErrNotImplemented is returned by every UnimplementedCoreAPI method. It is
|
||||||
|
// deliberately distinct from ErrUnknownMethod (a wire-level "no such
|
||||||
|
// method exists" verdict) and from any daemon-level "locked" error: this one
|
||||||
|
// means "this method exists on CoreAPI, but the fake/adapter embedding
|
||||||
|
// UnimplementedCoreAPI never got a real implementation for it." A test that
|
||||||
|
// exercises an undeclared method fails loudly on this text instead of
|
||||||
|
// silently nil-panicking or being mistaken for a legitimate failure.
|
||||||
|
var ErrNotImplemented = errors.New("ipc: not implemented (unimplemented CoreAPI stub)")
|
||||||
|
|
||||||
|
// UnimplementedCoreAPI is the gRPC Unimplemented*Server pattern applied to
|
||||||
|
// CoreAPI: embed it in a test double or adapter and override only the
|
||||||
|
// methods you actually exercise. Every method returns ErrNotImplemented, so
|
||||||
|
// a call that reaches an undeclared method fails loudly and specifically,
|
||||||
|
// rather than compiling to a silent no-op or nil-pointer panic. This
|
||||||
|
// replaces the old pattern of hand-writing all 30 no-op stubs per double —
|
||||||
|
// those were compiler-satisfying padding, not tests of anything.
|
||||||
|
type UnimplementedCoreAPI struct{}
|
||||||
|
|
||||||
|
var _ CoreAPI = UnimplementedCoreAPI{}
|
||||||
|
|
||||||
|
func (UnimplementedCoreAPI) WriteFact(ctx context.Context, req WriteFactReq) (int64, error) {
|
||||||
|
return 0, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) LatestFact(ctx context.Context, key string) (Fact, error) {
|
||||||
|
return Fact{}, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) LatestFactBySource(ctx context.Context, key, source string) (Fact, error) {
|
||||||
|
return Fact{}, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) Since(ctx context.Context, key string, now time.Time) (time.Duration, error) {
|
||||||
|
return 0, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) Presence(ctx context.Context) (Presence, error) {
|
||||||
|
return Presence{}, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) CreateReminder(ctx context.Context, fire time.Time, payload, cron string) (int64, error) {
|
||||||
|
return 0, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) MarkReminder(ctx context.Context, id int64, status string) error {
|
||||||
|
return ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) ListReminders(ctx context.Context, n int) ([]Reminder, error) {
|
||||||
|
return nil, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) RecordNudge(ctx context.Context, rule, channel, message string, ts time.Time) (int64, error) {
|
||||||
|
return 0, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) ResolveNudge(ctx context.Context, id int64, outcome string, ts time.Time) error {
|
||||||
|
return ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) RecentOutcomes(ctx context.Context, rule string, n int) ([]string, error) {
|
||||||
|
return nil, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) RecentFacts(ctx context.Context, n int) ([]Fact, error) {
|
||||||
|
return nil, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) CalendarEvents(ctx context.Context, from, to time.Time) ([]Fact, error) {
|
||||||
|
return nil, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) RecentNudges(ctx context.Context, n int) ([]Nudge, error) {
|
||||||
|
return nil, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) WriteNote(ctx context.Context, ts time.Time, text string, embedding []float32, source string) (int64, error) {
|
||||||
|
return 0, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) QueryNotes(ctx context.Context, embedding []float32, k int) ([]Note, error) {
|
||||||
|
return nil, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) RecentNotes(ctx context.Context, n int) ([]Note, error) {
|
||||||
|
return nil, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) ProposeTool(ctx context.Context, name, utterance, scope string, ts time.Time) (bool, error) {
|
||||||
|
return false, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) EnableTool(ctx context.Context, name string, cmd []string, destructive bool, scope string, ts time.Time) error {
|
||||||
|
return ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) DisableTool(ctx context.Context, name string) error {
|
||||||
|
return ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) DeleteTool(ctx context.Context, name string) error {
|
||||||
|
return ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) CaptureTask(ctx context.Context, req CaptureTaskReq) (CaptureTaskResp, error) {
|
||||||
|
return CaptureTaskResp{}, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) ListTasks(ctx context.Context, status string) ([]Task, error) {
|
||||||
|
return nil, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) SetTaskStatus(ctx context.Context, id int64, status string, ts time.Time) error {
|
||||||
|
return ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) ListProposedRoutines(ctx context.Context) ([]ProposedRoutine, error) {
|
||||||
|
return nil, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) DismissProposedRoutine(ctx context.Context, id int64) error {
|
||||||
|
return ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) AcceptProposedRoutine(ctx context.Context, id int64) error {
|
||||||
|
return ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) LookupTool(ctx context.Context, name string) (Tool, error) {
|
||||||
|
return Tool{}, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) ListTools(ctx context.Context, status string) ([]Tool, error) {
|
||||||
|
return nil, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) RevertFact(ctx context.Context, key string) (int64, error) {
|
||||||
|
return 0, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) TickTrace(ctx context.Context) (TickTrace, error) {
|
||||||
|
return TickTrace{}, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) MorningStatus(ctx context.Context) ([]MorningRoutineStatus, error) {
|
||||||
|
return nil, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) DayPlan(ctx context.Context) (DayPlan, error) {
|
||||||
|
return DayPlan{}, ErrNotImplemented
|
||||||
|
}
|
||||||
|
func (UnimplementedCoreAPI) Chat(ctx context.Context, text string) (string, error) {
|
||||||
|
return "", ErrNotImplemented
|
||||||
|
}
|
||||||
@@ -45,7 +45,12 @@ const (
|
|||||||
MethodRevertFact Method = "revert_fact"
|
MethodRevertFact Method = "revert_fact"
|
||||||
MethodTickTrace Method = "tick_trace"
|
MethodTickTrace Method = "tick_trace"
|
||||||
MethodMorningStatus Method = "morning_status"
|
MethodMorningStatus Method = "morning_status"
|
||||||
|
MethodDayPlan Method = "day_plan"
|
||||||
MethodChat Method = "chat"
|
MethodChat Method = "chat"
|
||||||
|
MethodCaptureTask Method = "capture_task"
|
||||||
|
MethodListTasks Method = "list_tasks"
|
||||||
|
MethodSetTaskStatus Method = "set_task_status"
|
||||||
|
MethodIngestMail Method = "ingest_mail"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Request — one frame from module to core. Params is the JSON-encoded argument
|
// Request — one frame from module to core. Params is the JSON-encoded argument
|
||||||
|
|||||||
@@ -286,6 +286,54 @@ func TestRemindersStillHonourSnooze(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ---------------------------- digest eligibility ------------------------------
|
||||||
|
|
||||||
|
// A Sev2 care candidate (break) suppressed for a genuine restraint reason is
|
||||||
|
// worth resurfacing later.
|
||||||
|
func TestDigestEligibleSev2SuppressedByRestraint(t *testing.T) {
|
||||||
|
for _, reason := range []string{"quiet_hours", "calendar_busy", "presence"} {
|
||||||
|
if !DigestEligible(Sev2, reason) {
|
||||||
|
t.Errorf("sev2 blocked by %q: want digest-eligible", reason)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A Sev1 care candidate (water/meal) never digests — a biological timer
|
||||||
|
// nudge is stale by the time anyone could resurface it, so it just drops.
|
||||||
|
func TestDigestEligibleSev1NeverDigests(t *testing.T) {
|
||||||
|
for _, reason := range []string{"quiet_hours", "calendar_busy", "presence"} {
|
||||||
|
if DigestEligible(Sev1, reason) {
|
||||||
|
t.Errorf("sev1 blocked by %q: want drop, got digest-eligible", reason)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ops severities are never blocked by these reasons in practice (Gate only
|
||||||
|
// applies quiet_hours/calendar_busy/presence to care severities), but the
|
||||||
|
// boundary itself must refuse to digest a high severity even if asked —
|
||||||
|
// alarms bypass the gate and deliver now, unchanged, never delayed.
|
||||||
|
func TestDigestEligibleNeverDigestsHighSeverity(t *testing.T) {
|
||||||
|
for _, sev := range []Severity{Sev3, Sev4} {
|
||||||
|
for _, reason := range []string{"quiet_hours", "calendar_busy", "presence"} {
|
||||||
|
if DigestEligible(sev, reason) {
|
||||||
|
t.Errorf("sev%d blocked by %q: high severity must never digest", sev, reason)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// cooldown and snooze are not "suppression" in the digest sense — cooldown
|
||||||
|
// means it was already said recently, snooze means the user asked to not
|
||||||
|
// hear about it. Neither should resurface later just because the severity
|
||||||
|
// matches.
|
||||||
|
func TestDigestEligibleExcludesCooldownAndSnooze(t *testing.T) {
|
||||||
|
for _, reason := range []string{"cooldown", "snooze", "inert_no_data", "predicate", ""} {
|
||||||
|
if DigestEligible(Sev2, reason) {
|
||||||
|
t.Errorf("sev2 blocked by %q: should not be digest-eligible", reason)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// GAP — the gate reads State.SnoozeUntil, but the Gatherer hard-codes it to nil
|
// GAP — the gate reads State.SnoozeUntil, but the Gatherer hard-codes it to nil
|
||||||
// (internal/loop/gather.go:153), so snooze is dead in the running daemon: the
|
// (internal/loop/gather.go:153), so snooze is dead in the running daemon: the
|
||||||
// unit tests above pass while nothing can ever populate the map. This asserts
|
// unit tests above pass while nothing can ever populate the map. This asserts
|
||||||
|
|||||||
@@ -105,6 +105,36 @@ func Tick(s State, rules []Rule) *Candidate {
|
|||||||
return fire
|
return fire
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DigestEligible decides digest-vs-drop for a care candidate the gate
|
||||||
|
// suppressed this tick (see ExplainGate's blockedBy). Pure — no I/O, no
|
||||||
|
// state, just the two facts that matter: why it was suppressed, and how
|
||||||
|
// insistent it was.
|
||||||
|
//
|
||||||
|
// Only genuine RESTRAINT blocks are eligible at all — quiet_hours,
|
||||||
|
// calendar_busy, presence(away). cooldown and snooze are not suppression in
|
||||||
|
// this sense: cooldown means "you already heard this recently" (resurfacing
|
||||||
|
// it later would be an actual repeat, not a rescue) and snooze is the user
|
||||||
|
// explicitly saying "not this" (digesting it anyway would defeat the ask).
|
||||||
|
// Ops severities (Sev3/4) never reach here — the gate never blocks them for
|
||||||
|
// these reasons in the first place (see Gate), and even if a future rule
|
||||||
|
// dropped Sev3+ into "care", digest still refuses them: alarms bypass the
|
||||||
|
// gate on purpose and must never be silently delayed into a bundle.
|
||||||
|
//
|
||||||
|
// Within care (Sev1–2), the boundary is severity itself: Sev1 (water, meal —
|
||||||
|
// biological timers with no "still relevant later" property; a water nudge
|
||||||
|
// from 3 hours into quiet hours is just wrong by morning) drops. Sev2
|
||||||
|
// (break — "you worked through a long stretch without a break while I
|
||||||
|
// couldn't reach you") is information that stays true and useful after the
|
||||||
|
// fact, so it digests.
|
||||||
|
func DigestEligible(sev Severity, blockedBy string) bool {
|
||||||
|
switch blockedBy {
|
||||||
|
case "quiet_hours", "calendar_busy", "presence":
|
||||||
|
default:
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return sev == Sev2
|
||||||
|
}
|
||||||
|
|
||||||
// ReminderDecision — a due reminder the daemon should deliver now.
|
// ReminderDecision — a due reminder the daemon should deliver now.
|
||||||
// NOT gated by the universal Gate (per spec: "wake me 7" fires in quiet hours;
|
// NOT gated by the universal Gate (per spec: "wake me 7" fires in quiet hours;
|
||||||
// that's the point). Snooze is the one part of restraint that still applies.
|
// that's the point). Snooze is the one part of restraint that still applies.
|
||||||
|
|||||||
@@ -0,0 +1,357 @@
|
|||||||
|
// Package memeval is background memory evaluation (Vikunja #248,
|
||||||
|
// docs/plans/03-memory-evaluation.md).
|
||||||
|
//
|
||||||
|
// It lives beside internal/memory rather than inside it because
|
||||||
|
// internal/store imports internal/memory for the vector-store backend, and an
|
||||||
|
// evaluator has to read store.Fact / store.Note / store.Nudge — putting it in
|
||||||
|
// internal/memory would close that import cycle.
|
||||||
|
//
|
||||||
|
// Every so often Maven reads back her own recent memory — facts, notes, the
|
||||||
|
// nudges she sent — and asks the resident model what it notices: a habit that
|
||||||
|
// stopped, a gap, something worth saying later. What comes back is written as
|
||||||
|
// notes with source EvalNoteSource and nothing else happens. That restraint is
|
||||||
|
// the design, not an unfinished edge:
|
||||||
|
//
|
||||||
|
// - She does not speak here. There is no dispatcher, no channel, no nudge.
|
||||||
|
// An observation is a thought she wrote down; he reads it on /dash when he
|
||||||
|
// wants to. "Not a nag, not autonomous" (CLAUDE.md) is easy to violate with
|
||||||
|
// exactly this feature — an hourly loop with an LLM in it and permission to
|
||||||
|
// talk is a machine for generating interruptions — so the loop has no way
|
||||||
|
// to reach him at all. Turning observations into nudges is a separate
|
||||||
|
// decision with a separate opt-in, and it is deliberately NOT in this file.
|
||||||
|
// - She does not act. No reminder is created, no routine proposed, no fact
|
||||||
|
// written. The model's suggested_action is recorded as text inside the note
|
||||||
|
// and interpreted by nobody.
|
||||||
|
// - She says nothing about an empty store. No memory ⇒ no LLM call ⇒ no
|
||||||
|
// "observations" invented out of two facts. A 1.7B asked to find a pattern
|
||||||
|
// will always find one; the defence is not asking.
|
||||||
|
//
|
||||||
|
// Everything the evaluator writes is attributable: source is EvalNoteSource, so
|
||||||
|
// an inferred observation can never be mistaken for something he said, and the
|
||||||
|
// whole batch is one SQL delete away if the output turns out to be noise.
|
||||||
|
package memeval
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/llm"
|
||||||
|
"github.com/kami/maven/internal/persona"
|
||||||
|
"github.com/kami/maven/internal/store"
|
||||||
|
)
|
||||||
|
|
||||||
|
// EvalNoteSource — the source stamped on every note the evaluator writes.
|
||||||
|
// Same infer:* convention as the rest of the derived facts.
|
||||||
|
const EvalNoteSource = "infer:memory-eval"
|
||||||
|
|
||||||
|
// DefaultMinConfidence — an observation below this is dropped. The model is
|
||||||
|
// asked for its own confidence and small models are badly calibrated, so this
|
||||||
|
// is a coarse filter, not a probability: it exists to throw away the guesses
|
||||||
|
// the model itself hedged on.
|
||||||
|
const DefaultMinConfidence = 0.7
|
||||||
|
|
||||||
|
// DefaultMaxItems — how much recent memory goes into one evaluation, per
|
||||||
|
// store. 30 facts + 30 notes + 30 nudges is a few thousand tokens of the 4096
|
||||||
|
// context the resident Thinking model runs with, which leaves room for its
|
||||||
|
// reasoning tokens. Raising this trades reasoning room for history.
|
||||||
|
const DefaultMaxItems = 30
|
||||||
|
|
||||||
|
// MaxObservations — the model may return at most this many observations per
|
||||||
|
// evaluation, enforced by the grammar. A cap here is also a noise cap: an
|
||||||
|
// evaluation that "notices" ten things has noticed nothing.
|
||||||
|
const MaxObservations = 3
|
||||||
|
|
||||||
|
// Observation — one thing the evaluator noticed.
|
||||||
|
type Observation struct {
|
||||||
|
Text string `json:"observation"`
|
||||||
|
Conf float64 `json:"confidence"`
|
||||||
|
// Action — what the model thinks should happen with this. Recorded, never
|
||||||
|
// executed: see the file comment. One of "note", "propose", "notify".
|
||||||
|
Action string `json:"suggested_action"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Completer — the llama-server seam, same shape router.Completer uses so the
|
||||||
|
// one resident model serves this caller too.
|
||||||
|
type Completer interface {
|
||||||
|
Complete(ctx context.Context, r llm.Req) (string, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reader — the slice of the store an evaluation reads. Narrow on purpose: the
|
||||||
|
// evaluator gets recent memory and nothing else. No entity graph, no presence,
|
||||||
|
// no config facts.
|
||||||
|
type Reader interface {
|
||||||
|
RecentFacts(ctx context.Context, n int) ([]store.Fact, error)
|
||||||
|
RecentNotes(ctx context.Context, n int) ([]store.Note, error)
|
||||||
|
RecentNudges(ctx context.Context, n int) ([]store.Nudge, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NoteWriter — where observations land. Embeddings are passed nil: an
|
||||||
|
// observation is written for a human to read on /dash, not to be recalled by
|
||||||
|
// similarity. Feeding LLM-generated text back into the RAG pool it was
|
||||||
|
// generated from is how a small model starts citing its own guesses as
|
||||||
|
// evidence.
|
||||||
|
type NoteWriter interface {
|
||||||
|
WriteNote(ctx context.Context, ts time.Time, text string, embedding []float32, source string) (int64, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Config — evaluator tuning. Zero values are replaced by the Default*
|
||||||
|
// constants, so the zero Config is the sane one.
|
||||||
|
type Config struct {
|
||||||
|
MaxItems int
|
||||||
|
MinConfidence float64
|
||||||
|
|
||||||
|
// ContextBlock — the shared persona block (internal/persona), re-evaluated
|
||||||
|
// per call so the clock in it is current. Prepended to the system prompt so
|
||||||
|
// observations come out in Maven's voice: feminine self-reference, informal
|
||||||
|
// "ты". nil is allowed; the base prompt still carries the address rules.
|
||||||
|
ContextBlock func() string
|
||||||
|
}
|
||||||
|
|
||||||
|
// Evaluator reads recent memory and records what the model notices.
|
||||||
|
type Evaluator struct {
|
||||||
|
read Reader
|
||||||
|
write NoteWriter
|
||||||
|
llm Completer
|
||||||
|
cfg Config
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewEvaluator(r Reader, w NoteWriter, c Completer, cfg Config) *Evaluator {
|
||||||
|
if cfg.MaxItems <= 0 {
|
||||||
|
cfg.MaxItems = DefaultMaxItems
|
||||||
|
}
|
||||||
|
if cfg.MinConfidence <= 0 {
|
||||||
|
cfg.MinConfidence = DefaultMinConfidence
|
||||||
|
}
|
||||||
|
return &Evaluator{read: r, write: w, llm: c, cfg: cfg}
|
||||||
|
}
|
||||||
|
|
||||||
|
// evalGrammar — GBNF pinning the reply to a bounded JSON array of fixed-shape
|
||||||
|
// observations. Same reasoning as the router's routeGrammar: the enum and the
|
||||||
|
// length bound are what stop a small model from drifting into free text or
|
||||||
|
// filling the token budget with one repeated field.
|
||||||
|
const evalGrammar = `
|
||||||
|
root ::= "[" ws (obs ("," ws obs){0,2})? ws "]"
|
||||||
|
obs ::= "{" ws "\"observation\"" ws ":" ws text "," ws "\"confidence\"" ws ":" ws conf "," ws "\"suggested_action\"" ws ":" ws act ws "}"
|
||||||
|
text ::= "\"" ([^"\\] | "\\" .){1,200} "\""
|
||||||
|
conf ::= "0" "." [0-9]{1,2} | "1" ("." "0")?
|
||||||
|
act ::= "\"note\"" | "\"propose\"" | "\"notify\""
|
||||||
|
ws ::= [ \t\n]*
|
||||||
|
`
|
||||||
|
|
||||||
|
// evalSystem — the evaluation prompt. Two things it insists on, both learned
|
||||||
|
// from the phraser: state the observation as something she noticed rather than
|
||||||
|
// an instruction, and say nothing when there is nothing (the model is given an
|
||||||
|
// explicit way to return an empty array, because a model with no exit returns
|
||||||
|
// filler).
|
||||||
|
const evalSystem = `Ты просматриваешь свою собственную память: недавние факты, заметки и напоминания, которые ты отправляла.
|
||||||
|
Найди то, что действительно заметно: привычка, которая прервалась; пробел в записях; повторяющаяся закономерность.
|
||||||
|
|
||||||
|
Правила:
|
||||||
|
- Отвечай ТОЛЬКО массивом JSON. Каждый элемент: {"observation": "...", "confidence": 0.0-1.0, "suggested_action": "note"|"propose"|"notify"}.
|
||||||
|
- observation — короткая фраза по-русски о том, что ты заметила. О себе — в женском роде ("я заметила"). К нему — на "ты".
|
||||||
|
- Не выдумывай. Если в памяти нет ничего заметного, верни пустой массив [].
|
||||||
|
- Не давай советов и не приказывай. Ты замечаешь, а не требуешь.
|
||||||
|
- confidence — насколько ты уверена, что это настоящая закономерность, а не совпадение.
|
||||||
|
- Максимум три наблюдения. Лучше одно точное, чем три общих.`
|
||||||
|
|
||||||
|
// Evaluate runs one evaluation and returns the observations it recorded.
|
||||||
|
//
|
||||||
|
// Returns (nil, nil) — not an error — for every ordinary "nothing to say"
|
||||||
|
// outcome: an empty store, an empty array from the model, everything below the
|
||||||
|
// confidence floor, or every observation already recorded earlier. Only a real
|
||||||
|
// read/LLM/write failure is an error, and the caller (a background ticker) logs
|
||||||
|
// it and waits for the next interval.
|
||||||
|
func (e *Evaluator) Evaluate(ctx context.Context, now time.Time) ([]Observation, error) {
|
||||||
|
snap, err := e.snapshot(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if snap == "" {
|
||||||
|
return nil, nil // nothing recorded ⇒ nothing to notice, and no LLM call
|
||||||
|
}
|
||||||
|
|
||||||
|
raw, err := e.llm.Complete(ctx, llm.Req{
|
||||||
|
System: persona.Prepend(e.cfg.ContextBlock, evalSystem),
|
||||||
|
User: snap,
|
||||||
|
Grammar: evalGrammar,
|
||||||
|
MaxTokens: 512,
|
||||||
|
RepeatPenalty: 1.1,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("memory eval: complete: %w", err)
|
||||||
|
}
|
||||||
|
obs, err := parseObservations(raw)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("memory eval: parse %q: %w", truncate(raw, 120), err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Dedupe against what earlier evaluations already wrote. Without this an
|
||||||
|
// hourly loop over a slowly-changing store writes the same sentence every
|
||||||
|
// hour until /dash is nothing but the evaluator talking to itself.
|
||||||
|
seen, err := e.recordedTexts(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
var kept []Observation
|
||||||
|
for _, o := range obs {
|
||||||
|
o.Text = strings.TrimSpace(o.Text)
|
||||||
|
if o.Text == "" || o.Conf < e.cfg.MinConfidence {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
norm := normalizeObservation(o.Text)
|
||||||
|
if seen[norm] {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
seen[norm] = true
|
||||||
|
if _, err := e.write.WriteNote(ctx, now, formatNote(o), nil, EvalNoteSource); err != nil {
|
||||||
|
return kept, fmt.Errorf("memory eval: write note: %w", err)
|
||||||
|
}
|
||||||
|
kept = append(kept, o)
|
||||||
|
}
|
||||||
|
return kept, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// formatNote — the stored text. The suggested action is kept as a visible
|
||||||
|
// suffix rather than a column: it is the model's opinion about what to do next,
|
||||||
|
// and the only consumer is a human reading /dash.
|
||||||
|
func formatNote(o Observation) string {
|
||||||
|
if o.Action == "" {
|
||||||
|
return o.Text
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("%s [%s]", o.Text, o.Action)
|
||||||
|
}
|
||||||
|
|
||||||
|
// recordedTexts — the normalized text of every observation earlier evaluations
|
||||||
|
// wrote, for dedupe. Reads a wider window than MaxItems because the point is to
|
||||||
|
// remember saying it, not to summarize it.
|
||||||
|
func (e *Evaluator) recordedTexts(ctx context.Context) (map[string]bool, error) {
|
||||||
|
notes, err := e.read.RecentNotes(ctx, 200)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("memory eval: recent notes: %w", err)
|
||||||
|
}
|
||||||
|
seen := make(map[string]bool, len(notes))
|
||||||
|
for _, n := range notes {
|
||||||
|
if n.Source != EvalNoteSource {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
text := n.Text
|
||||||
|
// Strip the "[action]" suffix formatNote appended.
|
||||||
|
if i := strings.LastIndex(text, " ["); i > 0 && strings.HasSuffix(text, "]") {
|
||||||
|
text = text[:i]
|
||||||
|
}
|
||||||
|
seen[normalizeObservation(text)] = true
|
||||||
|
}
|
||||||
|
return seen, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// normalizeObservation — dedupe key. Case- and whitespace-insensitive, which
|
||||||
|
// catches the realistic repeat (the model re-emitting the same sentence with a
|
||||||
|
// different comma) without pretending to do semantic dedupe.
|
||||||
|
func normalizeObservation(s string) string {
|
||||||
|
return strings.Join(strings.Fields(strings.ToLower(s)), " ")
|
||||||
|
}
|
||||||
|
|
||||||
|
// snapshot renders recent memory as the user turn. Returns "" when there is
|
||||||
|
// nothing in any store — the caller treats that as "do not ask the model".
|
||||||
|
//
|
||||||
|
// Notes written by earlier evaluations are excluded. Feeding her own
|
||||||
|
// observations back in is how "я заметила, что ты не записывал еду" becomes
|
||||||
|
// evidence for noticing it again, three evaluations deep.
|
||||||
|
func (e *Evaluator) snapshot(ctx context.Context) (string, error) {
|
||||||
|
n := e.cfg.MaxItems
|
||||||
|
facts, err := e.read.RecentFacts(ctx, n)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("memory eval: recent facts: %w", err)
|
||||||
|
}
|
||||||
|
notes, err := e.read.RecentNotes(ctx, n)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("memory eval: recent notes: %w", err)
|
||||||
|
}
|
||||||
|
nudges, err := e.read.RecentNudges(ctx, n)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("memory eval: recent nudges: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var b strings.Builder
|
||||||
|
wrote := false
|
||||||
|
if len(facts) > 0 {
|
||||||
|
b.WriteString("Факты:\n")
|
||||||
|
for _, f := range facts {
|
||||||
|
fmt.Fprintf(&b, "- %s %s=%s (%s)\n", f.Ts.Format("2006-01-02 15:04"), f.Key, truncate(f.Value, 80), f.Source)
|
||||||
|
wrote = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
own := 0
|
||||||
|
var noteLines []string
|
||||||
|
for _, nt := range notes {
|
||||||
|
if nt.Source == EvalNoteSource {
|
||||||
|
own++
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
noteLines = append(noteLines, fmt.Sprintf("- %s %s\n", nt.Ts.Format("2006-01-02 15:04"), truncate(nt.Text, 160)))
|
||||||
|
}
|
||||||
|
if len(noteLines) > 0 {
|
||||||
|
b.WriteString("\nЗаметки:\n")
|
||||||
|
for _, l := range noteLines {
|
||||||
|
b.WriteString(l)
|
||||||
|
wrote = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(nudges) > 0 {
|
||||||
|
b.WriteString("\nНапоминания, которые ты отправляла:\n")
|
||||||
|
for _, nd := range nudges {
|
||||||
|
outcome := nd.Outcome
|
||||||
|
if outcome == "" {
|
||||||
|
outcome = "?"
|
||||||
|
}
|
||||||
|
fmt.Fprintf(&b, "- %s %s → %s (%s)\n", nd.Ts.Format("2006-01-02 15:04"), nd.Rule, outcome, nd.Channel)
|
||||||
|
wrote = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !wrote {
|
||||||
|
// Only her own past observations, or nothing at all. Either way there is
|
||||||
|
// no new memory to evaluate.
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
b.WriteString("\nЧто ты замечаешь?")
|
||||||
|
return b.String(), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// parseObservations reads the model's array. Tolerates the leading/trailing
|
||||||
|
// prose a Thinking model sometimes emits around JSON by taking the outermost
|
||||||
|
// bracketed span, the same tolerance the router's parser has.
|
||||||
|
func parseObservations(raw string) ([]Observation, error) {
|
||||||
|
s := strings.TrimSpace(raw)
|
||||||
|
if i := strings.Index(s, "["); i >= 0 {
|
||||||
|
if j := strings.LastIndex(s, "]"); j > i {
|
||||||
|
s = s[i : j+1]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if s == "" {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
var obs []Observation
|
||||||
|
if err := json.Unmarshal([]byte(s), &obs); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if len(obs) > MaxObservations {
|
||||||
|
// The grammar bounds this; a grammar-less server or a future prompt
|
||||||
|
// change must not be able to flood /dash.
|
||||||
|
sort.SliceStable(obs, func(i, j int) bool { return obs[i].Conf > obs[j].Conf })
|
||||||
|
obs = obs[:MaxObservations]
|
||||||
|
}
|
||||||
|
return obs, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func truncate(s string, n int) string {
|
||||||
|
r := []rune(s)
|
||||||
|
if len(r) <= n {
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
return string(r[:n]) + "…"
|
||||||
|
}
|
||||||
@@ -0,0 +1,271 @@
|
|||||||
|
package memeval
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
"errors"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/llm"
|
||||||
|
"github.com/kami/maven/internal/store"
|
||||||
|
)
|
||||||
|
|
||||||
|
// fakeLLM — canned replies, one per call, and a record of what it was asked.
|
||||||
|
type fakeLLM struct {
|
||||||
|
replies []string
|
||||||
|
calls []llm.Req
|
||||||
|
err error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *fakeLLM) Complete(_ context.Context, r llm.Req) (string, error) {
|
||||||
|
f.calls = append(f.calls, r)
|
||||||
|
if f.err != nil {
|
||||||
|
return "", f.err
|
||||||
|
}
|
||||||
|
if len(f.replies) == 0 {
|
||||||
|
return "[]", nil
|
||||||
|
}
|
||||||
|
out := f.replies[0]
|
||||||
|
f.replies = f.replies[1:]
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func newTestStore(t *testing.T) *store.Store {
|
||||||
|
t.Helper()
|
||||||
|
st, err := store.Open(context.Background(), filepath.Join(t.TempDir(), "memeval_test.db"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("store.Open: %v", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { _ = st.Close() })
|
||||||
|
return st
|
||||||
|
}
|
||||||
|
|
||||||
|
func refNow() time.Time { return time.Date(2026, 8, 1, 9, 0, 0, 0, time.UTC) }
|
||||||
|
|
||||||
|
// seedMemory writes a little of everything the evaluator reads.
|
||||||
|
func seedMemory(t *testing.T, st *store.Store, ctx context.Context, now time.Time) {
|
||||||
|
t.Helper()
|
||||||
|
for i := 0; i < 3; i++ {
|
||||||
|
ts := now.Add(-time.Duration(i+1) * 24 * time.Hour)
|
||||||
|
if _, err := st.WriteFact(ctx, ts, store.KindSelf, "water_ml", "500", "tap:desk", 1.0, sql.NullInt64{}); err != nil {
|
||||||
|
t.Fatalf("write fact: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if _, err := st.WriteNote(ctx, now.Add(-2*time.Hour), "купить корм для кота", nil, "tap:voice"); err != nil {
|
||||||
|
t.Fatalf("write note: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := st.RecordNudge(ctx, "water", "voice", "пора выпить воды", now.Add(-time.Hour)); err != nil {
|
||||||
|
t.Fatalf("record nudge: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestEvaluateEmptyStoreAsksNothing — the "shuts up when uncertain" floor. An
|
||||||
|
// empty store must not even reach the model: a small model asked to find a
|
||||||
|
// pattern in nothing will invent one.
|
||||||
|
func TestEvaluateEmptyStoreAsksNothing(t *testing.T) {
|
||||||
|
st := newTestStore(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
f := &fakeLLM{}
|
||||||
|
ev := NewEvaluator(st, st, f, Config{})
|
||||||
|
|
||||||
|
obs, err := ev.Evaluate(ctx, refNow())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Evaluate: %v", err)
|
||||||
|
}
|
||||||
|
if len(obs) != 0 {
|
||||||
|
t.Fatalf("observations on an empty store = %d, want 0", len(obs))
|
||||||
|
}
|
||||||
|
if len(f.calls) != 0 {
|
||||||
|
t.Fatalf("LLM called %d times on an empty store, want 0", len(f.calls))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestEvaluateWritesHighConfidenceObservations — the happy path. Confident
|
||||||
|
// observations are written as notes stamped infer:memory-eval, and the low
|
||||||
|
// ones are dropped.
|
||||||
|
func TestEvaluateWritesHighConfidenceObservations(t *testing.T) {
|
||||||
|
st := newTestStore(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
now := refNow()
|
||||||
|
seedMemory(t, st, ctx, now)
|
||||||
|
|
||||||
|
f := &fakeLLM{replies: []string{`[
|
||||||
|
{"observation":"ты три дня не записывал еду","confidence":0.9,"suggested_action":"notify"},
|
||||||
|
{"observation":"может быть, ты стал меньше пить воды","confidence":0.3,"suggested_action":"note"}
|
||||||
|
]`}}
|
||||||
|
ev := NewEvaluator(st, st, f, Config{})
|
||||||
|
|
||||||
|
obs, err := ev.Evaluate(ctx, now)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Evaluate: %v", err)
|
||||||
|
}
|
||||||
|
if len(obs) != 1 {
|
||||||
|
t.Fatalf("kept %d observations, want 1 (the 0.3 one is below the floor): %+v", len(obs), obs)
|
||||||
|
}
|
||||||
|
if obs[0].Text != "ты три дня не записывал еду" {
|
||||||
|
t.Errorf("kept the wrong observation: %q", obs[0].Text)
|
||||||
|
}
|
||||||
|
|
||||||
|
notes, err := st.RecentNotes(ctx, 50)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("RecentNotes: %v", err)
|
||||||
|
}
|
||||||
|
var written []store.Note
|
||||||
|
for _, n := range notes {
|
||||||
|
if n.Source == EvalNoteSource {
|
||||||
|
written = append(written, n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(written) != 1 {
|
||||||
|
t.Fatalf("notes with source %s = %d, want 1", EvalNoteSource, len(written))
|
||||||
|
}
|
||||||
|
if !strings.Contains(written[0].Text, "ты три дня не записывал еду") {
|
||||||
|
t.Errorf("note text = %q", written[0].Text)
|
||||||
|
}
|
||||||
|
if !strings.Contains(written[0].Text, "[notify]") {
|
||||||
|
t.Errorf("note text = %q, want the suggested action recorded", written[0].Text)
|
||||||
|
}
|
||||||
|
|
||||||
|
// The prompt must carry the memory it is evaluating, and must not carry a
|
||||||
|
// grammar-free request.
|
||||||
|
if len(f.calls) != 1 {
|
||||||
|
t.Fatalf("LLM calls = %d, want 1", len(f.calls))
|
||||||
|
}
|
||||||
|
if !strings.Contains(f.calls[0].User, "water_ml") {
|
||||||
|
t.Errorf("prompt does not mention the seeded facts:\n%s", f.calls[0].User)
|
||||||
|
}
|
||||||
|
if f.calls[0].Grammar == "" {
|
||||||
|
t.Error("evaluation ran without a grammar")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestEvaluateDeduplicatesAcrossRuns — the failure mode that would make this
|
||||||
|
// feature unusable: an hourly loop over a store that barely changes writing the
|
||||||
|
// same sentence every hour until /dash is nothing but the evaluator.
|
||||||
|
func TestEvaluateDeduplicatesAcrossRuns(t *testing.T) {
|
||||||
|
st := newTestStore(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
now := refNow()
|
||||||
|
seedMemory(t, st, ctx, now)
|
||||||
|
|
||||||
|
same := `[{"observation":"ты три дня не записывал еду","confidence":0.9,"suggested_action":"note"}]`
|
||||||
|
spaced := `[{"observation":"Ты три дня не записывал еду","confidence":0.95,"suggested_action":"note"}]`
|
||||||
|
f := &fakeLLM{replies: []string{same, same, spaced}}
|
||||||
|
ev := NewEvaluator(st, st, f, Config{})
|
||||||
|
|
||||||
|
for i := 0; i < 3; i++ {
|
||||||
|
if _, err := ev.Evaluate(ctx, now.Add(time.Duration(i)*time.Hour)); err != nil {
|
||||||
|
t.Fatalf("Evaluate %d: %v", i, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
notes, err := st.RecentNotes(ctx, 50)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("RecentNotes: %v", err)
|
||||||
|
}
|
||||||
|
n := 0
|
||||||
|
for _, nt := range notes {
|
||||||
|
if nt.Source == EvalNoteSource {
|
||||||
|
n++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if n != 1 {
|
||||||
|
t.Fatalf("eval notes after three identical evaluations = %d, want 1", n)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestEvaluateIgnoresOwnNotes — her own observations must not become input.
|
||||||
|
// Otherwise "я заметила X" is evidence for noticing X again, three evaluations
|
||||||
|
// deep. With nothing but eval notes in the store there is no new memory, so the
|
||||||
|
// model is not asked at all.
|
||||||
|
func TestEvaluateIgnoresOwnNotes(t *testing.T) {
|
||||||
|
st := newTestStore(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
now := refNow()
|
||||||
|
if _, err := st.WriteNote(ctx, now.Add(-time.Hour), "я заметила, что ты мало пьёшь [note]", nil, EvalNoteSource); err != nil {
|
||||||
|
t.Fatalf("write note: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
f := &fakeLLM{}
|
||||||
|
ev := NewEvaluator(st, st, f, Config{})
|
||||||
|
obs, err := ev.Evaluate(ctx, now)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Evaluate: %v", err)
|
||||||
|
}
|
||||||
|
if len(obs) != 0 || len(f.calls) != 0 {
|
||||||
|
t.Fatalf("observations=%d llm calls=%d, want 0/0 — own notes are not memory to evaluate", len(obs), len(f.calls))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestEvaluateEmptyArrayIsNotAnError — "nothing to say" is the expected outcome
|
||||||
|
// most of the time and must not be logged as a failure.
|
||||||
|
func TestEvaluateEmptyArrayIsNotAnError(t *testing.T) {
|
||||||
|
st := newTestStore(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
now := refNow()
|
||||||
|
seedMemory(t, st, ctx, now)
|
||||||
|
|
||||||
|
ev := NewEvaluator(st, st, &fakeLLM{replies: []string{"[]"}}, Config{})
|
||||||
|
obs, err := ev.Evaluate(ctx, now)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Evaluate: %v", err)
|
||||||
|
}
|
||||||
|
if len(obs) != 0 {
|
||||||
|
t.Fatalf("observations = %d, want 0", len(obs))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestEvaluateLLMErrorIsReported — a broken llama-server is an error the caller
|
||||||
|
// logs; it must not silently write anything.
|
||||||
|
func TestEvaluateLLMErrorIsReported(t *testing.T) {
|
||||||
|
st := newTestStore(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
now := refNow()
|
||||||
|
seedMemory(t, st, ctx, now)
|
||||||
|
|
||||||
|
ev := NewEvaluator(st, st, &fakeLLM{err: errors.New("connection refused")}, Config{})
|
||||||
|
if _, err := ev.Evaluate(ctx, now); err == nil {
|
||||||
|
t.Fatal("want an error when the model is unreachable")
|
||||||
|
}
|
||||||
|
notes, err := st.RecentNotes(ctx, 50)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("RecentNotes: %v", err)
|
||||||
|
}
|
||||||
|
for _, n := range notes {
|
||||||
|
if n.Source == EvalNoteSource {
|
||||||
|
t.Fatalf("wrote a note despite an LLM failure: %q", n.Text)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestParseObservationsTolerantAndBounded — Thinking models wrap JSON in prose,
|
||||||
|
// and no reply may exceed MaxObservations even if the grammar is bypassed.
|
||||||
|
func TestParseObservationsTolerantAndBounded(t *testing.T) {
|
||||||
|
obs, err := parseObservations(`<think>hmm</think> вот: [{"observation":"a","confidence":0.9,"suggested_action":"note"}] всё`)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
if len(obs) != 1 || obs[0].Text != "a" {
|
||||||
|
t.Fatalf("got %+v, want one observation 'a'", obs)
|
||||||
|
}
|
||||||
|
|
||||||
|
var b strings.Builder
|
||||||
|
b.WriteString("[")
|
||||||
|
for i := 0; i < MaxObservations+3; i++ {
|
||||||
|
if i > 0 {
|
||||||
|
b.WriteString(",")
|
||||||
|
}
|
||||||
|
b.WriteString(`{"observation":"x","confidence":0.5,"suggested_action":"note"}`)
|
||||||
|
}
|
||||||
|
b.WriteString("]")
|
||||||
|
obs, err = parseObservations(b.String())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse: %v", err)
|
||||||
|
}
|
||||||
|
if len(obs) != MaxObservations {
|
||||||
|
t.Fatalf("parsed %d observations, want the %d cap", len(obs), MaxObservations)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,254 @@
|
|||||||
|
package memory
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Behavioural memory — "what do I usually do?" (Vikunja #254).
|
||||||
|
//
|
||||||
|
// The profile is COUNTED, not generated. docs/plans/09-behavioral-memory.md
|
||||||
|
// asks for an LLM to write a behaviour profile daily and store it as a fact;
|
||||||
|
// this does not do that, on purpose. A 1.7B asked to summarise a year of habits
|
||||||
|
// will produce fluent claims about the owner's life that no row in the store
|
||||||
|
// supports, and a wrong claim about him is the most expensive kind of wrong
|
||||||
|
// maven can be. Counting distinct days per weekday is verifiable, cheap enough
|
||||||
|
// to run on the question, and cannot invent a habit he does not have.
|
||||||
|
//
|
||||||
|
// Recomputed on read rather than cached as a fact for the same reason the store
|
||||||
|
// is append-only: a cached profile can disagree with the rows it came from, and
|
||||||
|
// then there are two truths. The plan's step 5 ("profile updates on fact write")
|
||||||
|
// exists to keep a cache fresh; there is no cache, so a new fact is already in
|
||||||
|
// the next answer.
|
||||||
|
//
|
||||||
|
// It is also read-only and unprompted-free. The plan's step 4 — a morning
|
||||||
|
// dispatcher nudge proposing the day — is deliberately NOT here: maven is not a
|
||||||
|
// nag, and proposing plans at 08:00 every day is the definition of one. Pattern
|
||||||
|
// inference that leads to a routine the owner accepts already exists in
|
||||||
|
// internal/pattern with the proposal queue on /routines; that is the sanctioned
|
||||||
|
// path from "she noticed" to "she acts", and it goes through him.
|
||||||
|
|
||||||
|
// Observation — one thing the owner was recorded doing, reduced to what a habit
|
||||||
|
// needs: when, and what. Facts arrive as store/ipc rows; the caller maps them
|
||||||
|
// so this package stays free of both.
|
||||||
|
type Observation struct {
|
||||||
|
At time.Time
|
||||||
|
Key string
|
||||||
|
Kind string // "self" | "env" | "config"
|
||||||
|
}
|
||||||
|
|
||||||
|
// Activity — one recurring thing, as counted. Days is the number of DISTINCT
|
||||||
|
// days it was observed on, which is the number that decides whether something
|
||||||
|
// is a habit; Count can be inflated by one busy day.
|
||||||
|
//
|
||||||
|
// TypicalAt is the median time of day it happens at, rounded to the minute — a
|
||||||
|
// median and not a mean, so one 03:00 outlier does not move "он обычно пьёт
|
||||||
|
// воду утром" into the night.
|
||||||
|
type Activity struct {
|
||||||
|
Key string
|
||||||
|
Days int
|
||||||
|
Count int
|
||||||
|
TypicalAt time.Duration
|
||||||
|
}
|
||||||
|
|
||||||
|
// Profile — the counted behaviour model. Weekly holds the activities that
|
||||||
|
// recur on a given weekday, Overall the ones that recur at all.
|
||||||
|
type Profile struct {
|
||||||
|
Since time.Time
|
||||||
|
Until time.Time
|
||||||
|
Weekly map[time.Weekday][]Activity
|
||||||
|
All []Activity
|
||||||
|
}
|
||||||
|
|
||||||
|
// MinHabitDays — how many distinct days an activity must appear on before maven
|
||||||
|
// will call it usual. Two is the smallest number that can distinguish a habit
|
||||||
|
// from a one-off; below that she says she does not know yet, which is true.
|
||||||
|
const MinHabitDays = 2
|
||||||
|
|
||||||
|
// nonBehaviouralKeyPrefixes — keys that are machinery or one-shot records, not
|
||||||
|
// behaviour. Calendar events carry the day in the key so they can never repeat;
|
||||||
|
// cooldown and quiet rows are maven's own tuning state, not his habits.
|
||||||
|
var nonBehaviouralKeyPrefixes = []string{
|
||||||
|
"calendar_event_",
|
||||||
|
"cooldown:",
|
||||||
|
"quiet",
|
||||||
|
"behavior_profile",
|
||||||
|
}
|
||||||
|
|
||||||
|
// BuildProfile counts habits out of observations. now bounds the window's upper
|
||||||
|
// end and supplies the location every day boundary is taken in — a habit is
|
||||||
|
// "on Tuesdays" in the owner's timezone or it is nothing.
|
||||||
|
//
|
||||||
|
// Only self-facts count. An env row is the world (weather, a relayed meeting),
|
||||||
|
// and a config row is maven's own state; neither says anything about what he
|
||||||
|
// usually does.
|
||||||
|
func BuildProfile(obs []Observation, now time.Time) Profile {
|
||||||
|
loc := now.Location()
|
||||||
|
p := Profile{Until: now, Weekly: map[time.Weekday][]Activity{}}
|
||||||
|
|
||||||
|
type bucket struct {
|
||||||
|
days map[string]struct{}
|
||||||
|
count int
|
||||||
|
mins []int
|
||||||
|
}
|
||||||
|
// key → bucket, and (weekday, key) → bucket.
|
||||||
|
all := map[string]*bucket{}
|
||||||
|
weekly := map[time.Weekday]map[string]*bucket{}
|
||||||
|
|
||||||
|
for _, o := range obs {
|
||||||
|
if o.Kind != "self" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
key := strings.TrimSpace(o.Key)
|
||||||
|
if key == "" || nonBehavioural(key) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
at := o.At.In(loc)
|
||||||
|
if at.IsZero() || at.After(now) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if p.Since.IsZero() || at.Before(p.Since) {
|
||||||
|
p.Since = at
|
||||||
|
}
|
||||||
|
day := at.Format("2006-01-02")
|
||||||
|
minute := at.Hour()*60 + at.Minute()
|
||||||
|
|
||||||
|
bump := func(m map[string]*bucket) {
|
||||||
|
b := m[key]
|
||||||
|
if b == nil {
|
||||||
|
b = &bucket{days: map[string]struct{}{}}
|
||||||
|
m[key] = b
|
||||||
|
}
|
||||||
|
b.days[day] = struct{}{}
|
||||||
|
b.count++
|
||||||
|
b.mins = append(b.mins, minute)
|
||||||
|
}
|
||||||
|
bump(all)
|
||||||
|
wd := at.Weekday()
|
||||||
|
if weekly[wd] == nil {
|
||||||
|
weekly[wd] = map[string]*bucket{}
|
||||||
|
}
|
||||||
|
bump(weekly[wd])
|
||||||
|
}
|
||||||
|
|
||||||
|
harvest := func(m map[string]*bucket) []Activity {
|
||||||
|
var out []Activity
|
||||||
|
for key, b := range m {
|
||||||
|
if len(b.days) < MinHabitDays {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
out = append(out, Activity{
|
||||||
|
Key: key,
|
||||||
|
Days: len(b.days),
|
||||||
|
Count: b.count,
|
||||||
|
TypicalAt: time.Duration(medianInt(b.mins)) * time.Minute,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
// Most-established first, then earliest in the day, then by key so the
|
||||||
|
// same history always reads back the same way.
|
||||||
|
sort.Slice(out, func(i, j int) bool {
|
||||||
|
if out[i].Days != out[j].Days {
|
||||||
|
return out[i].Days > out[j].Days
|
||||||
|
}
|
||||||
|
if out[i].TypicalAt != out[j].TypicalAt {
|
||||||
|
return out[i].TypicalAt < out[j].TypicalAt
|
||||||
|
}
|
||||||
|
return out[i].Key < out[j].Key
|
||||||
|
})
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
p.All = harvest(all)
|
||||||
|
for wd, m := range weekly {
|
||||||
|
if acts := harvest(m); len(acts) > 0 {
|
||||||
|
p.Weekly[wd] = acts
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return p
|
||||||
|
}
|
||||||
|
|
||||||
|
func nonBehavioural(key string) bool {
|
||||||
|
for _, p := range nonBehaviouralKeyPrefixes {
|
||||||
|
if strings.HasPrefix(key, p) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// medianInt — the middle value, averaging the two middles on an even count.
|
||||||
|
func medianInt(xs []int) int {
|
||||||
|
if len(xs) == 0 {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
s := make([]int, len(xs))
|
||||||
|
copy(s, xs)
|
||||||
|
sort.Ints(s)
|
||||||
|
mid := len(s) / 2
|
||||||
|
if len(s)%2 == 1 {
|
||||||
|
return s[mid]
|
||||||
|
}
|
||||||
|
return (s[mid-1] + s[mid]) / 2
|
||||||
|
}
|
||||||
|
|
||||||
|
// weekdayRU — accusative, as "по вторникам" and "в среду" both need it read
|
||||||
|
// back. Index is time.Weekday.
|
||||||
|
var weekdayRU = [...]string{"воскресеньям", "понедельникам", "вторникам", "средам", "четвергам", "пятницам", "субботам"}
|
||||||
|
|
||||||
|
// activityRU glosses the loop's known fact keys. An unknown key is read back
|
||||||
|
// verbatim: it is what the store holds, and inventing a Russian phrase for a key
|
||||||
|
// maven does not recognise would be putting words in his mouth.
|
||||||
|
var activityRU = map[string]string{
|
||||||
|
"water": "пьёшь воду",
|
||||||
|
"meal": "ешь",
|
||||||
|
"sleep": "спишь",
|
||||||
|
"break": "делаешь перерыв",
|
||||||
|
"shower": "принимаешь душ",
|
||||||
|
"walk": "гуляешь",
|
||||||
|
"pills": "пьёшь витамины",
|
||||||
|
"workout": "тренируешься",
|
||||||
|
}
|
||||||
|
|
||||||
|
// FormatWeekdayRU reads back what he usually does on a given weekday.
|
||||||
|
// Second person singular and informal, as she speaks TO him.
|
||||||
|
func (p Profile) FormatWeekdayRU(wd time.Weekday) string {
|
||||||
|
acts := p.Weekly[wd]
|
||||||
|
day := weekdayRU[int(wd)%7]
|
||||||
|
if len(acts) == 0 {
|
||||||
|
return fmt.Sprintf("по %s у меня пока нет ничего постоянного.", day)
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("по %s ты обычно %s.", day, joinActivities(acts))
|
||||||
|
}
|
||||||
|
|
||||||
|
// FormatOverallRU reads back the habits that hold across the whole week.
|
||||||
|
func (p Profile) FormatOverallRU() string {
|
||||||
|
if len(p.All) == 0 {
|
||||||
|
return "я ещё не набрала достаточно записей, чтобы говорить о привычках."
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("обычно ты %s.", joinActivities(p.All))
|
||||||
|
}
|
||||||
|
|
||||||
|
// maxRecited bounds a spoken profile. A list of fifteen habits read aloud is
|
||||||
|
// not an answer; the most established few are.
|
||||||
|
const maxRecited = 5
|
||||||
|
|
||||||
|
func joinActivities(acts []Activity) string {
|
||||||
|
if len(acts) > maxRecited {
|
||||||
|
acts = acts[:maxRecited]
|
||||||
|
}
|
||||||
|
parts := make([]string, len(acts))
|
||||||
|
for i, a := range acts {
|
||||||
|
gloss, ok := activityRU[a.Key]
|
||||||
|
if !ok {
|
||||||
|
gloss = a.Key
|
||||||
|
}
|
||||||
|
parts[i] = fmt.Sprintf("%s около %02d:%02d", gloss,
|
||||||
|
int(a.TypicalAt.Hours()), int(a.TypicalAt.Minutes())%60)
|
||||||
|
}
|
||||||
|
if len(parts) == 1 {
|
||||||
|
return parts[0]
|
||||||
|
}
|
||||||
|
return strings.Join(parts[:len(parts)-1], ", ") + " и " + parts[len(parts)-1]
|
||||||
|
}
|
||||||
@@ -0,0 +1,163 @@
|
|||||||
|
package memory
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
"unicode"
|
||||||
|
)
|
||||||
|
|
||||||
|
// habitHistory — n weeks of the same weekday, at the given local time.
|
||||||
|
func habitHistory(key string, wd time.Weekday, hh, mm, weeks int, from time.Time) []Observation {
|
||||||
|
var out []Observation
|
||||||
|
d := from
|
||||||
|
for d.Weekday() != wd {
|
||||||
|
d = d.AddDate(0, 0, -1)
|
||||||
|
}
|
||||||
|
for i := 0; i < weeks; i++ {
|
||||||
|
day := d.AddDate(0, 0, -7*i)
|
||||||
|
out = append(out, Observation{
|
||||||
|
At: time.Date(day.Year(), day.Month(), day.Day(), hh, mm, 0, 0, from.Location()),
|
||||||
|
Key: key,
|
||||||
|
Kind: "self",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
func behaviorNow() time.Time {
|
||||||
|
// A Monday, so "по вторникам" is a past weekday and not today.
|
||||||
|
return time.Date(2026, 8, 3, 20, 0, 0, 0, time.UTC)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestBuildProfileCountsWeekdayHabits(t *testing.T) {
|
||||||
|
now := behaviorNow()
|
||||||
|
obs := append(
|
||||||
|
habitHistory("workout", time.Tuesday, 19, 0, 4, now),
|
||||||
|
habitHistory("water", time.Tuesday, 9, 0, 3, now)...,
|
||||||
|
)
|
||||||
|
p := BuildProfile(obs, now)
|
||||||
|
|
||||||
|
tue := p.Weekly[time.Tuesday]
|
||||||
|
if len(tue) != 2 {
|
||||||
|
t.Fatalf("got %d tuesday activities, want 2: %+v", len(tue), tue)
|
||||||
|
}
|
||||||
|
// Most-established first.
|
||||||
|
if tue[0].Key != "workout" || tue[0].Days != 4 {
|
||||||
|
t.Errorf("first = %+v, want workout on 4 days", tue[0])
|
||||||
|
}
|
||||||
|
if tue[0].TypicalAt != 19*time.Hour {
|
||||||
|
t.Errorf("typical at %v, want 19:00", tue[0].TypicalAt)
|
||||||
|
}
|
||||||
|
if len(p.Weekly[time.Wednesday]) != 0 {
|
||||||
|
t.Errorf("wednesday must be empty: %+v", p.Weekly[time.Wednesday])
|
||||||
|
}
|
||||||
|
if len(p.All) != 2 {
|
||||||
|
t.Errorf("the week-wide list should hold both: %+v", p.All)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A one-off is not a habit. Saying "ты обычно X" off a single row is a
|
||||||
|
// confidently wrong claim about his life.
|
||||||
|
func TestBuildProfileNeedsMoreThanOneDay(t *testing.T) {
|
||||||
|
now := behaviorNow()
|
||||||
|
obs := habitHistory("workout", time.Tuesday, 19, 0, 1, now)
|
||||||
|
// Three rows, same day — a busy Tuesday, not a habit.
|
||||||
|
obs = append(obs, Observation{At: obs[0].At.Add(time.Hour), Key: "workout", Kind: "self"})
|
||||||
|
obs = append(obs, Observation{At: obs[0].At.Add(2 * time.Hour), Key: "workout", Kind: "self"})
|
||||||
|
|
||||||
|
p := BuildProfile(obs, now)
|
||||||
|
if len(p.All) != 0 || len(p.Weekly) != 0 {
|
||||||
|
t.Fatalf("one day of rows must produce no habit: %+v / %+v", p.All, p.Weekly)
|
||||||
|
}
|
||||||
|
if got := p.FormatOverallRU(); !strings.Contains(got, "не набрала достаточно") {
|
||||||
|
t.Errorf("empty profile reads %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only self-facts describe him. Env rows are the world and config rows are
|
||||||
|
// maven's own tuning state; counting either as a habit would be a category
|
||||||
|
// error the owner would then be told about.
|
||||||
|
func TestBuildProfileIgnoresNonSelfAndMachineryKeys(t *testing.T) {
|
||||||
|
now := behaviorNow()
|
||||||
|
var obs []Observation
|
||||||
|
for _, o := range habitHistory("water", time.Tuesday, 9, 0, 3, now) {
|
||||||
|
o.Kind = "env"
|
||||||
|
obs = append(obs, o)
|
||||||
|
}
|
||||||
|
for _, o := range habitHistory("cooldown:water", time.Tuesday, 9, 0, 3, now) {
|
||||||
|
obs = append(obs, o) // kind=self, but a machinery key
|
||||||
|
}
|
||||||
|
for _, o := range habitHistory("calendar_event_20260804_standup", time.Tuesday, 10, 0, 3, now) {
|
||||||
|
obs = append(obs, o)
|
||||||
|
}
|
||||||
|
if p := BuildProfile(obs, now); len(p.All) != 0 {
|
||||||
|
t.Fatalf("nothing here is a habit of his: %+v", p.All)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The median, not the mean: one 03:00 outlier must not move a morning habit
|
||||||
|
// into the night.
|
||||||
|
func TestBuildProfileTypicalTimeIsMedian(t *testing.T) {
|
||||||
|
now := behaviorNow()
|
||||||
|
obs := habitHistory("water", time.Tuesday, 9, 0, 4, now)
|
||||||
|
obs = append(obs, Observation{At: obs[0].At.AddDate(0, 0, -28).Add(-6 * time.Hour), Key: "water", Kind: "self"})
|
||||||
|
p := BuildProfile(obs, now)
|
||||||
|
if len(p.All) != 1 {
|
||||||
|
t.Fatalf("got %+v", p.All)
|
||||||
|
}
|
||||||
|
if p.All[0].TypicalAt != 9*time.Hour {
|
||||||
|
t.Errorf("typical at %v, want 09:00 despite the outlier", p.All[0].TypicalAt)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestProfileFormatRUPersona(t *testing.T) {
|
||||||
|
now := behaviorNow()
|
||||||
|
obs := append(
|
||||||
|
habitHistory("workout", time.Tuesday, 19, 0, 4, now),
|
||||||
|
habitHistory("water", time.Tuesday, 9, 5, 3, now)...,
|
||||||
|
)
|
||||||
|
p := BuildProfile(obs, now)
|
||||||
|
|
||||||
|
got := p.FormatWeekdayRU(time.Tuesday)
|
||||||
|
want := "по вторникам ты обычно тренируешься около 19:00 и пьёшь воду около 09:05."
|
||||||
|
if got != want {
|
||||||
|
t.Errorf("got %q\nwant %q", got, want)
|
||||||
|
}
|
||||||
|
if empty := p.FormatWeekdayRU(time.Thursday); !strings.Contains(empty, "ничего постоянного") {
|
||||||
|
t.Errorf("an unknown weekday reads %q", empty)
|
||||||
|
}
|
||||||
|
// Persona: she addresses him informally, never in the masculine about
|
||||||
|
// herself, and never with a pet name.
|
||||||
|
for _, s := range []string{got, p.FormatOverallRU(), p.FormatWeekdayRU(time.Thursday)} {
|
||||||
|
// Whole words: "ничего" contains "его", and a substring test would
|
||||||
|
// call a correct sentence a persona violation.
|
||||||
|
for _, tok := range strings.FieldsFunc(strings.ToLower(s), func(r rune) bool {
|
||||||
|
return !unicode.IsLetter(r)
|
||||||
|
}) {
|
||||||
|
switch tok {
|
||||||
|
case "рад", "понял", "вы", "ваш", "ваши", "милый", "дорогой", "он", "его":
|
||||||
|
t.Errorf("%q uses %q", s, tok)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// An unrecognised key is read back verbatim rather than glossed into something
|
||||||
|
// maven made up.
|
||||||
|
func TestProfileUnknownKeyReadBackVerbatim(t *testing.T) {
|
||||||
|
now := behaviorNow()
|
||||||
|
p := BuildProfile(habitHistory("починил кран", time.Tuesday, 12, 0, 2, now), now)
|
||||||
|
if got := p.FormatOverallRU(); !strings.Contains(got, "починил кран") {
|
||||||
|
t.Errorf("got %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A future-dated row is a clock problem, not a habit.
|
||||||
|
func TestBuildProfileIgnoresFutureRows(t *testing.T) {
|
||||||
|
now := behaviorNow()
|
||||||
|
obs := habitHistory("water", time.Tuesday, 9, 0, 3, now.AddDate(0, 2, 0))
|
||||||
|
if p := BuildProfile(obs, now); len(p.All) != 0 {
|
||||||
|
t.Fatalf("future rows counted: %+v", p.All)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,165 @@
|
|||||||
|
package morning
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/store"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The day plan (Vikunja #128).
|
||||||
|
//
|
||||||
|
// It lives here, with the morning routine engine, because it is the same
|
||||||
|
// question asked at a different scale: the routine knows what is still missing
|
||||||
|
// from a window, the plan knows what the whole day holds. A parallel system
|
||||||
|
// would have to re-read the same facts and re-decide what "today" means.
|
||||||
|
//
|
||||||
|
// It is pure, like the rest of this package: the daemon reads the calendar,
|
||||||
|
// the reminders and the checklist facts, and BuildPlan puts them in order.
|
||||||
|
//
|
||||||
|
// It is also NOT a nag. A plan she can recite when asked is the whole feature;
|
||||||
|
// nothing here fires, schedules or announces. Unprompted delivery stays with
|
||||||
|
// the existing morning nudge and the dispatcher's policy.
|
||||||
|
|
||||||
|
// PlanKind — where a plan line came from. It survives into the reply and the
|
||||||
|
// web view because the three read differently: an event is something happening
|
||||||
|
// to the owner, a reminder is something he asked for, a checklist item is
|
||||||
|
// something he has not done yet.
|
||||||
|
type PlanKind string
|
||||||
|
|
||||||
|
const (
|
||||||
|
PlanEvent PlanKind = "event"
|
||||||
|
PlanReminder PlanKind = "reminder"
|
||||||
|
PlanChecklist PlanKind = "checklist"
|
||||||
|
)
|
||||||
|
|
||||||
|
// PlanEntry — one timed thing on the day, as the daemon read it out of the
|
||||||
|
// store. Text is rendered verbatim; the plan does not rephrase.
|
||||||
|
//
|
||||||
|
// Uncertain marks provenance below a full-confidence read — a work meeting
|
||||||
|
// relayed off a phone notification (#126). It travels through to the reply so
|
||||||
|
// she hedges instead of reciting a guess as fact.
|
||||||
|
type PlanEntry struct {
|
||||||
|
At time.Time
|
||||||
|
Text string
|
||||||
|
Kind PlanKind
|
||||||
|
Uncertain bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// Plan — the ordered day. Date is the calendar day it describes.
|
||||||
|
type Plan struct {
|
||||||
|
Date time.Time
|
||||||
|
Items []PlanEntry
|
||||||
|
}
|
||||||
|
|
||||||
|
// BuildPlan orders everything known about the day Now falls on: calendar
|
||||||
|
// events, pending reminders, and one line per morning routine that still has
|
||||||
|
// unfinished items.
|
||||||
|
//
|
||||||
|
// Entries outside that calendar day are dropped — a plan for today that
|
||||||
|
// includes tomorrow's meeting is wrong in a way that is worse than terse.
|
||||||
|
// Ordering is by time, then by kind, then by text, so the same day always reads
|
||||||
|
// the same way.
|
||||||
|
func BuildPlan(routines []Routine, facts map[string]store.Fact, events, reminders []PlanEntry, now time.Time) Plan {
|
||||||
|
y, m, d := now.Date()
|
||||||
|
dayStart := time.Date(y, m, d, 0, 0, 0, 0, now.Location())
|
||||||
|
dayEnd := dayStart.AddDate(0, 0, 1)
|
||||||
|
|
||||||
|
p := Plan{Date: dayStart}
|
||||||
|
for _, group := range [][]PlanEntry{events, reminders} {
|
||||||
|
for _, e := range group {
|
||||||
|
at := e.At.In(now.Location())
|
||||||
|
if at.Before(dayStart) || !at.Before(dayEnd) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(e.Text) == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
e.At = at
|
||||||
|
p.Items = append(p.Items, e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
p.Items = append(p.Items, checklistEntries(routines, facts, now)...)
|
||||||
|
|
||||||
|
sort.SliceStable(p.Items, func(i, j int) bool {
|
||||||
|
a, b := p.Items[i], p.Items[j]
|
||||||
|
if !a.At.Equal(b.At) {
|
||||||
|
return a.At.Before(b.At)
|
||||||
|
}
|
||||||
|
if a.Kind != b.Kind {
|
||||||
|
return a.Kind < b.Kind
|
||||||
|
}
|
||||||
|
return a.Text < b.Text
|
||||||
|
})
|
||||||
|
return p
|
||||||
|
}
|
||||||
|
|
||||||
|
// checklistEntries renders one line per routine with work left in it, placed at
|
||||||
|
// the routine's nudge time — where the checklist actually matters in the day.
|
||||||
|
// A routine that does not apply today, is not in its window, or is already
|
||||||
|
// complete contributes nothing: the plan says what is left, not what was done.
|
||||||
|
func checklistEntries(routines []Routine, facts map[string]store.Fact, now time.Time) []PlanEntry {
|
||||||
|
var out []PlanEntry
|
||||||
|
for _, r := range routines {
|
||||||
|
st := Evaluate(r, facts, now)
|
||||||
|
if !st.Active || len(st.Missing) == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
labels := make([]string, 0, len(st.Missing))
|
||||||
|
for _, it := range st.Missing {
|
||||||
|
label := it.Label
|
||||||
|
if label == "" {
|
||||||
|
label = it.Key
|
||||||
|
}
|
||||||
|
labels = append(labels, label)
|
||||||
|
}
|
||||||
|
at := r.NudgeAt
|
||||||
|
if at == "" {
|
||||||
|
at = r.WindowEnd
|
||||||
|
}
|
||||||
|
when, ok := todayAt(at, now)
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
out = append(out, PlanEntry{
|
||||||
|
At: when,
|
||||||
|
Text: fmt.Sprintf("%s — осталось: %s", r.Name, strings.Join(labels, ", ")),
|
||||||
|
Kind: PlanChecklist,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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.
|
||||||
|
func (p Plan) After(now time.Time) Plan {
|
||||||
|
out := Plan{Date: p.Date}
|
||||||
|
for _, it := range p.Items {
|
||||||
|
if it.At.Before(now) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
out.Items = append(out.Items, it)
|
||||||
|
}
|
||||||
|
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.
|
||||||
|
func (p Plan) FormatRU() string {
|
||||||
|
if len(p.Items) == 0 {
|
||||||
|
return fmt.Sprintf("на %s ничего не запланировано.", p.Date.Format("02.01.2006"))
|
||||||
|
}
|
||||||
|
parts := make([]string, len(p.Items))
|
||||||
|
for i, it := range p.Items {
|
||||||
|
line := fmt.Sprintf("%s — %s", it.At.Format("15:04"), it.Text)
|
||||||
|
if it.Uncertain {
|
||||||
|
line = "похоже, " + line
|
||||||
|
}
|
||||||
|
parts[i] = line
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("план на %s: %s.", p.Date.Format("02.01.2006"), strings.Join(parts, "; "))
|
||||||
|
}
|
||||||
@@ -0,0 +1,169 @@
|
|||||||
|
package morning
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/store"
|
||||||
|
)
|
||||||
|
|
||||||
|
// planAt is at() for the plan tests' day (2026-08-03, a Monday); the existing
|
||||||
|
// at() in morning_test.go is pinned to a different date.
|
||||||
|
func planAt(now time.Time, hh, mm int) time.Time {
|
||||||
|
y, m, d := now.Date()
|
||||||
|
return time.Date(y, m, d, hh, mm, 0, 0, now.Location())
|
||||||
|
}
|
||||||
|
|
||||||
|
func planFixture(t *testing.T) (Plan, time.Time) {
|
||||||
|
t.Helper()
|
||||||
|
now := time.Date(2026, 8, 3, 9, 0, 0, 0, time.UTC)
|
||||||
|
routines := []Routine{{
|
||||||
|
Name: "утро",
|
||||||
|
WindowStart: "07:00",
|
||||||
|
WindowEnd: "11:00",
|
||||||
|
NudgeAt: "10:30",
|
||||||
|
Items: []Item{
|
||||||
|
{Key: "water", FactKey: "drank_water", Label: "выпить воды"},
|
||||||
|
{Key: "pills", FactKey: "took_pills", Label: "витамины"},
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
facts := map[string]store.Fact{
|
||||||
|
"drank_water": {Ts: planAt(now, 8, 0)},
|
||||||
|
}
|
||||||
|
events := []PlanEntry{
|
||||||
|
{At: planAt(now, 14, 0), Text: "Планёрка @ 14:00-14:30", Kind: PlanEvent, Uncertain: true},
|
||||||
|
{At: planAt(now, 10, 0), Text: "Standup @ 10:00-10:30", Kind: PlanEvent},
|
||||||
|
}
|
||||||
|
reminders := []PlanEntry{
|
||||||
|
{At: planAt(now, 18, 30), Text: "позвонить маме", Kind: PlanReminder},
|
||||||
|
}
|
||||||
|
return BuildPlan(routines, facts, events, reminders, now), now
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestBuildPlanOrdersTheDay(t *testing.T) {
|
||||||
|
p, now := planFixture(t)
|
||||||
|
|
||||||
|
if !p.Date.Equal(planAt(now, 0, 0)) {
|
||||||
|
t.Errorf("Date = %v, want midnight of now's day", p.Date)
|
||||||
|
}
|
||||||
|
want := []struct {
|
||||||
|
hhmm string
|
||||||
|
kind PlanKind
|
||||||
|
}{
|
||||||
|
{"10:00", PlanEvent},
|
||||||
|
{"10:30", PlanChecklist},
|
||||||
|
{"14:00", PlanEvent},
|
||||||
|
{"18:30", PlanReminder},
|
||||||
|
}
|
||||||
|
if len(p.Items) != len(want) {
|
||||||
|
t.Fatalf("got %d items, want %d: %+v", len(p.Items), len(want), p.Items)
|
||||||
|
}
|
||||||
|
for i, w := range want {
|
||||||
|
if got := p.Items[i].At.Format("15:04"); got != w.hhmm {
|
||||||
|
t.Errorf("item %d at %s, want %s", i, got, w.hhmm)
|
||||||
|
}
|
||||||
|
if p.Items[i].Kind != w.kind {
|
||||||
|
t.Errorf("item %d kind %q, want %q", i, p.Items[i].Kind, w.kind)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The checklist line says what is LEFT. An item already evidenced today must
|
||||||
|
// not be read back as outstanding.
|
||||||
|
func TestBuildPlanChecklistListsOnlyMissing(t *testing.T) {
|
||||||
|
p, _ := planFixture(t)
|
||||||
|
var line string
|
||||||
|
for _, it := range p.Items {
|
||||||
|
if it.Kind == PlanChecklist {
|
||||||
|
line = it.Text
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if line == "" {
|
||||||
|
t.Fatal("no checklist line in the plan")
|
||||||
|
}
|
||||||
|
if !strings.Contains(line, "витамины") {
|
||||||
|
t.Errorf("missing item not listed: %q", line)
|
||||||
|
}
|
||||||
|
if strings.Contains(line, "выпить воды") {
|
||||||
|
t.Errorf("a completed item must not be read back as outstanding: %q", line)
|
||||||
|
}
|
||||||
|
if !strings.HasPrefix(line, "утро — осталось:") {
|
||||||
|
t.Errorf("line = %q", line)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestBuildPlanSkipsCompleteAndInactiveRoutines(t *testing.T) {
|
||||||
|
now := time.Date(2026, 8, 3, 9, 0, 0, 0, time.UTC)
|
||||||
|
routines := []Routine{
|
||||||
|
{
|
||||||
|
Name: "утро", WindowStart: "07:00", WindowEnd: "11:00",
|
||||||
|
Items: []Item{{Key: "water", FactKey: "drank_water", Label: "выпить воды"}},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
// Not in its window at 09:00.
|
||||||
|
Name: "вечер", WindowStart: "20:00", WindowEnd: "23:00",
|
||||||
|
Items: []Item{{Key: "walk", FactKey: "walked", Label: "прогулка"}},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
facts := map[string]store.Fact{"drank_water": {Ts: planAt(now, 8, 0)}}
|
||||||
|
p := BuildPlan(routines, facts, nil, nil, now)
|
||||||
|
if len(p.Items) != 0 {
|
||||||
|
t.Fatalf("a complete routine and an out-of-window one must contribute nothing: %+v", p.Items)
|
||||||
|
}
|
||||||
|
if got, want := p.FormatRU(), "на 03.08.2026 ничего не запланировано."; got != want {
|
||||||
|
t.Errorf("got %q\nwant %q", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A plan for today that includes tomorrow's meeting is worse than terse.
|
||||||
|
func TestBuildPlanDropsOtherDays(t *testing.T) {
|
||||||
|
now := time.Date(2026, 8, 3, 9, 0, 0, 0, time.UTC)
|
||||||
|
events := []PlanEntry{
|
||||||
|
{At: planAt(now, 10, 0), Text: "today", Kind: PlanEvent},
|
||||||
|
{At: planAt(now, 10, 0).AddDate(0, 0, 1), Text: "tomorrow", Kind: PlanEvent},
|
||||||
|
{At: planAt(now, 10, 0).AddDate(0, 0, -1), Text: "yesterday", Kind: PlanEvent},
|
||||||
|
{At: planAt(now, 12, 0), Text: " ", Kind: PlanEvent},
|
||||||
|
}
|
||||||
|
p := BuildPlan(nil, nil, events, nil, now)
|
||||||
|
if len(p.Items) != 1 || p.Items[0].Text != "today" {
|
||||||
|
t.Fatalf("got %+v", p.Items)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPlanFormatRU(t *testing.T) {
|
||||||
|
p, _ := planFixture(t)
|
||||||
|
got := p.FormatRU()
|
||||||
|
want := "план на 03.08.2026: 10:00 — Standup @ 10:00-10:30; " +
|
||||||
|
"10:30 — утро — осталось: витамины; " +
|
||||||
|
"похоже, 14:00 — Планёрка @ 14:00-14:30; " +
|
||||||
|
"18:30 — позвонить маме."
|
||||||
|
if got != want {
|
||||||
|
t.Errorf("got %q\nwant %q", got, want)
|
||||||
|
}
|
||||||
|
// Persona: she recites, she does not exhort, and she never speaks of
|
||||||
|
// herself in the masculine or addresses him formally.
|
||||||
|
for _, bad := range []string{"рад ", "понял", "вы ", "ваш", "милый", "дорогой", "давай же", "не забудь"} {
|
||||||
|
if strings.Contains(strings.ToLower(got), bad) {
|
||||||
|
t.Errorf("plan text contains %q: %q", bad, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestPlanAfter(t *testing.T) {
|
||||||
|
p, now := planFixture(t)
|
||||||
|
rest := p.After(planAt(now, 11, 0))
|
||||||
|
if len(rest.Items) != 2 {
|
||||||
|
t.Fatalf("got %d items, want the 14:00 and 18:30 ones: %+v", len(rest.Items), rest.Items)
|
||||||
|
}
|
||||||
|
if !rest.Date.Equal(p.Date) {
|
||||||
|
t.Error("After must keep the date, so an empty rest-of-day still knows which day")
|
||||||
|
}
|
||||||
|
empty := p.After(planAt(now, 23, 0))
|
||||||
|
if len(empty.Items) != 0 {
|
||||||
|
t.Errorf("got %+v", empty.Items)
|
||||||
|
}
|
||||||
|
if !strings.Contains(empty.FormatRU(), "ничего не запланировано") {
|
||||||
|
t.Errorf("empty plan reads %q", empty.FormatRU())
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,9 +20,19 @@ type ProposedRoutine struct {
|
|||||||
const MaxIntervalRatio = 1.5
|
const MaxIntervalRatio = 1.5
|
||||||
|
|
||||||
// MinEvents is the minimum number of events needed to detect a pattern.
|
// MinEvents is the minimum number of events needed to detect a pattern.
|
||||||
// With N events, there are N-1 intervals; we need at least 2 intervals
|
// With N events there are N-1 intervals, so 4 events means 3 intervals.
|
||||||
// before proposing anything.
|
//
|
||||||
const MinEvents = 3
|
// This used to be 3 (two intervals), which is not a pattern — it is a
|
||||||
|
// coincidence with a mean. Two gaps of similar length happen constantly:
|
||||||
|
// water the plants on a Sunday, again the next Sunday, once more the Sunday
|
||||||
|
// after, and a detector with a ±50% band calls that a weekly routine. The
|
||||||
|
// cost of being wrong is asymmetric now that the digestion tick scans all of
|
||||||
|
// history on its own schedule and can announce what it finds: a false
|
||||||
|
// positive is something the owner has to read and dismiss, and a dismissal
|
||||||
|
// is permanent, so one bad guess burns that action+object pair forever.
|
||||||
|
// Three intervals is the cheapest bar that makes a run distinguishable from
|
||||||
|
// a repeat. False negatives cost one more observation and nothing else.
|
||||||
|
const MinEvents = 4
|
||||||
|
|
||||||
// Detect checks whether a sequence of events for the same action+object
|
// Detect checks whether a sequence of events for the same action+object
|
||||||
// forms a stable recurring pattern. Returns a ProposedRoutine when:
|
// forms a stable recurring pattern. Returns a ProposedRoutine when:
|
||||||
|
|||||||
@@ -6,12 +6,13 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func TestDetectEnoughEvents(t *testing.T) {
|
func TestDetectEnoughEvents(t *testing.T) {
|
||||||
// 3 events with 7-day intervals → stable pattern
|
// MinEvents events with 7-day intervals → stable pattern
|
||||||
base := time.Date(2026, 7, 1, 12, 0, 0, 0, time.UTC)
|
base := time.Date(2026, 7, 1, 12, 0, 0, 0, time.UTC)
|
||||||
events := []Event{
|
events := []Event{
|
||||||
{Action: "refill", Object: "cat_water", Ts: base},
|
{Action: "refill", Object: "cat_water", Ts: base},
|
||||||
{Action: "refill", Object: "cat_water", Ts: base.Add(7 * 24 * time.Hour)},
|
{Action: "refill", Object: "cat_water", Ts: base.Add(7 * 24 * time.Hour)},
|
||||||
{Action: "refill", Object: "cat_water", Ts: base.Add(14 * 24 * time.Hour)},
|
{Action: "refill", Object: "cat_water", Ts: base.Add(14 * 24 * time.Hour)},
|
||||||
|
{Action: "refill", Object: "cat_water", Ts: base.Add(21 * 24 * time.Hour)},
|
||||||
}
|
}
|
||||||
|
|
||||||
r, err := Detect(events)
|
r, err := Detect(events)
|
||||||
@@ -24,8 +25,8 @@ func TestDetectEnoughEvents(t *testing.T) {
|
|||||||
if r.Action != "refill" || r.Object != "cat_water" {
|
if r.Action != "refill" || r.Object != "cat_water" {
|
||||||
t.Fatalf("action/object: want refill/cat_water, got %s/%s", r.Action, r.Object)
|
t.Fatalf("action/object: want refill/cat_water, got %s/%s", r.Action, r.Object)
|
||||||
}
|
}
|
||||||
if r.N != 3 {
|
if r.N != 4 {
|
||||||
t.Fatalf("want N=3, got %d", r.N)
|
t.Fatalf("want N=4, got %d", r.N)
|
||||||
}
|
}
|
||||||
// ~7 days
|
// ~7 days
|
||||||
if r.IntervalDays < 6.9 || r.IntervalDays > 7.1 {
|
if r.IntervalDays < 6.9 || r.IntervalDays > 7.1 {
|
||||||
@@ -33,19 +34,28 @@ func TestDetectEnoughEvents(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestDetectNotEnoughEvents — two intervals are a coincidence, not a routine
|
||||||
|
// (Vikunja #43). Three same-day-of-week events used to be enough to propose a
|
||||||
|
// weekly reminder; MinEvents is 4 now so a repeat has to happen a third time
|
||||||
|
// before Maven calls it a pattern.
|
||||||
func TestDetectNotEnoughEvents(t *testing.T) {
|
func TestDetectNotEnoughEvents(t *testing.T) {
|
||||||
base := time.Date(2026, 7, 1, 12, 0, 0, 0, time.UTC)
|
base := time.Date(2026, 7, 1, 12, 0, 0, 0, time.UTC)
|
||||||
events := []Event{
|
for _, n := range []int{1, 2, MinEvents - 1} {
|
||||||
{Action: "refill", Object: "cat_water", Ts: base},
|
events := make([]Event, n)
|
||||||
{Action: "refill", Object: "cat_water", Ts: base.Add(7 * 24 * time.Hour)},
|
for i := range events {
|
||||||
}
|
events[i] = Event{
|
||||||
|
Action: "refill",
|
||||||
r, err := Detect(events)
|
Object: "cat_water",
|
||||||
if err != nil {
|
Ts: base.Add(time.Duration(i) * 7 * 24 * time.Hour),
|
||||||
t.Fatalf("Detect: %v", err)
|
}
|
||||||
}
|
}
|
||||||
if r != nil {
|
r, err := Detect(events)
|
||||||
t.Fatal("want nil for <3 events")
|
if err != nil {
|
||||||
|
t.Fatalf("Detect(%d events): %v", n, err)
|
||||||
|
}
|
||||||
|
if r != nil {
|
||||||
|
t.Fatalf("Detect(%d events) proposed %+v, want nil below MinEvents=%d", n, r, MinEvents)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -68,12 +78,13 @@ func TestDetectEmpty(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestDetectIrregularRejects(t *testing.T) {
|
func TestDetectIrregularRejects(t *testing.T) {
|
||||||
// 3 events but wildly irregular: 1 day, then 14 days → ratio 14 > 1.5
|
// wildly irregular: 1 day, then 14 days → ratio 14 > 1.5
|
||||||
base := time.Date(2026, 7, 1, 12, 0, 0, 0, time.UTC)
|
base := time.Date(2026, 7, 1, 12, 0, 0, 0, time.UTC)
|
||||||
events := []Event{
|
events := []Event{
|
||||||
{Action: "refill", Object: "cat_water", Ts: base},
|
{Action: "refill", Object: "cat_water", Ts: base},
|
||||||
{Action: "refill", Object: "cat_water", Ts: base.Add(1 * 24 * time.Hour)},
|
{Action: "refill", Object: "cat_water", Ts: base.Add(1 * 24 * time.Hour)},
|
||||||
{Action: "refill", Object: "cat_water", Ts: base.Add(15 * 24 * time.Hour)},
|
{Action: "refill", Object: "cat_water", Ts: base.Add(15 * 24 * time.Hour)},
|
||||||
|
{Action: "refill", Object: "cat_water", Ts: base.Add(16 * 24 * time.Hour)},
|
||||||
}
|
}
|
||||||
|
|
||||||
r, err := Detect(events)
|
r, err := Detect(events)
|
||||||
@@ -117,6 +128,7 @@ func TestDetectSameTimestamp(t *testing.T) {
|
|||||||
{Action: "refill", Object: "cat_water", Ts: base},
|
{Action: "refill", Object: "cat_water", Ts: base},
|
||||||
{Action: "refill", Object: "cat_water", Ts: base},
|
{Action: "refill", Object: "cat_water", Ts: base},
|
||||||
{Action: "refill", Object: "cat_water", Ts: base.Add(7 * 24 * time.Hour)},
|
{Action: "refill", Object: "cat_water", Ts: base.Add(7 * 24 * time.Hour)},
|
||||||
|
{Action: "refill", Object: "cat_water", Ts: base.Add(14 * 24 * time.Hour)},
|
||||||
}
|
}
|
||||||
|
|
||||||
r, err := Detect(events)
|
r, err := Detect(events)
|
||||||
|
|||||||
+100
-4
@@ -4,16 +4,112 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
"unicode"
|
||||||
)
|
)
|
||||||
|
|
||||||
// CalendarEventFormatter formats calendar events into a Russian reply string.
|
// CalendarEventFormatter formats calendar events into a Russian reply string.
|
||||||
type CalendarEventFormatter struct{}
|
type CalendarEventFormatter struct{}
|
||||||
|
|
||||||
// Format returns a Russian reply for the given calendar events on the given date.
|
// CalendarEntry — one event to recite. Uncertain marks an event maven did not
|
||||||
func (CalendarEventFormatter) Format(events []string, date time.Time) string {
|
// read off a calendar server: the work calendar arrives as relayed phone
|
||||||
|
// notifications (Vikunja #126), stored below full confidence, and she says so
|
||||||
|
// rather than reciting a guess as fact.
|
||||||
|
type CalendarEntry struct {
|
||||||
|
Text string
|
||||||
|
Uncertain bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// dayPlanWords — the tokens that ask for the day as a whole rather than for a
|
||||||
|
// calendar listing. Whole words, not substrings: "планёрка" is a MEETING, and a
|
||||||
|
// notification about one must not be mistaken for a request for the plan.
|
||||||
|
var dayPlanWords = []string{
|
||||||
|
"план", "плана", "плану", "плане", "планом",
|
||||||
|
"планы", "планов", "планам", "планах",
|
||||||
|
"расписание", "расписании", "распорядок", "распорядке",
|
||||||
|
"plan", "plans", "schedule", "agenda",
|
||||||
|
}
|
||||||
|
|
||||||
|
// otherDayWords — a day that is not today. The plan is built for the clock's
|
||||||
|
// own day only, so an utterance naming another one belongs to the calendar
|
||||||
|
// listing instead. Claiming it here would answer the wrong day, which is worse
|
||||||
|
// than answering more tersely.
|
||||||
|
var otherDayWords = []string{
|
||||||
|
"завтра", "послезавтра", "вчера", "позавчера",
|
||||||
|
"tomorrow", "yesterday",
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsDayPlanQuery reports whether an utterance asks for today's plan (Vikunja
|
||||||
|
// #128) — "какие планы на сегодня?", "что у меня по плану?", "что дальше?".
|
||||||
|
//
|
||||||
|
// Deliberately narrow. The calendar listing already answers "что у меня
|
||||||
|
// сегодня?" and a plan that hijacks every date-bearing question would bury the
|
||||||
|
// events under checklist lines. Only a plan-shaped ask, and only about today.
|
||||||
|
func IsDayPlanQuery(text string) bool {
|
||||||
|
toks := planTokens(text)
|
||||||
|
for _, t := range toks {
|
||||||
|
for _, w := range otherDayWords {
|
||||||
|
if t == w {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, t := range toks {
|
||||||
|
for _, w := range dayPlanWords {
|
||||||
|
if t == w {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// "что дальше?" / "what's next?" — the rest of the day, with no plan word
|
||||||
|
// in it. Both tokens rather than adjacency, because "what's" splits into
|
||||||
|
// "what" and "s" and because "и что потом дальше" is the same question.
|
||||||
|
return (hasTok(toks, "что") && hasTok(toks, "дальше")) ||
|
||||||
|
(hasTok(toks, "what") && hasTok(toks, "next"))
|
||||||
|
}
|
||||||
|
|
||||||
|
func hasTok(toks []string, w string) bool {
|
||||||
|
for _, t := range toks {
|
||||||
|
if t == w {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// planTokens lowercases and splits on everything that is not a letter or a
|
||||||
|
// digit, so "планы?" and "что-дальше" tokenize like the plain words do.
|
||||||
|
func planTokens(text string) []string {
|
||||||
|
return strings.FieldsFunc(strings.ToLower(text), func(r rune) bool {
|
||||||
|
return !unicode.IsLetter(r) && !unicode.IsDigit(r)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Format returns a Russian reply for the given calendar events on the given
|
||||||
|
// date. Every event is treated as certain — use FormatEntries when provenance
|
||||||
|
// differs between them.
|
||||||
|
func (f CalendarEventFormatter) Format(events []string, date time.Time) string {
|
||||||
|
entries := make([]CalendarEntry, len(events))
|
||||||
|
for i, e := range events {
|
||||||
|
entries[i] = CalendarEntry{Text: e}
|
||||||
|
}
|
||||||
|
return f.FormatEntries(entries, date)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FormatEntries returns a Russian reply, hedging the entries maven is not sure
|
||||||
|
// about. "похоже" and not "возможно": the notification did arrive, what is
|
||||||
|
// uncertain is whether it describes the meeting correctly.
|
||||||
|
func (CalendarEventFormatter) FormatEntries(entries []CalendarEntry, date time.Time) string {
|
||||||
dateStr := date.Format("02.01.2006")
|
dateStr := date.Format("02.01.2006")
|
||||||
if len(events) == 0 {
|
if len(entries) == 0 {
|
||||||
return fmt.Sprintf("на %s ничего нет.", dateStr)
|
return fmt.Sprintf("на %s ничего нет.", dateStr)
|
||||||
}
|
}
|
||||||
return fmt.Sprintf("на %s: %s", dateStr, strings.Join(events, "; "))
|
parts := make([]string, len(entries))
|
||||||
|
for i, e := range entries {
|
||||||
|
if e.Uncertain {
|
||||||
|
parts[i] = "похоже, " + e.Text
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
parts[i] = e.Text
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("на %s: %s", dateStr, strings.Join(parts, "; "))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,3 +24,60 @@ func TestCalendarEventFormatter(t *testing.T) {
|
|||||||
t.Errorf("multiple: got %q", got)
|
t.Errorf("multiple: got %q", got)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestCalendarEventFormatterHedgesUncertainEntries(t *testing.T) {
|
||||||
|
f := CalendarEventFormatter{}
|
||||||
|
date := time.Date(2026, 7, 6, 0, 0, 0, 0, time.UTC)
|
||||||
|
|
||||||
|
// An event relayed off a phone notification is not a calendar read, and she
|
||||||
|
// says so instead of reciting a guess as fact.
|
||||||
|
got := f.FormatEntries([]CalendarEntry{
|
||||||
|
{Text: "Standup @ 10:00-10:30"},
|
||||||
|
{Text: "Планёрка @ 14:00-14:30", Uncertain: true},
|
||||||
|
}, date)
|
||||||
|
want := "на 06.07.2026: Standup @ 10:00-10:30; похоже, Планёрка @ 14:00-14:30"
|
||||||
|
if got != want {
|
||||||
|
t.Errorf("got %q\nwant %q", got, want)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Format is FormatEntries with everything certain.
|
||||||
|
if got := f.FormatEntries(nil, date); got != "на 06.07.2026 ничего нет." {
|
||||||
|
t.Errorf("empty: got %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIsDayPlanQuery(t *testing.T) {
|
||||||
|
yes := []string{
|
||||||
|
"какие планы на сегодня?",
|
||||||
|
"что у меня по плану",
|
||||||
|
"расскажи план",
|
||||||
|
"мой распорядок на сегодня",
|
||||||
|
"расписание?",
|
||||||
|
"что дальше?",
|
||||||
|
"what's next",
|
||||||
|
"what is my plan today",
|
||||||
|
}
|
||||||
|
for _, s := range yes {
|
||||||
|
if !IsDayPlanQuery(s) {
|
||||||
|
t.Errorf("IsDayPlanQuery(%q) = false, want true", s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
no := []string{
|
||||||
|
// The calendar listing owns these.
|
||||||
|
"что у меня сегодня?",
|
||||||
|
"какие планы на завтра?",
|
||||||
|
"план на послезавтра",
|
||||||
|
"что было вчера",
|
||||||
|
// "планёрка" is a meeting, not a request for the plan.
|
||||||
|
"когда планёрка?",
|
||||||
|
"запиши планёрку на 14:00",
|
||||||
|
"какая погода?",
|
||||||
|
"",
|
||||||
|
}
|
||||||
|
for _, s := range no {
|
||||||
|
if IsDayPlanQuery(s) {
|
||||||
|
t.Errorf("IsDayPlanQuery(%q) = true, want false", s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
package router
|
||||||
|
|
||||||
|
import "time"
|
||||||
|
|
||||||
|
// Habit queries — "что я обычно делаю по вторникам?" (Vikunja #254).
|
||||||
|
//
|
||||||
|
// Deterministic matching, like the calendar and plan matchers: the LLM router
|
||||||
|
// classifies the intent, but WHICH weekday was asked about is a lookup, not a
|
||||||
|
// generation. A model that answers "по вторникам" for a question about Thursday
|
||||||
|
// gives a confidently wrong account of the owner's own life.
|
||||||
|
|
||||||
|
// HabitQuery — a parsed "what do I usually do" question. Weekday is set only
|
||||||
|
// when the utterance names one; otherwise the answer covers the whole week.
|
||||||
|
type HabitQuery struct {
|
||||||
|
Weekday time.Weekday
|
||||||
|
HasWeekday bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// habitMarkers — the words that make a question about habit rather than about
|
||||||
|
// today. Without one of these, "что я делаю" is a question about right now, and
|
||||||
|
// the recall path owns it.
|
||||||
|
var habitMarkers = []string{
|
||||||
|
"обычно", "обычное", "чаще", "постоянно", "привычки", "привычка", "привычках",
|
||||||
|
"регулярно", "каждый", "каждую", "каждое", "usually", "habits", "habit",
|
||||||
|
"typically", "normally",
|
||||||
|
}
|
||||||
|
|
||||||
|
// weekdayWords — every form of a weekday name maven needs to recognise,
|
||||||
|
// including the "по …ам" plural the question is usually phrased in.
|
||||||
|
var weekdayWords = map[string]time.Weekday{
|
||||||
|
"понедельник": time.Monday, "понедельникам": time.Monday,
|
||||||
|
"вторник": time.Tuesday, "вторникам": time.Tuesday,
|
||||||
|
"среда": time.Wednesday, "среду": time.Wednesday, "средам": time.Wednesday,
|
||||||
|
"четверг": time.Thursday, "четвергам": time.Thursday,
|
||||||
|
"пятница": time.Friday, "пятницу": time.Friday, "пятницам": time.Friday,
|
||||||
|
"суббота": time.Saturday, "субботу": time.Saturday, "субботам": time.Saturday,
|
||||||
|
"воскресенье": time.Sunday, "воскресеньям": time.Sunday,
|
||||||
|
"monday": time.Monday, "mondays": time.Monday,
|
||||||
|
"tuesday": time.Tuesday, "tuesdays": time.Tuesday,
|
||||||
|
"wednesday": time.Wednesday, "wednesdays": time.Wednesday,
|
||||||
|
"thursday": time.Thursday, "thursdays": time.Thursday,
|
||||||
|
"friday": time.Friday, "fridays": time.Friday,
|
||||||
|
"saturday": time.Saturday, "saturdays": time.Saturday,
|
||||||
|
"sunday": time.Sunday, "sundays": time.Sunday,
|
||||||
|
}
|
||||||
|
|
||||||
|
// ParseHabitQuery reports whether an utterance asks what the owner usually
|
||||||
|
// does, and on which weekday if it names one.
|
||||||
|
//
|
||||||
|
// A habit marker is required. "что я делаю в среду?" without one is a question
|
||||||
|
// about this coming Wednesday — the calendar's job — and answering it with a
|
||||||
|
// statistical average would be answering a different question.
|
||||||
|
func ParseHabitQuery(text string) (HabitQuery, bool) {
|
||||||
|
toks := planTokens(text)
|
||||||
|
marked := false
|
||||||
|
for _, t := range toks {
|
||||||
|
for _, m := range habitMarkers {
|
||||||
|
if t == m {
|
||||||
|
marked = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !marked {
|
||||||
|
return HabitQuery{}, false
|
||||||
|
}
|
||||||
|
for _, t := range toks {
|
||||||
|
if wd, ok := weekdayWords[t]; ok {
|
||||||
|
return HabitQuery{Weekday: wd, HasWeekday: true}, true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return HabitQuery{}, true
|
||||||
|
}
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
package router
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestParseHabitQuery(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
in string
|
||||||
|
ok bool
|
||||||
|
wd time.Weekday
|
||||||
|
hasWD bool
|
||||||
|
}{
|
||||||
|
{"что я обычно делаю по вторникам?", true, time.Tuesday, true},
|
||||||
|
{"что я обычно делаю?", true, 0, false},
|
||||||
|
{"какие у меня привычки", true, 0, false},
|
||||||
|
{"что я каждую пятницу делаю", true, time.Friday, true},
|
||||||
|
{"what do i usually do on mondays?", true, time.Monday, true},
|
||||||
|
// No habit marker: this is a question about the coming Wednesday, and
|
||||||
|
// the calendar owns it. Answering with an average answers the wrong
|
||||||
|
// question.
|
||||||
|
{"что я делаю в среду?", false, 0, false},
|
||||||
|
{"что у меня сегодня?", false, 0, false},
|
||||||
|
{"какие планы на сегодня?", false, 0, false},
|
||||||
|
{"", false, 0, false},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
q, ok := ParseHabitQuery(tt.in)
|
||||||
|
if ok != tt.ok {
|
||||||
|
t.Errorf("ParseHabitQuery(%q) ok = %v, want %v", tt.in, ok, tt.ok)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if q.HasWeekday != tt.hasWD {
|
||||||
|
t.Errorf("ParseHabitQuery(%q) hasWeekday = %v, want %v", tt.in, q.HasWeekday, tt.hasWD)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if q.HasWeekday && q.Weekday != tt.wd {
|
||||||
|
t.Errorf("ParseHabitQuery(%q) weekday = %v, want %v", tt.in, q.Weekday, tt.wd)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -118,6 +118,39 @@ const routeRepeatPenalty = 1.15
|
|||||||
// Route return ok=false so the caller drops to the classifier cascade.
|
// Route return ok=false so the caller drops to the classifier cascade.
|
||||||
const routeIntentUnknown = "unknown"
|
const routeIntentUnknown = "unknown"
|
||||||
|
|
||||||
|
// llmFullConfidence / llmThinConfidence — Vikunja #359. Confidence used to be
|
||||||
|
// hardcoded to 1.0 for every LLM decision, so the stage-3 gate in router.go
|
||||||
|
// never had anything to bite on and the LLM path could never produce a
|
||||||
|
// Clarify: on the 77-case RU fixture, 6/6 want_clarify cases were missed by
|
||||||
|
// EVERY model in the 31-07-2026 bake-off (0.8B through 2B) — proof this was a
|
||||||
|
// code bug, not a capability ceiling.
|
||||||
|
//
|
||||||
|
// The fix does not touch the prompt (routeSystem is under
|
||||||
|
// llm/check_prompt_parity.py in the training workspace; changing its text
|
||||||
|
// creates a parity break that has to be fixed there too — see Vikunja #362).
|
||||||
|
// Instead it reads structural signal that is already free:
|
||||||
|
// - a single-token utterance is thin evidence for anything a grammar
|
||||||
|
// didn't already catch at stage 0 — "вода" and "бэкап" alone don't say
|
||||||
|
// fact-vs-query or act-vs-report;
|
||||||
|
// - a fact with no key, or an act that never resolves to an allowlisted fn
|
||||||
|
// (checked in router.go, after slot-fill has had its say), is a decision
|
||||||
|
// with a hole in the one slot that makes it actionable.
|
||||||
|
//
|
||||||
|
// A model self-reporting confidence in the JSON was considered and rejected:
|
||||||
|
// a sub-2B is not calibrated (nothing stops it saying "confident" on exactly
|
||||||
|
// the cases it gets wrong today), and true logprobs would need a response
|
||||||
|
// field internal/llm.Client's Complete does not currently return — see
|
||||||
|
// internal/llm/client.go.
|
||||||
|
//
|
||||||
|
// llmThinConfidence sits below config.DefaultRouterThreshold (0.55) so the
|
||||||
|
// existing stage-3 gate in Router.Route treats it exactly like a low-scoring
|
||||||
|
// classifier result — same lane, same daemon-side clarify machinery
|
||||||
|
// (cmd/mavend/clarify.go), no new consumer to build.
|
||||||
|
const (
|
||||||
|
llmFullConfidence = 1.0
|
||||||
|
llmThinConfidence = 0.3
|
||||||
|
)
|
||||||
|
|
||||||
type routeAction struct {
|
type routeAction struct {
|
||||||
Intent string `json:"intent"`
|
Intent string `json:"intent"`
|
||||||
Key string `json:"key"`
|
Key string `json:"key"`
|
||||||
@@ -160,7 +193,15 @@ func (lr *LLMRouter) Route(ctx context.Context, utterance string, now time.Time)
|
|||||||
if a.Intent == routeIntentUnknown {
|
if a.Intent == routeIntentUnknown {
|
||||||
return Decision{}, false, nil
|
return Decision{}, false, nil
|
||||||
}
|
}
|
||||||
d := Decision{Utterance: utterance, Stage: 1, Confidence: 1.0}
|
d := Decision{Utterance: utterance, Stage: 1, Confidence: llmFullConfidence}
|
||||||
|
// A single-token utterance is thin evidence: the model had nothing to
|
||||||
|
// disambiguate on ("вода" is a fact-or-query coin flip, "бэкап" an
|
||||||
|
// act-or-report one) and stage 0 would already have won on anything
|
||||||
|
// that pattern-matches cleanly. Flag it now; router.go's stage-3 gate
|
||||||
|
// (Router.Route) decides whether that trips Clarify.
|
||||||
|
if len(strings.Fields(utterance)) <= 1 {
|
||||||
|
d.Confidence = llmThinConfidence
|
||||||
|
}
|
||||||
switch Intent(a.Intent) {
|
switch Intent(a.Intent) {
|
||||||
case IntentFact:
|
case IntentFact:
|
||||||
d.Intent = IntentFact
|
d.Intent = IntentFact
|
||||||
|
|||||||
@@ -258,4 +258,101 @@ func TestLLMFactGetsKeyFromParser(t *testing.T) {
|
|||||||
if !d.Slots.HasKey || d.Slots.Key != "water" {
|
if !d.Slots.HasKey || d.Slots.Key != "water" {
|
||||||
t.Fatalf("want key=water, got %+v", d.Slots)
|
t.Fatalf("want key=water, got %+v", d.Slots)
|
||||||
}
|
}
|
||||||
|
if d.Clarify {
|
||||||
|
t.Fatalf("the parser resolved the key, this must not clarify: %+v", d)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- confidence / stage-3 gate on the LLM path (Vikunja #359) -----------------
|
||||||
|
|
||||||
|
// A single-token utterance is thin evidence on its own — "вода" alone is a
|
||||||
|
// fact/query coin flip. The gate must ask rather than guess confidently.
|
||||||
|
func TestLLMRouterSingleTokenTripsClarify(t *testing.T) {
|
||||||
|
r := newLLMTestRouter(t, `{"intent":"query","text":"вода"}`)
|
||||||
|
d, err := r.Route(context.Background(), "вода", refNow())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("route: %v", err)
|
||||||
|
}
|
||||||
|
if !d.Clarify {
|
||||||
|
t.Fatalf("a bare single-token decision must clarify, got %+v", d)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A multi-word utterance with a clean answer must not be punished — the
|
||||||
|
// whole point is not trading the confident cases away for clarify coverage.
|
||||||
|
func TestLLMRouterMultiWordStaysConfident(t *testing.T) {
|
||||||
|
r := newLLMTestRouter(t, `{"intent":"reminder","text":"позвонить маме"}`)
|
||||||
|
d, err := r.Route(context.Background(), "напомни позвонить маме", refNow())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("route: %v", err)
|
||||||
|
}
|
||||||
|
if d.Clarify {
|
||||||
|
t.Fatalf("a clean multi-word decision must not clarify: %+v", d)
|
||||||
|
}
|
||||||
|
if d.Confidence != llmFullConfidence {
|
||||||
|
t.Fatalf("want full confidence, got %v", d.Confidence)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// "бэкап" alone: the model guesses act, but nothing on the allowlist matches
|
||||||
|
// "бэкап" as a verb — that must not fire a tool blind.
|
||||||
|
func TestLLMRouterActWithoutFnTripsClarify(t *testing.T) {
|
||||||
|
r := newLLMTestRouter(t, `{"intent":"act","verb":"бэкап"}`)
|
||||||
|
d, err := r.Route(context.Background(), "бэкап сделай пожалуйста расписание", refNow())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("route: %v", err)
|
||||||
|
}
|
||||||
|
if d.Slots.HasFn {
|
||||||
|
t.Fatalf("test setup drifted: %q now resolves to an fn", d.Slots.Fn)
|
||||||
|
}
|
||||||
|
if !d.Clarify {
|
||||||
|
t.Fatalf("an unresolved act must clarify rather than guess: %+v", d)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// An act that DOES resolve to an allowlisted fn must stay confident even
|
||||||
|
// though its own verb is single-word-ish in spirit — guard against the fn
|
||||||
|
// check firing on the happy path.
|
||||||
|
func TestLLMRouterActWithFnStaysConfident(t *testing.T) {
|
||||||
|
r := newLLMTestRouter(t, `{"intent":"act","verb":"restart nginx"}`)
|
||||||
|
d, err := r.Route(context.Background(), "слушай, restart nginx пожалуйста", refNow())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("route: %v", err)
|
||||||
|
}
|
||||||
|
if !d.Slots.HasFn {
|
||||||
|
t.Fatalf("test setup drifted, want fn resolved: %+v", d.Slots)
|
||||||
|
}
|
||||||
|
if d.Clarify {
|
||||||
|
t.Fatalf("a resolved act must not clarify: %+v", d)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A fact where NEITHER the model NOR the deterministic parser can name a key
|
||||||
|
// must clarify instead of silently writing under an empty/guessed key.
|
||||||
|
func TestLLMRouterFactWithoutKeyTripsClarify(t *testing.T) {
|
||||||
|
r := newLLMTestRouter(t, `{"intent":"fact","value":"что-то"}`)
|
||||||
|
d, err := r.Route(context.Background(), "у меня какая-то фигня случилась вот прямо только что", refNow())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("route: %v", err)
|
||||||
|
}
|
||||||
|
if d.Slots.HasKey {
|
||||||
|
t.Fatalf("test setup drifted: parser now resolves a key for this utterance")
|
||||||
|
}
|
||||||
|
if !d.Clarify {
|
||||||
|
t.Fatalf("a keyless fact must clarify rather than guess: %+v", d)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The whole point of #359: the classifier cascade cannot be traded away for
|
||||||
|
// clarify coverage. A multi-word fact the parser CAN key must stay confident
|
||||||
|
// through the full Router.Route path, not just the raw LLMRouter.
|
||||||
|
func TestRouterLLMFactWithResolvedKeyStaysConfident(t *testing.T) {
|
||||||
|
r := newLLMTestRouter(t, `{"intent":"fact","text":"я выпил воду"}`)
|
||||||
|
d, err := r.Route(context.Background(), "я выпил воду", refNow())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("route: %v", err)
|
||||||
|
}
|
||||||
|
if d.Clarify {
|
||||||
|
t.Fatalf("a fact the parser could key must not clarify: %+v", d)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,71 @@
|
|||||||
|
package router
|
||||||
|
|
||||||
|
import "strings"
|
||||||
|
|
||||||
|
// Money questions, matched deterministically (Vikunja #125).
|
||||||
|
//
|
||||||
|
// No new intent, for the same reason as tasks: the intent enum is a contract
|
||||||
|
// with the relabelling prompt. "сколько я потратил?" is a query; which figure
|
||||||
|
// it asks for is a lookup, not something to ask a 1.7B — and a model asked to
|
||||||
|
// invent a spending total will happily do it.
|
||||||
|
|
||||||
|
// MoneyWindow — which period a money question asks about.
|
||||||
|
type MoneyWindow int
|
||||||
|
|
||||||
|
const (
|
||||||
|
MoneyNone MoneyWindow = iota
|
||||||
|
MoneyToday
|
||||||
|
MoneyMonth
|
||||||
|
)
|
||||||
|
|
||||||
|
// moneyNouns — the words that make a question be about his money.
|
||||||
|
var moneyNouns = []string{
|
||||||
|
"потратил", "потратила", "тратил", "траты", "трат", "расходы", "расходов",
|
||||||
|
"заработал", "потрачено", "денег", "spend", "spent", "expenses",
|
||||||
|
}
|
||||||
|
|
||||||
|
// ParseMoneyQuery reports whether an utterance asks about spending or income,
|
||||||
|
// and over which window. Defaults to the month: "сколько я потратил?" without a
|
||||||
|
// period is the month-to-date question, which is the one worth answering.
|
||||||
|
//
|
||||||
|
// Narrow on purpose. A money noun alone is not enough — "я потратил весь день
|
||||||
|
// на это" is him talking about his day, so an amount word or an explicit
|
||||||
|
// question word has to be there too.
|
||||||
|
func ParseMoneyQuery(text string) (MoneyWindow, bool) {
|
||||||
|
toks := planTokens(text)
|
||||||
|
if len(toks) == 0 {
|
||||||
|
return MoneyNone, false
|
||||||
|
}
|
||||||
|
hasNoun := false
|
||||||
|
for _, t := range toks {
|
||||||
|
for _, n := range moneyNouns {
|
||||||
|
if t == n {
|
||||||
|
hasNoun = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !hasNoun {
|
||||||
|
return MoneyNone, false
|
||||||
|
}
|
||||||
|
// "весь день", "время", "силы" — spending that is not money.
|
||||||
|
for _, t := range toks {
|
||||||
|
switch t {
|
||||||
|
case "день", "дня", "время", "времени", "силы", "сил", "нервы":
|
||||||
|
return MoneyNone, false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
asking := hasTok(toks, "сколько") || hasTok(toks, "какие") || hasTok(toks, "покажи") ||
|
||||||
|
hasTok(toks, "how") || hasTok(toks, "much") || hasTok(toks, "my") ||
|
||||||
|
hasTok(toks, "мои") || hasTok(toks, "траты") || hasTok(toks, "расходы")
|
||||||
|
if !asking {
|
||||||
|
return MoneyNone, false
|
||||||
|
}
|
||||||
|
lower := strings.ToLower(text)
|
||||||
|
switch {
|
||||||
|
case hasTok(toks, "сегодня") || strings.Contains(lower, "today"):
|
||||||
|
return MoneyToday, true
|
||||||
|
case hasTok(toks, "месяц") || hasTok(toks, "месяце") || strings.Contains(lower, "month"):
|
||||||
|
return MoneyMonth, true
|
||||||
|
}
|
||||||
|
return MoneyMonth, true
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
package router
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestParseMoneyQuery(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
in string
|
||||||
|
window MoneyWindow
|
||||||
|
ok bool
|
||||||
|
}{
|
||||||
|
{"сколько я потратил сегодня?", MoneyToday, true},
|
||||||
|
{"сколько я потратил в этом месяце?", MoneyMonth, true},
|
||||||
|
{"сколько я потратил?", MoneyMonth, true}, // month-to-date by default
|
||||||
|
{"покажи мои траты", MoneyMonth, true},
|
||||||
|
{"какие у меня расходы за месяц", MoneyMonth, true},
|
||||||
|
{"how much did I spend today", MoneyToday, true},
|
||||||
|
{"сколько я заработал в этом месяце", MoneyMonth, true},
|
||||||
|
// Not about money.
|
||||||
|
{"я потратил весь день на это", MoneyNone, false},
|
||||||
|
{"потратил много сил", MoneyNone, false},
|
||||||
|
{"какая погода?", MoneyNone, false},
|
||||||
|
{"я купил молоко", MoneyNone, false},
|
||||||
|
{"", MoneyNone, false},
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
w, ok := ParseMoneyQuery(c.in)
|
||||||
|
if ok != c.ok || w != c.window {
|
||||||
|
t.Errorf("ParseMoneyQuery(%q) = (%v, %v), want (%v, %v)", c.in, w, ok, c.window, c.ok)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user