Compare commits
23 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b6abb19090 | |||
| 1f7fd476ec | |||
| 08512ad58b | |||
| ff71d981ef | |||
| 4d83f8c785 | |||
| a439117995 | |||
| 2689715c2d | |||
| 05f47aef4b | |||
| 45a5e37963 | |||
| 6d8a95095a | |||
| 7e21cd06b3 | |||
| 09c648b934 | |||
| 4f516657da | |||
| 990a4a99e9 | |||
| 5b622389c5 | |||
| a820a95ebb | |||
| ea9c746852 | |||
| d60a51c9e7 | |||
| 9aabb01e2a | |||
| 2815adee03 | |||
| 9f51596e2f | |||
| 87d176153a | |||
| 7d4b4ad736 |
@@ -229,8 +229,11 @@ world questions, so she needs to read external sources. What replaces it:
|
|||||||
|
|
||||||
## Web UI conventions
|
## Web UI conventions
|
||||||
|
|
||||||
Server-rendered pages share `cmd/mavweb/static/ui.css` (served at `/ui.css`) and the `nav`
|
Server-rendered pages share `cmd/mavweb/static/ui.css` (served at `/ui.css`) and the shell
|
||||||
partial (`navHTML` in `cmd/mavweb/main.go`, `{{template "nav" "<active-page>"}}`). No
|
partial in `cmd/mavweb/shell.html`: a page opens with `{{template "shellTop" "<page-key>"}}`
|
||||||
|
and closes with `{{template "shellBottom"}}`, and the key marks the active sidebar link.
|
||||||
|
Every page is its own embedded `.html` file next to `main.go` — no page markup lives in Go,
|
||||||
|
and the sidebar is data (`sidebarSections`, `pageIcon`) the template renders. No
|
||||||
per-page `<style>` beyond true one-offs. Wrap every table in `<div class=scroll>` so wide
|
per-page `<style>` beyond true one-offs. Wrap every table in `<div class=scroll>` so wide
|
||||||
data pans on a phone. Local preview + headless screenshot recipe is in `AGENTS.md`.
|
data pans on a phone. Local preview + headless screenshot recipe is in `AGENTS.md`.
|
||||||
|
|
||||||
|
|||||||
@@ -390,6 +390,11 @@ func (h *reactiveHandler) queryWeather(ctx context.Context, t *queryTurn) (strin
|
|||||||
if errors.Is(err, weather.ErrNotConfigured) {
|
if errors.Is(err, weather.ErrNotConfigured) {
|
||||||
return "погода не настроена.", true
|
return "погода не настроена.", true
|
||||||
}
|
}
|
||||||
|
if errors.Is(err, weather.ErrLocationUnknown) {
|
||||||
|
// He named a place and the geocoder does not have it. Saying so beats
|
||||||
|
// reading out the default city's temperature (Vikunja #421).
|
||||||
|
return "не знаю такого города — " + loc + ".", true
|
||||||
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("voice: weather: %v", err)
|
log.Printf("voice: weather: %v", err)
|
||||||
return "не получилось узнать погоду.", true
|
return "не получилось узнать погоду.", true
|
||||||
|
|||||||
+13
-13
@@ -106,11 +106,11 @@ func trimClarifyExpired(s string) string {
|
|||||||
// out, and "" when nothing was parked. Call it right after
|
// out, and "" when nothing was parked. Call it right after
|
||||||
// resolveClarifyAnswer: a live question is answered there, an expired one is
|
// resolveClarifyAnswer: a live question is answered there, an expired one is
|
||||||
// only reported here — the words themselves still go on to be routed fresh.
|
// only reported here — the words themselves still go on to be routed fresh.
|
||||||
func (h *reactiveHandler) clarifyExpiredNotice() string {
|
func (h *reactiveHandler) clarifyExpiredNotice(ctx context.Context) string {
|
||||||
if h.clarifyStore == nil {
|
if h.clarifyStore == nil {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
if !h.clarifyStore.TakeExpired(voiceDialogueID, h.now()) {
|
if !h.clarifyStore.TakeExpired(dialogueIDOf(ctx), h.now()) {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
log.Printf("voice: clarify — parked question expired, telling him and routing the words fresh")
|
log.Printf("voice: clarify — parked question expired, telling him and routing the words fresh")
|
||||||
@@ -157,7 +157,7 @@ func clarifyQuestion(dec router.Decision) (dialogue.Slot, string, bool) {
|
|||||||
// askClarify parks the request and returns the question to ask instead of the
|
// askClarify parks the request and returns the question to ask instead of the
|
||||||
// canned "не поняла". Returns ("", false) when there is nothing to ask about, so
|
// canned "не поняла". Returns ("", false) when there is nothing to ask about, so
|
||||||
// the caller falls back to the canned reply.
|
// the caller falls back to the canned reply.
|
||||||
func (h *reactiveHandler) askClarify(dec router.Decision) (string, bool) {
|
func (h *reactiveHandler) askClarify(ctx context.Context, dec router.Decision) (string, bool) {
|
||||||
if h.clarifyStore == nil {
|
if h.clarifyStore == nil {
|
||||||
return "", false
|
return "", false
|
||||||
}
|
}
|
||||||
@@ -165,7 +165,7 @@ func (h *reactiveHandler) askClarify(dec router.Decision) (string, bool) {
|
|||||||
if !ok {
|
if !ok {
|
||||||
return "", false
|
return "", false
|
||||||
}
|
}
|
||||||
h.clarifyStore.Put(voiceDialogueID, &dialogue.PendingQuestion{
|
h.clarifyStore.Put(dialogueIDOf(ctx), &dialogue.PendingQuestion{
|
||||||
Intent: dialogue.Intent(dec.Intent),
|
Intent: dialogue.Intent(dec.Intent),
|
||||||
Slots: toDialogueSlots(dec.Slots),
|
Slots: toDialogueSlots(dec.Slots),
|
||||||
Missing: []dialogue.Slot{slot},
|
Missing: []dialogue.Slot{slot},
|
||||||
@@ -192,7 +192,7 @@ func (h *reactiveHandler) resolveClarifyAnswer(ctx context.Context, text string)
|
|||||||
if h.clarifyStore == nil {
|
if h.clarifyStore == nil {
|
||||||
return "", false
|
return "", false
|
||||||
}
|
}
|
||||||
q := h.clarifyStore.Get(voiceDialogueID, h.now())
|
q := h.clarifyStore.Get(dialogueIDOf(ctx), h.now())
|
||||||
if q == nil {
|
if q == nil {
|
||||||
return "", false
|
return "", false
|
||||||
}
|
}
|
||||||
@@ -206,9 +206,9 @@ func (h *reactiveHandler) resolveClarifyAnswer(ctx context.Context, text string)
|
|||||||
// would fire at 11:00 saying "напомни" and nothing else.
|
// would fire at 11:00 saying "напомни" and nothing else.
|
||||||
q.Utterance = foldAnswerIntoUtterance(q.Utterance, merged.Text)
|
q.Utterance = foldAnswerIntoUtterance(q.Utterance, merged.Text)
|
||||||
if len(dialogue.StillMissing(q.Missing, merged)) > 0 {
|
if len(dialogue.StillMissing(q.Missing, merged)) > 0 {
|
||||||
return h.reaskOrGiveUp(q, merged, text), true
|
return h.reaskOrGiveUp(ctx, q, merged, text), true
|
||||||
}
|
}
|
||||||
h.clarifyStore.Delete(voiceDialogueID)
|
h.clarifyStore.Delete(dialogueIDOf(ctx))
|
||||||
|
|
||||||
// One gap filled is not the same as a complete request. askClarify parks
|
// One gap filled is not the same as a complete request. askClarify parks
|
||||||
// only the first gap, because one question per turn is the rule, but a
|
// only the first gap, because one question per turn is the rule, but a
|
||||||
@@ -217,7 +217,7 @@ func (h *reactiveHandler) resolveClarifyAnswer(ctx context.Context, text string)
|
|||||||
// a reminder with no time, which answered "не получилось разобрать время
|
// a reminder with no time, which answered "не получилось разобрать время
|
||||||
// напоминания." — an error for a request she never finished asking about.
|
// напоминания." — an error for a request she never finished asking about.
|
||||||
// Re-enter the loop instead, one question at a time as before.
|
// Re-enter the loop instead, one question at a time as before.
|
||||||
if reply, asked := h.askRemainingGap(q, intent, merged); asked {
|
if reply, asked := h.askRemainingGap(ctx, q, intent, merged); asked {
|
||||||
return reply, true
|
return reply, true
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -261,7 +261,7 @@ func foldAnswerIntoUtterance(utterance, subject string) string {
|
|||||||
// The attempt budget is shared with the re-ask path on purpose. A second gap
|
// The attempt budget is shared with the re-ask path on purpose. A second gap
|
||||||
// costs a question exactly like a second try at the first one does, so the cap
|
// costs a question exactly like a second try at the first one does, so the cap
|
||||||
// still bounds how many times she can speak before acting or letting go.
|
// still bounds how many times she can speak before acting or letting go.
|
||||||
func (h *reactiveHandler) askRemainingGap(q *dialogue.PendingQuestion, intent router.Intent, merged dialogue.Slots) (string, bool) {
|
func (h *reactiveHandler) askRemainingGap(ctx context.Context, q *dialogue.PendingQuestion, intent router.Intent, merged dialogue.Slots) (string, bool) {
|
||||||
remaining := dialogue.StillMissing(wantedSlots[intent], merged)
|
remaining := dialogue.StillMissing(wantedSlots[intent], merged)
|
||||||
if len(remaining) == 0 {
|
if len(remaining) == 0 {
|
||||||
return "", false
|
return "", false
|
||||||
@@ -270,7 +270,7 @@ func (h *reactiveHandler) askRemainingGap(q *dialogue.PendingQuestion, intent ro
|
|||||||
if !ok || !q.CanAsk() {
|
if !ok || !q.CanAsk() {
|
||||||
return "", false
|
return "", false
|
||||||
}
|
}
|
||||||
h.clarifyStore.Put(voiceDialogueID, &dialogue.PendingQuestion{
|
h.clarifyStore.Put(dialogueIDOf(ctx), &dialogue.PendingQuestion{
|
||||||
Intent: q.Intent,
|
Intent: q.Intent,
|
||||||
Slots: merged,
|
Slots: merged,
|
||||||
Missing: []dialogue.Slot{remaining[0]},
|
Missing: []dialogue.Slot{remaining[0]},
|
||||||
@@ -287,13 +287,13 @@ func (h *reactiveHandler) askRemainingGap(q *dialogue.PendingQuestion, intent ro
|
|||||||
// reaskOrGiveUp handles an answer that left the gap open: ask the same question
|
// reaskOrGiveUp handles an answer that left the gap open: ask the same question
|
||||||
// again while she has attempts left, otherwise say she did not understand and
|
// again while she has attempts left, otherwise say she did not understand and
|
||||||
// let the request go. Never returns "" — a mute give-up reads as "done".
|
// let the request go. Never returns "" — a mute give-up reads as "done".
|
||||||
func (h *reactiveHandler) reaskOrGiveUp(q *dialogue.PendingQuestion, merged dialogue.Slots, text string) string {
|
func (h *reactiveHandler) reaskOrGiveUp(ctx context.Context, q *dialogue.PendingQuestion, merged dialogue.Slots, text string) string {
|
||||||
question := ""
|
question := ""
|
||||||
if len(q.Missing) > 0 {
|
if len(q.Missing) > 0 {
|
||||||
question = clarifyQuestions[q.Missing[0]]
|
question = clarifyQuestions[q.Missing[0]]
|
||||||
}
|
}
|
||||||
if question == "" || !q.CanAsk() {
|
if question == "" || !q.CanAsk() {
|
||||||
h.clarifyStore.Delete(voiceDialogueID)
|
h.clarifyStore.Delete(dialogueIDOf(ctx))
|
||||||
log.Printf("voice: clarify — gave up on %v after %d question(s), answer was %q", q.Missing, q.Attempts, text)
|
log.Printf("voice: clarify — gave up on %v after %d question(s), answer was %q", q.Missing, q.Attempts, text)
|
||||||
return clarifyGaveUp
|
return clarifyGaveUp
|
||||||
}
|
}
|
||||||
@@ -302,7 +302,7 @@ func (h *reactiveHandler) reaskOrGiveUp(q *dialogue.PendingQuestion, merged dial
|
|||||||
q.Slots = merged
|
q.Slots = merged
|
||||||
q.Attempts++
|
q.Attempts++
|
||||||
q.Asked = h.now()
|
q.Asked = h.now()
|
||||||
h.clarifyStore.Put(voiceDialogueID, q)
|
h.clarifyStore.Put(dialogueIDOf(ctx), q)
|
||||||
log.Printf("voice: clarify — answer %q did not fill %v, asking again (attempt %d)", text, q.Missing, q.Attempts)
|
log.Printf("voice: clarify — answer %q did not fill %v, asking again (attempt %d)", text, q.Missing, q.Attempts)
|
||||||
return question
|
return question
|
||||||
}
|
}
|
||||||
|
|||||||
+70
-21
@@ -81,7 +81,7 @@ func TestClarifyReminderCompletesOnAnswer(t *testing.T) {
|
|||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
h, st, _ := newClarifyHandler(t)
|
h, st, _ := newClarifyHandler(t)
|
||||||
|
|
||||||
question, asked := h.askClarify(clarifyDec(router.IntentReminder, router.Slots{Text: "напомни позвонить маме"}, "напомни позвонить маме"))
|
question, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder, router.Slots{Text: "напомни позвонить маме"}, "напомни позвонить маме"))
|
||||||
if !asked || question != "Когда?" {
|
if !asked || question != "Когда?" {
|
||||||
t.Fatalf("expected the time question, got %q asked=%v", question, asked)
|
t.Fatalf("expected the time question, got %q asked=%v", question, asked)
|
||||||
}
|
}
|
||||||
@@ -112,7 +112,7 @@ func TestClarifyFactCompletesOnAnswer(t *testing.T) {
|
|||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
h, st, _ := newClarifyHandler(t)
|
h, st, _ := newClarifyHandler(t)
|
||||||
|
|
||||||
if _, asked := h.askClarify(clarifyDec(router.IntentFact, router.Slots{Text: "запиши"}, "запиши")); !asked {
|
if _, asked := h.askClarify(ctx, clarifyDec(router.IntentFact, router.Slots{Text: "запиши"}, "запиши")); !asked {
|
||||||
t.Fatal("a fact with no key should be asked about")
|
t.Fatal("a fact with no key should be asked about")
|
||||||
}
|
}
|
||||||
if reply, handled := h.resolveClarifyAnswer(ctx, "пил воду"); !handled || reply == clarifyGaveUp {
|
if reply, handled := h.resolveClarifyAnswer(ctx, "пил воду"); !handled || reply == clarifyGaveUp {
|
||||||
@@ -128,7 +128,7 @@ func TestClarifyAnswerAfterTTLIsANewRequest(t *testing.T) {
|
|||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
h, st, now := newClarifyHandler(t)
|
h, st, now := newClarifyHandler(t)
|
||||||
|
|
||||||
if _, asked := h.askClarify(clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
|
if _, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
|
||||||
t.Fatal("expected a question")
|
t.Fatal("expected a question")
|
||||||
}
|
}
|
||||||
*now = now.Add(clarifyTTL + time.Second)
|
*now = now.Add(clarifyTTL + time.Second)
|
||||||
@@ -147,7 +147,7 @@ func TestClarifyAsksThreeTimesThenSaysSo(t *testing.T) {
|
|||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
h, st, _ := newClarifyHandler(t)
|
h, st, _ := newClarifyHandler(t)
|
||||||
|
|
||||||
if _, asked := h.askClarify(clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
|
if _, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
|
||||||
t.Fatal("expected a first question")
|
t.Fatal("expected a first question")
|
||||||
}
|
}
|
||||||
// Two more unclear answers ⇒ two more questions (3 asks in total).
|
// Two more unclear answers ⇒ two more questions (3 asks in total).
|
||||||
@@ -185,7 +185,7 @@ func TestClarifyMaxAttemptsIsConfigurable(t *testing.T) {
|
|||||||
h, _, _ := newClarifyHandler(t)
|
h, _, _ := newClarifyHandler(t)
|
||||||
h.clarifyMaxAttempts = 1
|
h.clarifyMaxAttempts = 1
|
||||||
|
|
||||||
if _, asked := h.askClarify(clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
|
if _, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
|
||||||
t.Fatal("expected a question")
|
t.Fatal("expected a question")
|
||||||
}
|
}
|
||||||
if reply, handled := h.resolveClarifyAnswer(ctx, "ну не знаю"); !handled || reply != clarifyGaveUp {
|
if reply, handled := h.resolveClarifyAnswer(ctx, "ну не знаю"); !handled || reply != clarifyGaveUp {
|
||||||
@@ -199,7 +199,7 @@ func TestClarifyRestatedAnswerWins(t *testing.T) {
|
|||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
h, st, _ := newClarifyHandler(t)
|
h, st, _ := newClarifyHandler(t)
|
||||||
|
|
||||||
if _, asked := h.askClarify(clarifyDec(router.IntentReminder, router.Slots{Text: "напомни позвонить маме"}, "напомни позвонить маме")); !asked {
|
if _, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder, router.Slots{Text: "напомни позвонить маме"}, "напомни позвонить маме")); !asked {
|
||||||
t.Fatal("expected a question")
|
t.Fatal("expected a question")
|
||||||
}
|
}
|
||||||
// First answer parses, but re-park it by hand as if she had asked again:
|
// First answer parses, but re-park it by hand as if she had asked again:
|
||||||
@@ -232,7 +232,7 @@ func TestClarifiedActOffAllowlistIsStillRefused(t *testing.T) {
|
|||||||
h, st, _ := newClarifyHandler(t)
|
h, st, _ := newClarifyHandler(t)
|
||||||
marker := filepath.Join(t.TempDir(), "not-allowed-ran")
|
marker := filepath.Join(t.TempDir(), "not-allowed-ran")
|
||||||
|
|
||||||
if _, asked := h.askClarify(clarifyDec(router.IntentAct, router.Slots{Text: "сделай это"}, "сделай это")); !asked {
|
if _, asked := h.askClarify(ctx, clarifyDec(router.IntentAct, router.Slots{Text: "сделай это"}, "сделай это")); !asked {
|
||||||
t.Fatal("an act with no fn should be asked about")
|
t.Fatal("an act with no fn should be asked about")
|
||||||
}
|
}
|
||||||
reply, handled := h.resolveClarifyAnswer(ctx, "rm "+marker)
|
reply, handled := h.resolveClarifyAnswer(ctx, "rm "+marker)
|
||||||
@@ -260,7 +260,7 @@ func TestClarifiedDestructiveActStillNeedsConfirm(t *testing.T) {
|
|||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, asked := h.askClarify(clarifyDec(router.IntentAct, router.Slots{Text: "сделай это"}, "сделай это")); !asked {
|
if _, asked := h.askClarify(ctx, clarifyDec(router.IntentAct, router.Slots{Text: "сделай это"}, "сделай это")); !asked {
|
||||||
t.Fatal("expected a question")
|
t.Fatal("expected a question")
|
||||||
}
|
}
|
||||||
reply, handled := h.resolveClarifyAnswer(ctx, "delete_backups")
|
reply, handled := h.resolveClarifyAnswer(ctx, "delete_backups")
|
||||||
@@ -284,7 +284,7 @@ func TestNoQuestionWhenNothingIsMissing(t *testing.T) {
|
|||||||
clarifyDec(router.IntentQuery, router.Slots{Text: "ммм"}, "ммм"),
|
clarifyDec(router.IntentQuery, router.Slots{Text: "ммм"}, "ммм"),
|
||||||
clarifyDec(router.IntentNote, router.Slots{Text: "..."}, "..."),
|
clarifyDec(router.IntentNote, router.Slots{Text: "..."}, "..."),
|
||||||
} {
|
} {
|
||||||
if question, asked := h.askClarify(dec); asked {
|
if question, asked := h.askClarify(context.Background(), dec); asked {
|
||||||
t.Fatalf("intent %s should keep the canned reply, got %q", dec.Intent, question)
|
t.Fatalf("intent %s should keep the canned reply, got %q", dec.Intent, question)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -296,29 +296,29 @@ func TestNoQuestionWhenNothingIsMissing(t *testing.T) {
|
|||||||
// TestClarifyExpiryIsAnnouncedAndWordsStillRoute — his answer lands after the
|
// TestClarifyExpiryIsAnnouncedAndWordsStillRoute — his answer lands after the
|
||||||
// TTL: she must say the old request is gone AND still answer the new words.
|
// TTL: she must say the old request is gone AND still answer the new words.
|
||||||
func TestClarifyExpiryIsAnnouncedAndWordsStillRoute(t *testing.T) {
|
func TestClarifyExpiryIsAnnouncedAndWordsStillRoute(t *testing.T) {
|
||||||
ctx := context.Background()
|
ctx := withDialogueID(context.Background(), dialogueIDFor(sourceText, ""))
|
||||||
h, _, now := newClarifyHandler(t)
|
h, _, now := newClarifyHandler(t)
|
||||||
emb := router.NewHashEmbedder(1024)
|
emb := router.NewHashEmbedder(1024)
|
||||||
h.embedder = emb
|
h.embedder = emb
|
||||||
h.router = buildRouter(emb, h.matcher, 0.55, nil)
|
h.router = buildRouter(emb, h.matcher, 0.55, nil)
|
||||||
|
|
||||||
if _, asked := h.askClarify(clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
|
if _, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
|
||||||
t.Fatal("expected a question")
|
t.Fatal("expected a question")
|
||||||
}
|
}
|
||||||
*now = now.Add(clarifyTTL + time.Second)
|
*now = now.Add(clarifyTTL + time.Second)
|
||||||
|
|
||||||
reply := h.handleText(ctx, "как дела")
|
reply := h.handleText(ctx, "", "как дела")
|
||||||
if !isClarifyExpired(reply) {
|
if !isClarifyExpired(reply) {
|
||||||
t.Fatalf("expired question must be announced first, got %q", reply)
|
t.Fatalf("expired question must be announced first, got %q", reply)
|
||||||
}
|
}
|
||||||
if trimClarifyExpired(reply) == "" {
|
if trimClarifyExpired(reply) == "" {
|
||||||
t.Fatalf("the new words must still be answered, got only the notice: %q", reply)
|
t.Fatalf("the new words must still be answered, got only the notice: %q", reply)
|
||||||
}
|
}
|
||||||
if h.clarifyStore.Get(voiceDialogueID, h.now()) != nil {
|
if h.clarifyStore.Get(textDialogueID, h.now()) != nil {
|
||||||
t.Fatal("the expired question must be gone")
|
t.Fatal("the expired question must be gone")
|
||||||
}
|
}
|
||||||
// The notice is said once, not on every later utterance.
|
// The notice is said once, not on every later utterance.
|
||||||
if reply := h.handleText(ctx, "как дела"); isClarifyExpired(reply) {
|
if reply := h.handleText(ctx, "", "как дела"); isClarifyExpired(reply) {
|
||||||
t.Fatalf("notice repeated on a later turn: %q", reply)
|
t.Fatalf("notice repeated on a later turn: %q", reply)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -340,7 +340,7 @@ func TestClarifyAsksAboutTheSecondGapToo(t *testing.T) {
|
|||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
h, st, _ := newClarifyHandler(t)
|
h, st, _ := newClarifyHandler(t)
|
||||||
|
|
||||||
question, asked := h.askClarify(clarifyDec(router.IntentReminder, router.Slots{}, "напомни"))
|
question, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder, router.Slots{}, "напомни"))
|
||||||
if !asked || question != "О чём напомнить?" {
|
if !asked || question != "О чём напомнить?" {
|
||||||
t.Fatalf("expected the subject question, got %q asked=%v", question, asked)
|
t.Fatalf("expected the subject question, got %q asked=%v", question, asked)
|
||||||
}
|
}
|
||||||
@@ -380,7 +380,7 @@ func TestClarifySecondGapRespectsTheAttemptCap(t *testing.T) {
|
|||||||
h, _, _ := newClarifyHandler(t)
|
h, _, _ := newClarifyHandler(t)
|
||||||
h.clarifyMaxAttempts = 1
|
h.clarifyMaxAttempts = 1
|
||||||
|
|
||||||
if _, asked := h.askClarify(clarifyDec(router.IntentReminder, router.Slots{}, "напомни")); !asked {
|
if _, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder, router.Slots{}, "напомни")); !asked {
|
||||||
t.Fatal("expected the subject question")
|
t.Fatal("expected the subject question")
|
||||||
}
|
}
|
||||||
reply, handled := h.resolveClarifyAnswer(ctx, "позвонить маме")
|
reply, handled := h.resolveClarifyAnswer(ctx, "позвонить маме")
|
||||||
@@ -440,10 +440,10 @@ func TestClarifyProseHoldsThePersona(t *testing.T) {
|
|||||||
// The confirm turn used to return before the notice was even computed, so he
|
// The confirm turn used to return before the notice was even computed, so he
|
||||||
// answered the confirm and never heard that the older request was let go.
|
// answered the confirm and never heard that the older request was let go.
|
||||||
func TestExpiryNoticeSurvivesAConfirmTurn(t *testing.T) {
|
func TestExpiryNoticeSurvivesAConfirmTurn(t *testing.T) {
|
||||||
ctx := context.Background()
|
ctx := withDialogueID(context.Background(), dialogueIDFor(sourceText, ""))
|
||||||
h, _, now := newClarifyHandler(t)
|
h, _, now := newClarifyHandler(t)
|
||||||
|
|
||||||
if _, asked := h.askClarify(clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
|
if _, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
|
||||||
t.Fatal("expected a question")
|
t.Fatal("expected a question")
|
||||||
}
|
}
|
||||||
// A confirm parked with a longer life than the question, so only the
|
// A confirm parked with a longer life than the question, so only the
|
||||||
@@ -451,7 +451,7 @@ func TestExpiryNoticeSurvivesAConfirmTurn(t *testing.T) {
|
|||||||
h.pending = &pendingAct{fn: "delete_backups", phrase: "удалить бэкапы", expiry: now.Add(time.Hour)}
|
h.pending = &pendingAct{fn: "delete_backups", phrase: "удалить бэкапы", expiry: now.Add(time.Hour)}
|
||||||
*now = now.Add(clarifyTTL + time.Second)
|
*now = now.Add(clarifyTTL + time.Second)
|
||||||
|
|
||||||
reply := h.handleText(ctx, "нет")
|
reply := h.handleText(ctx, "", "нет")
|
||||||
if !isClarifyExpired(reply) {
|
if !isClarifyExpired(reply) {
|
||||||
t.Fatalf("the expired question must be announced on a confirm turn too, got %q", reply)
|
t.Fatalf("the expired question must be announced on a confirm turn too, got %q", reply)
|
||||||
}
|
}
|
||||||
@@ -461,7 +461,7 @@ func TestExpiryNoticeSurvivesAConfirmTurn(t *testing.T) {
|
|||||||
if h.pending != nil {
|
if h.pending != nil {
|
||||||
t.Fatal("the confirm must still have been consumed")
|
t.Fatal("the confirm must still have been consumed")
|
||||||
}
|
}
|
||||||
if h.clarifyStore.Get(voiceDialogueID, h.now()) != nil {
|
if h.clarifyStore.Get(textDialogueID, h.now()) != nil {
|
||||||
t.Fatal("the expired question must be gone")
|
t.Fatal("the expired question must be gone")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -476,7 +476,7 @@ func TestClarifySubjectAnswerFillsRatherThanClobbers(t *testing.T) {
|
|||||||
h, st, _ := newClarifyHandler(t)
|
h, st, _ := newClarifyHandler(t)
|
||||||
at := h.now().Add(2 * time.Hour)
|
at := h.now().Add(2 * time.Hour)
|
||||||
|
|
||||||
question, asked := h.askClarify(clarifyDec(router.IntentReminder,
|
question, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder,
|
||||||
router.Slots{Time: at, HasTime: true}, "напомни в 11"))
|
router.Slots{Time: at, HasTime: true}, "напомни в 11"))
|
||||||
if !asked || question != "О чём напомнить?" {
|
if !asked || question != "О чём напомнить?" {
|
||||||
t.Fatalf("expected the subject question, got %q asked=%v", question, asked)
|
t.Fatalf("expected the subject question, got %q asked=%v", question, asked)
|
||||||
@@ -501,3 +501,52 @@ func TestClarifySubjectAnswerFillsRatherThanClobbers(t *testing.T) {
|
|||||||
t.Fatalf("the answer clobbered the original request: %q", reminders[0].Payload)
|
t.Fatalf("the answer clobbered the original request: %q", reminders[0].Payload)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestClarifyIsPerConversation — the parked question belongs to the reach that
|
||||||
|
// was asked. Before this the clarify store had one global key, so a question
|
||||||
|
// asked in the web chat and never answered captured the next utterance from
|
||||||
|
// telegram, or from the mic, and answered it against a request the speaker had
|
||||||
|
// never made (Vikunja #466).
|
||||||
|
func TestClarifyIsPerConversation(t *testing.T) {
|
||||||
|
h, _, _ := newClarifyHandler(t)
|
||||||
|
web := withDialogueID(context.Background(), dialogueIDFor(sourceText, "web"))
|
||||||
|
telegram := withDialogueID(context.Background(), dialogueIDFor(sourceText, "telegram:42"))
|
||||||
|
|
||||||
|
if _, asked := h.askClarify(web, clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
|
||||||
|
t.Fatal("expected a question on the web conversation")
|
||||||
|
}
|
||||||
|
if _, handled := h.resolveClarifyAnswer(telegram, "в 11:00"); handled {
|
||||||
|
t.Fatal("a question asked on the web must not eat a telegram utterance")
|
||||||
|
}
|
||||||
|
if _, handled := h.resolveClarifyAnswer(voiceCtx(), "в 11:00"); handled {
|
||||||
|
t.Fatal("a question asked on the web must not eat what he says at the mic")
|
||||||
|
}
|
||||||
|
if reply, handled := h.resolveClarifyAnswer(web, "в 11:00"); !handled || reply == clarifyGaveUp {
|
||||||
|
t.Fatalf("the asker's own answer must land, handled=%v reply=%q", handled, reply)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// voiceCtx — the mic's conversation, which carries no id of its own.
|
||||||
|
func voiceCtx() context.Context {
|
||||||
|
return withDialogueID(context.Background(), dialogueIDFor(sourceVoice, ""))
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestARestartExpiresTheParkedQuestion pins the Vikunja #385 decision: the
|
||||||
|
// question dies with the process, and she does not claim to have let it go —
|
||||||
|
// the words that follow are routed as a fresh request. Restarting is modelled
|
||||||
|
// the way the daemon does it, by building a second handler over the same store.
|
||||||
|
func TestARestartExpiresTheParkedQuestion(t *testing.T) {
|
||||||
|
h, _, _ := newClarifyHandler(t)
|
||||||
|
ctx := voiceCtx()
|
||||||
|
if _, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
|
||||||
|
t.Fatal("expected a question before the restart")
|
||||||
|
}
|
||||||
|
|
||||||
|
restarted, _, _ := newClarifyHandler(t)
|
||||||
|
if _, handled := restarted.resolveClarifyAnswer(ctx, "в 11:00"); handled {
|
||||||
|
t.Fatal("a question parked before the restart must not eat the next utterance")
|
||||||
|
}
|
||||||
|
if notice := restarted.clarifyExpiredNotice(ctx); notice != "" {
|
||||||
|
t.Fatalf("notice = %q, want silence: nothing survived to expire", notice)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -514,11 +514,14 @@ func (h *reactiveHandler) handleHexisAct(ctx context.Context, dec router.Decisio
|
|||||||
|
|
||||||
// Resolve the utterance text as an entity reference through Nexus. An
|
// Resolve the utterance text as an entity reference through Nexus. An
|
||||||
// ambiguous match must stop and clarify — never guess a mutation target.
|
// ambiguous match must stop and clarify — never guess a mutation target.
|
||||||
|
// The name comes from entityReferenceText, not straight from the Text slot:
|
||||||
|
// the model transliterates Latin names as it routes (Vikunja #476).
|
||||||
|
subject := entityReferenceText(dec)
|
||||||
started := h.now()
|
started := h.now()
|
||||||
entityID, displayName, ambiguous, err := h.ecosystem.resolveEntityReference(ctx, dec.Slots.Text, nil)
|
entityID, displayName, ambiguous, err := h.ecosystem.resolveEntityReference(ctx, subject, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
h.recordEcosystemTrace(ctx, "nexus", "resolve", traceStatusForError(err), started,
|
h.recordEcosystemTrace(ctx, "nexus", "resolve", traceStatusForError(err), started,
|
||||||
mergeFields(traceErrorFields(err), map[string]any{"subject": redactSubject(dec.Slots.Text)}))
|
mergeFields(traceErrorFields(err), map[string]any{"subject": redactSubject(subject)}))
|
||||||
if unauthorizedEcosystemError(err) {
|
if unauthorizedEcosystemError(err) {
|
||||||
return "экосистема отклоняет доступ, проверь токен."
|
return "экосистема отклоняет доступ, проверь токен."
|
||||||
}
|
}
|
||||||
@@ -535,7 +538,7 @@ func (h *reactiveHandler) handleHexisAct(ctx context.Context, dec router.Decisio
|
|||||||
}
|
}
|
||||||
if entityID == "" {
|
if entityID == "" {
|
||||||
h.recordEcosystemTrace(ctx, "nexus", "resolve", traceNotFound, started,
|
h.recordEcosystemTrace(ctx, "nexus", "resolve", traceNotFound, started,
|
||||||
map[string]any{"subject": redactSubject(dec.Slots.Text)})
|
map[string]any{"subject": redactSubject(subject)})
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
h.recordEcosystemTrace(ctx, "nexus", "resolve", traceOK, started,
|
h.recordEcosystemTrace(ctx, "nexus", "resolve", traceOK, started,
|
||||||
@@ -569,10 +572,21 @@ func (h *reactiveHandler) handleHexisAct(ctx context.Context, dec router.Decisio
|
|||||||
}
|
}
|
||||||
verbLower := strings.ToLower(verb)
|
verbLower := strings.ToLower(verb)
|
||||||
|
|
||||||
|
// With no allowlisted fn the verb is a whole phrase ("restart status muzick
|
||||||
|
// indexer"), which no capability name ever contains. Read it the other way
|
||||||
|
// round then: the phrase is the haystack and the capability name is what we
|
||||||
|
// look for in it (Vikunja #476). Only when the fn slot is empty — a matched
|
||||||
|
// fn is a single verb and containment already means what it says.
|
||||||
|
loose := !dec.Slots.HasFn
|
||||||
var matches []*hexisclient.Capability
|
var matches []*hexisclient.Capability
|
||||||
for i, c := range caps {
|
for i, c := range caps {
|
||||||
if strings.Contains(strings.ToLower(c.Name), verbLower) ||
|
name := strings.ToLower(c.Name)
|
||||||
(c.Description != "" && strings.Contains(strings.ToLower(c.Description), verbLower)) {
|
hit := strings.Contains(name, verbLower) ||
|
||||||
|
(c.Description != "" && strings.Contains(strings.ToLower(c.Description), verbLower))
|
||||||
|
if loose && name != "" && strings.Contains(verbLower, name) {
|
||||||
|
hit = true
|
||||||
|
}
|
||||||
|
if hit {
|
||||||
matches = append(matches, &caps[i])
|
matches = append(matches, &caps[i])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -632,3 +646,29 @@ func (h *reactiveHandler) execHexis(ctx context.Context, capID, capName, entityI
|
|||||||
})
|
})
|
||||||
return "команда выполнена для " + displayName + "."
|
return "команда выполнена для " + displayName + "."
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// hexisBeforeClarify gives an entity-shaped act one chance at Hexis before she
|
||||||
|
// asks what to do.
|
||||||
|
//
|
||||||
|
// The stage-3 gate thins an act that never matched an allowlisted fn, so
|
||||||
|
// "перезапусти muzick indexer" was answered with "Что сделать?" and the Hexis
|
||||||
|
// path was never entered — the capability existed and no utterance could reach
|
||||||
|
// it (Vikunja #476). Hexis is exactly where an act with no local fn belongs:
|
||||||
|
// the verb is matched against the capabilities Hexis registers for the entity,
|
||||||
|
// not against the allowlist.
|
||||||
|
//
|
||||||
|
// Narrow on purpose. Only an act, only when the fn slot is still empty, and
|
||||||
|
// only when Hexis is wired — a box with no ecosystem asks the question it
|
||||||
|
// always asked. A "" back means Nexus knew no such entity or Hexis had no
|
||||||
|
// matching capability, and then she asks after all. Authority is unchanged:
|
||||||
|
// resolution stops on ambiguity and a mutating capability still goes through
|
||||||
|
// the spoken confirm in handleHexisAct.
|
||||||
|
func (h *reactiveHandler) hexisBeforeClarify(ctx context.Context, dec router.Decision) string {
|
||||||
|
if h.ecosystem == nil || h.ecosystem.hexis == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if dec.Intent != router.IntentAct || dec.Slots.HasFn || dec.Slots.Text == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return h.handleHexisAct(ctx, dec)
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,59 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
"unicode"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/router"
|
||||||
|
)
|
||||||
|
|
||||||
|
// latinRun matches a run of Latin-script words — the shape a service, host or
|
||||||
|
// project name takes in a Russian sentence. Digits, dot, dash and underscore
|
||||||
|
// ride along because "muzick-indexer" and "nginx.conf" are one name, not two.
|
||||||
|
var latinRun = regexp.MustCompile(`[A-Za-z][A-Za-z0-9._-]*(?:\s+[A-Za-z][A-Za-z0-9._-]*)*`)
|
||||||
|
|
||||||
|
// hasLatin reports whether s carries a Latin letter.
|
||||||
|
func hasLatin(s string) bool {
|
||||||
|
for _, r := range s {
|
||||||
|
if unicode.In(r, unicode.Latin) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// entityReferenceText is the name Nexus is asked to resolve.
|
||||||
|
//
|
||||||
|
// Normally that is the router's Text slot, which is the verb phrase the model
|
||||||
|
// wrote. But the resident model rewrites a Russian utterance as it routes, and
|
||||||
|
// on the way it transliterates: "перезапусти muzick indexer" came back as
|
||||||
|
// "перезагрузить музик индексер" (Vikunja #476). Nexus is then asked for a
|
||||||
|
// service nobody has ever named, so the act cannot resolve its target even
|
||||||
|
// with every gate open.
|
||||||
|
//
|
||||||
|
// The recovery is deliberately narrow. Only when the utterance holds a Latin
|
||||||
|
// run and the model's Text holds none has a name certainly been rewritten —
|
||||||
|
// then the longest Latin run in his own words is the reference. Anything else
|
||||||
|
// keeps the Text slot, so an English utterance and a Russian entity name are
|
||||||
|
// both untouched. Un-transliterating the Cyrillic back is not attempted: the
|
||||||
|
// surface form he said is right there, and guessing at a reverse mapping would
|
||||||
|
// invent a second name to be wrong about.
|
||||||
|
func entityReferenceText(dec router.Decision) string {
|
||||||
|
text := dec.Slots.Text
|
||||||
|
if hasLatin(text) || !hasLatin(dec.Utterance) {
|
||||||
|
return text
|
||||||
|
}
|
||||||
|
longest := ""
|
||||||
|
for _, m := range latinRun.FindAllString(dec.Utterance, -1) {
|
||||||
|
if len(m) > len(longest) {
|
||||||
|
longest = m
|
||||||
|
}
|
||||||
|
}
|
||||||
|
longest = strings.TrimSpace(longest)
|
||||||
|
// A single stray letter is not a name.
|
||||||
|
if len(longest) < 2 {
|
||||||
|
return text
|
||||||
|
}
|
||||||
|
return longest
|
||||||
|
}
|
||||||
@@ -0,0 +1,133 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/router"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TestEntityReferenceText pins when his own words win over the model's.
|
||||||
|
func TestEntityReferenceText(t *testing.T) {
|
||||||
|
for _, tc := range []struct {
|
||||||
|
name string
|
||||||
|
utterance string
|
||||||
|
text string
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "the model transliterated the name",
|
||||||
|
utterance: "перезапусти muzick indexer",
|
||||||
|
text: "перезагрузить музик индексер",
|
||||||
|
want: "muzick indexer",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "it kept the name, so nothing to repair",
|
||||||
|
utterance: "перезапусти muzick indexer",
|
||||||
|
text: "перезагрузить muzick indexer",
|
||||||
|
want: "перезагрузить muzick indexer",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "an all-Russian entity name is not a rewrite",
|
||||||
|
utterance: "перезапусти домашний сервер",
|
||||||
|
text: "перезагрузить домашний сервер",
|
||||||
|
want: "перезагрузить домашний сервер",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "an English turn never enters the recovery",
|
||||||
|
utterance: "restart muzick indexer",
|
||||||
|
text: "restart muzick indexer",
|
||||||
|
want: "restart muzick indexer",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "the longest Latin run is the name",
|
||||||
|
utterance: "а перезапусти-ка nginx на muzick-indexer, пожалуйста",
|
||||||
|
text: "перезагрузить нгинкс",
|
||||||
|
want: "muzick-indexer",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "one stray letter is not a name",
|
||||||
|
utterance: "перезапусти сервер a",
|
||||||
|
text: "перезагрузить сервер",
|
||||||
|
want: "перезагрузить сервер",
|
||||||
|
},
|
||||||
|
} {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
dec := router.Decision{Utterance: tc.utterance, Slots: router.Slots{Text: tc.text}}
|
||||||
|
if got := entityReferenceText(dec); got != tc.want {
|
||||||
|
t.Fatalf("entityReferenceText = %q, want %q", got, tc.want)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestNexusIsAskedForTheNameHeSaid — the defect end to end (Vikunja #476): the
|
||||||
|
// router hands over a transliterated Text, and Nexus must still be asked about
|
||||||
|
// the service that exists.
|
||||||
|
func TestNexusIsAskedForTheNameHeSaid(t *testing.T) {
|
||||||
|
ctx := context.Background()
|
||||||
|
nexus := newFakeNexus(t, fixtureNexusResolved("ent_muzick", "Muzick indexer", "service"))
|
||||||
|
hexis := newFakeHexis(t, restartCaps(), fixtureHexisExecuted("exec_1", "succeeded"))
|
||||||
|
h := ecoHandler(t, nexus, nil, hexis)
|
||||||
|
|
||||||
|
dec := router.Decision{
|
||||||
|
Utterance: "перезапусти muzick indexer",
|
||||||
|
Intent: router.IntentAct,
|
||||||
|
Slots: router.Slots{Text: "перезагрузить музик индексер", Fn: "restart", HasFn: true},
|
||||||
|
}
|
||||||
|
h.handleHexisAct(ctx, dec)
|
||||||
|
|
||||||
|
reqs := nexus.Requests()
|
||||||
|
if len(reqs) == 0 {
|
||||||
|
t.Fatal("nexus was never asked")
|
||||||
|
}
|
||||||
|
body := string(reqs[0].Body)
|
||||||
|
if !strings.Contains(body, "muzick indexer") {
|
||||||
|
t.Fatalf("nexus resolve body = %s, want the name he said", body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestAnEntityActReachesHexisInsteadOfAsking — the second half of #476. The
|
||||||
|
// stage-3 gate thins an act with no allowlisted fn, and that question used to
|
||||||
|
// be the whole turn, so the Hexis path was unreachable from voice or chat.
|
||||||
|
func TestAnEntityActReachesHexisInsteadOfAsking(t *testing.T) {
|
||||||
|
ctx := context.Background()
|
||||||
|
nexus := newFakeNexus(t, fixtureNexusResolved("ent_muzick", "Muzick indexer", "service"))
|
||||||
|
hexis := newFakeHexis(t, restartCaps(), fixtureHexisExecuted("exec_1", "succeeded"))
|
||||||
|
h := ecoHandler(t, nexus, nil, hexis)
|
||||||
|
|
||||||
|
dec := router.Decision{
|
||||||
|
Utterance: "перезапусти muzick indexer",
|
||||||
|
Intent: router.IntentAct,
|
||||||
|
Stage: 3,
|
||||||
|
Clarify: true,
|
||||||
|
Slots: router.Slots{Text: "restart status muzick indexer"},
|
||||||
|
}
|
||||||
|
reply := h.hexisBeforeClarify(ctx, dec)
|
||||||
|
if reply == "" {
|
||||||
|
t.Fatal("a resolvable entity act must reach hexis rather than fall through to the question")
|
||||||
|
}
|
||||||
|
if hexis.Count("", "/api/v1") == 0 {
|
||||||
|
t.Fatal("hexis was never contacted")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestClarifyStillAsksWithoutHexis — the narrowing. No ecosystem, no change:
|
||||||
|
// she asks exactly what she asked before.
|
||||||
|
func TestClarifyStillAsksWithoutHexis(t *testing.T) {
|
||||||
|
h, _, _ := newClarifyHandler(t)
|
||||||
|
dec := router.Decision{
|
||||||
|
Utterance: "перезапусти muzick indexer",
|
||||||
|
Intent: router.IntentAct,
|
||||||
|
Stage: 3,
|
||||||
|
Clarify: true,
|
||||||
|
Slots: router.Slots{Text: "перезагрузить музик индексер"},
|
||||||
|
}
|
||||||
|
if reply := h.hexisBeforeClarify(context.Background(), dec); reply != "" {
|
||||||
|
t.Fatalf("no hexis must mean no reply, got %q", reply)
|
||||||
|
}
|
||||||
|
if _, asked := h.askClarify(voiceCtx(), dec); !asked {
|
||||||
|
t.Fatal("she must still ask what to do")
|
||||||
|
}
|
||||||
|
}
|
||||||
+50
-3
@@ -1,17 +1,64 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/kami/maven/internal/dialogue"
|
"github.com/kami/maven/internal/dialogue"
|
||||||
"github.com/kami/maven/internal/router"
|
"github.com/kami/maven/internal/router"
|
||||||
)
|
)
|
||||||
|
|
||||||
// voiceDialogueID — the single dialogue-session key. This is a single-user box
|
// voiceDialogueID — the dialogue-session key for the microphone, and the
|
||||||
// (ponytail), so one slot suffices; a second speaker would need per-speaker ids,
|
// clarify key for it too. This is a single-user box (ponytail), so one slot
|
||||||
// which waits on voice-print attribution (see PROGRESS multi-user deferral).
|
// suffices; a second speaker would need per-speaker ids, which waits on
|
||||||
|
// voice-print attribution (see PROGRESS multi-user deferral).
|
||||||
const voiceDialogueID = "voice"
|
const voiceDialogueID = "voice"
|
||||||
|
|
||||||
|
// textDialogueID — the clarify key for a text turn that named no conversation.
|
||||||
|
// Separate from the mic: an old client that sends no id still must not answer
|
||||||
|
// a question she asked out loud.
|
||||||
|
const textDialogueID = "text"
|
||||||
|
|
||||||
|
// dialogueKey — the context key carrying the id of the conversation this turn
|
||||||
|
// belongs to. It rides the context rather than a parameter for the same reason
|
||||||
|
// the correlation id does: every step of the turn needs it, most of them only
|
||||||
|
// to hand to the next one, and threading it by hand would put it in six
|
||||||
|
// clarify signatures that have nothing else to say about it.
|
||||||
|
type dialogueKey struct{}
|
||||||
|
|
||||||
|
// dialogueIDFor builds the id a turn is held under: the conversation the reach
|
||||||
|
// named, qualified by the tap it arrived on, or the tap's own fallback when it
|
||||||
|
// named none.
|
||||||
|
//
|
||||||
|
// A parked clarifying question used to be held under voiceDialogueID no matter
|
||||||
|
// where the turn came from, so one unanswerable question captured the next
|
||||||
|
// three utterances from anywhere. Three independent curl sessions fed a
|
||||||
|
// capture attempt that had already failed, and a reminder among them was lost
|
||||||
|
// (Vikunja #466).
|
||||||
|
func dialogueIDFor(src turnSource, conversation string) string {
|
||||||
|
if conversation != "" {
|
||||||
|
return string(src) + ":" + conversation
|
||||||
|
}
|
||||||
|
if src == sourceVoice {
|
||||||
|
return voiceDialogueID
|
||||||
|
}
|
||||||
|
return textDialogueID
|
||||||
|
}
|
||||||
|
|
||||||
|
// withDialogueID tags a turn with that id.
|
||||||
|
func withDialogueID(ctx context.Context, id string) context.Context {
|
||||||
|
return context.WithValue(ctx, dialogueKey{}, id)
|
||||||
|
}
|
||||||
|
|
||||||
|
// dialogueIDOf reads it back. Falls back to the microphone's slot, which is
|
||||||
|
// what an unthreaded caller — a test, an internal replay — gets.
|
||||||
|
func dialogueIDOf(ctx context.Context) string {
|
||||||
|
if id, ok := ctx.Value(dialogueKey{}).(string); ok && id != "" {
|
||||||
|
return id
|
||||||
|
}
|
||||||
|
return voiceDialogueID
|
||||||
|
}
|
||||||
|
|
||||||
// toDialogueSlots and applyDialogueSlots are the only bridge between
|
// toDialogueSlots and applyDialogueSlots are the only bridge between
|
||||||
// router.Slots and dialogue.Slots. dialogue must not import router (import
|
// router.Slots and dialogue.Slots. dialogue must not import router (import
|
||||||
// cycle), so the two structs are hand-kept copies and every field has to be
|
// cycle), so the two structs are hand-kept copies and every field has to be
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/morning"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TestMorningNudgeBodySeparatesOptional — the one message a routine is allowed
|
||||||
|
// per day says what was not done, then what he could still do (Vikunja #473).
|
||||||
|
func TestMorningNudgeBodySeparatesOptional(t *testing.T) {
|
||||||
|
cand := morning.Candidate{
|
||||||
|
Routine: morning.Routine{Name: "утро"},
|
||||||
|
Missing: []morning.Item{
|
||||||
|
{Key: "meds", Label: "таблетки"},
|
||||||
|
{Key: "stretch", Label: "растяжка", Optional: true},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
body := morningNudgeBody(cand)
|
||||||
|
if !strings.Contains(body, "не сделано — таблетки") {
|
||||||
|
t.Fatalf("the required item must be named as not done: %q", body)
|
||||||
|
}
|
||||||
|
if !strings.Contains(body, "если будет время — растяжка") {
|
||||||
|
t.Fatalf("the optional item must read softer: %q", body)
|
||||||
|
}
|
||||||
|
if strings.Contains(body, "не сделано — таблетки, растяжка") {
|
||||||
|
t.Fatalf("optional must not be folded into the required list: %q", body)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Nothing optional missing: the sentence is what it always was.
|
||||||
|
only := morning.Candidate{
|
||||||
|
Routine: morning.Routine{Name: "утро"},
|
||||||
|
Missing: []morning.Item{{Key: "meds", Label: "таблетки"}},
|
||||||
|
}
|
||||||
|
if got, want := morningNudgeBody(only), "утро: не сделано — таблетки"; got != want {
|
||||||
|
t.Fatalf("morningNudgeBody = %q, want %q", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,12 +2,14 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/kami/maven/internal/ipc"
|
"github.com/kami/maven/internal/ipc"
|
||||||
"github.com/kami/maven/internal/memory"
|
"github.com/kami/maven/internal/memory"
|
||||||
"github.com/kami/maven/internal/router"
|
"github.com/kami/maven/internal/router"
|
||||||
|
"github.com/kami/maven/internal/store"
|
||||||
"github.com/kami/maven/internal/tool"
|
"github.com/kami/maven/internal/tool"
|
||||||
"github.com/kami/maven/internal/voice"
|
"github.com/kami/maven/internal/voice"
|
||||||
)
|
)
|
||||||
@@ -85,3 +87,38 @@ func TestReactiveNotesReminders(t *testing.T) {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestSpokenTaskCaptureFilesATask — the whole path, from the utterance to the
|
||||||
|
// task table. It went dead when the router started claiming the marker as an
|
||||||
|
// act: capture rides the note intent, so nothing below actionNote was ever
|
||||||
|
// reached and every capture answered "Что сделать?" (Vikunja #467).
|
||||||
|
func TestSpokenTaskCaptureFilesATask(t *testing.T) {
|
||||||
|
ctx := context.Background()
|
||||||
|
st := newTestStore(t)
|
||||||
|
api := ipc.NewStoreAPI(st)
|
||||||
|
now := time.Now()
|
||||||
|
emb := router.NewHashEmbedder(1024)
|
||||||
|
matcher := tool.NewMatcher(api)
|
||||||
|
h := &reactiveHandler{
|
||||||
|
api: api,
|
||||||
|
embedder: emb,
|
||||||
|
router: buildRouter(emb, matcher, 0.55, nil),
|
||||||
|
replier: voice.NewStubReplier(),
|
||||||
|
now: func() time.Time { return now },
|
||||||
|
memStore: memory.NewInMemoryStore(),
|
||||||
|
dataStore: st,
|
||||||
|
}
|
||||||
|
|
||||||
|
reply := h.handleText(ctx, "web", "добавь в задачи купить молоко")
|
||||||
|
if !strings.Contains(reply, "купить молоко") {
|
||||||
|
t.Fatalf("capture did not claim the turn: %q", reply)
|
||||||
|
}
|
||||||
|
open, err := st.ListTasks(ctx, store.TaskOpen)
|
||||||
|
if err != nil || len(open) != 1 {
|
||||||
|
t.Fatalf("task was not filed: tasks=%v err=%v", open, err)
|
||||||
|
}
|
||||||
|
// The words he said, not the model's rewrite of them.
|
||||||
|
if open[0].Text != "купить молоко" {
|
||||||
|
t.Fatalf("task text was rewritten: %q", open[0].Text)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1043,3 +1043,26 @@ func TestSimulatorRefusesBackwardsSteps(t *testing.T) {
|
|||||||
t.Errorf("the clock moved to %s on a refused step, it must stay at 09:00", got)
|
t.Errorf("the clock moved to %s on a refused step, it must stay at 09:00", got)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestSimulatorRoutesWithTheDeployedSeeds — the scenarios must replay against
|
||||||
|
// the classifier the deploy runs, not an empty one.
|
||||||
|
//
|
||||||
|
// They did not. The seed path was relative to the working directory, which is
|
||||||
|
// cmd/mavend under `go test`, so every file failed to open and the whole
|
||||||
|
// simulator scored three green scenarios with zero examples loaded (Vikunja
|
||||||
|
// #465). The count is asserted rather than logged, because a silent zero is
|
||||||
|
// exactly the failure that hid here for as long as it did.
|
||||||
|
func TestSimulatorRoutesWithTheDeployedSeeds(t *testing.T) {
|
||||||
|
cls := router.NewClassifier(router.NewHashEmbedder(1024))
|
||||||
|
seedClassifier(cls)
|
||||||
|
total := 0
|
||||||
|
for _, intent := range cls.Intents() {
|
||||||
|
total += len(cls.Examples(intent))
|
||||||
|
}
|
||||||
|
if total == 0 {
|
||||||
|
t.Fatalf("no seed examples loaded from %s — the simulator would route on nothing", seedPath())
|
||||||
|
}
|
||||||
|
if len(cls.Intents()) != 7 {
|
||||||
|
t.Fatalf("seeded %d intents, want all 7", len(cls.Intents()))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -10,22 +10,17 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/kami/maven/internal/calendar"
|
|
||||||
"github.com/kami/maven/internal/config"
|
"github.com/kami/maven/internal/config"
|
||||||
"github.com/kami/maven/internal/delivery"
|
"github.com/kami/maven/internal/delivery"
|
||||||
"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"
|
||||||
@@ -315,597 +310,6 @@ func (t *tickLoop) repeatPhrase(rule string) (body, summary string) {
|
|||||||
return pn.Body, pn.Summary
|
return pn.Body, pn.Summary
|
||||||
}
|
}
|
||||||
|
|
||||||
// shouldQueue — true when digest is enabled and the candidate's severity is
|
|
||||||
// at or below the configured ceiling.
|
|
||||||
func (t *tickLoop) shouldQueue(cand *loop.Candidate) bool {
|
|
||||||
return t.digestCfg != nil && t.digestCfg.Enabled &&
|
|
||||||
cand.Severity <= loop.Severity(t.digestCfg.SeverityCeiling)
|
|
||||||
}
|
|
||||||
|
|
||||||
// queueNudge — phrases the candidate and appends it to the digest queue.
|
|
||||||
// Deduplicates by rule name: if the same rule is already queued, this is a
|
|
||||||
// no-op (the first fire within the window is the one that counts).
|
|
||||||
func (t *tickLoop) queueNudge(ctx context.Context, cand *loop.Candidate, _ loop.State, now time.Time) {
|
|
||||||
for _, q := range t.digestQ {
|
|
||||||
if q.Rule == cand.Rule.Name {
|
|
||||||
return // already queued
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pn, err := t.phraser.PhraseNudge(ctx, *cand)
|
|
||||||
if err != nil {
|
|
||||||
log.Printf("tick: phrase nudge %s: %v", cand.Rule.Name, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
t.digestQ = append(t.digestQ, QueuedNudge{
|
|
||||||
Rule: cand.Rule.Name,
|
|
||||||
Severity: int(cand.Severity),
|
|
||||||
Body: pn.Body,
|
|
||||||
Key: cand.Rule.Name,
|
|
||||||
QueuedAt: now,
|
|
||||||
})
|
|
||||||
t.cachePhrase(pn)
|
|
||||||
}
|
|
||||||
|
|
||||||
// maybeFlush — flushes the digest queue if the window has elapsed since the
|
|
||||||
// first item or the queue reached MaxItems.
|
|
||||||
func (t *tickLoop) maybeFlush(ctx context.Context, now time.Time, state loop.State) {
|
|
||||||
if t.digestCfg == nil || !t.digestCfg.Enabled || len(t.digestQ) == 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
first := t.digestQ[0]
|
|
||||||
if now.Sub(first.QueuedAt) >= time.Duration(t.digestCfg.Window) ||
|
|
||||||
len(t.digestQ) >= t.digestCfg.MaxItems {
|
|
||||||
t.flushDigest(ctx, now, state)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// flushDigest — concatenates queued nudge bodies into a single digest
|
|
||||||
// notification and dispatches it. Clears the queue after a successful send.
|
|
||||||
// The digest uses the max severity among queued items for routing.
|
|
||||||
func (t *tickLoop) flushDigest(ctx context.Context, now time.Time, state loop.State) {
|
|
||||||
if len(t.digestQ) == 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
var b strings.Builder
|
|
||||||
maxSev := 0
|
|
||||||
for i, q := range t.digestQ {
|
|
||||||
if i > 0 {
|
|
||||||
b.WriteString(" · ")
|
|
||||||
}
|
|
||||||
b.WriteString(q.Body)
|
|
||||||
if q.Severity > maxSev {
|
|
||||||
maxSev = q.Severity
|
|
||||||
}
|
|
||||||
}
|
|
||||||
body := b.String()
|
|
||||||
summary := fmt.Sprintf("%d pending notifications", len(t.digestQ))
|
|
||||||
|
|
||||||
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 {
|
|
||||||
// keep the queue — the next tick's maybeFlush re-attempts.
|
|
||||||
log.Printf("tick: dispatch digest: %v", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
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.
|
|
||||||
// Nor are they queued: the row now exists, so no later tick re-detects
|
|
||||||
// them and they are never announced. See announceProposal.
|
|
||||||
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.
|
|
||||||
//
|
|
||||||
// What the cooldown is and is not. detectAndPropose returns non-nil only for a
|
|
||||||
// newly created row, so a pair gets exactly one chance to be spoken: the tick
|
|
||||||
// that first proposes it. Combined with one announcement per tick, the first
|
|
||||||
// tick over a populated history announces one pattern and permanently silences
|
|
||||||
// every other pattern found in the same pass. That is the intent, not an
|
|
||||||
// oversight — an inferred routine is not worth a second attempt at his
|
|
||||||
// attention, and /routines lists all of them. So the cooldown does not drain a
|
|
||||||
// backlog. It only spaces announcements of genuinely new pairs discovered on
|
|
||||||
// later ticks. If it should ever become "one per day until each is mentioned",
|
|
||||||
// that needs a queue rather than this counter.
|
|
||||||
//
|
|
||||||
// Cooldown gets its default here as well as in applyDefaults. That is
|
|
||||||
// deliberate: a tickLoop assembled directly in a test never goes through Load,
|
|
||||||
// and an unspaced announcer is not what those tests mean to exercise.
|
|
||||||
//
|
|
||||||
// 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.
|
|
||||||
// Validation (cron parses, name/body present, severity defaulted) already ran
|
|
||||||
// in config.Load, so this is a pure field copy.
|
|
||||||
func routinesFromConfig(rc []config.RoutineConfig) []routine.Routine {
|
|
||||||
if len(rc) == 0 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
out := make([]routine.Routine, len(rc))
|
|
||||||
for i, r := range rc {
|
|
||||||
out[i] = routine.Routine{Name: r.Name, Cron: r.Cron, Body: r.Body, Severity: r.Severity}
|
|
||||||
}
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
|
|
||||||
// fireRoutines dispatches the routines whose cron schedule crossed since their
|
|
||||||
// last fire. Each is delivered as a nudge through the normal routing table
|
|
||||||
// (ChannelsFor(severity, presence)) with a "routine:"-prefixed rule name so it
|
|
||||||
// can't collide with a care rule in the feedback autotuner. A dispatch failure
|
|
||||||
// logs and continues — one bad send must not skip the rest, and routine.Due has
|
|
||||||
// already advanced the last-fire time so a transient failure drops that fire
|
|
||||||
// rather than replaying it every tick (a routine is clockwork, not an alarm —
|
|
||||||
// no repeat-til-ack).
|
|
||||||
func (t *tickLoop) fireRoutines(ctx context.Context, now time.Time, state loop.State) {
|
|
||||||
for _, r := range routine.Due(t.routines, t.routineLast, now) {
|
|
||||||
pn := delivery.PhrasedNudge{
|
|
||||||
Candidate: loop.Candidate{
|
|
||||||
Rule: loop.Rule{Name: "routine:" + r.Name, Severity: loop.Severity(r.Severity)},
|
|
||||||
Severity: loop.Severity(r.Severity),
|
|
||||||
State: state,
|
|
||||||
},
|
|
||||||
Body: r.Body,
|
|
||||||
Summary: r.Body,
|
|
||||||
}
|
|
||||||
if _, err := t.dispatcher.DispatchNudge(ctx, pn, now); err != nil {
|
|
||||||
log.Printf("tick: dispatch routine %s: %v", r.Name, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// fireAcceptedRoutines nudges about the routines the user accepted, once per
|
|
||||||
// interval (Vikunja #366). Accepting used to create a single reminder, so a
|
|
||||||
// non-weekly routine fired once and went quiet forever; the schedule lives in
|
|
||||||
// the proposed_routines row now and the loop re-reads it every tick.
|
|
||||||
//
|
|
||||||
// A routine is a care-class nudge and goes through the restraint gate like any
|
|
||||||
// other: quiet hours, away presence and snooze all suppress it. Reminders bypass
|
|
||||||
// that gate; routines must not. A suppressed nudge is NOT marked fired, so it
|
|
||||||
// goes out on the next tick that the gate allows — one nudge, held, not dropped
|
|
||||||
// and not repeated.
|
|
||||||
//
|
|
||||||
// The body is literal text built from the detected action and object, not
|
|
||||||
// LLM-phrased, so a routine can't hallucinate. It nudges; it never acts.
|
|
||||||
func (t *tickLoop) fireAcceptedRoutines(ctx context.Context, now time.Time, state loop.State) {
|
|
||||||
rows, err := t.store.ListAcceptedRoutines(ctx)
|
|
||||||
if err != nil {
|
|
||||||
log.Printf("tick: list accepted routines: %v", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
accepted := make([]routine.Accepted, 0, len(rows))
|
|
||||||
for _, r := range rows {
|
|
||||||
if r.AcceptedTs == nil {
|
|
||||||
continue // accepted before the schedule column existed — no clock to start from.
|
|
||||||
}
|
|
||||||
accepted = append(accepted, routine.Accepted{
|
|
||||||
ID: r.ID,
|
|
||||||
Name: r.Action + " " + r.Object,
|
|
||||||
IntervalDays: r.IntervalDays,
|
|
||||||
Accepted: *r.AcceptedTs,
|
|
||||||
LastFired: r.LastFiredTs,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, a := range routine.DueAccepted(accepted, now) {
|
|
||||||
rule := loop.Rule{Name: "routine:" + a.Name, Severity: loop.Sev1}
|
|
||||||
if !loop.Gate(state, rule) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
body := "пора: " + a.Name
|
|
||||||
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: dispatch accepted routine %d: %v", a.ID, err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if len(sent) == 0 {
|
|
||||||
continue // routing dropped it — leave it due.
|
|
||||||
}
|
|
||||||
if err := t.store.MarkRoutineFired(ctx, a.ID, now); err != nil {
|
|
||||||
log.Printf("tick: mark routine %d fired: %v", a.ID, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// fireMorningRoutines checks each configured checklist against today's facts
|
|
||||||
// and dispatches a nag listing exactly what's still missing, at most once per
|
|
||||||
// routine per calendar day. Fact reads happen here (not in loop.Gatherer)
|
|
||||||
// because the item↔fact-key mapping is morning-routine-specific, not a rule
|
|
||||||
// concern — pulling it into the shared gather path would leak that mapping
|
|
||||||
// into loop's "rules declare wanted keys" contract. Bodies are literal
|
|
||||||
// operator text (item labels joined), not LLM-phrased, same rationale as
|
|
||||||
// cron routines: deterministic, can't hallucinate a checklist item.
|
|
||||||
func (t *tickLoop) fireMorningRoutines(ctx context.Context, now time.Time, state loop.State) {
|
|
||||||
if len(t.morningRoutines) == 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
facts := t.gatherMorningFacts(ctx)
|
|
||||||
|
|
||||||
for _, cand := range morning.Due(t.morningRoutines, facts, t.morningLast, now) {
|
|
||||||
labels := make([]string, len(cand.Missing))
|
|
||||||
for i, it := range cand.Missing {
|
|
||||||
labels[i] = it.Label
|
|
||||||
}
|
|
||||||
body := fmt.Sprintf("%s: не сделано — %s", cand.Routine.Name, strings.Join(labels, ", "))
|
|
||||||
pn := delivery.PhrasedNudge{
|
|
||||||
Candidate: loop.Candidate{
|
|
||||||
Rule: loop.Rule{Name: "morning:" + cand.Routine.Name, Severity: loop.Severity(cand.Routine.Severity)},
|
|
||||||
Severity: loop.Severity(cand.Routine.Severity),
|
|
||||||
State: state,
|
|
||||||
},
|
|
||||||
Body: body,
|
|
||||||
Summary: body,
|
|
||||||
}
|
|
||||||
if _, err := t.dispatcher.DispatchNudge(ctx, pn, now); err != nil {
|
|
||||||
log.Printf("tick: dispatch morning routine %s: %v", cand.Routine.Name, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// gatherMorningFacts reads the latest fact for every item's fact_key across
|
|
||||||
// all configured morning routines. Shared by fireMorningRoutines (nudge
|
|
||||||
// decision) and morningStatus (read-only query) so the two paths can never
|
|
||||||
// disagree about what evidence exists.
|
|
||||||
func (t *tickLoop) gatherMorningFacts(ctx context.Context) map[string]store.Fact {
|
|
||||||
keys := make(map[string]struct{})
|
|
||||||
for _, r := range t.morningRoutines {
|
|
||||||
for _, it := range r.Items {
|
|
||||||
keys[it.FactKey] = struct{}{}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
facts := make(map[string]store.Fact, len(keys))
|
|
||||||
for k := range keys {
|
|
||||||
f, err := t.store.LatestFact(ctx, k)
|
|
||||||
if err == nil {
|
|
||||||
facts[k] = f
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if err != store.ErrNoFact {
|
|
||||||
log.Printf("tick: morning: latest fact %s: %v", k, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return facts
|
|
||||||
}
|
|
||||||
|
|
||||||
// morningStatus is the read-only "what's missing" query the web UI (and
|
|
||||||
// eventually a voice query) calls. Pure recompute over the current facts —
|
|
||||||
// no dedupe/nudge-time gating, unlike fireMorningRoutines: this answers
|
|
||||||
// "state right now," not "should we nag."
|
|
||||||
func (t *tickLoop) morningStatus(ctx context.Context, now time.Time) []ipc.MorningRoutineStatus {
|
|
||||||
if len(t.morningRoutines) == 0 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
facts := t.gatherMorningFacts(ctx)
|
|
||||||
out := make([]ipc.MorningRoutineStatus, 0, len(t.morningRoutines))
|
|
||||||
for _, r := range t.morningRoutines {
|
|
||||||
st := morning.Evaluate(r, facts, now)
|
|
||||||
done := make(map[string]bool, len(st.Completed))
|
|
||||||
for _, it := range st.Completed {
|
|
||||||
done[it.Key] = true
|
|
||||||
}
|
|
||||||
items := make([]ipc.MorningRoutineItem, len(r.Items))
|
|
||||||
for i, it := range r.Items {
|
|
||||||
items[i] = ipc.MorningRoutineItem{Key: it.Key, Label: it.Label, Done: done[it.Key]}
|
|
||||||
}
|
|
||||||
out = append(out, ipc.MorningRoutineStatus{
|
|
||||||
Name: r.Name,
|
|
||||||
Active: st.Active,
|
|
||||||
WindowStart: r.WindowStart,
|
|
||||||
WindowEnd: r.WindowEnd,
|
|
||||||
Items: items,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
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,
|
|
||||||
// The plan prints the hour itself, so the "@ 14:00-14:30" tail the
|
|
||||||
// fact value carries would say it twice.
|
|
||||||
Text: calendar.FactSummary(f.Value),
|
|
||||||
Kind: morning.PlanEvent,
|
|
||||||
// Provenance below a calendar read (an ambient relay, #126) is
|
|
||||||
// hedged rather than recited as fact.
|
|
||||||
Uncertain: f.Confidence < 1.0,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
var reminders []morning.PlanEntry
|
|
||||||
rems, err := t.store.PendingReminders(ctx, dayStart, dayEnd)
|
|
||||||
if err != nil {
|
|
||||||
log.Printf("tick: day plan: pending reminders: %v", err)
|
|
||||||
}
|
|
||||||
for _, r := range rems {
|
|
||||||
if r.Status != store.ReminderPending {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
fire := r.NextFireTs
|
|
||||||
if fire.IsZero() {
|
|
||||||
fire = r.FireTs
|
|
||||||
}
|
|
||||||
reminders = append(reminders, morning.PlanEntry{
|
|
||||||
At: fire,
|
|
||||||
Text: r.Text(),
|
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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:
|
||||||
@@ -978,101 +382,3 @@ func (t *tickLoop) trace() *loop.TickTrace {
|
|||||||
defer t.mu.Unlock()
|
defer t.mu.Unlock()
|
||||||
return t.lastTrace
|
return t.lastTrace
|
||||||
}
|
}
|
||||||
|
|
||||||
// daemonAPI wraps a store-backed CoreAPI and overrides TickTrace with the
|
|
||||||
// daemon's in-memory tick trace cache.
|
|
||||||
type daemonAPI struct {
|
|
||||||
ipc.CoreAPI
|
|
||||||
getTrace func() *loop.TickTrace
|
|
||||||
getMorningStatus func(ctx context.Context) []ipc.MorningRoutineStatus
|
|
||||||
getDayPlan func(ctx context.Context) ipc.DayPlan
|
|
||||||
chatFn func(ctx context.Context, text string) string
|
|
||||||
getMCPServers func() []ipc.MCPServerStatus
|
|
||||||
getEvents func(n int) []ipc.IntakeEvent
|
|
||||||
}
|
|
||||||
|
|
||||||
// RecentEvents — the unified intake journal (Vikunja #283). Empty, not an
|
|
||||||
// error, when no bus was wired: "nothing has arrived" and "the journal is off"
|
|
||||||
// look the same to a reader on purpose, because neither is a fault and the
|
|
||||||
// page renders both as an empty table.
|
|
||||||
func (d *daemonAPI) RecentEvents(ctx context.Context, n int) ([]ipc.IntakeEvent, error) {
|
|
||||||
if d.getEvents == nil {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
return d.getEvents(n), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (d *daemonAPI) Chat(ctx context.Context, text string) (string, error) {
|
|
||||||
if d.chatFn == nil {
|
|
||||||
return "", errors.New("mavend: chat not available")
|
|
||||||
}
|
|
||||||
return d.chatFn(ctx, text), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// MCPServers — the configured MCP servers and their health (Vikunja #251).
|
|
||||||
// Empty, not an error, when the mcp block is absent: "not configured" is the
|
|
||||||
// default state and the web surface renders it as such.
|
|
||||||
func (d *daemonAPI) MCPServers(ctx context.Context) ([]ipc.MCPServerStatus, error) {
|
|
||||||
if d.getMCPServers == nil {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
return d.getMCPServers(), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (d *daemonAPI) TickTrace(ctx context.Context) (ipc.TickTrace, error) {
|
|
||||||
trace := d.getTrace()
|
|
||||||
if trace == nil {
|
|
||||||
return ipc.TickTrace{}, nil
|
|
||||||
}
|
|
||||||
return toIPCTickTrace(*trace), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (d *daemonAPI) MorningStatus(ctx context.Context) ([]ipc.MorningRoutineStatus, error) {
|
|
||||||
if d.getMorningStatus == nil {
|
|
||||||
return nil, errors.New("mavend: morning status not available")
|
|
||||||
}
|
|
||||||
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 {
|
|
||||||
rules := make([]ipc.RuleTrace, len(t.RuleTraces))
|
|
||||||
for i, r := range t.RuleTraces {
|
|
||||||
rules[i] = toIPCRuleTrace(r)
|
|
||||||
}
|
|
||||||
return ipc.TickTrace{
|
|
||||||
Now: t.Now,
|
|
||||||
Winner: t.Winner,
|
|
||||||
Rules: rules,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func toIPCRuleTrace(r loop.RuleTrace) ipc.RuleTrace {
|
|
||||||
return ipc.RuleTrace{
|
|
||||||
RuleName: r.RuleName,
|
|
||||||
Severity: int(r.Severity),
|
|
||||||
PredicateResult: r.PredicateResult,
|
|
||||||
GateResult: r.GateResult,
|
|
||||||
GateBlockedBy: r.GateBlockedBy,
|
|
||||||
GateDetail: toIPCGateDetail(r.GateDetail),
|
|
||||||
WasSelected: r.WasSelected,
|
|
||||||
LostTo: r.LostTo,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func toIPCGateDetail(d loop.GateDetail) ipc.GateDetail {
|
|
||||||
return ipc.GateDetail{
|
|
||||||
SnoozeUntil: d.SnoozeUntil,
|
|
||||||
CooldownUntil: d.CooldownUntil,
|
|
||||||
QuietHours: d.QuietHours,
|
|
||||||
CalendarBusy: d.CalendarBusy,
|
|
||||||
Presence: d.Presence,
|
|
||||||
InertKeysMissing: d.InertKeysMissing,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -0,0 +1,111 @@
|
|||||||
|
// mavend/tick_api.go — the daemonAPI read surface over the tick loop.
|
||||||
|
//
|
||||||
|
// Split out of tick.go, move-only (Vikunja #422). What mavweb asks the daemon
|
||||||
|
// for, and the loop-to-ipc conversions those answers need.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
"github.com/kami/maven/internal/loop"
|
||||||
|
)
|
||||||
|
|
||||||
|
// daemonAPI wraps a store-backed CoreAPI and overrides TickTrace with the
|
||||||
|
// daemon's in-memory tick trace cache.
|
||||||
|
type daemonAPI struct {
|
||||||
|
ipc.CoreAPI
|
||||||
|
getTrace func() *loop.TickTrace
|
||||||
|
getMorningStatus func(ctx context.Context) []ipc.MorningRoutineStatus
|
||||||
|
getDayPlan func(ctx context.Context) ipc.DayPlan
|
||||||
|
chatFn func(ctx context.Context, conversation, text string) string
|
||||||
|
getMCPServers func() []ipc.MCPServerStatus
|
||||||
|
getEvents func(n int) []ipc.IntakeEvent
|
||||||
|
}
|
||||||
|
|
||||||
|
// RecentEvents — the unified intake journal (Vikunja #283). Empty, not an
|
||||||
|
// error, when no bus was wired: "nothing has arrived" and "the journal is off"
|
||||||
|
// look the same to a reader on purpose, because neither is a fault and the
|
||||||
|
// page renders both as an empty table.
|
||||||
|
func (d *daemonAPI) RecentEvents(ctx context.Context, n int) ([]ipc.IntakeEvent, error) {
|
||||||
|
if d.getEvents == nil {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
return d.getEvents(n), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *daemonAPI) Chat(ctx context.Context, conversation, text string) (string, error) {
|
||||||
|
if d.chatFn == nil {
|
||||||
|
return "", errors.New("mavend: chat not available")
|
||||||
|
}
|
||||||
|
return d.chatFn(ctx, conversation, text), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// MCPServers — the configured MCP servers and their health (Vikunja #251).
|
||||||
|
// Empty, not an error, when the mcp block is absent: "not configured" is the
|
||||||
|
// default state and the web surface renders it as such.
|
||||||
|
func (d *daemonAPI) MCPServers(ctx context.Context) ([]ipc.MCPServerStatus, error) {
|
||||||
|
if d.getMCPServers == nil {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
return d.getMCPServers(), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *daemonAPI) TickTrace(ctx context.Context) (ipc.TickTrace, error) {
|
||||||
|
trace := d.getTrace()
|
||||||
|
if trace == nil {
|
||||||
|
return ipc.TickTrace{}, nil
|
||||||
|
}
|
||||||
|
return toIPCTickTrace(*trace), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *daemonAPI) MorningStatus(ctx context.Context) ([]ipc.MorningRoutineStatus, error) {
|
||||||
|
if d.getMorningStatus == nil {
|
||||||
|
return nil, errors.New("mavend: morning status not available")
|
||||||
|
}
|
||||||
|
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 {
|
||||||
|
rules := make([]ipc.RuleTrace, len(t.RuleTraces))
|
||||||
|
for i, r := range t.RuleTraces {
|
||||||
|
rules[i] = toIPCRuleTrace(r)
|
||||||
|
}
|
||||||
|
return ipc.TickTrace{
|
||||||
|
Now: t.Now,
|
||||||
|
Winner: t.Winner,
|
||||||
|
Rules: rules,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func toIPCRuleTrace(r loop.RuleTrace) ipc.RuleTrace {
|
||||||
|
return ipc.RuleTrace{
|
||||||
|
RuleName: r.RuleName,
|
||||||
|
Severity: int(r.Severity),
|
||||||
|
PredicateResult: r.PredicateResult,
|
||||||
|
GateResult: r.GateResult,
|
||||||
|
GateBlockedBy: r.GateBlockedBy,
|
||||||
|
GateDetail: toIPCGateDetail(r.GateDetail),
|
||||||
|
WasSelected: r.WasSelected,
|
||||||
|
LostTo: r.LostTo,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func toIPCGateDetail(d loop.GateDetail) ipc.GateDetail {
|
||||||
|
return ipc.GateDetail{
|
||||||
|
SnoozeUntil: d.SnoozeUntil,
|
||||||
|
CooldownUntil: d.CooldownUntil,
|
||||||
|
QuietHours: d.QuietHours,
|
||||||
|
CalendarBusy: d.CalendarBusy,
|
||||||
|
Presence: d.Presence,
|
||||||
|
InertKeysMissing: d.InertKeysMissing,
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,233 @@
|
|||||||
|
// mavend/tick_digest.go — the digest queue.
|
||||||
|
//
|
||||||
|
// Split out of tick.go, move-only (Vikunja #422). A nudge below the severity
|
||||||
|
// ceiling is held here instead of spoken, flushed as one batch on the window,
|
||||||
|
// and drained by hand when he asks. Everything about batching lives here.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"log"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/delivery"
|
||||||
|
"github.com/kami/maven/internal/loop"
|
||||||
|
"github.com/kami/maven/internal/store"
|
||||||
|
)
|
||||||
|
|
||||||
|
// shouldQueue — true when digest is enabled and the candidate's severity is
|
||||||
|
// at or below the configured ceiling.
|
||||||
|
func (t *tickLoop) shouldQueue(cand *loop.Candidate) bool {
|
||||||
|
return t.digestCfg != nil && t.digestCfg.Enabled &&
|
||||||
|
cand.Severity <= loop.Severity(t.digestCfg.SeverityCeiling)
|
||||||
|
}
|
||||||
|
|
||||||
|
// queueNudge — phrases the candidate and appends it to the digest queue.
|
||||||
|
// Deduplicates by rule name: if the same rule is already queued, this is a
|
||||||
|
// no-op (the first fire within the window is the one that counts).
|
||||||
|
func (t *tickLoop) queueNudge(ctx context.Context, cand *loop.Candidate, _ loop.State, now time.Time) {
|
||||||
|
for _, q := range t.digestQ {
|
||||||
|
if q.Rule == cand.Rule.Name {
|
||||||
|
return // already queued
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pn, err := t.phraser.PhraseNudge(ctx, *cand)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("tick: phrase nudge %s: %v", cand.Rule.Name, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
t.digestQ = append(t.digestQ, QueuedNudge{
|
||||||
|
Rule: cand.Rule.Name,
|
||||||
|
Severity: int(cand.Severity),
|
||||||
|
Body: pn.Body,
|
||||||
|
Key: cand.Rule.Name,
|
||||||
|
QueuedAt: now,
|
||||||
|
})
|
||||||
|
t.cachePhrase(pn)
|
||||||
|
}
|
||||||
|
|
||||||
|
// maybeFlush — flushes the digest queue if the window has elapsed since the
|
||||||
|
// first item or the queue reached MaxItems.
|
||||||
|
func (t *tickLoop) maybeFlush(ctx context.Context, now time.Time, state loop.State) {
|
||||||
|
if t.digestCfg == nil || !t.digestCfg.Enabled || len(t.digestQ) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
first := t.digestQ[0]
|
||||||
|
if now.Sub(first.QueuedAt) >= time.Duration(t.digestCfg.Window) ||
|
||||||
|
len(t.digestQ) >= t.digestCfg.MaxItems {
|
||||||
|
t.flushDigest(ctx, now, state)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// flushDigest — concatenates queued nudge bodies into a single digest
|
||||||
|
// notification and dispatches it. Clears the queue after a successful send.
|
||||||
|
// The digest uses the max severity among queued items for routing.
|
||||||
|
func (t *tickLoop) flushDigest(ctx context.Context, now time.Time, state loop.State) {
|
||||||
|
if len(t.digestQ) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var b strings.Builder
|
||||||
|
maxSev := 0
|
||||||
|
for i, q := range t.digestQ {
|
||||||
|
if i > 0 {
|
||||||
|
b.WriteString(" · ")
|
||||||
|
}
|
||||||
|
b.WriteString(q.Body)
|
||||||
|
if q.Severity > maxSev {
|
||||||
|
maxSev = q.Severity
|
||||||
|
}
|
||||||
|
}
|
||||||
|
body := b.String()
|
||||||
|
summary := fmt.Sprintf("%d pending notifications", len(t.digestQ))
|
||||||
|
|
||||||
|
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 {
|
||||||
|
// keep the queue — the next tick's maybeFlush re-attempts.
|
||||||
|
log.Printf("tick: dispatch digest: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
t.digestQ = nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,197 @@
|
|||||||
|
// mavend/tick_morning.go — the morning checklist and the day plan.
|
||||||
|
//
|
||||||
|
// Split out of tick.go, move-only (Vikunja #422). One window per configured
|
||||||
|
// routine, nudging once at the end for what is still open, plus the read
|
||||||
|
// surfaces /morning renders.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"log"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/calendar"
|
||||||
|
"github.com/kami/maven/internal/delivery"
|
||||||
|
"github.com/kami/maven/internal/ipc"
|
||||||
|
"github.com/kami/maven/internal/loop"
|
||||||
|
"github.com/kami/maven/internal/morning"
|
||||||
|
"github.com/kami/maven/internal/store"
|
||||||
|
)
|
||||||
|
|
||||||
|
// fireMorningRoutines checks each configured checklist against today's facts
|
||||||
|
// and dispatches a nag listing exactly what's still missing, at most once per
|
||||||
|
// routine per calendar day. Fact reads happen here (not in loop.Gatherer)
|
||||||
|
// because the item↔fact-key mapping is morning-routine-specific, not a rule
|
||||||
|
// concern — pulling it into the shared gather path would leak that mapping
|
||||||
|
// into loop's "rules declare wanted keys" contract. Bodies are literal
|
||||||
|
// operator text (item labels joined), not LLM-phrased, same rationale as
|
||||||
|
// cron routines: deterministic, can't hallucinate a checklist item.
|
||||||
|
func (t *tickLoop) fireMorningRoutines(ctx context.Context, now time.Time, state loop.State) {
|
||||||
|
if len(t.morningRoutines) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
facts := t.gatherMorningFacts(ctx)
|
||||||
|
|
||||||
|
for _, cand := range morning.Due(t.morningRoutines, facts, t.morningLast, now) {
|
||||||
|
body := morningNudgeBody(cand)
|
||||||
|
pn := delivery.PhrasedNudge{
|
||||||
|
Candidate: loop.Candidate{
|
||||||
|
Rule: loop.Rule{Name: "morning:" + cand.Routine.Name, Severity: loop.Severity(cand.Routine.Severity)},
|
||||||
|
Severity: loop.Severity(cand.Routine.Severity),
|
||||||
|
State: state,
|
||||||
|
},
|
||||||
|
Body: body,
|
||||||
|
Summary: body,
|
||||||
|
}
|
||||||
|
if _, err := t.dispatcher.DispatchNudge(ctx, pn, now); err != nil {
|
||||||
|
log.Printf("tick: dispatch morning routine %s: %v", cand.Routine.Name, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// morningNudgeBody words the one message a routine gets per day. Required
|
||||||
|
// items are what she says was not done; optional ones follow, worded as
|
||||||
|
// something he could still do rather than something he owes (Vikunja #473).
|
||||||
|
// Operator text, not phrased by the model, for the same reason it always was:
|
||||||
|
// a checklist item must not be invented.
|
||||||
|
func morningNudgeBody(cand morning.Candidate) string {
|
||||||
|
labels := func(items []morning.Item) string {
|
||||||
|
out := make([]string, len(items))
|
||||||
|
for i, it := range items {
|
||||||
|
out[i] = it.Label
|
||||||
|
}
|
||||||
|
return strings.Join(out, ", ")
|
||||||
|
}
|
||||||
|
body := fmt.Sprintf("%s: не сделано — %s", cand.Routine.Name, labels(morning.Required(cand.Missing)))
|
||||||
|
if opt := morning.OptionalOnly(cand.Missing); len(opt) > 0 {
|
||||||
|
body += fmt.Sprintf(". если будет время — %s", labels(opt))
|
||||||
|
}
|
||||||
|
return body
|
||||||
|
}
|
||||||
|
|
||||||
|
// gatherMorningFacts reads the latest fact for every item's fact_key across
|
||||||
|
// all configured morning routines. Shared by fireMorningRoutines (nudge
|
||||||
|
// decision) and morningStatus (read-only query) so the two paths can never
|
||||||
|
// disagree about what evidence exists.
|
||||||
|
func (t *tickLoop) gatherMorningFacts(ctx context.Context) map[string]store.Fact {
|
||||||
|
keys := make(map[string]struct{})
|
||||||
|
for _, r := range t.morningRoutines {
|
||||||
|
for _, it := range r.Items {
|
||||||
|
keys[it.FactKey] = struct{}{}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
facts := make(map[string]store.Fact, len(keys))
|
||||||
|
for k := range keys {
|
||||||
|
f, err := t.store.LatestFact(ctx, k)
|
||||||
|
if err == nil {
|
||||||
|
facts[k] = f
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if err != store.ErrNoFact {
|
||||||
|
log.Printf("tick: morning: latest fact %s: %v", k, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return facts
|
||||||
|
}
|
||||||
|
|
||||||
|
// morningStatus is the read-only "what's missing" query the web UI (and
|
||||||
|
// eventually a voice query) calls. Pure recompute over the current facts —
|
||||||
|
// no dedupe/nudge-time gating, unlike fireMorningRoutines: this answers
|
||||||
|
// "state right now," not "should we nag."
|
||||||
|
func (t *tickLoop) morningStatus(ctx context.Context, now time.Time) []ipc.MorningRoutineStatus {
|
||||||
|
if len(t.morningRoutines) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
facts := t.gatherMorningFacts(ctx)
|
||||||
|
out := make([]ipc.MorningRoutineStatus, 0, len(t.morningRoutines))
|
||||||
|
for _, r := range t.morningRoutines {
|
||||||
|
st := morning.Evaluate(r, facts, now)
|
||||||
|
done := make(map[string]bool, len(st.Completed))
|
||||||
|
for _, it := range st.Completed {
|
||||||
|
done[it.Key] = true
|
||||||
|
}
|
||||||
|
items := make([]ipc.MorningRoutineItem, len(r.Items))
|
||||||
|
for i, it := range r.Items {
|
||||||
|
items[i] = ipc.MorningRoutineItem{Key: it.Key, Label: it.Label, Done: done[it.Key]}
|
||||||
|
}
|
||||||
|
out = append(out, ipc.MorningRoutineStatus{
|
||||||
|
Name: r.Name,
|
||||||
|
Active: st.Active,
|
||||||
|
WindowStart: r.WindowStart,
|
||||||
|
WindowEnd: r.WindowEnd,
|
||||||
|
Items: items,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
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,
|
||||||
|
// The plan prints the hour itself, so the "@ 14:00-14:30" tail the
|
||||||
|
// fact value carries would say it twice.
|
||||||
|
Text: calendar.FactSummary(f.Value),
|
||||||
|
Kind: morning.PlanEvent,
|
||||||
|
// Provenance below a calendar read (an ambient relay, #126) is
|
||||||
|
// hedged rather than recited as fact.
|
||||||
|
Uncertain: f.Confidence < 1.0,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
var reminders []morning.PlanEntry
|
||||||
|
rems, err := t.store.PendingReminders(ctx, dayStart, dayEnd)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("tick: day plan: pending reminders: %v", err)
|
||||||
|
}
|
||||||
|
for _, r := range rems {
|
||||||
|
if r.Status != store.ReminderPending {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
fire := r.NextFireTs
|
||||||
|
if fire.IsZero() {
|
||||||
|
fire = r.FireTs
|
||||||
|
}
|
||||||
|
reminders = append(reminders, morning.PlanEntry{
|
||||||
|
At: fire,
|
||||||
|
Text: r.Text(),
|
||||||
|
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
|
||||||
|
}
|
||||||
@@ -0,0 +1,234 @@
|
|||||||
|
// mavend/tick_routines.go — pattern detection and the routines that fire.
|
||||||
|
//
|
||||||
|
// Split out of tick.go, move-only (Vikunja #422). Configured routines, the
|
||||||
|
// routines he accepted on /routines, and the tick-side detector that proposes
|
||||||
|
// new ones.
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"log"
|
||||||
|
"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/routine"
|
||||||
|
)
|
||||||
|
|
||||||
|
// 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.
|
||||||
|
// Nor are they queued: the row now exists, so no later tick re-detects
|
||||||
|
// them and they are never announced. See announceProposal.
|
||||||
|
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.
|
||||||
|
//
|
||||||
|
// What the cooldown is and is not. detectAndPropose returns non-nil only for a
|
||||||
|
// newly created row, so a pair gets exactly one chance to be spoken: the tick
|
||||||
|
// that first proposes it. Combined with one announcement per tick, the first
|
||||||
|
// tick over a populated history announces one pattern and permanently silences
|
||||||
|
// every other pattern found in the same pass. That is the intent, not an
|
||||||
|
// oversight — an inferred routine is not worth a second attempt at his
|
||||||
|
// attention, and /routines lists all of them. So the cooldown does not drain a
|
||||||
|
// backlog. It only spaces announcements of genuinely new pairs discovered on
|
||||||
|
// later ticks. If it should ever become "one per day until each is mentioned",
|
||||||
|
// that needs a queue rather than this counter.
|
||||||
|
//
|
||||||
|
// Cooldown gets its default here as well as in applyDefaults. That is
|
||||||
|
// deliberate: a tickLoop assembled directly in a test never goes through Load,
|
||||||
|
// and an unspaced announcer is not what those tests mean to exercise.
|
||||||
|
//
|
||||||
|
// 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
|
||||||
|
}
|
||||||
|
|
||||||
|
// routinesFromConfig maps the config's routine blocks to the engine type.
|
||||||
|
// Validation (cron parses, name/body present, severity defaulted) already ran
|
||||||
|
// in config.Load, so this is a pure field copy.
|
||||||
|
func routinesFromConfig(rc []config.RoutineConfig) []routine.Routine {
|
||||||
|
if len(rc) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
out := make([]routine.Routine, len(rc))
|
||||||
|
for i, r := range rc {
|
||||||
|
out[i] = routine.Routine{Name: r.Name, Cron: r.Cron, Body: r.Body, Severity: r.Severity}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// fireRoutines dispatches the routines whose cron schedule crossed since their
|
||||||
|
// last fire. Each is delivered as a nudge through the normal routing table
|
||||||
|
// (ChannelsFor(severity, presence)) with a "routine:"-prefixed rule name so it
|
||||||
|
// can't collide with a care rule in the feedback autotuner. A dispatch failure
|
||||||
|
// logs and continues — one bad send must not skip the rest, and routine.Due has
|
||||||
|
// already advanced the last-fire time so a transient failure drops that fire
|
||||||
|
// rather than replaying it every tick (a routine is clockwork, not an alarm —
|
||||||
|
// no repeat-til-ack).
|
||||||
|
func (t *tickLoop) fireRoutines(ctx context.Context, now time.Time, state loop.State) {
|
||||||
|
for _, r := range routine.Due(t.routines, t.routineLast, now) {
|
||||||
|
pn := delivery.PhrasedNudge{
|
||||||
|
Candidate: loop.Candidate{
|
||||||
|
Rule: loop.Rule{Name: "routine:" + r.Name, Severity: loop.Severity(r.Severity)},
|
||||||
|
Severity: loop.Severity(r.Severity),
|
||||||
|
State: state,
|
||||||
|
},
|
||||||
|
Body: r.Body,
|
||||||
|
Summary: r.Body,
|
||||||
|
}
|
||||||
|
if _, err := t.dispatcher.DispatchNudge(ctx, pn, now); err != nil {
|
||||||
|
log.Printf("tick: dispatch routine %s: %v", r.Name, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// fireAcceptedRoutines nudges about the routines the user accepted, once per
|
||||||
|
// interval (Vikunja #366). Accepting used to create a single reminder, so a
|
||||||
|
// non-weekly routine fired once and went quiet forever; the schedule lives in
|
||||||
|
// the proposed_routines row now and the loop re-reads it every tick.
|
||||||
|
//
|
||||||
|
// A routine is a care-class nudge and goes through the restraint gate like any
|
||||||
|
// other: quiet hours, away presence and snooze all suppress it. Reminders bypass
|
||||||
|
// that gate; routines must not. A suppressed nudge is NOT marked fired, so it
|
||||||
|
// goes out on the next tick that the gate allows — one nudge, held, not dropped
|
||||||
|
// and not repeated.
|
||||||
|
//
|
||||||
|
// The body is literal text built from the detected action and object, not
|
||||||
|
// LLM-phrased, so a routine can't hallucinate. It nudges; it never acts.
|
||||||
|
func (t *tickLoop) fireAcceptedRoutines(ctx context.Context, now time.Time, state loop.State) {
|
||||||
|
rows, err := t.store.ListAcceptedRoutines(ctx)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("tick: list accepted routines: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
accepted := make([]routine.Accepted, 0, len(rows))
|
||||||
|
for _, r := range rows {
|
||||||
|
if r.AcceptedTs == nil {
|
||||||
|
continue // accepted before the schedule column existed — no clock to start from.
|
||||||
|
}
|
||||||
|
accepted = append(accepted, routine.Accepted{
|
||||||
|
ID: r.ID,
|
||||||
|
Name: r.Action + " " + r.Object,
|
||||||
|
IntervalDays: r.IntervalDays,
|
||||||
|
Accepted: *r.AcceptedTs,
|
||||||
|
LastFired: r.LastFiredTs,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, a := range routine.DueAccepted(accepted, now) {
|
||||||
|
rule := loop.Rule{Name: "routine:" + a.Name, Severity: loop.Sev1}
|
||||||
|
if !loop.Gate(state, rule) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
body := "пора: " + a.Name
|
||||||
|
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: dispatch accepted routine %d: %v", a.ID, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if len(sent) == 0 {
|
||||||
|
continue // routing dropped it — leave it due.
|
||||||
|
}
|
||||||
|
if err := t.store.MarkRoutineFired(ctx, a.ID, now); err != nil {
|
||||||
|
log.Printf("tick: mark routine %d fired: %v", a.ID, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -584,7 +584,7 @@ func TestDigestSev4BypassesQueue(t *testing.T) {
|
|||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
now := refNow()
|
now := refNow()
|
||||||
markPresent(t, st, ctx, now)
|
markPresent(t, st, ctx, now)
|
||||||
if _, err := st.SetValue(ctx, store.KindSelf, "service_down", "poll:uptimekuma", "down", now); err != nil {
|
if _, err := st.SetValue(ctx, store.KindSelf, "service_down:db", "poll:uptimekuma", "down", now); err != nil {
|
||||||
t.Fatalf("seed service_down: %v", err)
|
t.Fatalf("seed service_down: %v", err)
|
||||||
}
|
}
|
||||||
sink := &fakeSink{}
|
sink := &fakeSink{}
|
||||||
|
|||||||
+7
-4
@@ -220,9 +220,9 @@ func (h *reactiveHandler) upgradeAPI(api ipc.CoreAPI) {
|
|||||||
// handleText — the core reactive path without stt/tts. Used by the IPC Chat
|
// handleText — the core reactive path without stt/tts. Used by the IPC Chat
|
||||||
// endpoint (and eventually by telegram). Splits out the audio bookends from
|
// endpoint (and eventually by telegram). Splits out the audio bookends from
|
||||||
// HandlePushToTalk so text channels share the same routing logic.
|
// HandlePushToTalk so text channels share the same routing logic.
|
||||||
func (h *reactiveHandler) handleText(ctx context.Context, text string) string {
|
func (h *reactiveHandler) handleText(ctx context.Context, conversation, text string) string {
|
||||||
log.Printf("voice: handleText: %q", text)
|
log.Printf("voice: handleText: %q", text)
|
||||||
return h.runTurn(ctx, text, sourceText)
|
return h.runTurn(withDialogueID(ctx, dialogueIDFor(sourceText, conversation)), text, sourceText)
|
||||||
}
|
}
|
||||||
|
|
||||||
// turnSource — which channel this utterance arrived on, in the same provenance
|
// turnSource — which channel this utterance arrived on, in the same provenance
|
||||||
@@ -255,7 +255,7 @@ func (h *reactiveHandler) runTurn(ctx context.Context, text string, src turnSour
|
|||||||
// early. He can be asked a question, walk off, come back and say "да" to a
|
// early. He can be asked a question, walk off, come back and say "да" to a
|
||||||
// confirm that is still parked; computing the notice after that return meant
|
// confirm that is still parked; computing the notice after that return meant
|
||||||
// he answered the confirm and never heard that the older request was let go.
|
// he answered the confirm and never heard that the older request was let go.
|
||||||
expiredNotice := h.clarifyExpiredNotice()
|
expiredNotice := h.clarifyExpiredNotice(ctx)
|
||||||
|
|
||||||
// 2. confirm turn — if a destructive act is parked, this utterance is its
|
// 2. confirm turn — if a destructive act is parked, this utterance is its
|
||||||
// y/n answer, not a fresh command. Handled before routing so "да" doesn't
|
// y/n answer, not a fresh command. Handled before routing so "да" doesn't
|
||||||
@@ -351,7 +351,10 @@ func (h *reactiveHandler) runTurn(ctx context.Context, text string, src turnSour
|
|||||||
// and park the request (clarify.go); otherwise the replier's canned reply
|
// and park the request (clarify.go); otherwise the replier's canned reply
|
||||||
// stands.
|
// stands.
|
||||||
if dec.Clarify {
|
if dec.Clarify {
|
||||||
if question, asked := h.askClarify(dec); asked {
|
if reply := h.hexisBeforeClarify(ctx, dec); reply != "" {
|
||||||
|
return withNotice(expiredNotice, reply)
|
||||||
|
}
|
||||||
|
if question, asked := h.askClarify(ctx, dec); asked {
|
||||||
return withNotice(expiredNotice, question)
|
return withNotice(expiredNotice, question)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+37
-6
@@ -238,7 +238,10 @@ func wireVoice(cfg *config.Config, coreAPI ipc.CoreAPI, phr phraser.Phraser, mem
|
|||||||
// ----- dialogue (multi-turn slot carry-over; 2-min follow-up window) -----
|
// ----- dialogue (multi-turn slot carry-over; 2-min follow-up window) -----
|
||||||
// Store-backed when the daemon passes a store, so a restart mid-conversation
|
// 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
|
// keeps the thread (Vikunja #363). Sessions past their TTL are dropped on
|
||||||
// load, never revived. Clarify's parked question stays in memory only.
|
// load, never revived. Clarify's parked question stays in memory only, and
|
||||||
|
// that is a decision rather than an omission (Vikunja #385, docs/design.md):
|
||||||
|
// a restart expires it, so the thread comes back and the open question does
|
||||||
|
// not.
|
||||||
var dialogueSessions *dialogue.SessionStore
|
var dialogueSessions *dialogue.SessionStore
|
||||||
if dataStore != nil {
|
if dataStore != nil {
|
||||||
dialogueSessions = dialogue.NewPersistentSessionStore(2*time.Minute, dataStore)
|
dialogueSessions = dialogue.NewPersistentSessionStore(2*time.Minute, dataStore)
|
||||||
@@ -380,6 +383,11 @@ func buildRouter(emb router.Embedder, acts router.ActMatcher, threshold float64,
|
|||||||
// is an agenda question and must not.
|
// is an agenda question and must not.
|
||||||
grammars = append(grammars, router.AgendaQueryGrammars()...)
|
grammars = append(grammars, router.AgendaQueryGrammars()...)
|
||||||
grammars = append(grammars, router.ReminderGrammar())
|
grammars = append(grammars, router.ReminderGrammar())
|
||||||
|
// Last, and it matches any utterance shape — its Build is the filter. An
|
||||||
|
// explicit capture marker beats the model, which called it an act and
|
||||||
|
// rewrote the task text (Vikunja #467). After the rules above because a
|
||||||
|
// marker never collides with a clock or agenda question.
|
||||||
|
grammars = append(grammars, router.TaskCaptureGrammar())
|
||||||
return router.New(router.Config{
|
return router.New(router.Config{
|
||||||
Grammars: grammars,
|
Grammars: grammars,
|
||||||
Classifier: cls,
|
Classifier: cls,
|
||||||
@@ -393,11 +401,34 @@ func buildRouter(emb router.Embedder, acts router.ActMatcher, threshold float64,
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// seedDir is the directory containing intent seed files. Each file is named
|
// seedDir is the directory containing intent seed files, relative to the repo
|
||||||
// <intent>.txt and contains one training example per line (blank lines and
|
// root. Each file is named <intent>.txt and holds one training example per
|
||||||
// lines starting with # are ignored). Relative to the working directory.
|
// line (blank lines and lines starting with # are ignored).
|
||||||
const seedDir = "models/seeds"
|
const seedDir = "models/seeds"
|
||||||
|
|
||||||
|
// seedPath resolves seedDir against the working directory, walking up until it
|
||||||
|
// finds it. The daemon runs from the repo root and the first candidate hits.
|
||||||
|
//
|
||||||
|
// A test does not: `go test ./cmd/mavend/` runs with the working directory at
|
||||||
|
// cmd/mavend, so every open failed and the simulator scenarios replayed a whole
|
||||||
|
// scripted day against a classifier holding zero examples (Vikunja #465). They
|
||||||
|
// passed, which is the part that matters — a green simulator was not exercising
|
||||||
|
// the routing the deploy runs, and a regression in the seed set could not have
|
||||||
|
// shown up there.
|
||||||
|
//
|
||||||
|
// Bounded at five levels, so a daemon started somewhere without the seeds logs
|
||||||
|
// the same failure it always did rather than walking to the filesystem root.
|
||||||
|
func seedPath() string {
|
||||||
|
dir := seedDir
|
||||||
|
for i := 0; i < 5; i++ {
|
||||||
|
if st, err := os.Stat(dir); err == nil && st.IsDir() {
|
||||||
|
return dir
|
||||||
|
}
|
||||||
|
dir = filepath.Join("..", dir)
|
||||||
|
}
|
||||||
|
return seedDir
|
||||||
|
}
|
||||||
|
|
||||||
// seedClassifier floors the embedded examples so the cold-boot path
|
// seedClassifier floors the embedded examples so the cold-boot path
|
||||||
// doesn't return ErrNoIntents. Loads examples from seedDir — one file per
|
// doesn't return ErrNoIntents. Loads examples from seedDir — one file per
|
||||||
// intent (act.txt, reminder.txt, fact.txt, note.txt, query.txt). When the
|
// intent (act.txt, reminder.txt, fact.txt, note.txt, query.txt). When the
|
||||||
@@ -422,11 +453,11 @@ func seedClassifier(c *router.Classifier) {
|
|||||||
}
|
}
|
||||||
total += n
|
total += n
|
||||||
}
|
}
|
||||||
log.Printf("voice: loaded %d seed examples from %s", total, seedDir)
|
log.Printf("voice: loaded %d seed examples from %s", total, seedPath())
|
||||||
}
|
}
|
||||||
|
|
||||||
func loadSeedFile(c *router.Classifier, intent router.Intent) (int, error) {
|
func loadSeedFile(c *router.Classifier, intent router.Intent) (int, error) {
|
||||||
path := filepath.Join(seedDir, string(intent)+".txt")
|
path := filepath.Join(seedPath(), string(intent)+".txt")
|
||||||
f, err := os.Open(path)
|
f, err := os.Open(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, fmt.Errorf("open %s: %w", path, err)
|
return 0, fmt.Errorf("open %s: %w", path, err)
|
||||||
|
|||||||
+45
-33
@@ -1,10 +1,13 @@
|
|||||||
// Package main — weatherq.go holds the weather-query keyword helpers: does
|
// 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
|
// this utterance ask about weather at all, and which place (if any) did he
|
||||||
// name. Both are plain substring/lookup matching, not NLU — extend this file
|
// name. Both are plain keyword matching, not NLU — extend this file rather
|
||||||
// rather than voice.go for anything in that shape.
|
// than voice.go for anything in that shape.
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import "strings"
|
import (
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
// isWeatherQuery returns true if the utterance is about weather.
|
// isWeatherQuery returns true if the utterance is about weather.
|
||||||
func isWeatherQuery(u string) bool {
|
func isWeatherQuery(u string) bool {
|
||||||
@@ -19,40 +22,49 @@ func isWeatherQuery(u string) bool {
|
|||||||
strings.Contains(lower, "temperature")
|
strings.Contains(lower, "temperature")
|
||||||
}
|
}
|
||||||
|
|
||||||
// weatherCities — the city names an utterance may name explicitly, as
|
// weatherPlace — the place he named, after "в"/"во"/"in". One or two words,
|
||||||
// lowercase substrings mapped to the provider's spelling. This is a
|
// letters and dashes only, so "в Нижнем Новгороде" and "in New York" both
|
||||||
// convenience for "какая погода в Лондоне", NOT a source of default truth:
|
// come through whole and "в 5 утра" does not.
|
||||||
// nothing here is used unless he actually said it.
|
var weatherPlace = regexp.MustCompile(`(?i)(?:^|\s)(?:в|во|in)\s+([\p{L}-]+(?:\s+[\p{L}-]+)?)`)
|
||||||
var weatherCities = map[string]string{
|
|
||||||
"москв": "Moscow",
|
// weatherNonPlaces — words that follow "в" in a weather question and are not
|
||||||
"moscow": "Moscow",
|
// cities. "какая погода в доме" is the smart-home sensor, not Open-Meteo, and
|
||||||
"питер": "Saint Petersburg",
|
// "тепло в комнате" is the same question about the same room.
|
||||||
"spb": "Saint Petersburg",
|
var weatherNonPlaces = map[string]bool{
|
||||||
"петербур": "Saint Petersburg",
|
"доме": true, "квартире": true, "комнате": true, "спальне": true,
|
||||||
"лондон": "London",
|
"гостиной": true, "кухне": true, "гараже": true, "офисе": true,
|
||||||
"london": "London",
|
"выходные": true, "субботу": true, "воскресенье": true, "понедельник": true,
|
||||||
"париж": "Paris",
|
"вторник": true, "среду": true, "четверг": true, "пятницу": true,
|
||||||
"paris": "Paris",
|
"обед": true, "обеде": true, "утро": true, "утром": true, "вечер": true,
|
||||||
"берлин": "Berlin",
|
"вечером": true, "ночь": true, "ночью": true, "целом": true, "принципе": true,
|
||||||
"berlin": "Berlin",
|
|
||||||
"нью-йорк": "New York",
|
|
||||||
"new york": "New York",
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// extractWeatherLocation returns the city he named, or the configured default
|
// extractWeatherLocation returns the place he named, or the configured default
|
||||||
// when he named none. It returns "" when he named none AND no default is
|
// when he named none. It returns "" when he named none AND no default is
|
||||||
// configured — the caller must then say it does not know.
|
// configured — the caller must then say it does not know.
|
||||||
//
|
//
|
||||||
// It used to return "Moscow" in that case. That is a made-up answer presented
|
// It used to be a hand-written table of six cities in two spellings each
|
||||||
// as fact: reading out Moscow's temperature to someone who is not in Moscow is
|
// (Vikunja #421). Anything outside it — Kazan, Tbilisi — was dropped silently
|
||||||
// wrong in exactly the way maven must never be wrong. voice.weather
|
// and answered for the default location, which reads as a correct answer about
|
||||||
// .default_location is the only source of an unstated location.
|
// the wrong place. There is a geocoder behind this now: internal/weather
|
||||||
|
// already calls Open-Meteo's geocoding endpoint for every lookup, so any place
|
||||||
|
// it knows is a place he can ask about, and the table bought nothing.
|
||||||
|
//
|
||||||
|
// A named place that the geocoder cannot resolve is the caller's problem to
|
||||||
|
// report, not this function's to hide.
|
||||||
|
//
|
||||||
|
// It used to return "Moscow" when he named nothing. That is a made-up answer
|
||||||
|
// presented as fact. voice.weather.default_location is the only source of an
|
||||||
|
// unstated location.
|
||||||
func extractWeatherLocation(u, defaultLoc string) string {
|
func extractWeatherLocation(u, defaultLoc string) string {
|
||||||
lower := strings.ToLower(u)
|
m := weatherPlace.FindStringSubmatch(u)
|
||||||
for substr, name := range weatherCities {
|
if m == nil {
|
||||||
if strings.Contains(lower, substr) {
|
return defaultLoc
|
||||||
return name
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return defaultLoc
|
place := strings.TrimSpace(m[1])
|
||||||
|
first := strings.ToLower(strings.Fields(place)[0])
|
||||||
|
if weatherNonPlaces[first] {
|
||||||
|
return defaultLoc
|
||||||
|
}
|
||||||
|
return place
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
// TestExtractWeatherLocation — any place he names comes through, not just the
|
||||||
|
// six that used to be in a table (Vikunja #421).
|
||||||
|
func TestExtractWeatherLocation(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
utterance string
|
||||||
|
def string
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
// The cities the table had, and the ones it silently dropped.
|
||||||
|
{"какая погода в Москве", "Berlin", "Москве"},
|
||||||
|
{"какая погода в Казани", "Berlin", "Казани"},
|
||||||
|
{"погода в Тбилиси?", "Berlin", "Тбилиси"},
|
||||||
|
{"what's the weather in New York", "Berlin", "New York"},
|
||||||
|
{"тепло в Нижнем Новгороде?", "Berlin", "Нижнем Новгороде"},
|
||||||
|
// He named nothing: the configured default, and nothing at all when
|
||||||
|
// there is no default.
|
||||||
|
{"какая сегодня погода", "Berlin", "Berlin"},
|
||||||
|
{"какая сегодня погода", "", ""},
|
||||||
|
// "в" followed by something that is not a place stays the default —
|
||||||
|
// the house sensors and the day words answer elsewhere.
|
||||||
|
{"тепло в комнате?", "Berlin", "Berlin"},
|
||||||
|
{"какая погода в выходные", "Berlin", "Berlin"},
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
if got := extractWeatherLocation(c.utterance, c.def); got != c.want {
|
||||||
|
t.Errorf("extractWeatherLocation(%q, %q) = %q, want %q", c.utterance, c.def, got, c.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+71
-21
@@ -140,6 +140,10 @@ type poller struct {
|
|||||||
wgIface string
|
wgIface string
|
||||||
wgCmd string
|
wgCmd string
|
||||||
|
|
||||||
|
// kumaSeen — monitor name → state as of the last poll, so a monitor that
|
||||||
|
// disappears from the gauge can be marked unknown instead of staying down.
|
||||||
|
kumaSeen map[string]string
|
||||||
|
|
||||||
// zen is nil unless a token file was configured — money tracking is a
|
// zen is nil unless a token file was configured — money tracking is a
|
||||||
// capability, off by default like weather and telegram.
|
// capability, off by default like weather and telegram.
|
||||||
zen *zenmoney.Client
|
zen *zenmoney.Client
|
||||||
@@ -333,50 +337,96 @@ func maxSeverity(a netdataAlarms) string {
|
|||||||
return sev
|
return sev
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---- kuma: monitor_status gauge → aggregate service_down -------------------
|
// ---- kuma: monitor_status gauge → one fact per monitor ---------------------
|
||||||
|
|
||||||
// Kuma exposes Prometheus text: `monitor_status{...,monitor_name="X"} V` where
|
// Kuma exposes Prometheus text: `monitor_status{...,monitor_name="X"} V` where
|
||||||
// V is 1=up 0=down 2=pending 3=maintenance. We reduce to one aggregate the
|
// V is 1=up 0=down 2=pending 3=maintenance. We write one fact per monitor,
|
||||||
// existing ServiceDownRule consumes: "down" if ANY monitor reads 0, else "up".
|
// keyed `service_down:<monitor name>`, because the nudge has to say WHICH
|
||||||
// Per-service granularity is a later add (a fact per monitor) — the MVP nudge
|
// service is down. The aggregate this used to write could not, which is why
|
||||||
// only needs "something is down".
|
// the rule shipped disabled.
|
||||||
var kumaLine = regexp.MustCompile(`^monitor_status\{([^}]*)\}\s+([0-9.eE+-]+)`)
|
var (
|
||||||
|
kumaLine = regexp.MustCompile(`^monitor_status\{([^}]*)\}\s+([0-9.eE+-]+)`)
|
||||||
|
kumaName = regexp.MustCompile(`monitor_name="([^"]*)"`)
|
||||||
|
)
|
||||||
|
|
||||||
func (p *poller) pollKuma(ctx context.Context, now time.Time) error {
|
func (p *poller) pollKuma(ctx context.Context, now time.Time) error {
|
||||||
body, err := p.get(ctx, p.kumaURL, p.kumaKey)
|
body, err := p.get(ctx, p.kumaURL, p.kumaKey)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
down, seen := kumaAnyDown(body)
|
states := kumaMonitors(body)
|
||||||
if !seen {
|
if len(states) == 0 {
|
||||||
return fmt.Errorf("no monitor_status metrics (auth/endpoint wrong?)")
|
return fmt.Errorf("no monitor_status metrics (auth/endpoint wrong?)")
|
||||||
}
|
}
|
||||||
val := "up"
|
var firstErr error
|
||||||
if down {
|
for name, val := range states {
|
||||||
val = "down"
|
if err := p.writeIfChanged(ctx, kumaFactKey(name), kumaSource, val, now); err != nil && firstErr == nil {
|
||||||
|
firstErr = err // one bad monitor must not blind the rest
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return p.writeIfChanged(ctx, "service_down", "poll:uptimekuma", val, now)
|
// A monitor deleted in kuma stops appearing in the gauge, and its last fact
|
||||||
|
// would otherwise read "down" forever. Mark it unknown, which no rule fires
|
||||||
|
// on. The seen-set is in memory, so a restart forgets it — harmless, since
|
||||||
|
// the next poll that still lacks the monitor says nothing new either.
|
||||||
|
for name := range p.kumaSeen {
|
||||||
|
if _, still := states[name]; !still {
|
||||||
|
if err := p.writeIfChanged(ctx, kumaFactKey(name), kumaSource, "unknown", now); err != nil && firstErr == nil {
|
||||||
|
firstErr = err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
p.kumaSeen = states
|
||||||
|
return firstErr
|
||||||
}
|
}
|
||||||
|
|
||||||
// kumaAnyDown parses kuma's Prometheus text: down=true if any monitor reads 0
|
// kumaSource — the provenance the loop rule requires. Written here, checked in
|
||||||
// (pending=2/maintenance=3 are not "down"). seen=false ⇒ no monitor_status
|
// loop.ServiceDownRule; a poller under any other source cannot fire it.
|
||||||
// lines matched at all (wrong endpoint or auth rejected before the body).
|
const kumaSource = "poll:uptimekuma"
|
||||||
func kumaAnyDown(body []byte) (down, seen bool) {
|
|
||||||
|
// kumaFactKey — the fact key for one monitor. The suffix is the name he hears,
|
||||||
|
// so it stays as kuma spells it rather than being slugged into something else.
|
||||||
|
func kumaFactKey(name string) string { return "service_down:" + name }
|
||||||
|
|
||||||
|
// kumaMonitors parses kuma's Prometheus text into monitor name → state
|
||||||
|
// ("up"/"down"/"pending"/"maintenance"). An empty map means no monitor_status
|
||||||
|
// line matched at all (wrong endpoint, or auth rejected before the body).
|
||||||
|
// A line with no monitor_name label is skipped: a fact nobody can name is
|
||||||
|
// exactly the thing this replaced.
|
||||||
|
func kumaMonitors(body []byte) map[string]string {
|
||||||
|
out := make(map[string]string)
|
||||||
for _, line := range strings.Split(string(body), "\n") {
|
for _, line := range strings.Split(string(body), "\n") {
|
||||||
m := kumaLine.FindStringSubmatch(strings.TrimSpace(line))
|
m := kumaLine.FindStringSubmatch(strings.TrimSpace(line))
|
||||||
if m == nil {
|
if m == nil {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
seen = true
|
nm := kumaName.FindStringSubmatch(m[1])
|
||||||
|
if nm == nil || strings.TrimSpace(nm[1]) == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
v, err := strconv.ParseFloat(m[2], 64)
|
v, err := strconv.ParseFloat(m[2], 64)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if v == 0 {
|
out[strings.TrimSpace(nm[1])] = kumaState(v)
|
||||||
down = true
|
}
|
||||||
}
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// kumaState — the gauge's four values. pending and maintenance are not "down":
|
||||||
|
// a monitor paused in kuma should silence that monitor, not page him.
|
||||||
|
func kumaState(v float64) string {
|
||||||
|
switch v {
|
||||||
|
case 0:
|
||||||
|
return "down"
|
||||||
|
case 1:
|
||||||
|
return "up"
|
||||||
|
case 2:
|
||||||
|
return "pending"
|
||||||
|
case 3:
|
||||||
|
return "maintenance"
|
||||||
|
default:
|
||||||
|
return "unknown"
|
||||||
}
|
}
|
||||||
return down, seen
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---- helpers ---------------------------------------------------------------
|
// ---- helpers ---------------------------------------------------------------
|
||||||
|
|||||||
+36
-12
@@ -35,22 +35,46 @@ func TestMaxSeverity(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestKumaAnyDown(t *testing.T) {
|
func TestKumaMonitorsNamesEveryOne(t *testing.T) {
|
||||||
cases := []struct {
|
cases := []struct {
|
||||||
body string
|
name string
|
||||||
down, seen bool
|
body string
|
||||||
|
want map[string]string
|
||||||
}{
|
}{
|
||||||
{"", false, false},
|
{"empty body", "", map[string]string{}},
|
||||||
{`monitor_status{monitor_name="web"} 1`, false, true},
|
{"help line only", `# HELP monitor_status ...`, map[string]string{}},
|
||||||
{`monitor_status{monitor_name="web"} 1` + "\n" + `monitor_status{monitor_name="db"} 0`, true, true},
|
{
|
||||||
{`monitor_status{monitor_name="mnt"} 3`, false, true}, // maintenance ≠ down
|
"one up one down",
|
||||||
{`# HELP monitor_status ...`, false, false},
|
`monitor_status{monitor_name="web"} 1` + "\n" + `monitor_status{monitor_name="db"} 0`,
|
||||||
|
map[string]string{"web": "up", "db": "down"},
|
||||||
|
},
|
||||||
|
{"maintenance is not down", `monitor_status{monitor_name="mnt"} 3`, map[string]string{"mnt": "maintenance"}},
|
||||||
|
{"pending is not down", `monitor_status{monitor_name="p"} 2`, map[string]string{"p": "pending"}},
|
||||||
|
{
|
||||||
|
"other labels do not hide the name",
|
||||||
|
`monitor_status{monitor_type="http",monitor_name="ci",monitor_url="x"} 0`,
|
||||||
|
map[string]string{"ci": "down"},
|
||||||
|
},
|
||||||
|
{"a nameless line is skipped", `monitor_status{monitor_type="http"} 0`, map[string]string{}},
|
||||||
}
|
}
|
||||||
for _, c := range cases {
|
for _, c := range cases {
|
||||||
down, seen := kumaAnyDown([]byte(c.body))
|
t.Run(c.name, func(t *testing.T) {
|
||||||
if down != c.down || seen != c.seen {
|
got := kumaMonitors([]byte(c.body))
|
||||||
t.Errorf("kumaAnyDown(%q) = (%v,%v), want (%v,%v)", c.body, down, seen, c.down, c.seen)
|
if len(got) != len(c.want) {
|
||||||
}
|
t.Fatalf("kumaMonitors = %v, want %v", got, c.want)
|
||||||
|
}
|
||||||
|
for k, v := range c.want {
|
||||||
|
if got[k] != v {
|
||||||
|
t.Errorf("monitor %q = %q, want %q", k, got[k], v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestKumaFactKeyCarriesTheName(t *testing.T) {
|
||||||
|
if got := kumaFactKey("nexus db"); got != "service_down:nexus db" {
|
||||||
|
t.Errorf("kumaFactKey = %q", got)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -139,7 +139,10 @@ func TestHandleAmbientIgnoresNonMeetings(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestHandleAmbientAuth(t *testing.T) {
|
func TestHandleAmbientAuth(t *testing.T) {
|
||||||
body := `{"title":"Планёрка 10:00","posted_at":"2026-08-03T09:40:00Z"}`
|
// "завтра" so the meeting is in the future in every zone: the clock in the
|
||||||
|
// text is a local wall clock and posted_at is a Z instant, so a bare "10:00"
|
||||||
|
// is already stale on a box east of UTC and stores nothing.
|
||||||
|
body := `{"title":"Планёрка завтра 10:00","posted_at":"2026-08-03T09:40:00Z"}`
|
||||||
|
|
||||||
newReq := func(hdr, val string) *http.Request {
|
newReq := func(hdr, val string) *http.Request {
|
||||||
r := httptest.NewRequest(http.MethodPost, "/api/ambient", strings.NewReader(body))
|
r := httptest.NewRequest(http.MethodPost, "/api/ambient", strings.NewReader(body))
|
||||||
@@ -245,3 +248,31 @@ func TestHandleAmbientBadInput(t *testing.T) {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The Z-instant defect end to end: a phone posts an RFC 3339 instant in UTC and
|
||||||
|
// the clock inside the text is his wall clock. On a UTC+4 box a 14:30 standup
|
||||||
|
// used to be stored at 18:30, and the size of the error was the deploy's offset.
|
||||||
|
func TestHandleAmbientStoresTheWallClockHeRead(t *testing.T) {
|
||||||
|
// No zone juggling: the assertion is that the stored wall clock is the one
|
||||||
|
// he read, whatever zone the box is in. That is false under the old code
|
||||||
|
// on every box except a UTC one.
|
||||||
|
core := &ambientCore{}
|
||||||
|
rr, resp := postAmbient(t, core, ambientTestToken, calendar.Notification{
|
||||||
|
Package: "com.slack",
|
||||||
|
Title: "Standup",
|
||||||
|
Text: "созвон завтра в 14:30",
|
||||||
|
Posted: time.Date(2026, 8, 2, 9, 0, 0, 0, time.UTC),
|
||||||
|
})
|
||||||
|
if rr.Code != http.StatusCreated {
|
||||||
|
t.Fatalf("status = %d, want 201: %s", rr.Code, rr.Body)
|
||||||
|
}
|
||||||
|
if !strings.HasSuffix(resp.Key, "_Standup") {
|
||||||
|
t.Errorf("key = %q, want a key naming the meeting", resp.Key)
|
||||||
|
}
|
||||||
|
if len(core.writeLog) != 1 {
|
||||||
|
t.Fatalf("expected 1 fact write, got %d", len(core.writeLog))
|
||||||
|
}
|
||||||
|
if got := core.writeLog[0].Value; got != "Standup @ 14:30-15:00" {
|
||||||
|
t.Errorf("value = %q, want %q", got, "Standup @ 14:30-15:00")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
{{template "shellTop" "chat"}}
|
||||||
|
<h1>Chat</h1>
|
||||||
|
<section class=card>
|
||||||
|
{{if .Error}}<div class="msg msg-err">{{.Error}}</div>{{end}}
|
||||||
|
<div class="scroll chat-scroll" id=chatHistory>
|
||||||
|
{{range .Messages}}
|
||||||
|
<div class="chat-msg {{.Role}}"><strong>{{if eq .Role "user"}}you{{else}}maven{{end}}:</strong> {{.Text}}</div>
|
||||||
|
{{else}}
|
||||||
|
<div class=empty>
|
||||||
|
<svg class=icon width="20" height="20"><use href="/ethos-icons.svg#i-message"/></svg>
|
||||||
|
<div>start a conversation</div>
|
||||||
|
</div>
|
||||||
|
{{end}}
|
||||||
|
</div>
|
||||||
|
<form method=post action=/api/chat class=chat-form>
|
||||||
|
<input type=text name=text class=input-wide placeholder="type a message..." required autofocus>
|
||||||
|
<button class=btn>send</button>
|
||||||
|
</form>
|
||||||
|
</section>
|
||||||
|
<script>
|
||||||
|
var ch = document.getElementById('chatHistory');
|
||||||
|
if(ch) ch.scrollTop = ch.scrollHeight;
|
||||||
|
</script>
|
||||||
|
{{template "shellBottom"}}
|
||||||
@@ -54,7 +54,9 @@ type fakeCore struct {
|
|||||||
revertErr error
|
revertErr error
|
||||||
|
|
||||||
// for handleNotifications tests
|
// for handleNotifications tests
|
||||||
nudgesErr error
|
nudgesErr error
|
||||||
|
attempts []ipc.DeliveryAttempt
|
||||||
|
attemptStatus string
|
||||||
|
|
||||||
// for handleHistory tests
|
// for handleHistory tests
|
||||||
historyFacts []ipc.Fact
|
historyFacts []ipc.Fact
|
||||||
@@ -77,7 +79,7 @@ func (f *fakeCore) MCPServers(context.Context) ([]ipc.MCPServerStatus, error) {
|
|||||||
return f.mcpServers, f.mcpErr
|
return f.mcpServers, f.mcpErr
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *fakeCore) Chat(_ context.Context, text string) (string, error) {
|
func (f *fakeCore) Chat(_ context.Context, _, text string) (string, error) {
|
||||||
f.chatText = text
|
f.chatText = text
|
||||||
if f.chatErr != nil {
|
if f.chatErr != nil {
|
||||||
return "", f.chatErr
|
return "", f.chatErr
|
||||||
@@ -1251,3 +1253,35 @@ func TestHandleWS_AssertedSession_PassesGate(t *testing.T) {
|
|||||||
t.Fatalf("status = 403 on an asserted session; body=%s", rr.Body.String())
|
t.Fatalf("status = 403 on an asserted session; body=%s", rr.Body.String())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (f *fakeCore) DeliveryAttempts(_ context.Context, status string, _ int) ([]ipc.DeliveryAttempt, error) {
|
||||||
|
f.attemptStatus = status
|
||||||
|
return f.attempts, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestHandleNotifications_ShowsTheOutbox — the outbox was written and never
|
||||||
|
// read, so a dropped or failed send was invisible (Vikunja #390).
|
||||||
|
func TestHandleNotifications_ShowsTheOutbox(t *testing.T) {
|
||||||
|
done := time.Date(2026, 8, 4, 9, 0, 30, 0, time.UTC)
|
||||||
|
core := &fakeCore{
|
||||||
|
attempts: []ipc.DeliveryAttempt{
|
||||||
|
{Kind: "nudge", Rule: "care-check", Channel: "telegram", Status: "dropped",
|
||||||
|
Created: done.Add(-30 * time.Second), Completed: &done},
|
||||||
|
{Kind: "reminder", ReminderID: 7, Channel: "voice", Status: "pending", Created: done},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
rr := httptest.NewRecorder()
|
||||||
|
handleNotifications(rr, httptest.NewRequest(http.MethodGet, "/notifications?status=dropped", nil), core)
|
||||||
|
if rr.Code != http.StatusOK {
|
||||||
|
t.Fatalf("status = %d, want 200; body=%s", rr.Code, rr.Body.String())
|
||||||
|
}
|
||||||
|
if core.attemptStatus != "dropped" {
|
||||||
|
t.Errorf("status filter = %q, want it passed through", core.attemptStatus)
|
||||||
|
}
|
||||||
|
body := rr.Body.String()
|
||||||
|
for _, want := range []string{"care-check", "dropped", "reminder #7", "Delivery outbox"} {
|
||||||
|
if !strings.Contains(body, want) {
|
||||||
|
t.Errorf("rendered outbox missing %q", want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
+122
-245
@@ -75,6 +75,23 @@ var morningHTML string
|
|||||||
//go:embed events.html
|
//go:embed events.html
|
||||||
var eventsHTML string
|
var eventsHTML string
|
||||||
|
|
||||||
|
//go:embed tools.html
|
||||||
|
var toolsHTML string
|
||||||
|
|
||||||
|
//go:embed routines.html
|
||||||
|
var routinesHTML string
|
||||||
|
|
||||||
|
//go:embed chat.html
|
||||||
|
var chatPageHTML string
|
||||||
|
|
||||||
|
// shellHTML — the shell partial every page is wrapped in: "shellTop", the
|
||||||
|
// "sidebar" it calls, and "shellBottom". It used to be two Go string constants
|
||||||
|
// with the sidebar assembled by a strings.Builder, which is the one piece of
|
||||||
|
// markup that was still concatenated in Go.
|
||||||
|
//
|
||||||
|
//go:embed shell.html
|
||||||
|
var shellHTML string
|
||||||
|
|
||||||
// ── Ethos Workstation Shell ──
|
// ── Ethos Workstation Shell ──
|
||||||
//
|
//
|
||||||
// Two template pieces that wrap every page:
|
// Two template pieces that wrap every page:
|
||||||
@@ -135,74 +152,40 @@ var sidebarSections = []struct {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
func sidebarActive(url, key string, activeKey string) string {
|
// pageIcon returns the ethos-icons.svg symbol id for the given page. The
|
||||||
if key == activeKey {
|
// sidebar template wraps it in the <use> reference.
|
||||||
return `class="active"`
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
// sidebarHTML renders the sidebar navigation given the active page key.
|
|
||||||
func sidebarHTML(active string) template.HTML {
|
|
||||||
var b strings.Builder
|
|
||||||
for _, sec := range sidebarSections {
|
|
||||||
b.WriteString(`<div class=sidebar-section>`)
|
|
||||||
b.WriteString(`<div class=sidebar-label>`)
|
|
||||||
b.WriteString(sec.Label)
|
|
||||||
b.WriteString(`</div>`)
|
|
||||||
for _, p := range sec.Pages {
|
|
||||||
cls := ""
|
|
||||||
if p.Key == active {
|
|
||||||
cls = ` class="active"`
|
|
||||||
}
|
|
||||||
b.WriteString(`<a href="`)
|
|
||||||
b.WriteString(p.URL)
|
|
||||||
b.WriteString(`"`)
|
|
||||||
b.WriteString(cls)
|
|
||||||
b.WriteString(`><span class=icon>`)
|
|
||||||
b.WriteString(pageIcon(p.Key))
|
|
||||||
b.WriteString(`</span><span>`)
|
|
||||||
b.WriteString(p.Label)
|
|
||||||
b.WriteString(`</span></a>`)
|
|
||||||
}
|
|
||||||
b.WriteString(`</div>`)
|
|
||||||
}
|
|
||||||
return template.HTML(b.String())
|
|
||||||
}
|
|
||||||
|
|
||||||
// pageIcon returns an ethos-icons.svg <use> reference for the given page.
|
|
||||||
func pageIcon(key string) string {
|
func pageIcon(key string) string {
|
||||||
switch key {
|
switch key {
|
||||||
case "dash":
|
case "dash":
|
||||||
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-grid"/></svg>`
|
return "i-grid"
|
||||||
case "history":
|
case "history":
|
||||||
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-clock"/></svg>`
|
return "i-clock"
|
||||||
case "trace":
|
case "trace":
|
||||||
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-wave"/></svg>`
|
return "i-wave"
|
||||||
case "notifications":
|
case "notifications":
|
||||||
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-bell"/></svg>`
|
return "i-bell"
|
||||||
case "tasks":
|
case "tasks":
|
||||||
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-grid"/></svg>`
|
return "i-grid"
|
||||||
case "reminders":
|
case "reminders":
|
||||||
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-calendar"/></svg>`
|
return "i-calendar"
|
||||||
case "routines":
|
case "routines":
|
||||||
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-repeat"/></svg>`
|
return "i-repeat"
|
||||||
case "morning":
|
case "morning":
|
||||||
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-calendar"/></svg>`
|
return "i-calendar"
|
||||||
case "chat":
|
case "chat":
|
||||||
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-message"/></svg>`
|
return "i-message"
|
||||||
case "voice":
|
case "voice":
|
||||||
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-mic"/></svg>`
|
return "i-mic"
|
||||||
case "ecosystem":
|
case "ecosystem":
|
||||||
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-grid"/></svg>`
|
return "i-grid"
|
||||||
case "tools":
|
case "tools":
|
||||||
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-settings"/></svg>`
|
return "i-settings"
|
||||||
case "models":
|
case "models":
|
||||||
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-wave"/></svg>`
|
return "i-wave"
|
||||||
case "passkey":
|
case "passkey":
|
||||||
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-lock"/></svg>`
|
return "i-lock"
|
||||||
default:
|
default:
|
||||||
return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-search"/></svg>`
|
return "i-search"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -242,63 +225,12 @@ func pageTitle(key string) string {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// shellTopHTML opens the shell and renders the top bar + sidebar.
|
|
||||||
// Usage: {{template "shellTop" "<page-key>"}}
|
|
||||||
const shellTopHTML = `{{define "shellTop"}}<!doctype html><meta charset=utf-8>
|
|
||||||
<meta name=viewport content="width=device-width,initial-scale=1,viewport-fit=cover">
|
|
||||||
<meta name=theme-color content="#14110D">
|
|
||||||
<link rel=manifest href=/manifest.json>
|
|
||||||
<title>maven · {{pageTitle .}}</title>
|
|
||||||
<link rel=stylesheet href=/ui.css>
|
|
||||||
<div class=shell data-app=maven>
|
|
||||||
<header class=topbar>
|
|
||||||
<div class=breadcrumbs>
|
|
||||||
<span class=current>{{pageTitle .}}</span>
|
|
||||||
</div>
|
|
||||||
<div class=topbar-actions>
|
|
||||||
<div class=search-trigger onclick="window.__openSearch()" role=button tabindex=0>
|
|
||||||
<svg class=icon width="13" height="13"><use href="/ethos-icons.svg#i-search"/></svg>
|
|
||||||
Search
|
|
||||||
<span class=kbd-hint>Ctrl+/</span>
|
|
||||||
</div>
|
|
||||||
<button class=icon-btn onclick="window.__openPalette()" title="Command Palette (Ctrl+K)" aria-label="Command Palette">
|
|
||||||
<svg class=icon width="15" height="15"><use href="/ethos-icons.svg#i-grid"/></svg>
|
|
||||||
</button>
|
|
||||||
<span class=conn-status>
|
|
||||||
<span class="dot online" id=connDot></span>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
<div class=shell-body>
|
|
||||||
<aside class=sidebar>
|
|
||||||
{{sidebarHTML .}}
|
|
||||||
</aside>
|
|
||||||
<main class=content>
|
|
||||||
{{end}}`
|
|
||||||
|
|
||||||
// shellBottomHTML closes the content area, inspector, and shell.
|
|
||||||
// Usage: {{template "shellBottom"}}
|
|
||||||
const shellBottomHTML = `{{define "shellBottom"}}
|
|
||||||
</main>
|
|
||||||
<aside class=inspector id=inspector>
|
|
||||||
<div class=inspector-inner>
|
|
||||||
<div class=inspector-header>
|
|
||||||
<span id=inspectorTitle>Details</span>
|
|
||||||
<button class=inspector-close onclick="closeInspector()" aria-label="Close inspector">×</button>
|
|
||||||
</div>
|
|
||||||
<div class=inspector-body id=inspectorBody></div>
|
|
||||||
</div>
|
|
||||||
</aside>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<script src=/mavweb.js></script>
|
|
||||||
{{end}}`
|
|
||||||
|
|
||||||
// shellFuncs returns the FuncMap shared by every server-rendered page template.
|
// shellFuncs returns the FuncMap shared by every server-rendered page template.
|
||||||
func shellFuncs() template.FuncMap {
|
func shellFuncs() template.FuncMap {
|
||||||
return template.FuncMap{
|
return template.FuncMap{
|
||||||
"pageTitle": pageTitle,
|
"pageTitle": pageTitle,
|
||||||
"sidebarHTML": sidebarHTML,
|
"pageIcon": pageIcon,
|
||||||
|
"sidebarSections": func() any { return sidebarSections },
|
||||||
"ago": func(t time.Time) string {
|
"ago": func(t time.Time) string {
|
||||||
if t.IsZero() {
|
if t.IsZero() {
|
||||||
return "never"
|
return "never"
|
||||||
@@ -313,21 +245,21 @@ func shellFuncs() template.FuncMap {
|
|||||||
// a small fetch loop refreshes the tables in place. html/template escapes the
|
// a small fetch loop refreshes the tables in place. html/template escapes the
|
||||||
// user text in facts/nudges. Read-only: browses the append-only store via
|
// user text in facts/nudges. Read-only: browses the append-only store via
|
||||||
// CoreAPI, never writes — the store IS the audit trail, this just shows it.
|
// CoreAPI, never writes — the store IS the audit trail, this just shows it.
|
||||||
var dashTmpl = template.Must(template.New("dash").Funcs(shellFuncs()).Parse(shellTopHTML + dashHTML + shellBottomHTML))
|
var dashTmpl = template.Must(template.New("dash").Funcs(shellFuncs()).Parse(shellHTML + dashHTML))
|
||||||
|
|
||||||
// ecosystemTmpl — read-only view of the Nexus/Praxis/Hexis siblings, whose only
|
// ecosystemTmpl — read-only view of the Nexus/Praxis/Hexis siblings, whose only
|
||||||
// human surface is here (they ship no web UI of their own).
|
// human surface is here (they ship no web UI of their own).
|
||||||
var ecosystemTmpl = template.Must(template.New("ecosystem").Funcs(shellFuncs()).Parse(shellTopHTML + ecosystemHTML + shellBottomHTML))
|
var ecosystemTmpl = template.Must(template.New("ecosystem").Funcs(shellFuncs()).Parse(shellHTML + ecosystemHTML))
|
||||||
|
|
||||||
// eventsTmpl — the unified intake journal (Vikunja #283), read-only. Same
|
// eventsTmpl — the unified intake journal (Vikunja #283), read-only. Same
|
||||||
// shape as trace.html and morning.html: server-rendered, refreshed on reload.
|
// shape as trace.html and morning.html: server-rendered, refreshed on reload.
|
||||||
var eventsTmpl = template.Must(template.New("events").Funcs(shellFuncs()).Parse(shellTopHTML + eventsHTML + shellBottomHTML))
|
var eventsTmpl = template.Must(template.New("events").Funcs(shellFuncs()).Parse(shellHTML + eventsHTML))
|
||||||
|
|
||||||
// morningTmpl — read-only view of today's checklist state per configured
|
// morningTmpl — read-only view of today's checklist state per configured
|
||||||
// morning routine (internal/morning). Same shape as trace.html: a plain
|
// morning routine (internal/morning). Same shape as trace.html: a plain
|
||||||
// server-rendered page, refreshed on reload — no live-update loop, since
|
// server-rendered page, refreshed on reload — no live-update loop, since
|
||||||
// checklist state changes on the scale of minutes, not seconds.
|
// checklist state changes on the scale of minutes, not seconds.
|
||||||
var morningTmpl = template.Must(template.New("morning").Funcs(shellFuncs()).Parse(shellTopHTML + morningHTML + shellBottomHTML))
|
var morningTmpl = template.Must(template.New("morning").Funcs(shellFuncs()).Parse(shellHTML + morningHTML))
|
||||||
|
|
||||||
func noCache(h http.Handler) http.Handler {
|
func noCache(h http.Handler) http.Handler {
|
||||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
@@ -747,107 +679,23 @@ var toolsTmpl = template.Must(template.New("tools").Funcs(func() template.FuncMa
|
|||||||
m := shellFuncs()
|
m := shellFuncs()
|
||||||
m["join"] = strings.Join
|
m["join"] = strings.Join
|
||||||
return m
|
return m
|
||||||
}()).Parse(shellTopHTML + toolsHTML + shellBottomHTML))
|
}()).Parse(shellHTML + toolsHTML))
|
||||||
|
|
||||||
const toolsHTML = `{{template "shellTop" "tools"}}
|
var historyTmpl = template.Must(template.New("history").Funcs(shellFuncs()).Parse(shellHTML + historyHTML))
|
||||||
<h1>Tools</h1>
|
|
||||||
<p class=hint>enabling requires step-up — <a href=/auth/passkey>assert a passkey</a> first.</p>
|
|
||||||
{{if .Msg}}<div class="msg msg-ok">{{.Msg}}</div>{{end}}
|
|
||||||
<section class=card>
|
|
||||||
<h2 class=card-title>proposed <span class=badge>{{len .Proposed}}</span></h2>
|
|
||||||
{{if .Proposed}}<p class=hint>maven drafted these from acts she couldn't run. Fill the command (argv, space-separated) and enable. A row in an <code>mcp:</code> scope came from an MCP server and already knows what it calls — check the command, then enable.</p>
|
|
||||||
<div class=scroll><table><tr><th>name</th><th>scope</th><th>from utterance</th><th>enable as</th></tr>
|
|
||||||
{{range .Proposed}}<tr>
|
|
||||||
<td><code>{{.Name}}</code></td><td><span class=badge>{{.Scope}}</span></td><td>{{.Utterance}}</td>
|
|
||||||
<td><form method=post action=/tools>
|
|
||||||
<input type=hidden name=name value="{{.Name}}">
|
|
||||||
<input type=hidden name=scope value="{{.Scope}}">
|
|
||||||
<input type=hidden name=action value=enable>
|
|
||||||
<input type=text name=cmd class=input-wide placeholder="systemctl restart" value="{{join .Cmd " "}}" required>
|
|
||||||
<label><input type=checkbox name=destructive {{if .Destructive}}checked{{end}}> destructive</label>
|
|
||||||
<button class=btn>enable</button></form>
|
|
||||||
<form method=post action=/tools class=inline-form>
|
|
||||||
<input type=hidden name=name value="{{.Name}}">
|
|
||||||
<input type=hidden name=action value=dismiss>
|
|
||||||
<button class="btn btn-muted">dismiss</button></form></td>
|
|
||||||
</tr>{{end}}</table></div>
|
|
||||||
{{else}}<div class=empty>
|
|
||||||
<svg class=icon width="20" height="20"><use href="/ethos-icons.svg#i-search"/></svg>
|
|
||||||
<div>no proposed tools</div>
|
|
||||||
<div class=hint>maven will propose tools here when she needs help running an action</div>
|
|
||||||
</div>{{end}}
|
|
||||||
</section>
|
|
||||||
<section class=card>
|
|
||||||
<h2 class=card-title>enabled <span class=badge>{{len .Enabled}}</span></h2>
|
|
||||||
{{if .Enabled}}<div class=scroll><table><tr><th>name</th><th>scope</th><th>command</th><th></th><th></th></tr>
|
|
||||||
{{range .Enabled}}<tr><td><code>{{.Name}}</code></td><td><span class=badge>{{.Scope}}</span></td><td><code>{{join .Cmd " "}}</code></td>
|
|
||||||
<td>{{if .Destructive}}<span class=red>destructive</span>{{end}}</td>
|
|
||||||
<td><form method=post action=/tools class=inline-form>
|
|
||||||
<input type=hidden name=name value="{{.Name}}">
|
|
||||||
<input type=hidden name=scope value="{{.Scope}}">
|
|
||||||
<input type=hidden name=action value=disable>
|
|
||||||
<button class=btn>disable</button></form></td></tr>{{end}}</table></div>
|
|
||||||
{{else}}<div class=empty>
|
|
||||||
<svg class=icon width="20" height="20"><use href="/ethos-icons.svg#i-settings"/></svg>
|
|
||||||
<div>no tools enabled</div>
|
|
||||||
<div class=hint>enable proposed tools above, or ask maven to configure one</div>
|
|
||||||
</div>{{end}}
|
|
||||||
</section>
|
|
||||||
<section class=card>
|
|
||||||
<h2 class=card-title>MCP servers <span class=badge>{{len .MCP}}</span></h2>
|
|
||||||
{{if .MCP}}<p class=hint>servers she connects OUT to. Their tools appear above as proposals — a configured server is a place she may look, not a capability she has. A <code>stdio</code> target is a process on this box; an <code>http</code> one on a loopback or LAN address is inside the network, so treat its tools accordingly.</p>
|
|
||||||
<div class=scroll><table><tr><th>name</th><th>transport</th><th>target</th><th>state</th><th>tools</th></tr>
|
|
||||||
{{range .MCP}}<tr><td><code>{{.Name}}</code></td><td><span class=badge>{{.Transport}}</span></td><td><code>{{.Target}}</code></td>
|
|
||||||
<td>{{if .Connected}}connected{{if .Server}} — {{.Server}}{{end}}{{else}}<span class=red>down</span>{{if .Err}} — {{.Err}}{{end}}{{end}}</td>
|
|
||||||
<td>{{.Tools}}</td></tr>{{end}}</table></div>
|
|
||||||
{{else}}<div class=empty>
|
|
||||||
<svg class=icon width="20" height="20"><use href="/ethos-icons.svg#i-settings"/></svg>
|
|
||||||
<div>no MCP servers configured</div>
|
|
||||||
<div class=hint>add an <code>mcp.servers</code> block to mavend.json to let her use an external tool server</div>
|
|
||||||
</div>{{end}}
|
|
||||||
</section>
|
|
||||||
{{template "shellBottom"}}`
|
|
||||||
|
|
||||||
// routinesHTML — proposed routine review surface. One row per thing maven
|
var notificationsTmpl = template.Must(template.New("notifications").Funcs(shellFuncs()).Parse(shellHTML + notificationsHTML))
|
||||||
|
|
||||||
|
var remindersTmpl = template.Must(template.New("reminders").Funcs(shellFuncs()).Parse(shellHTML + remindersHTML))
|
||||||
|
|
||||||
|
var passkeyTmpl = template.Must(template.New("passkey").Funcs(shellFuncs()).Parse(shellHTML + passkeyPageHTML))
|
||||||
|
|
||||||
|
var voiceTmpl = template.Must(template.New("voice").Funcs(shellFuncs()).Parse(shellHTML + voiceHTML))
|
||||||
|
|
||||||
|
var tasksTmpl = template.Must(template.New("tasks").Funcs(shellFuncs()).Parse(shellHTML + tasksHTML))
|
||||||
|
|
||||||
|
// routinesTmpl — the proposed-routine review surface. One row per thing maven
|
||||||
// noticed, in her words, with at most two actions: accept or dismiss.
|
// noticed, in her words, with at most two actions: accept or dismiss.
|
||||||
const routinesHTML = `{{template "shellTop" "routines"}}
|
var routinesTmpl = template.Must(template.New("routines").Funcs(shellFuncs()).Parse(shellHTML + routinesHTML))
|
||||||
<h1>Routines</h1>
|
|
||||||
{{if .Msg}}<div class="msg msg-ok">{{.Msg}}</div>{{end}}
|
|
||||||
<section class=card>
|
|
||||||
<h2 class=card-title>noticed <span class=badge>{{len .Proposed}}</span></h2>
|
|
||||||
{{if .Proposed}}<div class=scroll><table><tr><th>maven noticed</th><th>when</th><th></th><th></th></tr>
|
|
||||||
{{range .Proposed}}<tr>
|
|
||||||
<td>{{.Phrase}}</td><td class=muted>{{.Noticed}}</td>
|
|
||||||
<td><form method=post action=/routines class=inline-form>
|
|
||||||
<input type=hidden name=id value="{{.ID}}">
|
|
||||||
<input type=hidden name=action value=accept>
|
|
||||||
<button class=btn>accept</button></form></td>
|
|
||||||
<td><form method=post action=/routines class=inline-form>
|
|
||||||
<input type=hidden name=id value="{{.ID}}">
|
|
||||||
<input type=hidden name=action value=dismiss>
|
|
||||||
<button class="btn btn-muted">dismiss</button></form></td>
|
|
||||||
</tr>{{end}}</table></div>
|
|
||||||
{{else}}<div class=empty>
|
|
||||||
<svg class=icon width="20" height="20"><use href="/ethos-icons.svg#i-wave"/></svg>
|
|
||||||
<div>no proposed routines</div>
|
|
||||||
<div class=hint>maven will propose routines here when she detects a recurring pattern</div>
|
|
||||||
</div>{{end}}
|
|
||||||
</section>
|
|
||||||
{{template "shellBottom"}}`
|
|
||||||
|
|
||||||
var historyTmpl = template.Must(template.New("history").Funcs(shellFuncs()).Parse(shellTopHTML + historyHTML + shellBottomHTML))
|
|
||||||
|
|
||||||
var notificationsTmpl = template.Must(template.New("notifications").Funcs(shellFuncs()).Parse(shellTopHTML + notificationsHTML + shellBottomHTML))
|
|
||||||
|
|
||||||
var remindersTmpl = template.Must(template.New("reminders").Funcs(shellFuncs()).Parse(shellTopHTML + remindersHTML + shellBottomHTML))
|
|
||||||
|
|
||||||
var passkeyTmpl = template.Must(template.New("passkey").Funcs(shellFuncs()).Parse(shellTopHTML + passkeyPageHTML + 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 traceTmpl = template.Must(template.New("trace").Funcs(func() template.FuncMap {
|
var traceTmpl = template.Must(template.New("trace").Funcs(func() template.FuncMap {
|
||||||
m := shellFuncs()
|
m := shellFuncs()
|
||||||
@@ -859,7 +707,7 @@ var traceTmpl = template.Must(template.New("trace").Funcs(func() template.FuncMa
|
|||||||
}
|
}
|
||||||
m["join"] = strings.Join
|
m["join"] = strings.Join
|
||||||
return m
|
return m
|
||||||
}()).Parse(shellTopHTML + traceHTML + shellBottomHTML))
|
}()).Parse(shellHTML + traceHTML))
|
||||||
|
|
||||||
func handleHistory(w http.ResponseWriter, r *http.Request, core ipc.CoreAPI) {
|
func handleHistory(w http.ResponseWriter, r *http.Request, core ipc.CoreAPI) {
|
||||||
if core == nil {
|
if core == nil {
|
||||||
@@ -893,12 +741,59 @@ func handleNotifications(w http.ResponseWriter, r *http.Request, core ipc.CoreAP
|
|||||||
http.Error(w, "notifications error: "+err.Error(), http.StatusBadGateway)
|
http.Error(w, "notifications error: "+err.Error(), http.StatusBadGateway)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
// The outbox, on the page that already answers "what did she send".
|
||||||
|
// A failed or dropped attempt is why she went quiet, and until now it was
|
||||||
|
// recorded and unreadable (Vikunja #390). Filter with ?status=dropped.
|
||||||
|
status := r.URL.Query().Get("status")
|
||||||
|
attempts, err := core.DeliveryAttempts(ctx, status, 50)
|
||||||
|
if err != nil {
|
||||||
|
// The nudge list is still worth showing, so this is a note on the page
|
||||||
|
// rather than a dead page.
|
||||||
|
log.Printf("notifications: delivery attempts: %v", err)
|
||||||
|
}
|
||||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||||
if err := notificationsTmpl.Execute(w, map[string]any{"Nudges": nudges}); err != nil {
|
if err := notificationsTmpl.Execute(w, map[string]any{
|
||||||
|
"Nudges": nudges,
|
||||||
|
"Attempts": deliveryRows(attempts),
|
||||||
|
"Status": status,
|
||||||
|
}); err != nil {
|
||||||
log.Printf("notifications template: %v", err)
|
log.Printf("notifications template: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// deliveryRow is one outbox line, with every timestamp already formatted so
|
||||||
|
// the template holds no date logic — same shape as taskRow.
|
||||||
|
type deliveryRow struct {
|
||||||
|
Kind string
|
||||||
|
Target string
|
||||||
|
Channel string
|
||||||
|
Status string
|
||||||
|
Created string
|
||||||
|
Completed string
|
||||||
|
}
|
||||||
|
|
||||||
|
func deliveryRows(as []ipc.DeliveryAttempt) []deliveryRow {
|
||||||
|
out := make([]deliveryRow, 0, len(as))
|
||||||
|
for _, a := range as {
|
||||||
|
target := a.Rule
|
||||||
|
if target == "" && a.ReminderID != 0 {
|
||||||
|
target = "reminder #" + strconv.FormatInt(a.ReminderID, 10)
|
||||||
|
}
|
||||||
|
row := deliveryRow{
|
||||||
|
Kind: a.Kind,
|
||||||
|
Target: target,
|
||||||
|
Channel: a.Channel,
|
||||||
|
Status: a.Status,
|
||||||
|
Created: a.Created.Format("02.01 15:04"),
|
||||||
|
}
|
||||||
|
if a.Completed != nil {
|
||||||
|
row.Completed = a.Completed.Format("15:04")
|
||||||
|
}
|
||||||
|
out = append(out, row)
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
func handleReminders(w http.ResponseWriter, r *http.Request, core ipc.CoreAPI) {
|
func handleReminders(w http.ResponseWriter, r *http.Request, core ipc.CoreAPI) {
|
||||||
if core == nil {
|
if core == nil {
|
||||||
http.Error(w, "reminders disabled (no -core)", http.StatusServiceUnavailable)
|
http.Error(w, "reminders disabled (no -core)", http.StatusServiceUnavailable)
|
||||||
@@ -1125,9 +1020,10 @@ func fmtTaskDate(t *time.Time) string {
|
|||||||
return t.Local().Format("02 Jan")
|
return t.Local().Format("02 Jan")
|
||||||
}
|
}
|
||||||
|
|
||||||
// routineRow is one line on the page: what maven noticed, in her words, and
|
// routineView 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. A view model, not a database row — the template
|
||||||
type routineRow struct {
|
// never formats an interval or a timestamp itself.
|
||||||
|
type routineView struct {
|
||||||
ID int64
|
ID int64
|
||||||
Phrase string
|
Phrase string
|
||||||
Noticed string
|
Noticed string
|
||||||
@@ -1189,23 +1085,23 @@ func handleRoutines(w http.ResponseWriter, r *http.Request, core ipc.CoreAPI, se
|
|||||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||||
if err := routinesTmpl.Execute(w, struct {
|
if err := routinesTmpl.Execute(w, struct {
|
||||||
Msg string
|
Msg string
|
||||||
Proposed []routineRow
|
Proposed []routineView
|
||||||
}{msg, routineRows(proposed)}); err != nil {
|
}{msg, toRoutineViews(proposed)}); err != nil {
|
||||||
log.Printf("routines render: %v", err)
|
log.Printf("routines render: %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// routineRows turns the wire rows into display rows. The phrase comes from
|
// toRoutineViews turns the wire rows into view models. The phrase comes from
|
||||||
// pattern.PhraseRoutine so the page says the same thing maven's voice says.
|
// pattern.PhraseRoutine so the page says the same thing maven's voice says.
|
||||||
func routineRows(rs []ipc.ProposedRoutine) []routineRow {
|
func toRoutineViews(rs []ipc.ProposedRoutine) []routineView {
|
||||||
out := make([]routineRow, 0, len(rs))
|
out := make([]routineView, 0, len(rs))
|
||||||
for _, r := range rs {
|
for _, r := range rs {
|
||||||
p := pattern.ProposedRoutine{Action: r.Action, Object: r.Object, IntervalDays: r.IntervalDays}
|
p := pattern.ProposedRoutine{Action: r.Action, Object: r.Object, IntervalDays: r.IntervalDays}
|
||||||
noticed := "just now"
|
noticed := "just now"
|
||||||
if r.CreatedTs > 0 {
|
if r.CreatedTs > 0 {
|
||||||
noticed = time.Since(time.UnixMilli(r.CreatedTs)).Round(time.Minute).String() + " ago"
|
noticed = time.Since(time.UnixMilli(r.CreatedTs)).Round(time.Minute).String() + " ago"
|
||||||
}
|
}
|
||||||
out = append(out, routineRow{ID: r.ID, Phrase: pattern.PhraseRoutine(&p), Noticed: noticed})
|
out = append(out, routineView{ID: r.ID, Phrase: pattern.PhraseRoutine(&p), Noticed: noticed})
|
||||||
}
|
}
|
||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
@@ -1602,32 +1498,7 @@ func handlePTT(w http.ResponseWriter, r *http.Request, voiceAddr string, session
|
|||||||
|
|
||||||
// chatTmpl — plain text conversation interface. No JS: form POSTs to /api/chat
|
// chatTmpl — plain text conversation interface. No JS: form POSTs to /api/chat
|
||||||
// and the handler redirects back to /chat with the response.
|
// and the handler redirects back to /chat with the response.
|
||||||
var chatTmpl = template.Must(template.New("chat").Funcs(shellFuncs()).Parse(shellTopHTML + chatPageHTML + shellBottomHTML))
|
var chatTmpl = template.Must(template.New("chat").Funcs(shellFuncs()).Parse(shellHTML + chatPageHTML))
|
||||||
|
|
||||||
const chatPageHTML = `{{template "shellTop" "chat"}}
|
|
||||||
<h1>Chat</h1>
|
|
||||||
<section class=card>
|
|
||||||
{{if .Error}}<div class="msg msg-err">{{.Error}}</div>{{end}}
|
|
||||||
<div class="scroll chat-scroll" id=chatHistory>
|
|
||||||
{{range .Messages}}
|
|
||||||
<div class="chat-msg {{.Role}}"><strong>{{if eq .Role "user"}}you{{else}}maven{{end}}:</strong> {{.Text}}</div>
|
|
||||||
{{else}}
|
|
||||||
<div class=empty>
|
|
||||||
<svg class=icon width="20" height="20"><use href="/ethos-icons.svg#i-message"/></svg>
|
|
||||||
<div>start a conversation</div>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
<form method=post action=/api/chat class=chat-form>
|
|
||||||
<input type=text name=text class=input-wide placeholder="type a message..." required autofocus>
|
|
||||||
<button class=btn>send</button>
|
|
||||||
</form>
|
|
||||||
</section>
|
|
||||||
<script>
|
|
||||||
var ch = document.getElementById('chatHistory');
|
|
||||||
if(ch) ch.scrollTop = ch.scrollHeight;
|
|
||||||
</script>
|
|
||||||
{{template "shellBottom"}}`
|
|
||||||
|
|
||||||
// handleChatPage renders the chat conversation page.
|
// handleChatPage renders the chat conversation page.
|
||||||
func handleChatPage(w http.ResponseWriter, r *http.Request, core ipc.CoreAPI) {
|
func handleChatPage(w http.ResponseWriter, r *http.Request, core ipc.CoreAPI) {
|
||||||
@@ -1678,7 +1549,13 @@ func handleChatAPI(w http.ResponseWriter, r *http.Request, core ipc.CoreAPI, ses
|
|||||||
http.Redirect(w, r, "/chat", http.StatusSeeOther)
|
http.Redirect(w, r, "/chat", http.StatusSeeOther)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
reply, err := core.Chat(r.Context(), text)
|
// One conversation id for the whole web chat, and a different one from
|
||||||
|
// telegram or the mic. A parked question belongs to the reach that was
|
||||||
|
// asked; before this, a clarify nobody answered on the web ate the next
|
||||||
|
// utterance spoken at the mic (Vikunja #466). This server has no
|
||||||
|
// per-browser session, so every browser tab is the same conversation —
|
||||||
|
// which is right for a single-owner box.
|
||||||
|
reply, err := core.Chat(r.Context(), "web", text)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("chat api: %v", err)
|
log.Printf("chat api: %v", err)
|
||||||
http.Redirect(w, r, "/chat", http.StatusSeeOther)
|
http.Redirect(w, r, "/chat", http.StatusSeeOther)
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ type modelController interface {
|
|||||||
SwapModel(ctx context.Context, req ipc.SwapModelReq) (ipc.SwapModelResp, error)
|
SwapModel(ctx context.Context, req ipc.SwapModelReq) (ipc.SwapModelResp, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
var modelsTmpl = template.Must(template.New("models").Funcs(shellFuncs()).Parse(shellTopHTML + modelsHTML + shellBottomHTML))
|
var modelsTmpl = template.Must(template.New("models").Funcs(shellFuncs()).Parse(shellHTML + modelsHTML))
|
||||||
|
|
||||||
const modelsHTML = `{{template "shellTop" "models"}}
|
const modelsHTML = `{{template "shellTop" "models"}}
|
||||||
<h1>Resident model</h1>
|
<h1>Resident model</h1>
|
||||||
|
|||||||
@@ -14,5 +14,27 @@
|
|||||||
<div>no notifications yet</div>
|
<div>no notifications yet</div>
|
||||||
<div class=hint>check back later or ask maven a question</div>
|
<div class=hint>check back later or ask maven a question</div>
|
||||||
</div>{{end}}
|
</div>{{end}}
|
||||||
|
<h2>Delivery outbox</h2>
|
||||||
|
<p class=hint>
|
||||||
|
every send is recorded before it leaves, so a failure is visible rather than silent.
|
||||||
|
<a href="/notifications">all</a> ·
|
||||||
|
<a href="/notifications?status=dropped">dropped</a> ·
|
||||||
|
<a href="/notifications?status=failed">failed</a> ·
|
||||||
|
<a href="/notifications?status=pending">pending</a> ·
|
||||||
|
<a href="/notifications?status=unknown">unknown</a>
|
||||||
|
</p>
|
||||||
|
{{if .Attempts}}<div class=scroll><table>
|
||||||
|
<tr><th>started</th><th>kind</th><th>rule</th><th>channel</th><th>status</th><th>finished</th></tr>
|
||||||
|
{{range .Attempts}}<tr>
|
||||||
|
<td class=hint>{{.Created}}</td>
|
||||||
|
<td>{{.Kind}}</td>
|
||||||
|
<td class=key>{{.Target}}</td>
|
||||||
|
<td><span class=badge>{{.Channel}}</span></td>
|
||||||
|
<td class={{.Status}}>{{.Status}}</td>
|
||||||
|
<td class=hint>{{.Completed}}</td>
|
||||||
|
</tr>{{end}}</table></div>
|
||||||
|
{{else}}<div class=empty>
|
||||||
|
<div>no delivery attempts{{if .Status}} with status {{.Status}}{{end}}</div>
|
||||||
|
</div>{{end}}
|
||||||
{{template "shellBottom"}}
|
{{template "shellBottom"}}
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
{{template "shellTop" "routines"}}
|
||||||
|
<h1>Routines</h1>
|
||||||
|
{{if .Msg}}<div class="msg msg-ok">{{.Msg}}</div>{{end}}
|
||||||
|
<section class=card>
|
||||||
|
<h2 class=card-title>noticed <span class=badge>{{len .Proposed}}</span></h2>
|
||||||
|
{{if .Proposed}}<div class=scroll><table><tr><th>maven noticed</th><th>when</th><th></th><th></th></tr>
|
||||||
|
{{range .Proposed}}<tr>
|
||||||
|
<td>{{.Phrase}}</td><td class=muted>{{.Noticed}}</td>
|
||||||
|
<td><form method=post action=/routines class=inline-form>
|
||||||
|
<input type=hidden name=id value="{{.ID}}">
|
||||||
|
<input type=hidden name=action value=accept>
|
||||||
|
<button class=btn>accept</button></form></td>
|
||||||
|
<td><form method=post action=/routines class=inline-form>
|
||||||
|
<input type=hidden name=id value="{{.ID}}">
|
||||||
|
<input type=hidden name=action value=dismiss>
|
||||||
|
<button class="btn btn-muted">dismiss</button></form></td>
|
||||||
|
</tr>{{end}}</table></div>
|
||||||
|
{{else}}<div class=empty>
|
||||||
|
<svg class=icon width="20" height="20"><use href="/ethos-icons.svg#i-wave"/></svg>
|
||||||
|
<div>no proposed routines</div>
|
||||||
|
<div class=hint>maven will propose routines here when she detects a recurring pattern</div>
|
||||||
|
</div>{{end}}
|
||||||
|
</section>
|
||||||
|
{{template "shellBottom"}}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
{{define "shellTop"}}<!doctype html><meta charset=utf-8>
|
||||||
|
<meta name=viewport content="width=device-width,initial-scale=1,viewport-fit=cover">
|
||||||
|
<meta name=theme-color content="#14110D">
|
||||||
|
<link rel=manifest href=/manifest.json>
|
||||||
|
<title>maven · {{pageTitle .}}</title>
|
||||||
|
<link rel=stylesheet href=/ui.css>
|
||||||
|
<div class=shell data-app=maven>
|
||||||
|
<header class=topbar>
|
||||||
|
<div class=breadcrumbs>
|
||||||
|
<span class=current>{{pageTitle .}}</span>
|
||||||
|
</div>
|
||||||
|
<div class=topbar-actions>
|
||||||
|
<div class=search-trigger onclick="window.__openSearch()" role=button tabindex=0>
|
||||||
|
<svg class=icon width="13" height="13"><use href="/ethos-icons.svg#i-search"/></svg>
|
||||||
|
Search
|
||||||
|
<span class=kbd-hint>Ctrl+/</span>
|
||||||
|
</div>
|
||||||
|
<button class=icon-btn onclick="window.__openPalette()" title="Command Palette (Ctrl+K)" aria-label="Command Palette">
|
||||||
|
<svg class=icon width="15" height="15"><use href="/ethos-icons.svg#i-grid"/></svg>
|
||||||
|
</button>
|
||||||
|
<span class=conn-status>
|
||||||
|
<span class="dot online" id=connDot></span>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
<div class=shell-body>
|
||||||
|
<aside class=sidebar>
|
||||||
|
{{template "sidebar" .}}
|
||||||
|
</aside>
|
||||||
|
<main class=content>
|
||||||
|
{{end}}{{/* sidebar — the section list, with the active page's link marked. The dot
|
||||||
|
argument is the page key the page passed to shellTop. */}}{{define "sidebar"}}{{$active := .}}{{range sidebarSections}}<div class=sidebar-section><div class=sidebar-label>{{.Label}}</div>
|
||||||
|
{{- range .Pages}}<a href="{{.URL}}"{{if eq .Key $active}} class="active"{{end}}><span class=icon><svg class=icon width="14" height="14"><use href="/ethos-icons.svg#{{pageIcon .Key}}"/></svg></span><span>{{.Label}}</span></a>
|
||||||
|
{{- end}}</div>
|
||||||
|
{{end}}{{end}}{{define "shellBottom"}}
|
||||||
|
</main>
|
||||||
|
<aside class=inspector id=inspector>
|
||||||
|
<div class=inspector-inner>
|
||||||
|
<div class=inspector-header>
|
||||||
|
<span id=inspectorTitle>Details</span>
|
||||||
|
<button class=inspector-close onclick="closeInspector()" aria-label="Close inspector">×</button>
|
||||||
|
</div>
|
||||||
|
<div class=inspector-body id=inspectorBody></div>
|
||||||
|
</div>
|
||||||
|
</aside>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<script src=/mavweb.js></script>
|
||||||
|
{{end}}
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
{{template "shellTop" "tools"}}
|
||||||
|
<h1>Tools</h1>
|
||||||
|
<p class=hint>enabling requires step-up — <a href=/auth/passkey>assert a passkey</a> first.</p>
|
||||||
|
{{if .Msg}}<div class="msg msg-ok">{{.Msg}}</div>{{end}}
|
||||||
|
<section class=card>
|
||||||
|
<h2 class=card-title>proposed <span class=badge>{{len .Proposed}}</span></h2>
|
||||||
|
{{if .Proposed}}<p class=hint>maven drafted these from acts she couldn't run. Fill the command (argv, space-separated) and enable. A row in an <code>mcp:</code> scope came from an MCP server and already knows what it calls — check the command, then enable.</p>
|
||||||
|
<div class=scroll><table><tr><th>name</th><th>scope</th><th>from utterance</th><th>enable as</th></tr>
|
||||||
|
{{range .Proposed}}<tr>
|
||||||
|
<td><code>{{.Name}}</code></td><td><span class=badge>{{.Scope}}</span></td><td>{{.Utterance}}</td>
|
||||||
|
<td><form method=post action=/tools>
|
||||||
|
<input type=hidden name=name value="{{.Name}}">
|
||||||
|
<input type=hidden name=scope value="{{.Scope}}">
|
||||||
|
<input type=hidden name=action value=enable>
|
||||||
|
<input type=text name=cmd class=input-wide placeholder="systemctl restart" value="{{join .Cmd " "}}" required>
|
||||||
|
<label><input type=checkbox name=destructive {{if .Destructive}}checked{{end}}> destructive</label>
|
||||||
|
<button class=btn>enable</button></form>
|
||||||
|
<form method=post action=/tools class=inline-form>
|
||||||
|
<input type=hidden name=name value="{{.Name}}">
|
||||||
|
<input type=hidden name=action value=dismiss>
|
||||||
|
<button class="btn btn-muted">dismiss</button></form></td>
|
||||||
|
</tr>{{end}}</table></div>
|
||||||
|
{{else}}<div class=empty>
|
||||||
|
<svg class=icon width="20" height="20"><use href="/ethos-icons.svg#i-search"/></svg>
|
||||||
|
<div>no proposed tools</div>
|
||||||
|
<div class=hint>maven will propose tools here when she needs help running an action</div>
|
||||||
|
</div>{{end}}
|
||||||
|
</section>
|
||||||
|
<section class=card>
|
||||||
|
<h2 class=card-title>enabled <span class=badge>{{len .Enabled}}</span></h2>
|
||||||
|
{{if .Enabled}}<div class=scroll><table><tr><th>name</th><th>scope</th><th>command</th><th></th><th></th></tr>
|
||||||
|
{{range .Enabled}}<tr><td><code>{{.Name}}</code></td><td><span class=badge>{{.Scope}}</span></td><td><code>{{join .Cmd " "}}</code></td>
|
||||||
|
<td>{{if .Destructive}}<span class=red>destructive</span>{{end}}</td>
|
||||||
|
<td><form method=post action=/tools class=inline-form>
|
||||||
|
<input type=hidden name=name value="{{.Name}}">
|
||||||
|
<input type=hidden name=scope value="{{.Scope}}">
|
||||||
|
<input type=hidden name=action value=disable>
|
||||||
|
<button class=btn>disable</button></form></td></tr>{{end}}</table></div>
|
||||||
|
{{else}}<div class=empty>
|
||||||
|
<svg class=icon width="20" height="20"><use href="/ethos-icons.svg#i-settings"/></svg>
|
||||||
|
<div>no tools enabled</div>
|
||||||
|
<div class=hint>enable proposed tools above, or ask maven to configure one</div>
|
||||||
|
</div>{{end}}
|
||||||
|
</section>
|
||||||
|
<section class=card>
|
||||||
|
<h2 class=card-title>MCP servers <span class=badge>{{len .MCP}}</span></h2>
|
||||||
|
{{if .MCP}}<p class=hint>servers she connects OUT to. Their tools appear above as proposals — a configured server is a place she may look, not a capability she has. A <code>stdio</code> target is a process on this box; an <code>http</code> one on a loopback or LAN address is inside the network, so treat its tools accordingly.</p>
|
||||||
|
<div class=scroll><table><tr><th>name</th><th>transport</th><th>target</th><th>state</th><th>tools</th></tr>
|
||||||
|
{{range .MCP}}<tr><td><code>{{.Name}}</code></td><td><span class=badge>{{.Transport}}</span></td><td><code>{{.Target}}</code></td>
|
||||||
|
<td>{{if .Connected}}connected{{if .Server}} — {{.Server}}{{end}}{{else}}<span class=red>down</span>{{if .Err}} — {{.Err}}{{end}}{{end}}</td>
|
||||||
|
<td>{{.Tools}}</td></tr>{{end}}</table></div>
|
||||||
|
{{else}}<div class=empty>
|
||||||
|
<svg class=icon width="20" height="20"><use href="/ethos-icons.svg#i-settings"/></svg>
|
||||||
|
<div>no MCP servers configured</div>
|
||||||
|
<div class=hint>add an <code>mcp.servers</code> block to mavend.json to let her use an external tool server</div>
|
||||||
|
</div>{{end}}
|
||||||
|
</section>
|
||||||
|
{{template "shellBottom"}}
|
||||||
+5
-5
@@ -8,12 +8,12 @@
|
|||||||
"//disabled_rules": [
|
"//disabled_rules": [
|
||||||
"Nudge rules that are not wired at all. Names come from loop.DefaultRules:",
|
"Nudge rules that are not wired at all. Names come from loop.DefaultRules:",
|
||||||
"water, meal, break, service_down, netdata_critical.",
|
"water, meal, break, service_down, netdata_critical.",
|
||||||
"service_down is off because it cannot say WHICH service — mavpoll folds the",
|
"service_down is back on: mavpoll now writes one fact per kuma monitor",
|
||||||
"whole kuma gauge into one boolean, so the nudge is always the generic 'a",
|
"(service_down:<name>), so the nudge names the service and pausing a monitor",
|
||||||
"service on homesrv is down'. Nothing to act on, every fifteen minutes.",
|
"in kuma silences that monitor. It is also edge-triggered, so a service that",
|
||||||
"Turn it back on once Vikunja #444 lands a fact per monitor."
|
"stays down is one nudge, not one every fifteen minutes."
|
||||||
],
|
],
|
||||||
"disabled_rules": ["service_down"],
|
"disabled_rules": [],
|
||||||
|
|
||||||
"phraser": {
|
"phraser": {
|
||||||
"model_path": "/opt/maven/models/llm/qwen3/Qwen3-1.7B-UD-Q4_K_XL.gguf",
|
"model_path": "/opt/maven/models/llm/qwen3/Qwen3-1.7B-UD-Q4_K_XL.gguf",
|
||||||
|
|||||||
@@ -223,6 +223,30 @@ Not alternatives — layers:
|
|||||||
Router contract: `[{"intent":<enum>, key?, value?, text?, verb?}, ...]` over
|
Router contract: `[{"intent":<enum>, key?, value?, text?, verb?}, ...]` over
|
||||||
7 intents (`fact, reminder, note, query, act, chat, system`).
|
7 intents (`fact, reminder, note, query, act, chat, system`).
|
||||||
|
|
||||||
|
#### A restart expires a parked question
|
||||||
|
|
||||||
|
Decided 2026-08-04 (Vikunja #385). The follow-up dialogue session survives a
|
||||||
|
restart; the clarify question parked behind it does not, and neither do the
|
||||||
|
three yes/no confirms in `voice.go`. `ClarifyStore` stays in memory.
|
||||||
|
|
||||||
|
Three reasons, in the order they settle it:
|
||||||
|
|
||||||
|
- The clock stops meaning anything. A parked question carries a 90s TTL and an
|
||||||
|
attempt count. A restart is a gap of unknown length, so a restored question is
|
||||||
|
either already dead or pretending to be young.
|
||||||
|
- Restoring the question restores the request behind it. He asked for something,
|
||||||
|
she asked back, and then the daemon went away. Acting on that minutes later,
|
||||||
|
against words he has probably given up on, is the misroute the stage 3 gate
|
||||||
|
exists to avoid.
|
||||||
|
- She does not announce it either. The expiry notice needs to know a question
|
||||||
|
was parked, and knowing that across a restart means storing it. One sentence,
|
||||||
|
in the rare window where he speaks within 90s of a restart, does not pay for a
|
||||||
|
marker that outlives the thing it describes. His next words route fresh, which
|
||||||
|
is the correct answer with or without the notice.
|
||||||
|
|
||||||
|
So the notice stays what it is: the in-process TTL case, where she really did
|
||||||
|
wait and really did let go.
|
||||||
|
|
||||||
### save-where — the two-memory routing axis
|
### save-where — the two-memory routing axis
|
||||||
|
|
||||||
One discriminator: **does the loop evaluate a predicate against it?**
|
One discriminator: **does the loop evaluate a predicate against it?**
|
||||||
@@ -365,6 +389,29 @@ lives in `source`; rules trust provenance.
|
|||||||
`source=poll:healthcheck`. A compromised poller must not be able to forge a
|
`source=poll:healthcheck`. A compromised poller must not be able to forge a
|
||||||
trigger.
|
trigger.
|
||||||
|
|
||||||
|
#### A fact per monitor, not an aggregate
|
||||||
|
|
||||||
|
mavpoll writes one fact per kuma monitor, keyed `service_down:<monitor name>`.
|
||||||
|
It used to fold the whole gauge into a single boolean, and the nudge could then
|
||||||
|
only say that something on homesrv was down. That is not something he can act
|
||||||
|
on, so the rule shipped disabled.
|
||||||
|
|
||||||
|
Three things follow from the split:
|
||||||
|
|
||||||
|
- The key set is no longer known at wiring time. A rule declares
|
||||||
|
`WantPrefixes` and the gatherer resolves the family per tick, which is the
|
||||||
|
only prefix read in the loop.
|
||||||
|
- Pausing a monitor in kuma silences that monitor. Under the aggregate it
|
||||||
|
silenced nothing, because some other monitor kept the boolean at "down".
|
||||||
|
- A monitor deleted in kuma would keep its last fact reading "down" forever, so
|
||||||
|
mavpoll marks a vanished monitor "unknown". No rule fires on "unknown".
|
||||||
|
|
||||||
|
The rule is also edge-triggered: it fires on a transition it has not already
|
||||||
|
nudged about (`State.NudgedSince`). A polled fact is written only when the
|
||||||
|
value changes, but the predicate reads the current value, so without the edge
|
||||||
|
check a service that stays down qualifies on every tick and cooldown is the
|
||||||
|
only brake.
|
||||||
|
|
||||||
### Presence — concrete scoring
|
### Presence — concrete scoring
|
||||||
|
|
||||||
**Combiner — noisy-OR, not weighted sum.** These are independent-ish positive
|
**Combiner — noisy-OR, not weighted sum.** These are independent-ish positive
|
||||||
|
|||||||
@@ -311,7 +311,7 @@ func TestGate_IpcServer_CheckWiredThroughSocket(t *testing.T) {
|
|||||||
if fake.writes != 0 {
|
if fake.writes != 0 {
|
||||||
t.Errorf("auth refused but CoreAPI was called %d time(s); refused calls must not reach CoreAPI", fake.writes)
|
t.Errorf("auth refused but CoreAPI was called %d time(s); refused calls must not reach CoreAPI", fake.writes)
|
||||||
}
|
}
|
||||||
_, err = cli.Chat(context.Background(), "привет")
|
_, err = cli.Chat(context.Background(), "web", "привет")
|
||||||
if !errors.Is(err, ipc.ErrForbidden) {
|
if !errors.Is(err, ipc.ErrForbidden) {
|
||||||
t.Errorf("wire: chat from unenrolled uid = %v; want ipc.ErrForbidden", err)
|
t.Errorf("wire: chat from unenrolled uid = %v; want ipc.ErrForbidden", err)
|
||||||
}
|
}
|
||||||
@@ -344,7 +344,7 @@ func TestGate_IpcServer_ChatAllowedForEnrolledCaller(t *testing.T) {
|
|||||||
t.Fatalf("dial: %v", err)
|
t.Fatalf("dial: %v", err)
|
||||||
}
|
}
|
||||||
t.Cleanup(func() { _ = cli.Close() })
|
t.Cleanup(func() { _ = cli.Close() })
|
||||||
reply, err := cli.Chat(context.Background(), "привет")
|
reply, err := cli.Chat(context.Background(), "web", "привет")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Chat: %v", err)
|
t.Fatalf("Chat: %v", err)
|
||||||
}
|
}
|
||||||
@@ -373,7 +373,7 @@ func (r *recordingAPI) WriteFact(_ context.Context, _ ipc.WriteFactReq) (int64,
|
|||||||
return int64(r.writes), nil
|
return int64(r.writes), 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
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,7 +68,28 @@ var dayWords = map[string]int{
|
|||||||
// word ("завтра", "tomorrow") when the notification carries one, and the result
|
// word ("завтра", "tomorrow") when the notification carries one, and the result
|
||||||
// is refused if it lands more than ambientPastGrace in the past. A bare start
|
// is refused if it lands more than ambientPastGrace in the past. A bare start
|
||||||
// time gets DefaultReminderDuration.
|
// time gets DefaultReminderDuration.
|
||||||
|
//
|
||||||
|
// The clock reading is a wall clock in the daemon's local zone. See
|
||||||
|
// EventFromNotificationIn.
|
||||||
func EventFromNotification(n Notification) (Event, bool) {
|
func EventFromNotification(n Notification) (Event, bool) {
|
||||||
|
return EventFromNotificationIn(n, time.Local)
|
||||||
|
}
|
||||||
|
|
||||||
|
// EventFromNotificationIn is EventFromNotification against an explicit zone.
|
||||||
|
//
|
||||||
|
// "созвон в 14:30" carries no zone, and nobody writing a phone notification
|
||||||
|
// means 14:30Z. The wall clock used to be resolved against Posted's own zone,
|
||||||
|
// and a phone posts an RFC 3339 instant ending in Z, so every ambient meeting
|
||||||
|
// on this box landed four hours late. The size of the error is the deploy's UTC
|
||||||
|
// offset, which is why it is invisible on a UTC box and wrong everywhere else.
|
||||||
|
//
|
||||||
|
// Posted stays an instant in its own zone: it says when the phone showed the
|
||||||
|
// notification, and the past-grace check compares instants. Only the day and
|
||||||
|
// the wall clock are read in loc.
|
||||||
|
func EventFromNotificationIn(n Notification, loc *time.Location) (Event, bool) {
|
||||||
|
if loc == nil {
|
||||||
|
loc = time.Local
|
||||||
|
}
|
||||||
if n.Posted.IsZero() {
|
if n.Posted.IsZero() {
|
||||||
return Event{}, false
|
return Event{}, false
|
||||||
}
|
}
|
||||||
@@ -82,8 +103,9 @@ func EventFromNotification(n Notification) (Event, bool) {
|
|||||||
return Event{}, false
|
return Event{}, false
|
||||||
}
|
}
|
||||||
|
|
||||||
y, m, d := n.Posted.AddDate(0, 0, dayOffset(line)).Date()
|
// The day is Posted's LOCAL day: a notification posted at 23:30Z saying
|
||||||
loc := n.Posted.Location()
|
// "завтра в 09:00" is already tomorrow where he is standing.
|
||||||
|
y, m, d := n.Posted.In(loc).AddDate(0, 0, dayOffset(line)).Date()
|
||||||
s := time.Date(y, m, d, start.hour, start.min, 0, 0, loc)
|
s := time.Date(y, m, d, start.hour, start.min, 0, 0, loc)
|
||||||
// Too far in the past to be the meeting this notification is about. The day
|
// Too far in the past to be the meeting this notification is about. The day
|
||||||
// was inferred, so the honest reading is that the inference was wrong.
|
// was inferred, so the honest reading is that the inference was wrong.
|
||||||
|
|||||||
@@ -74,12 +74,12 @@ func TestEventFromNotification(t *testing.T) {
|
|||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
ev, ok := EventFromNotification(Notification{
|
ev, ok := EventFromNotificationIn(Notification{
|
||||||
Package: "com.google.android.gm",
|
Package: "com.google.android.gm",
|
||||||
Title: tt.title,
|
Title: tt.title,
|
||||||
Text: tt.text,
|
Text: tt.text,
|
||||||
Posted: posted,
|
Posted: posted,
|
||||||
})
|
}, posted.Location())
|
||||||
if ok != tt.wantOK {
|
if ok != tt.wantOK {
|
||||||
t.Fatalf("ok = %v, want %v (event %+v)", ok, tt.wantOK, ev)
|
t.Fatalf("ok = %v, want %v (event %+v)", ok, tt.wantOK, ev)
|
||||||
}
|
}
|
||||||
@@ -98,8 +98,8 @@ func TestEventFromNotification(t *testing.T) {
|
|||||||
if !ev.End.After(ev.Start) {
|
if !ev.End.After(ev.Start) {
|
||||||
t.Errorf("end %v must be after start %v", ev.End, 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
|
// The event lands on the day the phone showed it, in the zone it
|
||||||
// location — not shifted into UTC.
|
// was resolved against — never shifted into UTC.
|
||||||
if ev.Start.Location() != posted.Location() {
|
if ev.Start.Location() != posted.Location() {
|
||||||
t.Errorf("location = %v, want %v", ev.Start.Location(), posted.Location())
|
t.Errorf("location = %v, want %v", ev.Start.Location(), posted.Location())
|
||||||
}
|
}
|
||||||
@@ -162,10 +162,10 @@ func TestEventFromNotificationDayWords(t *testing.T) {
|
|||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
t.Run(tt.name, func(t *testing.T) {
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
ev, ok := EventFromNotification(Notification{
|
ev, ok := EventFromNotificationIn(Notification{
|
||||||
Package: "com.google.android.calendar",
|
Package: "com.google.android.calendar",
|
||||||
Title: tt.title, Text: tt.text, Posted: tt.posted,
|
Title: tt.title, Text: tt.text, Posted: tt.posted,
|
||||||
})
|
}, tt.posted.Location())
|
||||||
if ok != tt.wantOK {
|
if ok != tt.wantOK {
|
||||||
t.Fatalf("ok = %v, want %v (event %+v)", ok, tt.wantOK, ev)
|
t.Fatalf("ok = %v, want %v (event %+v)", ok, tt.wantOK, ev)
|
||||||
}
|
}
|
||||||
@@ -189,10 +189,10 @@ func TestEventFromNotificationDayWords(t *testing.T) {
|
|||||||
// summary makes "Завтра Планёрка" the name of the meeting, and FactKey folds
|
// summary makes "Завтра Планёрка" the name of the meeting, and FactKey folds
|
||||||
// that into the key.
|
// that into the key.
|
||||||
func TestEventFromNotificationDropsDayWordFromSummary(t *testing.T) {
|
func TestEventFromNotificationDropsDayWordFromSummary(t *testing.T) {
|
||||||
ev, ok := EventFromNotification(Notification{
|
ev, ok := EventFromNotificationIn(Notification{
|
||||||
Title: "Завтра Планёрка 09:00",
|
Title: "Завтра Планёрка 09:00",
|
||||||
Posted: time.Date(2026, 8, 3, 21, 0, 0, 0, time.UTC),
|
Posted: time.Date(2026, 8, 3, 21, 0, 0, 0, time.UTC),
|
||||||
})
|
}, time.UTC)
|
||||||
if !ok {
|
if !ok {
|
||||||
t.Fatal("expected an event")
|
t.Fatal("expected an event")
|
||||||
}
|
}
|
||||||
@@ -209,10 +209,10 @@ func TestEventFromNotificationNeedsPostedAt(t *testing.T) {
|
|||||||
|
|
||||||
// An ambient event must never be indistinguishable from a calendar read.
|
// An ambient event must never be indistinguishable from a calendar read.
|
||||||
func TestAmbientEventsAreStoredAtReducedConfidence(t *testing.T) {
|
func TestAmbientEventsAreStoredAtReducedConfidence(t *testing.T) {
|
||||||
ev, ok := EventFromNotification(Notification{
|
ev, ok := EventFromNotificationIn(Notification{
|
||||||
Title: "Планёрка 10:00-10:30",
|
Title: "Планёрка 10:00-10:30",
|
||||||
Posted: time.Date(2026, 8, 3, 9, 0, 0, 0, time.UTC),
|
Posted: time.Date(2026, 8, 3, 9, 0, 0, 0, time.UTC),
|
||||||
})
|
}, time.UTC)
|
||||||
if !ok {
|
if !ok {
|
||||||
t.Fatal("expected an event")
|
t.Fatal("expected an event")
|
||||||
}
|
}
|
||||||
@@ -237,3 +237,52 @@ func TestStripClock(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The defect this file's zone handling exists for: a phone posts an RFC 3339
|
||||||
|
// instant ending in Z, and "созвон в 14:30" used to be resolved against that
|
||||||
|
// Z, so on a UTC+4 box the meeting was stored at 18:30. A wall clock in a
|
||||||
|
// notification is local by construction.
|
||||||
|
func TestNotificationClockIsLocalNotUTC(t *testing.T) {
|
||||||
|
samara := time.FixedZone("+04", 4*3600)
|
||||||
|
n := Notification{
|
||||||
|
Package: "com.slack",
|
||||||
|
Title: "Standup",
|
||||||
|
Text: "созвон в 14:30",
|
||||||
|
Posted: time.Date(2026, 8, 2, 9, 0, 0, 0, time.UTC), // 13:00 local
|
||||||
|
}
|
||||||
|
ev, ok := EventFromNotificationIn(n, samara)
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("expected an event")
|
||||||
|
}
|
||||||
|
if got := ev.Start.Format("15:04"); got != "14:30" {
|
||||||
|
t.Errorf("start = %s local, want 14:30", got)
|
||||||
|
}
|
||||||
|
if got := ev.Start.UTC().Format("15:04"); got != "10:30" {
|
||||||
|
t.Errorf("start = %sZ, want 10:30Z (14:30 at UTC+4)", got)
|
||||||
|
}
|
||||||
|
if ev.Start.Location() != samara {
|
||||||
|
t.Errorf("location = %v, want %v", ev.Start.Location(), samara)
|
||||||
|
}
|
||||||
|
// The stored key is the local day, so it files under the day he lived.
|
||||||
|
if want, got := "calendar_event_20260802_Standup", FactKeyIn(ev, samara); got != want {
|
||||||
|
t.Errorf("FactKey = %q, want %q", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A notification posted late in the UTC evening is already the next day where
|
||||||
|
// he is standing. The day must come from the local clock, not from Posted's.
|
||||||
|
func TestNotificationDayIsTheLocalDay(t *testing.T) {
|
||||||
|
samara := time.FixedZone("+04", 4*3600)
|
||||||
|
n := Notification{
|
||||||
|
Title: "Планёрка 09:00",
|
||||||
|
Text: "завтра",
|
||||||
|
Posted: time.Date(2026, 8, 2, 21, 0, 0, 0, time.UTC), // 03-08 01:00 local
|
||||||
|
}
|
||||||
|
ev, ok := EventFromNotificationIn(n, samara)
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("expected an event")
|
||||||
|
}
|
||||||
|
if y, m, d := ev.Start.Date(); y != 2026 || m != time.August || d != 4 {
|
||||||
|
t.Errorf("date = %d-%02d-%02d, want 2026-08-04 (tomorrow, locally)", y, m, d)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -149,10 +149,11 @@ type Config struct {
|
|||||||
//
|
//
|
||||||
// Rules are code, not config (see loop.DefaultRules), and that stays true:
|
// Rules are code, not config (see loop.DefaultRules), and that stays true:
|
||||||
// this only subtracts. It exists because a rule can be right in principle
|
// this only subtracts. It exists because a rule can be right in principle
|
||||||
// and useless in practice — kuma's service_down cannot name the service it
|
// and useless in practice. service_down was the case that forced it: it
|
||||||
// is nudging about (Vikunja #444), so being told "a service on homesrv is
|
// could not name the service it was nudging about, so being told "a service
|
||||||
// down" every fifteen minutes is noise with no action attached. Turning it
|
// on homesrv is down" every fifteen minutes was noise with no action
|
||||||
// off beats learning to ignore her.
|
// attached. That is fixed — one fact per kuma monitor — and the rule ships
|
||||||
|
// enabled again. The escape hatch stays.
|
||||||
//
|
//
|
||||||
// A disabled rule is never gathered for, never evaluated, and never
|
// A disabled rule is never gathered for, never evaluated, and never
|
||||||
// delivered on any channel. Unknown names are ignored, so removing a rule
|
// delivered on any channel. Unknown names are ignored, so removing a rule
|
||||||
@@ -601,6 +602,9 @@ type MorningRoutineItemConfig struct {
|
|||||||
Key string `json:"key"`
|
Key string `json:"key"`
|
||||||
FactKey string `json:"fact_key"`
|
FactKey string `json:"fact_key"`
|
||||||
Label string `json:"label"`
|
Label string `json:"label"`
|
||||||
|
// Optional — this one being skipped does not earn a nudge. Default false,
|
||||||
|
// so a routine written before 04-08-2026 keeps behaving as it did.
|
||||||
|
Optional bool `json:"optional,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// QuietHoursConfig — a recurring daily quiet-window. Times are local to the
|
// QuietHoursConfig — a recurring daily quiet-window. Times are local to the
|
||||||
@@ -1734,7 +1738,7 @@ func morningRoutinesFromConfig(mc []MorningRoutineConfig) []morning.Routine {
|
|||||||
for i, r := range mc {
|
for i, r := range mc {
|
||||||
items := make([]morning.Item, len(r.Items))
|
items := make([]morning.Item, len(r.Items))
|
||||||
for j, it := range r.Items {
|
for j, it := range r.Items {
|
||||||
items[j] = morning.Item{Key: it.Key, FactKey: it.FactKey, Label: it.Label}
|
items[j] = morning.Item{Key: it.Key, FactKey: it.FactKey, Label: it.Label, Optional: it.Optional}
|
||||||
}
|
}
|
||||||
weekdays := make([]time.Weekday, len(r.Weekdays))
|
weekdays := make([]time.Weekday, len(r.Weekdays))
|
||||||
for j, w := range r.Weekdays {
|
for j, w := range r.Weekdays {
|
||||||
|
|||||||
@@ -57,6 +57,14 @@ func (q *PendingQuestion) CanAsk() bool {
|
|||||||
|
|
||||||
// ClarifyStore holds the parked questions. Same shape and locking as
|
// ClarifyStore holds the parked questions. Same shape and locking as
|
||||||
// SessionStore: keyed by dialogue id, expired entries dropped on read.
|
// SessionStore: keyed by dialogue id, expired entries dropped on read.
|
||||||
|
//
|
||||||
|
// Memory only, deliberately, unlike SessionStore — a restart expires every
|
||||||
|
// parked question and she does not announce that it happened (Vikunja #385,
|
||||||
|
// written down in docs/design.md). The 90s TTL and the attempt count measure a
|
||||||
|
// pause in one conversation, and a restart is a gap of unknown length, so a
|
||||||
|
// restored question would either be dead already or lying about its age. His
|
||||||
|
// next words route fresh, which is the right answer with or without a notice.
|
||||||
|
// Do not give this store a persister without re-arguing that.
|
||||||
type ClarifyStore struct {
|
type ClarifyStore struct {
|
||||||
mu sync.RWMutex
|
mu sync.RWMutex
|
||||||
questions map[string]*PendingQuestion
|
questions map[string]*PendingQuestion
|
||||||
|
|||||||
+26
-122
@@ -60,6 +60,19 @@ type Nudge struct {
|
|||||||
OutcomeTs *int64 `json:"outcome_ts,omitempty"`
|
OutcomeTs *int64 `json:"outcome_ts,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DeliveryAttempt — one row of the delivery outbox. Times are formatted by the
|
||||||
|
// reader; Completed is nil while the attempt is still pending.
|
||||||
|
type DeliveryAttempt struct {
|
||||||
|
ID int64 `json:"id"`
|
||||||
|
Kind string `json:"kind"`
|
||||||
|
Rule string `json:"rule,omitempty"`
|
||||||
|
ReminderID int64 `json:"reminder_id,omitempty"`
|
||||||
|
Channel string `json:"channel"`
|
||||||
|
Status string `json:"status"`
|
||||||
|
Created time.Time `json:"created"`
|
||||||
|
Completed *time.Time `json:"completed,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
// Note — a recall/preference item; ranked by embedding cosine on query.
|
// Note — a recall/preference item; ranked by embedding cosine on query.
|
||||||
// Score is set by QueryNotes (0 on the write path).
|
// Score is set by QueryNotes (0 on the write path).
|
||||||
type Note struct {
|
type Note struct {
|
||||||
@@ -521,6 +534,12 @@ type outcomesReq struct {
|
|||||||
type nReq struct {
|
type nReq struct {
|
||||||
N int `json:"n"`
|
N int `json:"n"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// deliveryAttemptsReq — the outbox read. Status is empty for every status.
|
||||||
|
type deliveryAttemptsReq struct {
|
||||||
|
Status string `json:"status,omitempty"`
|
||||||
|
N int `json:"n"`
|
||||||
|
}
|
||||||
type kindNReq struct {
|
type kindNReq struct {
|
||||||
Kind string `json:"kind"`
|
Kind string `json:"kind"`
|
||||||
N int `json:"n"`
|
N int `json:"n"`
|
||||||
@@ -593,8 +612,14 @@ type MCPServerStatus struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// chatReq / chatResp — text chat round-trip for the IPC Chat method.
|
// chatReq / chatResp — text chat round-trip for the IPC Chat method.
|
||||||
|
//
|
||||||
|
// Conversation names the thread this utterance belongs to: a mavweb session, a
|
||||||
|
// telegram chat. It is opaque to the daemon and only has to be stable for one
|
||||||
|
// conversation and distinct across them. Empty is allowed and means "the
|
||||||
|
// unattributed text tap", which is what an old client sends.
|
||||||
type chatReq struct {
|
type chatReq struct {
|
||||||
Text string `json:"text"`
|
Text string `json:"text"`
|
||||||
|
Conversation string `json:"conversation,omitempty"`
|
||||||
}
|
}
|
||||||
type chatResp struct {
|
type chatResp struct {
|
||||||
Reply string `json:"reply"`
|
Reply string `json:"reply"`
|
||||||
@@ -653,127 +678,6 @@ type acceptProposedRoutineReq struct {
|
|||||||
ID int64 `json:"id"`
|
ID int64 `json:"id"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// CoreAPI — what core exposes to modules. One Go interface, satisfied by:
|
|
||||||
// - the in-process store adapter (server.go storeAPI) — used by the daemon
|
|
||||||
// for modules that live in-process for now (router, delivery) and by tests,
|
|
||||||
// - the socket-backed server's dispatcher (which delegates to a CoreAPI),
|
|
||||||
// - the client proxy (client.go) — same interface, over the wire.
|
|
||||||
//
|
|
||||||
// So a module imports ipc, holds a CoreAPI, and is agnostic to whether it's
|
|
||||||
// been wired in-process (tests / daemon-embedded) or socketed (full topology).
|
|
||||||
// That swappability is the seam the auth layer will insert into without
|
|
||||||
// touching the module code.
|
|
||||||
type CoreAPI interface {
|
|
||||||
WriteFact(ctx context.Context, req WriteFactReq) (int64, error)
|
|
||||||
LatestFact(ctx context.Context, key string) (Fact, error)
|
|
||||||
LatestFactBySource(ctx context.Context, key, source string) (Fact, error)
|
|
||||||
Since(ctx context.Context, key string, now time.Time) (time.Duration, error)
|
|
||||||
Presence(ctx context.Context) (Presence, error)
|
|
||||||
CreateReminder(ctx context.Context, fire time.Time, payload, cron string) (int64, error)
|
|
||||||
MarkReminder(ctx context.Context, id int64, status string) error
|
|
||||||
ListReminders(ctx context.Context, n int) ([]Reminder, error)
|
|
||||||
RecordNudge(ctx context.Context, rule, channel, message string, ts time.Time) (int64, error)
|
|
||||||
ResolveNudge(ctx context.Context, id int64, outcome string, ts time.Time) error
|
|
||||||
RecentOutcomes(ctx context.Context, rule string, n int) ([]string, error)
|
|
||||||
RecentFacts(ctx context.Context, n int) ([]Fact, error)
|
|
||||||
RecentActiveFactsByKind(ctx context.Context, kind string, n int) ([]Fact, error)
|
|
||||||
CalendarEvents(ctx context.Context, from, to time.Time) ([]Fact, error)
|
|
||||||
RecentNudges(ctx context.Context, n int) ([]Nudge, error)
|
|
||||||
|
|
||||||
// RecentEcosystemTraces reads the ecosystem call log, which lives in its
|
|
||||||
// own table so machine-rate traces never crowd out human-rate facts.
|
|
||||||
RecentEcosystemTraces(ctx context.Context, n int) ([]EcosystemTrace, error)
|
|
||||||
WriteNote(ctx context.Context, ts time.Time, text string, embedding []float32, source string) (int64, error)
|
|
||||||
QueryNotes(ctx context.Context, embedding []float32, k int) ([]Note, error)
|
|
||||||
RecentNotes(ctx context.Context, n int) ([]Note, error)
|
|
||||||
// RecentNotesFromSource — the newest n notes whose source starts with
|
|
||||||
// prefix. Notes Maven read rather than heard (rss:, crawl:) are excluded
|
|
||||||
// from recall, so this is the only way to reach them, and it keeps the feed
|
|
||||||
// answer from being crowded out of a fixed window by his own notes.
|
|
||||||
RecentNotesFromSource(ctx context.Context, prefix string, n int) ([]Note, error)
|
|
||||||
|
|
||||||
// ProposeTool drafts an inert 'proposed' tool scaffold (maven-callable);
|
|
||||||
// returns whether a new proposal was written. EnableTool fills cmd +
|
|
||||||
// destructive and flips status to 'enabled'. DisableTool reverts an
|
|
||||||
// enabled tool back to proposed (it stays in the store, won't run).
|
|
||||||
// Enable/DisableTool gate at AuthStepUp (allowlist mutation, human-only);
|
|
||||||
// ProposeTool is maven-callable (no step-up — she has no passkey).
|
|
||||||
// LookupTool/ListTools read them.
|
|
||||||
// scope defaults to "homelab" when empty.
|
|
||||||
ProposeTool(ctx context.Context, name, utterance, scope string, ts time.Time) (bool, error)
|
|
||||||
EnableTool(ctx context.Context, name string, cmd []string, destructive bool, scope string, ts time.Time) error
|
|
||||||
DisableTool(ctx context.Context, name string) error
|
|
||||||
DeleteTool(ctx context.Context, name string) error
|
|
||||||
LookupTool(ctx context.Context, name string) (Tool, error)
|
|
||||||
ListTools(ctx context.Context, status string) ([]Tool, error)
|
|
||||||
RevertFact(ctx context.Context, key string) (int64, error)
|
|
||||||
|
|
||||||
// ListProposedRoutines returns proposed routines, newest first.
|
|
||||||
ListProposedRoutines(ctx context.Context) ([]ProposedRoutine, error)
|
|
||||||
// DismissProposedRoutine flips a proposed routine to 'dismissed'.
|
|
||||||
DismissProposedRoutine(ctx context.Context, id int64) error
|
|
||||||
// AcceptProposedRoutine flips a proposed routine to 'accepted'. The tick
|
|
||||||
// loop takes the schedule from there — no reminder is created (Vikunja #366).
|
|
||||||
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, by string) error
|
|
||||||
|
|
||||||
// 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
|
|
||||||
// persisted — it's a daemon-level cache).
|
|
||||||
TickTrace(ctx context.Context) (TickTrace, error)
|
|
||||||
|
|
||||||
// MorningStatus returns each configured morning routine's current
|
|
||||||
// checklist state (see internal/morning): active today/now, which items
|
|
||||||
// are done, which are still missing. The store adapter returns an error
|
|
||||||
// (morning routines are daemon-config, not persisted) — same shape as
|
|
||||||
// TickTrace.
|
|
||||||
MorningStatus(ctx context.Context) ([]MorningRoutineStatus, error)
|
|
||||||
|
|
||||||
// MCPServers reports the configured MCP servers and their health
|
|
||||||
// (Vikunja #251). Read-only introspection for /tools — there is no
|
|
||||||
// "call this tool" method on purpose: an MCP tool runs through the same
|
|
||||||
// allowlist, confirm turn and act path as any other tool, and a second
|
|
||||||
// mutation path would be a second thing to get wrong. Empty when the
|
|
||||||
// mcp config block is absent, which is the default.
|
|
||||||
MCPServers(ctx context.Context) ([]MCPServerStatus, 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
|
|
||||||
// (router → dialogue → action → replier) and returns the reply text.
|
|
||||||
// No audio or stt/tts — for text channels (mavweb, telegram).
|
|
||||||
Chat(ctx context.Context, text string) (string, error)
|
|
||||||
|
|
||||||
// RecentEvents returns the daemon's unified intake journal, newest first
|
|
||||||
// (Vikunja #283) — one envelope per thing that arrived, whatever direction
|
|
||||||
// it came from: a relayed notification, a mail candidate, a feed item, a
|
|
||||||
// changed page, a spend, a presence probe.
|
|
||||||
//
|
|
||||||
// Read-only and daemon-cached, the same shape as TickTrace and DayPlan:
|
|
||||||
// the store adapter returns an error, because the journal is a bounded
|
|
||||||
// in-memory ring and not a table. Its contents are a window over intake,
|
|
||||||
// never the durable record — that is still the fact, note or task the
|
|
||||||
// intake path wrote.
|
|
||||||
RecentEvents(ctx context.Context, n int) ([]IntakeEvent, error)
|
|
||||||
}
|
|
||||||
|
|
||||||
// IntakeEvent — one entry of the unified intake journal on the wire. Mirrors
|
// IntakeEvent — one entry of the unified intake journal on the wire. Mirrors
|
||||||
// event.Event field for field; the ipc package does not import internal/event
|
// event.Event field for field; the ipc package does not import internal/event
|
||||||
// so the wire shape stays independent of the in-process type.
|
// so the wire shape stays independent of the in-process type.
|
||||||
|
|||||||
+11
-2
@@ -68,6 +68,7 @@ var readOnlyMethods = map[Method]bool{
|
|||||||
MethodRecentActiveFacts: true,
|
MethodRecentActiveFacts: true,
|
||||||
MethodCalendarEvents: true,
|
MethodCalendarEvents: true,
|
||||||
MethodRecentNudges: true,
|
MethodRecentNudges: true,
|
||||||
|
MethodDeliveryAttempts: true,
|
||||||
MethodRecentEcoTraces: true,
|
MethodRecentEcoTraces: true,
|
||||||
MethodQueryNotes: true,
|
MethodQueryNotes: true,
|
||||||
MethodRecentNotes: true,
|
MethodRecentNotes: true,
|
||||||
@@ -373,6 +374,14 @@ func (c *Client) RecentEcosystemTraces(ctx context.Context, n int) ([]EcosystemT
|
|||||||
return out, nil
|
return out, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *Client) DeliveryAttempts(ctx context.Context, status string, n int) ([]DeliveryAttempt, error) {
|
||||||
|
var out []DeliveryAttempt
|
||||||
|
if err := c.call(ctx, MethodDeliveryAttempts, deliveryAttemptsReq{Status: status, N: n}, &out); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (c *Client) RecentNudges(ctx context.Context, n int) ([]Nudge, error) {
|
func (c *Client) RecentNudges(ctx context.Context, n int) ([]Nudge, error) {
|
||||||
var out []Nudge
|
var out []Nudge
|
||||||
if err := c.call(ctx, MethodRecentNudges, nReq{N: n}, &out); err != nil {
|
if err := c.call(ctx, MethodRecentNudges, nReq{N: n}, &out); err != nil {
|
||||||
@@ -623,9 +632,9 @@ func (c *Client) AcceptProposedRoutine(ctx context.Context, id int64) error {
|
|||||||
return c.call(ctx, MethodAcceptProposedRoutine, acceptProposedRoutineReq{ID: id}, nil)
|
return c.call(ctx, MethodAcceptProposedRoutine, acceptProposedRoutineReq{ID: id}, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Client) Chat(ctx context.Context, text string) (string, error) {
|
func (c *Client) Chat(ctx context.Context, conversation, text string) (string, error) {
|
||||||
var r chatResp
|
var r chatResp
|
||||||
if err := c.call(ctx, MethodChat, chatReq{Text: text}, &r); err != nil {
|
if err := c.call(ctx, MethodChat, chatReq{Text: text, Conversation: conversation}, &r); err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
return r.Reply, nil
|
return r.Reply, nil
|
||||||
|
|||||||
@@ -0,0 +1,194 @@
|
|||||||
|
package ipc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// CoreAPI and the eight domain interfaces it composes (Vikunja #408).
|
||||||
|
//
|
||||||
|
// It used to be one flat block of forty methods, and the cost of that shape
|
||||||
|
// was paid three times over: every method added an arm to the dispatcher, a
|
||||||
|
// stub to the daemon's locked API, and a stub to every test double. Two of
|
||||||
|
// those three are already gone — the dispatcher is a table (methodTable in
|
||||||
|
// server.go), and UnimplementedCoreAPI took the padding out of the doubles and
|
||||||
|
// out of lockedAPI, which no longer exists.
|
||||||
|
//
|
||||||
|
// What was left is the interface itself, and this file is that half. CoreAPI
|
||||||
|
// is unchanged as a type: the same forty methods, in the same order, so the
|
||||||
|
// wire contract, the client proxy and the store adapter are all untouched.
|
||||||
|
// What it gains is a named seam per domain, so a caller that only reads facts
|
||||||
|
// can say FactAPI and a reader can see which cluster a method belongs to
|
||||||
|
// without counting lines.
|
||||||
|
//
|
||||||
|
// Add a method to the domain it belongs to, not to CoreAPI.
|
||||||
|
|
||||||
|
// FactAPI — the fact store: write, read the current value, read history, and
|
||||||
|
// undo. Presence sits here because it is a hysteresis view over presence
|
||||||
|
// facts, not a store of its own.
|
||||||
|
type FactAPI interface {
|
||||||
|
WriteFact(ctx context.Context, req WriteFactReq) (int64, error)
|
||||||
|
LatestFact(ctx context.Context, key string) (Fact, error)
|
||||||
|
LatestFactBySource(ctx context.Context, key, source string) (Fact, error)
|
||||||
|
Since(ctx context.Context, key string, now time.Time) (time.Duration, error)
|
||||||
|
Presence(ctx context.Context) (Presence, error)
|
||||||
|
RecentFacts(ctx context.Context, n int) ([]Fact, error)
|
||||||
|
RecentActiveFactsByKind(ctx context.Context, kind string, n int) ([]Fact, error)
|
||||||
|
CalendarEvents(ctx context.Context, from, to time.Time) ([]Fact, error)
|
||||||
|
RevertFact(ctx context.Context, key string) (int64, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReminderAPI — scheduled sends the owner asked for.
|
||||||
|
type ReminderAPI interface {
|
||||||
|
CreateReminder(ctx context.Context, fire time.Time, payload, cron string) (int64, error)
|
||||||
|
MarkReminder(ctx context.Context, id int64, status string) error
|
||||||
|
ListReminders(ctx context.Context, n int) ([]Reminder, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NudgeAPI — proactive sends Maven proposed, their outcomes, and the outbox
|
||||||
|
// they went out through.
|
||||||
|
type NudgeAPI interface {
|
||||||
|
RecordNudge(ctx context.Context, rule, channel, message string, ts time.Time) (int64, error)
|
||||||
|
ResolveNudge(ctx context.Context, id int64, outcome string, ts time.Time) error
|
||||||
|
RecentOutcomes(ctx context.Context, rule string, n int) ([]string, error)
|
||||||
|
RecentNudges(ctx context.Context, n int) ([]Nudge, error)
|
||||||
|
// DeliveryAttempts reads the outbox, newest first. An empty status means
|
||||||
|
// every status (Vikunja #390).
|
||||||
|
DeliveryAttempts(ctx context.Context, status string, n int) ([]DeliveryAttempt, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NoteAPI — free text he captured, plus the embedded recall over it.
|
||||||
|
type NoteAPI interface {
|
||||||
|
WriteNote(ctx context.Context, ts time.Time, text string, embedding []float32, source string) (int64, error)
|
||||||
|
QueryNotes(ctx context.Context, embedding []float32, k int) ([]Note, error)
|
||||||
|
RecentNotes(ctx context.Context, n int) ([]Note, error)
|
||||||
|
// RecentNotesFromSource — the newest n notes whose source starts with
|
||||||
|
// prefix. Notes Maven read rather than heard (rss:, crawl:) are excluded
|
||||||
|
// from recall, so this is the only way to reach them, and it keeps the feed
|
||||||
|
// answer from being crowded out of a fixed window by his own notes.
|
||||||
|
RecentNotesFromSource(ctx context.Context, prefix string, n int) ([]Note, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ToolAPI — the capability allowlist and its read side.
|
||||||
|
//
|
||||||
|
// ProposeTool drafts an inert 'proposed' tool scaffold (maven-callable);
|
||||||
|
// returns whether a new proposal was written. EnableTool fills cmd +
|
||||||
|
// destructive and flips status to 'enabled'. DisableTool reverts an
|
||||||
|
// enabled tool back to proposed (it stays in the store, won't run).
|
||||||
|
// Enable/DisableTool gate at AuthStepUp (allowlist mutation, human-only);
|
||||||
|
// ProposeTool is maven-callable (no step-up — she has no passkey).
|
||||||
|
// LookupTool/ListTools read them.
|
||||||
|
// scope defaults to "homelab" when empty.
|
||||||
|
type ToolAPI interface {
|
||||||
|
ProposeTool(ctx context.Context, name, utterance, scope string, ts time.Time) (bool, error)
|
||||||
|
EnableTool(ctx context.Context, name string, cmd []string, destructive bool, scope string, ts time.Time) error
|
||||||
|
DisableTool(ctx context.Context, name string) error
|
||||||
|
DeleteTool(ctx context.Context, name string) error
|
||||||
|
LookupTool(ctx context.Context, name string) (Tool, error)
|
||||||
|
ListTools(ctx context.Context, status string) ([]Tool, error)
|
||||||
|
|
||||||
|
// MCPServers reports the configured MCP servers and their health
|
||||||
|
// (Vikunja #251). Read-only introspection for /tools — there is no
|
||||||
|
// "call this tool" method on purpose: an MCP tool runs through the same
|
||||||
|
// allowlist, confirm turn and act path as any other tool, and a second
|
||||||
|
// mutation path would be a second thing to get wrong. Empty when the
|
||||||
|
// mcp config block is absent, which is the default.
|
||||||
|
MCPServers(ctx context.Context) ([]MCPServerStatus, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// RoutineAPI — the shapes of his day: routines Maven noticed and proposed, the
|
||||||
|
// morning checklist, and today's plan.
|
||||||
|
//
|
||||||
|
// MorningStatus and DayPlan are daemon-computed rather than stored, so the
|
||||||
|
// store adapter returns an error for both — the same shape as TickTrace.
|
||||||
|
type RoutineAPI interface {
|
||||||
|
// ListProposedRoutines returns proposed routines, newest first.
|
||||||
|
ListProposedRoutines(ctx context.Context) ([]ProposedRoutine, error)
|
||||||
|
// DismissProposedRoutine flips a proposed routine to 'dismissed'.
|
||||||
|
DismissProposedRoutine(ctx context.Context, id int64) error
|
||||||
|
// AcceptProposedRoutine flips a proposed routine to 'accepted'. The tick
|
||||||
|
// loop takes the schedule from there — no reminder is created (Vikunja #366).
|
||||||
|
AcceptProposedRoutine(ctx context.Context, id int64) error
|
||||||
|
|
||||||
|
// MorningStatus returns each configured morning routine's current
|
||||||
|
// checklist state (see internal/morning): active today/now, which items
|
||||||
|
// are done, which are still missing.
|
||||||
|
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.
|
||||||
|
DayPlan(ctx context.Context) (DayPlan, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// TaskAPI — outstanding work, whatever surface it arrived from.
|
||||||
|
type TaskAPI interface {
|
||||||
|
// 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, by string) error
|
||||||
|
}
|
||||||
|
|
||||||
|
// SystemAPI — what the daemon knows about itself, plus the one method that
|
||||||
|
// runs a whole turn.
|
||||||
|
type SystemAPI interface {
|
||||||
|
// 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
|
||||||
|
// persisted — it's a daemon-level cache).
|
||||||
|
TickTrace(ctx context.Context) (TickTrace, error)
|
||||||
|
|
||||||
|
// RecentEcosystemTraces reads the ecosystem call log, which lives in its
|
||||||
|
// own table so machine-rate traces never crowd out human-rate facts.
|
||||||
|
RecentEcosystemTraces(ctx context.Context, n int) ([]EcosystemTrace, error)
|
||||||
|
|
||||||
|
// RecentEvents returns the daemon's unified intake journal, newest first
|
||||||
|
// (Vikunja #283) — one envelope per thing that arrived, whatever direction
|
||||||
|
// it came from: a relayed notification, a mail candidate, a feed item, a
|
||||||
|
// changed page, a spend, a presence probe.
|
||||||
|
//
|
||||||
|
// Read-only and daemon-cached, the same shape as TickTrace and DayPlan:
|
||||||
|
// the store adapter returns an error, because the journal is a bounded
|
||||||
|
// in-memory ring and not a table. Its contents are a window over intake,
|
||||||
|
// never the durable record — that is still the fact, note or task the
|
||||||
|
// intake path wrote.
|
||||||
|
RecentEvents(ctx context.Context, n int) ([]IntakeEvent, error)
|
||||||
|
|
||||||
|
// Chat routes a text utterance through the reactive handler's core path
|
||||||
|
// (router → dialogue → action → replier) and returns the reply text.
|
||||||
|
// No audio or stt/tts — for text channels (mavweb, telegram).
|
||||||
|
//
|
||||||
|
// conversation names the thread. A parked clarifying question is held per
|
||||||
|
// conversation, so an unanswered question on one reach cannot eat the next
|
||||||
|
// utterance from another (Vikunja #466). Empty means the unattributed text
|
||||||
|
// tap and is still one conversation of its own, separate from the mic.
|
||||||
|
Chat(ctx context.Context, conversation, text string) (string, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// CoreAPI — what core exposes to modules. One Go interface, satisfied by:
|
||||||
|
// - the in-process store adapter (storeapi.go) — used by the daemon
|
||||||
|
// for modules that live in-process for now (router, delivery) and by tests,
|
||||||
|
// - the socket-backed server's dispatcher (which delegates to a CoreAPI),
|
||||||
|
// - the client proxy (client.go) — same interface, over the wire.
|
||||||
|
//
|
||||||
|
// So a module imports ipc, holds a CoreAPI, and is agnostic to whether it's
|
||||||
|
// been wired in-process (tests / daemon-embedded) or socketed (full topology).
|
||||||
|
// That swappability is the seam the auth layer inserts into without touching
|
||||||
|
// the module code.
|
||||||
|
type CoreAPI interface {
|
||||||
|
FactAPI
|
||||||
|
ReminderAPI
|
||||||
|
NudgeAPI
|
||||||
|
NoteAPI
|
||||||
|
ToolAPI
|
||||||
|
RoutineAPI
|
||||||
|
TaskAPI
|
||||||
|
SystemAPI
|
||||||
|
}
|
||||||
@@ -36,6 +36,13 @@ const maxFrame = 4 << 20
|
|||||||
// (we read the length but not the body), so the caller must close it.
|
// (we read the length but not the body), so the caller must close it.
|
||||||
var ErrFrameTooLarge = errors.New("ipc: frame too large")
|
var ErrFrameTooLarge = errors.New("ipc: frame too large")
|
||||||
|
|
||||||
|
// The framing is hand-rolled and it stays that way (Vikunja #410): ninety
|
||||||
|
// lines, readable on the wire with socat, and every standard replacement
|
||||||
|
// brings schema machinery this boundary does not want. The condition is that
|
||||||
|
// it is defended by tests rather than inherited untested — truncated header,
|
||||||
|
// truncated body, partial reads, frame boundaries and a non-JSON body all
|
||||||
|
// live in frame_test.go.
|
||||||
|
//
|
||||||
// writeFrame encodes v as JSON and frames it as a 4-byte big-endian length
|
// writeFrame encodes v as JSON and frames it as a 4-byte big-endian length
|
||||||
// prefix + body. length-prefixed JSON (not a tighter binary schema) is the
|
// prefix + body. length-prefixed JSON (not a tighter binary schema) is the
|
||||||
// deferred-but-picked wire format: debuggable with `socat`/`nc`, trivial to
|
// deferred-but-picked wire format: debuggable with `socat`/`nc`, trivial to
|
||||||
|
|||||||
@@ -0,0 +1,142 @@
|
|||||||
|
package ipc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/binary"
|
||||||
|
"errors"
|
||||||
|
"io"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The framing is hand-rolled, and it is the protocol all nine daemons depend
|
||||||
|
// on, so a bug in it is a bug everywhere (Vikunja #410). The review asked
|
||||||
|
// whether to replace it with something standard. It stays: length-prefixed
|
||||||
|
// JSON over a unix socket is ninety lines, it is readable with socat, and the
|
||||||
|
// alternatives (net/rpc, gRPC, a codec library) all buy schema machinery this
|
||||||
|
// boundary does not want. What was wrong was inheriting it untested. These
|
||||||
|
// are the paths a real socket produces that the round-trip test never does.
|
||||||
|
|
||||||
|
// A short header is not EOF. EOF means the peer closed cleanly between
|
||||||
|
// frames, which the server treats as a normal disconnect; a header that stops
|
||||||
|
// halfway is a truncated frame and must be reported as an error, or a peer
|
||||||
|
// that dies mid-write looks like one that hung up politely.
|
||||||
|
func TestReadFrameTruncatedHeader(t *testing.T) {
|
||||||
|
var v any
|
||||||
|
err := readFrame(bytes.NewReader([]byte{0, 0, 4}), &v)
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("a three-byte header must fail")
|
||||||
|
}
|
||||||
|
if errors.Is(err, io.EOF) {
|
||||||
|
t.Fatalf("err = %v, want a truncation error, not EOF", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A header promising more body than follows. Same reasoning: the frame never
|
||||||
|
// arrived, so it must not decode into a zero value the caller then trusts.
|
||||||
|
func TestReadFrameTruncatedBody(t *testing.T) {
|
||||||
|
var buf bytes.Buffer
|
||||||
|
var hdr [4]byte
|
||||||
|
binary.BigEndian.PutUint32(hdr[:], 32)
|
||||||
|
buf.Write(hdr[:])
|
||||||
|
buf.WriteString(`{"m":"pi`)
|
||||||
|
|
||||||
|
var got map[string]string
|
||||||
|
if err := readFrame(&buf, &got); err == nil {
|
||||||
|
t.Fatal("a body shorter than its prefix must fail")
|
||||||
|
}
|
||||||
|
if len(got) != 0 {
|
||||||
|
t.Errorf("decoded %v from a truncated frame", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Nothing at all is EOF, and only this is.
|
||||||
|
func TestReadFrameEmptyIsEOF(t *testing.T) {
|
||||||
|
var v any
|
||||||
|
if err := readFrame(bytes.NewReader(nil), &v); !errors.Is(err, io.EOF) {
|
||||||
|
t.Fatalf("err = %v, want io.EOF", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// byteAtATime returns one byte per Read, which is what a socket is allowed to
|
||||||
|
// do and what a bytes.Reader never does. readFrame uses io.ReadFull for both
|
||||||
|
// the header and the body; this is the test that would fail if either turned
|
||||||
|
// into a bare Read.
|
||||||
|
type byteAtATime struct {
|
||||||
|
b []byte
|
||||||
|
i int
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *byteAtATime) Read(p []byte) (int, error) {
|
||||||
|
if r.i >= len(r.b) {
|
||||||
|
return 0, io.EOF
|
||||||
|
}
|
||||||
|
if len(p) == 0 {
|
||||||
|
return 0, nil
|
||||||
|
}
|
||||||
|
p[0] = r.b[r.i]
|
||||||
|
r.i++
|
||||||
|
return 1, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestReadFrameReassemblesPartialReads(t *testing.T) {
|
||||||
|
type payload struct {
|
||||||
|
Msg string `json:"m"`
|
||||||
|
N int `json:"n"`
|
||||||
|
}
|
||||||
|
want := payload{Msg: "привет", N: 7}
|
||||||
|
var buf bytes.Buffer
|
||||||
|
if err := writeFrame(&buf, want); err != nil {
|
||||||
|
t.Fatalf("writeFrame: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var got payload
|
||||||
|
if err := readFrame(&byteAtATime{b: buf.Bytes()}, &got); err != nil {
|
||||||
|
t.Fatalf("readFrame: %v", err)
|
||||||
|
}
|
||||||
|
if got != want {
|
||||||
|
t.Fatalf("got %+v, want %+v", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Two frames written back to back must come back as two frames. A reader that
|
||||||
|
// consumed more than one frame's body would desynchronize the connection, and
|
||||||
|
// the symptom would be a reply attributed to the wrong request.
|
||||||
|
func TestReadFrameStopsAtTheFrameBoundary(t *testing.T) {
|
||||||
|
var buf bytes.Buffer
|
||||||
|
for _, m := range []string{"first", "second"} {
|
||||||
|
if err := writeFrame(&buf, map[string]string{"m": m}); err != nil {
|
||||||
|
t.Fatalf("writeFrame: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
r := &byteAtATime{b: buf.Bytes()}
|
||||||
|
for _, want := range []string{"first", "second"} {
|
||||||
|
var got map[string]string
|
||||||
|
if err := readFrame(r, &got); err != nil {
|
||||||
|
t.Fatalf("readFrame(%s): %v", want, err)
|
||||||
|
}
|
||||||
|
if got["m"] != want {
|
||||||
|
t.Fatalf("got %q, want %q", got["m"], want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var extra map[string]string
|
||||||
|
if err := readFrame(r, &extra); !errors.Is(err, io.EOF) {
|
||||||
|
t.Fatalf("after two frames: err = %v, want io.EOF", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A body that is not JSON is an error, not a zero value. The peer is either
|
||||||
|
// broken or not speaking this protocol; either way the caller must not read
|
||||||
|
// on as though it decoded.
|
||||||
|
func TestReadFrameRejectsNonJSONBody(t *testing.T) {
|
||||||
|
var buf bytes.Buffer
|
||||||
|
var hdr [4]byte
|
||||||
|
body := []byte("not json at all")
|
||||||
|
binary.BigEndian.PutUint32(hdr[:], uint32(len(body)))
|
||||||
|
buf.Write(hdr[:])
|
||||||
|
buf.Write(body)
|
||||||
|
|
||||||
|
var got map[string]string
|
||||||
|
if err := readFrame(&buf, &got); err == nil {
|
||||||
|
t.Fatal("a non-JSON body must fail")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -401,7 +401,7 @@ func TestChatViaClient(t *testing.T) {
|
|||||||
}
|
}
|
||||||
t.Cleanup(func() { _ = cli.Close() })
|
t.Cleanup(func() { _ = cli.Close() })
|
||||||
|
|
||||||
reply, err := cli.Chat(context.Background(), "привет")
|
reply, err := cli.Chat(context.Background(), "web", "привет")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Chat: %v", err)
|
t.Fatalf("Chat: %v", err)
|
||||||
}
|
}
|
||||||
@@ -417,7 +417,7 @@ type chatTestAPI struct {
|
|||||||
UnimplementedCoreAPI
|
UnimplementedCoreAPI
|
||||||
}
|
}
|
||||||
|
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,148 @@
|
|||||||
|
package ipc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"go/ast"
|
||||||
|
"go/parser"
|
||||||
|
"go/token"
|
||||||
|
"io/fs"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/store"
|
||||||
|
)
|
||||||
|
|
||||||
|
// mapErr turns a store sentinel into its wire twin so a module can errors.Is
|
||||||
|
// without importing internal/store. The design is right and the failure mode is
|
||||||
|
// quiet: add a sentinel to store, forget the switch, and the client gets an
|
||||||
|
// untyped error that no caller can branch on. These two tests are the alarm.
|
||||||
|
|
||||||
|
// mapErrPairs — every store sentinel that has a wire twin, and the twin.
|
||||||
|
var mapErrPairs = []struct {
|
||||||
|
name string // the store identifier, for the coverage test below
|
||||||
|
from error
|
||||||
|
wants error
|
||||||
|
}{
|
||||||
|
{"ErrNoFact", store.ErrNoFact, ErrNoFact},
|
||||||
|
{"ErrConfidence", store.ErrConfidence, ErrConfidence},
|
||||||
|
{"ErrVoidsMissing", store.ErrVoidsMissing, ErrVoidsMissing},
|
||||||
|
{"ErrNudgeNotFound", store.ErrNudgeNotFound, ErrNudgeNotFound},
|
||||||
|
{"ErrNudgeOutcome", store.ErrNudgeOutcome, ErrNudgeOutcome},
|
||||||
|
{"ErrReminderNotFound", store.ErrReminderNotFound, ErrReminderNotFound},
|
||||||
|
{"ErrReminderState", store.ErrReminderState, ErrReminderState},
|
||||||
|
{"ErrToolNotFound", store.ErrToolNotFound, ErrToolNotFound},
|
||||||
|
}
|
||||||
|
|
||||||
|
// unmappedStoreErrors — store sentinels that deliberately have no wire twin,
|
||||||
|
// each with the reason it stays store-side. A new sentinel is in neither list
|
||||||
|
// and fails TestMapErrCoversEveryStoreSentinel, which is the point: whether a
|
||||||
|
// module can branch on an error is a decision, not a default.
|
||||||
|
var unmappedStoreErrors = map[string]string{
|
||||||
|
"ErrKeyLen": "unlock path — the key never crosses CoreAPI",
|
||||||
|
"ErrDecrypt": "unlock path — the key never crosses CoreAPI",
|
||||||
|
|
||||||
|
"ErrToolCmd": "write-side validation of an allowlist mutation; the caller is the owner at a step-up, not a module branching on the verdict",
|
||||||
|
|
||||||
|
"ErrProposedRoutineNotFound": "no module branches on a routine id that vanished; accept and dismiss are owner clicks",
|
||||||
|
"ErrProposedRoutineExists": "the propose path already reports 'nothing new' through its bool return",
|
||||||
|
"ErrRoutineStatus": "an unknown status is a caller bug, not a state a module recovers from",
|
||||||
|
|
||||||
|
"ErrTaskNotFound": "the task surfaces re-list rather than branch",
|
||||||
|
"ErrTaskEmpty": "input validation — the surface refuses empty text before it gets here",
|
||||||
|
"ErrTaskStatus": "an illegal status move is a caller bug; the surface offers only legal ones",
|
||||||
|
}
|
||||||
|
|
||||||
|
// The mapping itself, through a wrap, because every real caller wraps.
|
||||||
|
func TestMapErrMapsEveryPair(t *testing.T) {
|
||||||
|
for _, p := range mapErrPairs {
|
||||||
|
got := mapErr(fmt.Errorf("storeapi: %w", p.from))
|
||||||
|
if got != p.wants {
|
||||||
|
t.Errorf("mapErr(store.%s) = %v, want %v", p.name, got, p.wants)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Anything mapErr does not recognise passes through untouched. A module that
|
||||||
|
// cannot branch on an error must still see the original text.
|
||||||
|
func TestMapErrPassesUnknownThrough(t *testing.T) {
|
||||||
|
if mapErr(nil) != nil {
|
||||||
|
t.Error("mapErr(nil) must stay nil")
|
||||||
|
}
|
||||||
|
own := fmt.Errorf("socket closed")
|
||||||
|
if got := mapErr(own); got != own {
|
||||||
|
t.Errorf("mapErr(%v) = %v, want the same error back", own, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The parity half: every exported sentinel in internal/store is either mapped
|
||||||
|
// or listed with a reason. Read off the source, so a sentinel added in a file
|
||||||
|
// this package never touches still trips it.
|
||||||
|
func TestMapErrCoversEveryStoreSentinel(t *testing.T) {
|
||||||
|
mapped := map[string]bool{}
|
||||||
|
for _, p := range mapErrPairs {
|
||||||
|
mapped[p.name] = true
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, name := range storeSentinelNames(t) {
|
||||||
|
if mapped[name] || unmappedStoreErrors[name] != "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
t.Errorf("store.%s is a new sentinel with no verdict: add it to mapErr and mapErrPairs, "+
|
||||||
|
"or to unmappedStoreErrors with the reason a module cannot branch on it", name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// storeSentinelNames reads internal/store for exported package-level error
|
||||||
|
// values: `var ErrX = errors.New(...)`, inside a block or on its own.
|
||||||
|
func storeSentinelNames(t *testing.T) []string {
|
||||||
|
t.Helper()
|
||||||
|
fset := token.NewFileSet()
|
||||||
|
pkgs, err := parser.ParseDir(fset, "../store", func(fi fs.FileInfo) bool {
|
||||||
|
return !strings.HasSuffix(fi.Name(), "_test.go")
|
||||||
|
}, 0)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("parse internal/store: %v", err)
|
||||||
|
}
|
||||||
|
var out []string
|
||||||
|
for _, pkg := range pkgs {
|
||||||
|
for _, f := range pkg.Files {
|
||||||
|
for _, d := range f.Decls {
|
||||||
|
gd, ok := d.(*ast.GenDecl)
|
||||||
|
if !ok || gd.Tok != token.VAR {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for _, spec := range gd.Specs {
|
||||||
|
vs, ok := spec.(*ast.ValueSpec)
|
||||||
|
if !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for i, n := range vs.Names {
|
||||||
|
if !strings.HasPrefix(n.Name, "Err") || !n.IsExported() {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if i < len(vs.Values) && isErrorsNew(vs.Values[i]) {
|
||||||
|
out = append(out, n.Name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(out) < len(mapErrPairs) {
|
||||||
|
t.Fatalf("found %d sentinels in internal/store, fewer than the %d already mapped — the scan is broken, not the store", len(out), len(mapErrPairs))
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
func isErrorsNew(e ast.Expr) bool {
|
||||||
|
call, ok := e.(*ast.CallExpr)
|
||||||
|
if !ok {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
sel, ok := call.Fun.(*ast.SelectorExpr)
|
||||||
|
if !ok || sel.Sel.Name != "New" {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
id, ok := sel.X.(*ast.Ident)
|
||||||
|
return ok && id.Name == "errors"
|
||||||
|
}
|
||||||
+11
-424
@@ -2,9 +2,7 @@ package ipc
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"database/sql"
|
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"net"
|
"net"
|
||||||
@@ -13,430 +11,9 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/kami/maven/internal/netaddr"
|
"github.com/kami/maven/internal/netaddr"
|
||||||
"github.com/kami/maven/internal/store"
|
|
||||||
"golang.org/x/sys/unix"
|
"golang.org/x/sys/unix"
|
||||||
)
|
)
|
||||||
|
|
||||||
// storeAPI — adapts *store.Store to CoreAPI. The daemon constructs one of
|
|
||||||
// these inside the core process; the socket Server calls it through the
|
|
||||||
// CoreAPI interface, so over-the-wire and in-process callers behave
|
|
||||||
// identically. The translation here is the only place store sentinels cross
|
|
||||||
// the wire: store.ErrNoFact becomes ipc.ErrNoFact, etc. — keeping the module
|
|
||||||
// view of errors stable regardless of transport.
|
|
||||||
type storeAPI struct {
|
|
||||||
s *store.Store
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewStoreAPI wraps a *store.Store as a CoreAPI. The store is the sqlcipher-
|
|
||||||
// unlocked handle held ONLY in core's address space; this adapter never
|
|
||||||
// returns it to a caller — core mediates.
|
|
||||||
func NewStoreAPI(s *store.Store) CoreAPI { return &storeAPI{s: s} }
|
|
||||||
|
|
||||||
func (a *storeAPI) WriteFact(ctx context.Context, req WriteFactReq) (int64, error) {
|
|
||||||
var voids sql.NullInt64
|
|
||||||
if req.VoidsID != nil {
|
|
||||||
voids = sql.NullInt64{Int64: *req.VoidsID, Valid: true}
|
|
||||||
}
|
|
||||||
id, err := a.s.WriteFactAboutSubject(ctx, req.Ts, store.FactKind(req.Kind), req.Key, req.Subject, req.Value, req.Source, req.Confidence, voids)
|
|
||||||
return id, mapErr(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) LatestFact(ctx context.Context, key string) (Fact, error) {
|
|
||||||
f, err := a.s.LatestFact(ctx, key)
|
|
||||||
if err != nil {
|
|
||||||
return Fact{}, mapErr(err)
|
|
||||||
}
|
|
||||||
return toFact(f), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) LatestFactBySource(ctx context.Context, key, source string) (Fact, error) {
|
|
||||||
f, err := a.s.LatestFactBySource(ctx, key, source)
|
|
||||||
if err != nil {
|
|
||||||
return Fact{}, mapErr(err)
|
|
||||||
}
|
|
||||||
return toFact(f), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) Since(ctx context.Context, key string, now time.Time) (time.Duration, error) {
|
|
||||||
d, err := a.s.Since(ctx, key, now)
|
|
||||||
return d, mapErr(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) Presence(ctx context.Context) (Presence, error) {
|
|
||||||
b, score, upd, err := a.s.LoadPresenceState(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return Presence{}, fmt.Errorf("ipc: load presence: %w", err)
|
|
||||||
}
|
|
||||||
return Presence{Bucket: Bucket(b), Score: score, Updated: upd}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) CreateReminder(ctx context.Context, fire time.Time, payload, cron string) (int64, error) {
|
|
||||||
id, err := a.s.CreateReminder(ctx, fire, payload, cron)
|
|
||||||
return id, mapErr(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) MarkReminder(ctx context.Context, id int64, status string) error {
|
|
||||||
return mapErr(a.s.MarkReminder(ctx, id, status))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) ListReminders(ctx context.Context, n int) ([]Reminder, error) {
|
|
||||||
rs, err := a.s.ListReminders(ctx, n)
|
|
||||||
if err != nil {
|
|
||||||
return nil, mapErr(err)
|
|
||||||
}
|
|
||||||
out := make([]Reminder, len(rs))
|
|
||||||
for i, r := range rs {
|
|
||||||
out[i] = toReminder(r)
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) RescheduleReminder(ctx context.Context, id int64, now time.Time) error {
|
|
||||||
return mapErr(a.s.RescheduleReminder(ctx, id, now))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) RecordNudge(ctx context.Context, rule, channel, message string, ts time.Time) (int64, error) {
|
|
||||||
id, err := a.s.RecordNudge(ctx, rule, channel, message, ts)
|
|
||||||
return id, mapErr(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) ResolveNudge(ctx context.Context, id int64, outcome string, ts time.Time) error {
|
|
||||||
return mapErr(a.s.ResolveNudge(ctx, id, outcome, ts))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) RecentOutcomes(ctx context.Context, rule string, n int) ([]string, error) {
|
|
||||||
out, err := a.s.RecentOutcomes(ctx, rule, n)
|
|
||||||
return out, mapErr(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) RecentFacts(ctx context.Context, n int) ([]Fact, error) {
|
|
||||||
fs, err := a.s.RecentFacts(ctx, n)
|
|
||||||
if err != nil {
|
|
||||||
return nil, mapErr(err)
|
|
||||||
}
|
|
||||||
out := make([]Fact, len(fs))
|
|
||||||
for i, f := range fs {
|
|
||||||
out[i] = toFact(f)
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) RecentActiveFactsByKind(ctx context.Context, kind string, n int) ([]Fact, error) {
|
|
||||||
fs, err := a.s.RecentActiveFactsByKind(ctx, store.FactKind(kind), n)
|
|
||||||
if err != nil {
|
|
||||||
return nil, mapErr(err)
|
|
||||||
}
|
|
||||||
out := make([]Fact, len(fs))
|
|
||||||
for i, f := range fs {
|
|
||||||
out[i] = toFact(f)
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) CalendarEvents(ctx context.Context, from, to time.Time) ([]Fact, error) {
|
|
||||||
fs, err := a.s.CalendarEvents(ctx, from, to)
|
|
||||||
if err != nil {
|
|
||||||
return nil, mapErr(err)
|
|
||||||
}
|
|
||||||
out := make([]Fact, len(fs))
|
|
||||||
for i, f := range fs {
|
|
||||||
out[i] = toFact(f)
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) RecentEcosystemTraces(ctx context.Context, n int) ([]EcosystemTrace, error) {
|
|
||||||
trs, err := a.s.RecentEcosystemTraces(ctx, n)
|
|
||||||
if err != nil {
|
|
||||||
return nil, mapErr(err)
|
|
||||||
}
|
|
||||||
out := make([]EcosystemTrace, len(trs))
|
|
||||||
for i, tr := range trs {
|
|
||||||
out[i] = EcosystemTrace{
|
|
||||||
ID: tr.ID, Ts: tr.Ts, Service: tr.Service, Operation: tr.Operation,
|
|
||||||
Status: tr.Status, DurationMs: tr.DurationMs, CorrelationID: tr.CorrelationID,
|
|
||||||
CausationID: tr.CausationID, HTTPStatus: tr.HTTPStatus, Fields: tr.Fields,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) RecentNudges(ctx context.Context, n int) ([]Nudge, error) {
|
|
||||||
ns, err := a.s.RecentNudges(ctx, n)
|
|
||||||
if err != nil {
|
|
||||||
return nil, mapErr(err)
|
|
||||||
}
|
|
||||||
out := make([]Nudge, len(ns))
|
|
||||||
for i, ng := range ns {
|
|
||||||
out[i] = toNudge(ng)
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) WriteNote(ctx context.Context, ts time.Time, text string, embedding []float32, source string) (int64, error) {
|
|
||||||
id, err := a.s.WriteNote(ctx, ts, text, embedding, source)
|
|
||||||
return id, mapErr(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) QueryNotes(ctx context.Context, embedding []float32, k int) ([]Note, error) {
|
|
||||||
ns, err := a.s.QueryNotes(ctx, embedding, k)
|
|
||||||
if err != nil {
|
|
||||||
return nil, mapErr(err)
|
|
||||||
}
|
|
||||||
out := make([]Note, len(ns))
|
|
||||||
for i, n := range ns {
|
|
||||||
out[i] = toNote(n)
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) RecentNotesFromSource(ctx context.Context, prefix string, n int) ([]Note, error) {
|
|
||||||
ns, err := a.s.RecentNotesFromSource(ctx, prefix, n)
|
|
||||||
if err != nil {
|
|
||||||
return nil, mapErr(err)
|
|
||||||
}
|
|
||||||
out := make([]Note, len(ns))
|
|
||||||
for i, note := range ns {
|
|
||||||
out[i] = toNote(note)
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) RecentNotes(ctx context.Context, n int) ([]Note, error) {
|
|
||||||
ns, err := a.s.RecentNotes(ctx, n)
|
|
||||||
if err != nil {
|
|
||||||
return nil, mapErr(err)
|
|
||||||
}
|
|
||||||
out := make([]Note, len(ns))
|
|
||||||
for i, note := range ns {
|
|
||||||
out[i] = toNote(note)
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) ProposeTool(ctx context.Context, name, utterance, scope string, ts time.Time) (bool, error) {
|
|
||||||
ok, err := a.s.ProposeTool(ctx, name, utterance, scope, ts)
|
|
||||||
return ok, mapErr(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) EnableTool(ctx context.Context, name string, cmd []string, destructive bool, scope string, ts time.Time) error {
|
|
||||||
return mapErr(a.s.EnableTool(ctx, name, cmd, destructive, scope, ts))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) DisableTool(ctx context.Context, name string) error {
|
|
||||||
return mapErr(a.s.DisableTool(ctx, name))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) LookupTool(ctx context.Context, name string) (Tool, error) {
|
|
||||||
t, err := a.s.LookupTool(ctx, name)
|
|
||||||
if err != nil {
|
|
||||||
return Tool{}, mapErr(err)
|
|
||||||
}
|
|
||||||
return toTool(t), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) RevertFact(ctx context.Context, key string) (int64, error) {
|
|
||||||
_, newID, err := a.s.VoidLatestFact(ctx, key, "feedback", time.Now())
|
|
||||||
return newID, mapErr(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) Chat(ctx context.Context, text string) (string, error) {
|
|
||||||
return "", errors.New("store: chat not available via direct store API")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) TickTrace(ctx context.Context) (TickTrace, error) {
|
|
||||||
return TickTrace{}, errors.New("store: tick trace not available via direct store API")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) MorningStatus(ctx context.Context) ([]MorningRoutineStatus, error) {
|
|
||||||
return nil, errors.New("store: morning status not available via direct store API")
|
|
||||||
}
|
|
||||||
|
|
||||||
// RecentEvents — same shape as TickTrace: the intake journal is a bounded ring
|
|
||||||
// in the daemon's memory, not a table, so a bare store cannot serve it.
|
|
||||||
func (a *storeAPI) RecentEvents(ctx context.Context, n int) ([]IntakeEvent, error) {
|
|
||||||
return nil, errors.New("store: intake events not available via direct store API")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) MCPServers(ctx context.Context) ([]MCPServerStatus, error) {
|
|
||||||
return nil, nil // no manager behind a bare store: nothing configured
|
|
||||||
}
|
|
||||||
|
|
||||||
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) {
|
|
||||||
ts, err := a.s.ListTools(ctx, status)
|
|
||||||
if err != nil {
|
|
||||||
return nil, mapErr(err)
|
|
||||||
}
|
|
||||||
out := make([]Tool, len(ts))
|
|
||||||
for i, t := range ts {
|
|
||||||
out[i] = toTool(t)
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) DeleteTool(ctx context.Context, name string) error {
|
|
||||||
return mapErr(a.s.DeleteTool(ctx, name))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) CaptureTask(ctx context.Context, req CaptureTaskReq) (CaptureTaskResp, error) {
|
|
||||||
res, err := a.s.CaptureTask(ctx, store.Task{
|
|
||||||
CreatedTs: req.Ts,
|
|
||||||
Text: req.Text,
|
|
||||||
Source: req.Source,
|
|
||||||
Evidence: req.Evidence,
|
|
||||||
ExternalID: req.ExternalID,
|
|
||||||
Status: req.Status,
|
|
||||||
Due: req.Due,
|
|
||||||
Weight: req.Weight,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return CaptureTaskResp{}, mapErr(err)
|
|
||||||
}
|
|
||||||
return CaptureTaskResp{ID: res.ID, Created: res.Created, Promoted: res.Promoted}, 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,
|
|
||||||
ExternalID: t.ExternalID,
|
|
||||||
Status: t.Status,
|
|
||||||
Due: t.Due,
|
|
||||||
Weight: t.Weight,
|
|
||||||
Resolved: t.ResolvedTs,
|
|
||||||
ResolvedBy: t.ResolvedBy,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) SetTaskStatus(ctx context.Context, id int64, status string, ts time.Time, by string) error {
|
|
||||||
return mapErr(a.s.SetTaskStatus(ctx, id, status, ts, by))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) ListProposedRoutines(ctx context.Context) ([]ProposedRoutine, error) {
|
|
||||||
rs, err := a.s.ListProposedRoutines(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return nil, mapErr(err)
|
|
||||||
}
|
|
||||||
out := make([]ProposedRoutine, len(rs))
|
|
||||||
for i, r := range rs {
|
|
||||||
out[i] = ProposedRoutine{
|
|
||||||
ID: r.ID,
|
|
||||||
Action: r.Action,
|
|
||||||
Object: r.Object,
|
|
||||||
IntervalDays: r.IntervalDays,
|
|
||||||
Status: r.Status,
|
|
||||||
CreatedTs: r.CreatedTs.UnixMilli(),
|
|
||||||
}
|
|
||||||
if r.ReminderID != nil {
|
|
||||||
out[i].ReminderID = r.ReminderID
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) DismissProposedRoutine(ctx context.Context, id int64) error {
|
|
||||||
return mapErr(a.s.DismissProposedRoutine(ctx, id))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *storeAPI) AcceptProposedRoutine(ctx context.Context, id int64) error {
|
|
||||||
return mapErr(a.s.AcceptProposedRoutine(ctx, id, time.Now().UTC()))
|
|
||||||
}
|
|
||||||
|
|
||||||
func toTool(t store.Tool) Tool {
|
|
||||||
return Tool{
|
|
||||||
Name: t.Name, Scope: t.Scope, Cmd: t.Cmd, Destructive: t.Destructive,
|
|
||||||
Status: t.Status, Utterance: t.Utterance, Created: t.CreatedTs, Updated: t.UpdatedTs,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func toReminder(r store.Reminder) Reminder {
|
|
||||||
return Reminder{
|
|
||||||
ID: r.ID,
|
|
||||||
CreatedTs: r.CreatedTs,
|
|
||||||
FireTs: r.FireTs,
|
|
||||||
NextFireTs: r.NextFireTs,
|
|
||||||
Payload: r.Payload,
|
|
||||||
Status: r.Status,
|
|
||||||
Cron: r.Cron,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func toNote(n store.Note) Note {
|
|
||||||
return Note{ID: n.ID, Ts: n.Ts, Text: n.Text, Source: n.Source, Score: n.Score}
|
|
||||||
}
|
|
||||||
|
|
||||||
func toNudge(n store.Nudge) Nudge {
|
|
||||||
out := Nudge{
|
|
||||||
ID: n.ID, Ts: n.Ts, Rule: n.Rule, Channel: n.Channel,
|
|
||||||
Message: n.Message, Outcome: n.Outcome,
|
|
||||||
}
|
|
||||||
if n.OutcomeTs.Valid {
|
|
||||||
v := n.OutcomeTs.Int64
|
|
||||||
out.OutcomeTs = &v
|
|
||||||
}
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
|
|
||||||
func toFact(f store.Fact) Fact {
|
|
||||||
out := Fact{
|
|
||||||
ID: f.ID,
|
|
||||||
Ts: f.Ts,
|
|
||||||
Kind: string(f.Kind),
|
|
||||||
Key: f.Key,
|
|
||||||
Value: f.Value,
|
|
||||||
Source: f.Source,
|
|
||||||
Confidence: f.Confidence,
|
|
||||||
}
|
|
||||||
if f.VoidsID.Valid {
|
|
||||||
v := f.VoidsID.Int64
|
|
||||||
out.VoidsID = &v
|
|
||||||
}
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
|
|
||||||
// mapErr — store sentinel ↔ ipc sentinel. An unrecognized store error is
|
|
||||||
// wrapped but not mapped (server-side dispatch surfaces it as codeInternal,
|
|
||||||
// keeping internal text off the wire except to the daemon log).
|
|
||||||
func mapErr(err error) error {
|
|
||||||
if err == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
switch {
|
|
||||||
case errors.Is(err, store.ErrNoFact):
|
|
||||||
return ErrNoFact
|
|
||||||
case errors.Is(err, store.ErrConfidence):
|
|
||||||
return ErrConfidence
|
|
||||||
case errors.Is(err, store.ErrVoidsMissing):
|
|
||||||
return ErrVoidsMissing
|
|
||||||
case errors.Is(err, store.ErrNudgeNotFound):
|
|
||||||
return ErrNudgeNotFound
|
|
||||||
case errors.Is(err, store.ErrNudgeOutcome):
|
|
||||||
return ErrNudgeOutcome
|
|
||||||
case errors.Is(err, store.ErrReminderNotFound):
|
|
||||||
return ErrReminderNotFound
|
|
||||||
case errors.Is(err, store.ErrReminderState):
|
|
||||||
return ErrReminderState
|
|
||||||
case errors.Is(err, store.ErrToolNotFound):
|
|
||||||
return ErrToolNotFound
|
|
||||||
}
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Server — the core side of the boundary. Listens on a unix domain socket,
|
// Server — the core side of the boundary. Listens on a unix domain socket,
|
||||||
// accepts module connections, frames requests to a CoreAPI and responses back.
|
// accepts module connections, frames requests to a CoreAPI and responses back.
|
||||||
// One Server per daemon process; concurrent connections are handled in their
|
// One Server per daemon process; concurrent connections are handled in their
|
||||||
@@ -863,6 +440,16 @@ var methodTable = map[Method]handlerFunc{
|
|||||||
}
|
}
|
||||||
return out, nil
|
return out, nil
|
||||||
}),
|
}),
|
||||||
|
MethodDeliveryAttempts: withParams(func(ctx context.Context, api CoreAPI, p deliveryAttemptsReq) ([]DeliveryAttempt, error) {
|
||||||
|
out, err := api.DeliveryAttempts(ctx, p.Status, p.N)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if out == nil {
|
||||||
|
out = []DeliveryAttempt{}
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}),
|
||||||
MethodRecentNudges: withParams(func(ctx context.Context, api CoreAPI, p nReq) ([]Nudge, error) {
|
MethodRecentNudges: withParams(func(ctx context.Context, api CoreAPI, p nReq) ([]Nudge, error) {
|
||||||
out, err := api.RecentNudges(ctx, p.N)
|
out, err := api.RecentNudges(ctx, p.N)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -974,7 +561,7 @@ var methodTable = map[Method]handlerFunc{
|
|||||||
return map[string]int64{"new_id": newID}, nil
|
return map[string]int64{"new_id": newID}, nil
|
||||||
}),
|
}),
|
||||||
MethodChat: withParams(func(ctx context.Context, api CoreAPI, p chatReq) (chatResp, error) {
|
MethodChat: withParams(func(ctx context.Context, api CoreAPI, p chatReq) (chatResp, error) {
|
||||||
reply, err := api.Chat(ctx, p.Text)
|
reply, err := api.Chat(ctx, p.Conversation, p.Text)
|
||||||
return chatResp{Reply: reply}, err
|
return chatResp{Reply: reply}, err
|
||||||
}),
|
}),
|
||||||
MethodTickTrace: withoutParams(func(ctx context.Context, api CoreAPI) (TickTrace, error) {
|
MethodTickTrace: withoutParams(func(ctx context.Context, api CoreAPI) (TickTrace, error) {
|
||||||
|
|||||||
@@ -0,0 +1,455 @@
|
|||||||
|
// ipc/storeapi.go — the sqlite-backed CoreAPI.
|
||||||
|
//
|
||||||
|
// Split out of server.go, move-only (Vikunja #423). server.go was two
|
||||||
|
// unrelated things: this adapter, and the dispatcher that calls it over the
|
||||||
|
// socket. Nothing here knows there is a wire.
|
||||||
|
package ipc
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/store"
|
||||||
|
)
|
||||||
|
|
||||||
|
// storeAPI — adapts *store.Store to CoreAPI. The daemon constructs one of
|
||||||
|
// these inside the core process; the socket Server calls it through the
|
||||||
|
// CoreAPI interface, so over-the-wire and in-process callers behave
|
||||||
|
// identically. The translation here is the only place store sentinels cross
|
||||||
|
// the wire: store.ErrNoFact becomes ipc.ErrNoFact, etc. — keeping the module
|
||||||
|
// view of errors stable regardless of transport.
|
||||||
|
type storeAPI struct {
|
||||||
|
s *store.Store
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewStoreAPI wraps a *store.Store as a CoreAPI. The store is the sqlcipher-
|
||||||
|
// unlocked handle held ONLY in core's address space; this adapter never
|
||||||
|
// returns it to a caller — core mediates.
|
||||||
|
func NewStoreAPI(s *store.Store) CoreAPI { return &storeAPI{s: s} }
|
||||||
|
|
||||||
|
func (a *storeAPI) WriteFact(ctx context.Context, req WriteFactReq) (int64, error) {
|
||||||
|
var voids sql.NullInt64
|
||||||
|
if req.VoidsID != nil {
|
||||||
|
voids = sql.NullInt64{Int64: *req.VoidsID, Valid: true}
|
||||||
|
}
|
||||||
|
id, err := a.s.WriteFactAboutSubject(ctx, req.Ts, store.FactKind(req.Kind), req.Key, req.Subject, req.Value, req.Source, req.Confidence, voids)
|
||||||
|
return id, mapErr(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) LatestFact(ctx context.Context, key string) (Fact, error) {
|
||||||
|
f, err := a.s.LatestFact(ctx, key)
|
||||||
|
if err != nil {
|
||||||
|
return Fact{}, mapErr(err)
|
||||||
|
}
|
||||||
|
return toFact(f), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) LatestFactBySource(ctx context.Context, key, source string) (Fact, error) {
|
||||||
|
f, err := a.s.LatestFactBySource(ctx, key, source)
|
||||||
|
if err != nil {
|
||||||
|
return Fact{}, mapErr(err)
|
||||||
|
}
|
||||||
|
return toFact(f), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) Since(ctx context.Context, key string, now time.Time) (time.Duration, error) {
|
||||||
|
d, err := a.s.Since(ctx, key, now)
|
||||||
|
return d, mapErr(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) Presence(ctx context.Context) (Presence, error) {
|
||||||
|
b, score, upd, err := a.s.LoadPresenceState(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return Presence{}, fmt.Errorf("ipc: load presence: %w", err)
|
||||||
|
}
|
||||||
|
return Presence{Bucket: Bucket(b), Score: score, Updated: upd}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) CreateReminder(ctx context.Context, fire time.Time, payload, cron string) (int64, error) {
|
||||||
|
id, err := a.s.CreateReminder(ctx, fire, payload, cron)
|
||||||
|
return id, mapErr(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) MarkReminder(ctx context.Context, id int64, status string) error {
|
||||||
|
return mapErr(a.s.MarkReminder(ctx, id, status))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) ListReminders(ctx context.Context, n int) ([]Reminder, error) {
|
||||||
|
rs, err := a.s.ListReminders(ctx, n)
|
||||||
|
if err != nil {
|
||||||
|
return nil, mapErr(err)
|
||||||
|
}
|
||||||
|
out := make([]Reminder, len(rs))
|
||||||
|
for i, r := range rs {
|
||||||
|
out[i] = toReminder(r)
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) RescheduleReminder(ctx context.Context, id int64, now time.Time) error {
|
||||||
|
return mapErr(a.s.RescheduleReminder(ctx, id, now))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) RecordNudge(ctx context.Context, rule, channel, message string, ts time.Time) (int64, error) {
|
||||||
|
id, err := a.s.RecordNudge(ctx, rule, channel, message, ts)
|
||||||
|
return id, mapErr(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) ResolveNudge(ctx context.Context, id int64, outcome string, ts time.Time) error {
|
||||||
|
return mapErr(a.s.ResolveNudge(ctx, id, outcome, ts))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) RecentOutcomes(ctx context.Context, rule string, n int) ([]string, error) {
|
||||||
|
out, err := a.s.RecentOutcomes(ctx, rule, n)
|
||||||
|
return out, mapErr(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) RecentFacts(ctx context.Context, n int) ([]Fact, error) {
|
||||||
|
fs, err := a.s.RecentFacts(ctx, n)
|
||||||
|
if err != nil {
|
||||||
|
return nil, mapErr(err)
|
||||||
|
}
|
||||||
|
out := make([]Fact, len(fs))
|
||||||
|
for i, f := range fs {
|
||||||
|
out[i] = toFact(f)
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) RecentActiveFactsByKind(ctx context.Context, kind string, n int) ([]Fact, error) {
|
||||||
|
fs, err := a.s.RecentActiveFactsByKind(ctx, store.FactKind(kind), n)
|
||||||
|
if err != nil {
|
||||||
|
return nil, mapErr(err)
|
||||||
|
}
|
||||||
|
out := make([]Fact, len(fs))
|
||||||
|
for i, f := range fs {
|
||||||
|
out[i] = toFact(f)
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) CalendarEvents(ctx context.Context, from, to time.Time) ([]Fact, error) {
|
||||||
|
fs, err := a.s.CalendarEvents(ctx, from, to)
|
||||||
|
if err != nil {
|
||||||
|
return nil, mapErr(err)
|
||||||
|
}
|
||||||
|
out := make([]Fact, len(fs))
|
||||||
|
for i, f := range fs {
|
||||||
|
out[i] = toFact(f)
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) RecentEcosystemTraces(ctx context.Context, n int) ([]EcosystemTrace, error) {
|
||||||
|
trs, err := a.s.RecentEcosystemTraces(ctx, n)
|
||||||
|
if err != nil {
|
||||||
|
return nil, mapErr(err)
|
||||||
|
}
|
||||||
|
out := make([]EcosystemTrace, len(trs))
|
||||||
|
for i, tr := range trs {
|
||||||
|
out[i] = EcosystemTrace{
|
||||||
|
ID: tr.ID, Ts: tr.Ts, Service: tr.Service, Operation: tr.Operation,
|
||||||
|
Status: tr.Status, DurationMs: tr.DurationMs, CorrelationID: tr.CorrelationID,
|
||||||
|
CausationID: tr.CausationID, HTTPStatus: tr.HTTPStatus, Fields: tr.Fields,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) RecentNudges(ctx context.Context, n int) ([]Nudge, error) {
|
||||||
|
ns, err := a.s.RecentNudges(ctx, n)
|
||||||
|
if err != nil {
|
||||||
|
return nil, mapErr(err)
|
||||||
|
}
|
||||||
|
out := make([]Nudge, len(ns))
|
||||||
|
for i, ng := range ns {
|
||||||
|
out[i] = toNudge(ng)
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) DeliveryAttempts(ctx context.Context, status string, n int) ([]DeliveryAttempt, error) {
|
||||||
|
as, err := a.s.ListDeliveryAttempts(ctx, status, n)
|
||||||
|
if err != nil {
|
||||||
|
return nil, mapErr(err)
|
||||||
|
}
|
||||||
|
out := make([]DeliveryAttempt, len(as))
|
||||||
|
for i, at := range as {
|
||||||
|
out[i] = DeliveryAttempt{
|
||||||
|
ID: at.ID, Kind: at.Kind, Rule: at.Rule, ReminderID: at.ReminderID,
|
||||||
|
Channel: at.Channel, Status: at.Status, Created: at.Created,
|
||||||
|
}
|
||||||
|
if at.HasComplete {
|
||||||
|
t := at.Completed
|
||||||
|
out[i].Completed = &t
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) WriteNote(ctx context.Context, ts time.Time, text string, embedding []float32, source string) (int64, error) {
|
||||||
|
id, err := a.s.WriteNote(ctx, ts, text, embedding, source)
|
||||||
|
return id, mapErr(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) QueryNotes(ctx context.Context, embedding []float32, k int) ([]Note, error) {
|
||||||
|
ns, err := a.s.QueryNotes(ctx, embedding, k)
|
||||||
|
if err != nil {
|
||||||
|
return nil, mapErr(err)
|
||||||
|
}
|
||||||
|
out := make([]Note, len(ns))
|
||||||
|
for i, n := range ns {
|
||||||
|
out[i] = toNote(n)
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) RecentNotesFromSource(ctx context.Context, prefix string, n int) ([]Note, error) {
|
||||||
|
ns, err := a.s.RecentNotesFromSource(ctx, prefix, n)
|
||||||
|
if err != nil {
|
||||||
|
return nil, mapErr(err)
|
||||||
|
}
|
||||||
|
out := make([]Note, len(ns))
|
||||||
|
for i, note := range ns {
|
||||||
|
out[i] = toNote(note)
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) RecentNotes(ctx context.Context, n int) ([]Note, error) {
|
||||||
|
ns, err := a.s.RecentNotes(ctx, n)
|
||||||
|
if err != nil {
|
||||||
|
return nil, mapErr(err)
|
||||||
|
}
|
||||||
|
out := make([]Note, len(ns))
|
||||||
|
for i, note := range ns {
|
||||||
|
out[i] = toNote(note)
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) ProposeTool(ctx context.Context, name, utterance, scope string, ts time.Time) (bool, error) {
|
||||||
|
ok, err := a.s.ProposeTool(ctx, name, utterance, scope, ts)
|
||||||
|
return ok, mapErr(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) EnableTool(ctx context.Context, name string, cmd []string, destructive bool, scope string, ts time.Time) error {
|
||||||
|
return mapErr(a.s.EnableTool(ctx, name, cmd, destructive, scope, ts))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) DisableTool(ctx context.Context, name string) error {
|
||||||
|
return mapErr(a.s.DisableTool(ctx, name))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) LookupTool(ctx context.Context, name string) (Tool, error) {
|
||||||
|
t, err := a.s.LookupTool(ctx, name)
|
||||||
|
if err != nil {
|
||||||
|
return Tool{}, mapErr(err)
|
||||||
|
}
|
||||||
|
return toTool(t), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) RevertFact(ctx context.Context, key string) (int64, error) {
|
||||||
|
_, newID, err := a.s.VoidLatestFact(ctx, key, "feedback", time.Now())
|
||||||
|
return newID, mapErr(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) Chat(ctx context.Context, conversation, text string) (string, error) {
|
||||||
|
return "", errors.New("store: chat not available via direct store API")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) TickTrace(ctx context.Context) (TickTrace, error) {
|
||||||
|
return TickTrace{}, errors.New("store: tick trace not available via direct store API")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) MorningStatus(ctx context.Context) ([]MorningRoutineStatus, error) {
|
||||||
|
return nil, errors.New("store: morning status not available via direct store API")
|
||||||
|
}
|
||||||
|
|
||||||
|
// RecentEvents — same shape as TickTrace: the intake journal is a bounded ring
|
||||||
|
// in the daemon's memory, not a table, so a bare store cannot serve it.
|
||||||
|
func (a *storeAPI) RecentEvents(ctx context.Context, n int) ([]IntakeEvent, error) {
|
||||||
|
return nil, errors.New("store: intake events not available via direct store API")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) MCPServers(ctx context.Context) ([]MCPServerStatus, error) {
|
||||||
|
return nil, nil // no manager behind a bare store: nothing configured
|
||||||
|
}
|
||||||
|
|
||||||
|
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) {
|
||||||
|
ts, err := a.s.ListTools(ctx, status)
|
||||||
|
if err != nil {
|
||||||
|
return nil, mapErr(err)
|
||||||
|
}
|
||||||
|
out := make([]Tool, len(ts))
|
||||||
|
for i, t := range ts {
|
||||||
|
out[i] = toTool(t)
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) DeleteTool(ctx context.Context, name string) error {
|
||||||
|
return mapErr(a.s.DeleteTool(ctx, name))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) CaptureTask(ctx context.Context, req CaptureTaskReq) (CaptureTaskResp, error) {
|
||||||
|
res, err := a.s.CaptureTask(ctx, store.Task{
|
||||||
|
CreatedTs: req.Ts,
|
||||||
|
Text: req.Text,
|
||||||
|
Source: req.Source,
|
||||||
|
Evidence: req.Evidence,
|
||||||
|
ExternalID: req.ExternalID,
|
||||||
|
Status: req.Status,
|
||||||
|
Due: req.Due,
|
||||||
|
Weight: req.Weight,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return CaptureTaskResp{}, mapErr(err)
|
||||||
|
}
|
||||||
|
return CaptureTaskResp{ID: res.ID, Created: res.Created, Promoted: res.Promoted}, 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,
|
||||||
|
ExternalID: t.ExternalID,
|
||||||
|
Status: t.Status,
|
||||||
|
Due: t.Due,
|
||||||
|
Weight: t.Weight,
|
||||||
|
Resolved: t.ResolvedTs,
|
||||||
|
ResolvedBy: t.ResolvedBy,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) SetTaskStatus(ctx context.Context, id int64, status string, ts time.Time, by string) error {
|
||||||
|
return mapErr(a.s.SetTaskStatus(ctx, id, status, ts, by))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) ListProposedRoutines(ctx context.Context) ([]ProposedRoutine, error) {
|
||||||
|
rs, err := a.s.ListProposedRoutines(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, mapErr(err)
|
||||||
|
}
|
||||||
|
out := make([]ProposedRoutine, len(rs))
|
||||||
|
for i, r := range rs {
|
||||||
|
out[i] = ProposedRoutine{
|
||||||
|
ID: r.ID,
|
||||||
|
Action: r.Action,
|
||||||
|
Object: r.Object,
|
||||||
|
IntervalDays: r.IntervalDays,
|
||||||
|
Status: string(r.Status),
|
||||||
|
CreatedTs: r.CreatedTs.UnixMilli(),
|
||||||
|
}
|
||||||
|
if r.ReminderID != nil {
|
||||||
|
out[i].ReminderID = r.ReminderID
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) DismissProposedRoutine(ctx context.Context, id int64) error {
|
||||||
|
return mapErr(a.s.DismissProposedRoutine(ctx, id))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *storeAPI) AcceptProposedRoutine(ctx context.Context, id int64) error {
|
||||||
|
return mapErr(a.s.AcceptProposedRoutine(ctx, id, time.Now().UTC()))
|
||||||
|
}
|
||||||
|
|
||||||
|
func toTool(t store.Tool) Tool {
|
||||||
|
return Tool{
|
||||||
|
Name: t.Name, Scope: t.Scope, Cmd: t.Cmd, Destructive: t.Destructive,
|
||||||
|
Status: t.Status, Utterance: t.Utterance, Created: t.CreatedTs, Updated: t.UpdatedTs,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func toReminder(r store.Reminder) Reminder {
|
||||||
|
return Reminder{
|
||||||
|
ID: r.ID,
|
||||||
|
CreatedTs: r.CreatedTs,
|
||||||
|
FireTs: r.FireTs,
|
||||||
|
NextFireTs: r.NextFireTs,
|
||||||
|
Payload: r.Payload,
|
||||||
|
Status: r.Status,
|
||||||
|
Cron: r.Cron,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func toNote(n store.Note) Note {
|
||||||
|
return Note{ID: n.ID, Ts: n.Ts, Text: n.Text, Source: n.Source, Score: n.Score}
|
||||||
|
}
|
||||||
|
|
||||||
|
func toNudge(n store.Nudge) Nudge {
|
||||||
|
out := Nudge{
|
||||||
|
ID: n.ID, Ts: n.Ts, Rule: n.Rule, Channel: n.Channel,
|
||||||
|
Message: n.Message, Outcome: n.Outcome,
|
||||||
|
}
|
||||||
|
if n.OutcomeTs.Valid {
|
||||||
|
v := n.OutcomeTs.Int64
|
||||||
|
out.OutcomeTs = &v
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
func toFact(f store.Fact) Fact {
|
||||||
|
out := Fact{
|
||||||
|
ID: f.ID,
|
||||||
|
Ts: f.Ts,
|
||||||
|
Kind: string(f.Kind),
|
||||||
|
Key: f.Key,
|
||||||
|
Value: f.Value,
|
||||||
|
Source: f.Source,
|
||||||
|
Confidence: f.Confidence,
|
||||||
|
}
|
||||||
|
if f.VoidsID.Valid {
|
||||||
|
v := f.VoidsID.Int64
|
||||||
|
out.VoidsID = &v
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// mapErr — store sentinel ↔ ipc sentinel. An unrecognized store error is
|
||||||
|
// wrapped but not mapped (server-side dispatch surfaces it as codeInternal,
|
||||||
|
// keeping internal text off the wire except to the daemon log).
|
||||||
|
func mapErr(err error) error {
|
||||||
|
if err == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
switch {
|
||||||
|
case errors.Is(err, store.ErrNoFact):
|
||||||
|
return ErrNoFact
|
||||||
|
case errors.Is(err, store.ErrConfidence):
|
||||||
|
return ErrConfidence
|
||||||
|
case errors.Is(err, store.ErrVoidsMissing):
|
||||||
|
return ErrVoidsMissing
|
||||||
|
case errors.Is(err, store.ErrNudgeNotFound):
|
||||||
|
return ErrNudgeNotFound
|
||||||
|
case errors.Is(err, store.ErrNudgeOutcome):
|
||||||
|
return ErrNudgeOutcome
|
||||||
|
case errors.Is(err, store.ErrReminderNotFound):
|
||||||
|
return ErrReminderNotFound
|
||||||
|
case errors.Is(err, store.ErrReminderState):
|
||||||
|
return ErrReminderState
|
||||||
|
case errors.Is(err, store.ErrToolNotFound):
|
||||||
|
return ErrToolNotFound
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
@@ -68,6 +68,9 @@ func (UnimplementedCoreAPI) RecentActiveFactsByKind(ctx context.Context, kind st
|
|||||||
func (UnimplementedCoreAPI) CalendarEvents(ctx context.Context, from, to time.Time) ([]Fact, error) {
|
func (UnimplementedCoreAPI) CalendarEvents(ctx context.Context, from, to time.Time) ([]Fact, error) {
|
||||||
return nil, ErrNotImplemented
|
return nil, ErrNotImplemented
|
||||||
}
|
}
|
||||||
|
func (UnimplementedCoreAPI) DeliveryAttempts(ctx context.Context, status string, n int) ([]DeliveryAttempt, error) {
|
||||||
|
return nil, ErrNotImplemented
|
||||||
|
}
|
||||||
func (UnimplementedCoreAPI) RecentNudges(ctx context.Context, n int) ([]Nudge, error) {
|
func (UnimplementedCoreAPI) RecentNudges(ctx context.Context, n int) ([]Nudge, error) {
|
||||||
return nil, ErrNotImplemented
|
return nil, ErrNotImplemented
|
||||||
}
|
}
|
||||||
@@ -141,6 +144,6 @@ func (UnimplementedCoreAPI) MCPServers(ctx context.Context) ([]MCPServerStatus,
|
|||||||
func (UnimplementedCoreAPI) DayPlan(ctx context.Context) (DayPlan, error) {
|
func (UnimplementedCoreAPI) DayPlan(ctx context.Context) (DayPlan, error) {
|
||||||
return DayPlan{}, ErrNotImplemented
|
return DayPlan{}, ErrNotImplemented
|
||||||
}
|
}
|
||||||
func (UnimplementedCoreAPI) Chat(ctx context.Context, text string) (string, error) {
|
func (UnimplementedCoreAPI) Chat(ctx context.Context, conversation, text string) (string, error) {
|
||||||
return "", ErrNotImplemented
|
return "", ErrNotImplemented
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ const (
|
|||||||
MethodRecentActiveFacts Method = "recent_active_facts_by_kind"
|
MethodRecentActiveFacts Method = "recent_active_facts_by_kind"
|
||||||
MethodCalendarEvents Method = "calendar_events"
|
MethodCalendarEvents Method = "calendar_events"
|
||||||
MethodRecentNudges Method = "recent_nudges"
|
MethodRecentNudges Method = "recent_nudges"
|
||||||
|
MethodDeliveryAttempts Method = "delivery_attempts"
|
||||||
MethodRecentEcoTraces Method = "recent_ecosystem_traces"
|
MethodRecentEcoTraces Method = "recent_ecosystem_traces"
|
||||||
MethodWriteNote Method = "write_note"
|
MethodWriteNote Method = "write_note"
|
||||||
MethodQueryNotes Method = "query_notes"
|
MethodQueryNotes Method = "query_notes"
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ func TestExplainGate_PresenceAway(t *testing.T) {
|
|||||||
func TestExplainGate_PresenceAwayOpsBypass(t *testing.T) {
|
func TestExplainGate_PresenceAwayOpsBypass(t *testing.T) {
|
||||||
now := refTime()
|
now := refTime()
|
||||||
s := State{Now: now, Presence: store.Away,
|
s := State{Now: now, Presence: store.Away,
|
||||||
Facts: map[string]store.Fact{"service_down": factAt("service_down", "poll:uptimekuma", `"down"`, now.Add(-1*time.Minute))},
|
Facts: map[string]store.Fact{"service_down:db": factAt("service_down:db", "poll:uptimekuma", `"down"`, now.Add(-1*time.Minute))},
|
||||||
}
|
}
|
||||||
r := ServiceDownRule() // Sev4 ops
|
r := ServiceDownRule() // Sev4 ops
|
||||||
passed, blocked, d := ExplainGate(s, r)
|
passed, blocked, d := ExplainGate(s, r)
|
||||||
@@ -259,8 +259,8 @@ func TestExplainTick_WinnerRecorded(t *testing.T) {
|
|||||||
Now: now,
|
Now: now,
|
||||||
Presence: store.Present,
|
Presence: store.Present,
|
||||||
Facts: map[string]store.Fact{
|
Facts: map[string]store.Fact{
|
||||||
"water": factAt("water", "tap:water", `"250ml"`, now.Add(-4*time.Hour)),
|
"water": factAt("water", "tap:water", `"250ml"`, now.Add(-4*time.Hour)),
|
||||||
"service_down": factAt("service_down", "poll:uptimekuma", `"down"`, now.Add(-1*time.Minute)),
|
"service_down:db": factAt("service_down:db", "poll:uptimekuma", `"down"`, now.Add(-1*time.Minute)),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
cand, trace := ExplainTick(s, DefaultRules())
|
cand, trace := ExplainTick(s, DefaultRules())
|
||||||
|
|||||||
@@ -198,12 +198,12 @@ func TestTickNeverDogpilesAndPicksLoudest(t *testing.T) {
|
|||||||
Now: now,
|
Now: now,
|
||||||
Presence: store.Present,
|
Presence: store.Present,
|
||||||
Facts: map[string]store.Fact{
|
Facts: map[string]store.Fact{
|
||||||
"water": ago("water", "tap:water", `"250ml"`, 5*time.Hour),
|
"water": ago("water", "tap:water", `"250ml"`, 5*time.Hour),
|
||||||
"meal": ago("meal", "voice", `"lunch"`, 8*time.Hour),
|
"meal": ago("meal", "voice", `"lunch"`, 8*time.Hour),
|
||||||
"desk_active": ago("desk_active", "infer:hyprland", "1", 30*time.Second),
|
"desk_active": ago("desk_active", "infer:hyprland", "1", 30*time.Second),
|
||||||
"break": ago("break", "voice", `"walk"`, 3*time.Hour),
|
"break": ago("break", "voice", `"walk"`, 3*time.Hour),
|
||||||
"service_down": ago("service_down", "poll:uptimekuma", `"down"`, time.Minute),
|
"service_down:db": ago("service_down:db", "poll:uptimekuma", `"down"`, time.Minute),
|
||||||
"netdata_alarm": ago("netdata_alarm", "poll:netdata", `"critical"`, time.Minute),
|
"netdata_alarm": ago("netdata_alarm", "poll:netdata", `"critical"`, time.Minute),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
// sanity: every rule really does want to fire, so the pick is a real choice.
|
// sanity: every rule really does want to fire, so the pick is a real choice.
|
||||||
|
|||||||
@@ -91,6 +91,20 @@ func (g *Gatherer) GatherState(ctx context.Context, now time.Time) (State, []sto
|
|||||||
return State{}, nil, err
|
return State{}, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// prefix families — the keys a rule cannot name at wiring time (one fact
|
||||||
|
// per kuma monitor). Loaded into the same map; State.FactsUnder reads them.
|
||||||
|
for _, r := range g.rules {
|
||||||
|
for _, p := range r.WantPrefixes {
|
||||||
|
fam, err := g.store.LatestFactsByPrefix(ctx, p)
|
||||||
|
if err != nil {
|
||||||
|
return State{}, nil, err
|
||||||
|
}
|
||||||
|
for _, f := range fam {
|
||||||
|
facts[f.Key] = f
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// last nudge per rule + cooldown-until derived from the active cooldown.
|
// last nudge per rule + cooldown-until derived from the active cooldown.
|
||||||
// "active" = the feedback tuner's persisted base if one exists, else the
|
// "active" = the feedback tuner's persisted base if one exists, else the
|
||||||
// rule's static Base. LatestFactBySource is the trust-by-provenance read
|
// rule's static Base. LatestFactBySource is the trust-by-provenance read
|
||||||
|
|||||||
@@ -0,0 +1,47 @@
|
|||||||
|
package loop
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/kami/maven/internal/store"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The gatherer is the only impure piece, and a rule over a prefix has no keys
|
||||||
|
// to declare at wiring time. This is the end of that path: mavpoll's per-monitor
|
||||||
|
// facts reach the snapshot, and the rule fires on the one that is down.
|
||||||
|
func TestGatherStateLoadsPrefixFamilies(t *testing.T) {
|
||||||
|
ctx := context.Background()
|
||||||
|
s, err := store.Open(ctx, filepath.Join(t.TempDir(), "loop_test.db"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Open: %v", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { _ = s.Close() })
|
||||||
|
|
||||||
|
now := time.Now().UTC().Truncate(time.Millisecond)
|
||||||
|
for key, val := range map[string]string{
|
||||||
|
"service_down:db": "down",
|
||||||
|
"service_down:web": "up",
|
||||||
|
} {
|
||||||
|
if _, err := s.SetValue(ctx, store.KindEnv, key, ServiceDownSource, val, now.Add(-time.Minute)); err != nil {
|
||||||
|
t.Fatalf("SetValue %s: %v", key, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
rules := []Rule{ServiceDownRule()}
|
||||||
|
st, _, err := NewGatherer(s, rules).GatherState(ctx, now)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("GatherState: %v", err)
|
||||||
|
}
|
||||||
|
if _, ok := st.Facts["service_down:db"]; !ok {
|
||||||
|
t.Fatalf("prefix family not gathered: %v", st.Facts)
|
||||||
|
}
|
||||||
|
if got := DownServices(st); len(got) != 1 || got[0] != "db" {
|
||||||
|
t.Fatalf("DownServices = %v, want [db]", got)
|
||||||
|
}
|
||||||
|
if !rules[0].Predicate(st) {
|
||||||
|
t.Fatal("the rule must fire on a gathered per-monitor fact")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -82,7 +82,7 @@ func TestTickOpsHardSurvivesAwayAndQuiet(t *testing.T) {
|
|||||||
Presence: store.Away,
|
Presence: store.Away,
|
||||||
QuietHours: true,
|
QuietHours: true,
|
||||||
Facts: map[string]store.Fact{
|
Facts: map[string]store.Fact{
|
||||||
"service_down": factAt("service_down", "poll:uptimekuma", `"down"`, now.Add(-1*time.Minute)),
|
"service_down:db": factAt("service_down:db", "poll:uptimekuma", `"down"`, now.Add(-1*time.Minute)),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
got := Tick(s, DefaultRules())
|
got := Tick(s, DefaultRules())
|
||||||
@@ -99,7 +99,7 @@ func TestTickServiceSourceTrustRefusesForgedTrigger(t *testing.T) {
|
|||||||
Now: now,
|
Now: now,
|
||||||
Presence: store.Present,
|
Presence: store.Present,
|
||||||
Facts: map[string]store.Fact{
|
Facts: map[string]store.Fact{
|
||||||
"service_down": factAt("service_down", "ambient", `"down"`, now.Add(-1*time.Minute)),
|
"service_down:db": factAt("service_down:db", "ambient", `"down"`, now.Add(-1*time.Minute)),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
if got := Tick(s, DefaultRules()); got != nil {
|
if got := Tick(s, DefaultRules()); got != nil {
|
||||||
@@ -115,8 +115,8 @@ func TestTickOneNudgePerTickMaxSeverityWins(t *testing.T) {
|
|||||||
Now: now,
|
Now: now,
|
||||||
Presence: store.Present,
|
Presence: store.Present,
|
||||||
Facts: map[string]store.Fact{
|
Facts: map[string]store.Fact{
|
||||||
"water": factAt("water", "tap:water", `"250ml"`, now.Add(-4*time.Hour)),
|
"water": factAt("water", "tap:water", `"250ml"`, now.Add(-4*time.Hour)),
|
||||||
"service_down": factAt("service_down", "poll:uptimekuma", `"down"`, now.Add(-1*time.Minute)),
|
"service_down:db": factAt("service_down:db", "poll:uptimekuma", `"down"`, now.Add(-1*time.Minute)),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
got := Tick(s, DefaultRules())
|
got := Tick(s, DefaultRules())
|
||||||
|
|||||||
+55
-13
@@ -28,6 +28,13 @@ type Rule struct {
|
|||||||
// that check itself, leave this empty. Otherwise set to the key(s) the rule
|
// that check itself, leave this empty. Otherwise set to the key(s) the rule
|
||||||
// needs and the gate will skip the rule when any are missing.
|
// needs and the gate will skip the rule when any are missing.
|
||||||
InertWhenNoData []string
|
InertWhenNoData []string
|
||||||
|
|
||||||
|
// WantPrefixes — key prefixes whose whole family the gatherer must load.
|
||||||
|
// InertWhenNoData names keys that exist at wiring time; a rule over a key
|
||||||
|
// set that is only known at read time (one fact per kuma monitor) declares
|
||||||
|
// the prefix here instead. Prefixes never make a rule inert: an empty
|
||||||
|
// family is the predicate's own "no data" case.
|
||||||
|
WantPrefixes []string
|
||||||
}
|
}
|
||||||
|
|
||||||
// Cooldown — tunable bounded by the envelope so a weird week (auto-tuned) can't
|
// Cooldown — tunable bounded by the envelope so a weird week (auto-tuned) can't
|
||||||
@@ -98,23 +105,58 @@ func BreakRule() Rule {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ServiceDownRule — sev4 ops hard: the `service_down` aggregate fact reads
|
// ServiceDownPrefix — mavpoll writes one fact per kuma monitor under this
|
||||||
// "down". Source must be poll:uptimekuma — kuma is the source of truth for
|
// prefix, `service_down:<monitor name>`. The suffix is the name he hears.
|
||||||
// service up/down (mavpoll writes this key). The predicate is provenance-scoped:
|
const ServiceDownPrefix = "service_down:"
|
||||||
// a compromised poller writing under a different source can't forge the trigger.
|
|
||||||
|
// ServiceDownSource — kuma is the source of truth for service up/down. The
|
||||||
|
// rule is provenance-scoped: a poller writing under a different source cannot
|
||||||
|
// forge the trigger.
|
||||||
|
const ServiceDownSource = "poll:uptimekuma"
|
||||||
|
|
||||||
|
// DownServices — the monitors currently reading "down", by name, in key order.
|
||||||
|
//
|
||||||
|
// Pure, and the rule and the phraser both call it, so the message can never
|
||||||
|
// name a service the predicate did not fire on.
|
||||||
|
func DownServices(s State) []string {
|
||||||
|
var out []string
|
||||||
|
for _, f := range s.FactsUnder(ServiceDownPrefix) {
|
||||||
|
if f.Source == ServiceDownSource && f.Value == `"down"` {
|
||||||
|
out = append(out, strings.TrimPrefix(f.Key, ServiceDownPrefix))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// ServiceDownRule — sev4 ops hard: at least one kuma monitor reads "down".
|
||||||
|
//
|
||||||
|
// It used to read one aggregate `service_down` fact, which is why it was
|
||||||
|
// disabled in deploy: the nudge could say that something on homesrv was down
|
||||||
|
// but never which thing. Per-monitor facts fix that, and pausing a monitor in
|
||||||
|
// kuma now silences that monitor rather than nothing.
|
||||||
|
//
|
||||||
|
// Edge-triggered — see State.NudgedSince. Without it a service that stays down
|
||||||
|
// for a day qualifies on every tick and cooldown alone is the only brake.
|
||||||
func ServiceDownRule() Rule {
|
func ServiceDownRule() Rule {
|
||||||
return Rule{
|
return Rule{
|
||||||
Name: "service_down",
|
Name: "service_down",
|
||||||
Severity: Sev4,
|
Severity: Sev4,
|
||||||
Cooldown: Cooldown{Base: 15 * time.Minute, Min: 5 * time.Minute, Max: 1 * time.Hour},
|
Cooldown: Cooldown{Base: 15 * time.Minute, Min: 5 * time.Minute, Max: 1 * time.Hour},
|
||||||
InertWhenNoData: []string{"service_down"},
|
WantPrefixes: []string{ServiceDownPrefix},
|
||||||
Predicate: func(s State) bool {
|
Predicate: func(s State) bool {
|
||||||
f, ok := s.Fact("service_down")
|
var newest time.Time
|
||||||
if !ok || f.Ts.IsZero() {
|
for _, f := range s.FactsUnder(ServiceDownPrefix) {
|
||||||
return false
|
if f.Source != ServiceDownSource || f.Value != `"down"` {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if f.Ts.After(newest) {
|
||||||
|
newest = f.Ts
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// value is json `"down"`; trivial check keyed off source provenance.
|
if newest.IsZero() {
|
||||||
return f.Source == "poll:uptimekuma" && f.Value == `"down"`
|
return false // nothing down, or no data at all → shut up
|
||||||
|
}
|
||||||
|
return !s.NudgedSince("service_down", newest)
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+80
-15
@@ -193,13 +193,13 @@ func TestOpsRulePredicates(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "service_down fires on a kuma down fact",
|
name: "service_down fires on a kuma down fact",
|
||||||
rule: ServiceDownRule(),
|
rule: ServiceDownRule(),
|
||||||
facts: map[string]store.Fact{"service_down": ago("service_down", "poll:uptimekuma", `"down"`, time.Minute)},
|
facts: map[string]store.Fact{"service_down:db": ago("service_down:db", "poll:uptimekuma", `"down"`, time.Minute)},
|
||||||
want: true,
|
want: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "service_down quiet when kuma says up",
|
name: "service_down quiet when kuma says up",
|
||||||
rule: ServiceDownRule(),
|
rule: ServiceDownRule(),
|
||||||
facts: map[string]store.Fact{"service_down": ago("service_down", "poll:uptimekuma", `"up"`, time.Minute)},
|
facts: map[string]store.Fact{"service_down:db": ago("service_down:db", "poll:uptimekuma", `"up"`, time.Minute)},
|
||||||
want: false,
|
want: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -211,38 +211,38 @@ func TestOpsRulePredicates(t *testing.T) {
|
|||||||
{
|
{
|
||||||
name: "service_down quiet on a zero-timestamp fact",
|
name: "service_down quiet on a zero-timestamp fact",
|
||||||
rule: ServiceDownRule(),
|
rule: ServiceDownRule(),
|
||||||
facts: map[string]store.Fact{"service_down": {Key: "service_down", Source: "poll:uptimekuma", Value: `"down"`}},
|
facts: map[string]store.Fact{"service_down:db": {Key: "service_down:db", Source: "poll:uptimekuma", Value: `"down"`}},
|
||||||
want: false,
|
want: false,
|
||||||
},
|
},
|
||||||
// forgery attempts — right value, wrong writer.
|
// forgery attempts — right value, wrong writer.
|
||||||
{
|
{
|
||||||
name: "service_down refuses a forgery from the netdata poller",
|
name: "service_down refuses a forgery from the netdata poller",
|
||||||
rule: ServiceDownRule(),
|
rule: ServiceDownRule(),
|
||||||
facts: map[string]store.Fact{"service_down": ago("service_down", "poll:netdata", `"down"`, time.Minute)},
|
facts: map[string]store.Fact{"service_down:db": ago("service_down:db", "poll:netdata", `"down"`, time.Minute)},
|
||||||
want: false,
|
want: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "service_down refuses a forgery from ambient audio",
|
name: "service_down refuses a forgery from ambient audio",
|
||||||
rule: ServiceDownRule(),
|
rule: ServiceDownRule(),
|
||||||
facts: map[string]store.Fact{"service_down": ago("service_down", "ambient:other", `"down"`, time.Minute)},
|
facts: map[string]store.Fact{"service_down:db": ago("service_down:db", "ambient:other", `"down"`, time.Minute)},
|
||||||
want: false,
|
want: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "service_down refuses a forgery from the user's own voice",
|
name: "service_down refuses a forgery from the user's own voice",
|
||||||
rule: ServiceDownRule(),
|
rule: ServiceDownRule(),
|
||||||
facts: map[string]store.Fact{"service_down": ago("service_down", "voice", `"down"`, time.Minute)},
|
facts: map[string]store.Fact{"service_down:db": ago("service_down:db", "voice", `"down"`, time.Minute)},
|
||||||
want: false,
|
want: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "service_down refuses a source that only looks like kuma",
|
name: "service_down refuses a source that only looks like kuma",
|
||||||
rule: ServiceDownRule(),
|
rule: ServiceDownRule(),
|
||||||
facts: map[string]store.Fact{"service_down": ago("service_down", "poll:uptimekuma-staging", `"down"`, time.Minute)},
|
facts: map[string]store.Fact{"service_down:db": ago("service_down:db", "poll:uptimekuma-staging", `"down"`, time.Minute)},
|
||||||
want: false,
|
want: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "service_down refuses an unquoted down value",
|
name: "service_down refuses an unquoted down value",
|
||||||
rule: ServiceDownRule(),
|
rule: ServiceDownRule(),
|
||||||
facts: map[string]store.Fact{"service_down": ago("service_down", "poll:uptimekuma", `down`, time.Minute)},
|
facts: map[string]store.Fact{"service_down:db": ago("service_down:db", "poll:uptimekuma", `down`, time.Minute)},
|
||||||
want: false,
|
want: false,
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -312,9 +312,11 @@ func TestOpsRulePredicates(t *testing.T) {
|
|||||||
// a second no-data backstop, so a rule that forgets it loses the safety net
|
// a second no-data backstop, so a rule that forgets it loses the safety net
|
||||||
// even if its predicate happens to check.
|
// even if its predicate happens to check.
|
||||||
func TestDefaultRulesDeclareInertKeys(t *testing.T) {
|
func TestDefaultRulesDeclareInertKeys(t *testing.T) {
|
||||||
|
// A rule over a key set that only exists at read time declares a prefix
|
||||||
|
// instead — the gatherer still needs to be told what to load.
|
||||||
for _, r := range DefaultRules() {
|
for _, r := range DefaultRules() {
|
||||||
if len(r.InertWhenNoData) == 0 {
|
if len(r.InertWhenNoData) == 0 && len(r.WantPrefixes) == 0 {
|
||||||
t.Errorf("rule %q declares no InertWhenNoData keys", r.Name)
|
t.Errorf("rule %q declares neither InertWhenNoData keys nor WantPrefixes", r.Name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -377,11 +379,11 @@ func TestDefaultRuleCooldownsAreBounded(t *testing.T) {
|
|||||||
// hidden state, no clock reads.
|
// hidden state, no clock reads.
|
||||||
func TestPredicatesArePure(t *testing.T) {
|
func TestPredicatesArePure(t *testing.T) {
|
||||||
s := stateWith(map[string]store.Fact{
|
s := stateWith(map[string]store.Fact{
|
||||||
"water": ago("water", "tap:water", `"250ml"`, 4*time.Hour),
|
"water": ago("water", "tap:water", `"250ml"`, 4*time.Hour),
|
||||||
"meal": ago("meal", "voice", `"lunch"`, 7*time.Hour),
|
"meal": ago("meal", "voice", `"lunch"`, 7*time.Hour),
|
||||||
"desk_active": ago("desk_active", "infer:hyprland", "1", 30*time.Second),
|
"desk_active": ago("desk_active", "infer:hyprland", "1", 30*time.Second),
|
||||||
"break": ago("break", "voice", `"walk"`, 2*time.Hour),
|
"break": ago("break", "voice", `"walk"`, 2*time.Hour),
|
||||||
"service_down": ago("service_down", "poll:uptimekuma", `"down"`, time.Minute),
|
"service_down:db": ago("service_down:db", "poll:uptimekuma", `"down"`, time.Minute),
|
||||||
})
|
})
|
||||||
for _, r := range DefaultRules() {
|
for _, r := range DefaultRules() {
|
||||||
first := r.Predicate(s)
|
first := r.Predicate(s)
|
||||||
@@ -434,3 +436,66 @@ func TestRulesExceptEmptyKeepsEverything(t *testing.T) {
|
|||||||
t.Errorf("rules = %v, dropped = %v", ruleNames(rules), dropped)
|
t.Errorf("rules = %v, dropped = %v", ruleNames(rules), dropped)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ---------------------------- per-monitor service_down -----------------------
|
||||||
|
|
||||||
|
// The rule must name what fired on it, and the phraser reads the same helper,
|
||||||
|
// so a service that is up can never be spoken as down.
|
||||||
|
func TestDownServicesNamesOnlyTheDownOnes(t *testing.T) {
|
||||||
|
s := State{
|
||||||
|
Now: refTime(),
|
||||||
|
Facts: map[string]store.Fact{
|
||||||
|
"service_down:web": ago("service_down:web", ServiceDownSource, `"up"`, time.Minute),
|
||||||
|
"service_down:db": ago("service_down:db", ServiceDownSource, `"down"`, time.Minute),
|
||||||
|
"service_down:vault": ago("service_down:vault", ServiceDownSource, `"down"`, time.Minute),
|
||||||
|
"service_down:paused": ago("service_down:paused", ServiceDownSource, `"maintenance"`, time.Minute),
|
||||||
|
"service_down:forged": ago("service_down:forged", "voice", `"down"`, time.Minute),
|
||||||
|
"service_down:missing": ago("service_down:missing", ServiceDownSource, `"unknown"`, time.Minute),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
got := DownServices(s)
|
||||||
|
want := []string{"db", "vault"} // key order, so speech is stable
|
||||||
|
if len(got) != len(want) {
|
||||||
|
t.Fatalf("DownServices = %v, want %v", got, want)
|
||||||
|
}
|
||||||
|
for i := range want {
|
||||||
|
if got[i] != want[i] {
|
||||||
|
t.Fatalf("DownServices = %v, want %v", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A monitor paused in kuma must silence that monitor. Before per-monitor facts
|
||||||
|
// the aggregate stayed "down" and pausing achieved nothing.
|
||||||
|
func TestPausedMonitorSilencesOnlyItself(t *testing.T) {
|
||||||
|
base := map[string]store.Fact{
|
||||||
|
"service_down:db": ago("service_down:db", ServiceDownSource, `"maintenance"`, time.Minute),
|
||||||
|
"service_down:web": ago("service_down:web", ServiceDownSource, `"down"`, time.Minute),
|
||||||
|
}
|
||||||
|
if !ServiceDownRule().Predicate(State{Now: refTime(), Facts: base}) {
|
||||||
|
t.Fatal("web is still down, the rule must fire")
|
||||||
|
}
|
||||||
|
delete(base, "service_down:web")
|
||||||
|
if ServiceDownRule().Predicate(State{Now: refTime(), Facts: base}) {
|
||||||
|
t.Fatal("only a paused monitor is left, the rule must be quiet")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Edge-triggered: he is told once per transition. A service that stays down
|
||||||
|
// for a day used to qualify on every tick, with cooldown as the only brake.
|
||||||
|
func TestServiceDownFiresOncePerTransition(t *testing.T) {
|
||||||
|
down := ago("service_down:db", ServiceDownSource, `"down"`, time.Hour)
|
||||||
|
s := State{Now: refTime(), Facts: map[string]store.Fact{"service_down:db": down}}
|
||||||
|
if !ServiceDownRule().Predicate(s) {
|
||||||
|
t.Fatal("first sight of the transition must fire")
|
||||||
|
}
|
||||||
|
s.LastNudge = map[string]store.Nudge{"service_down": {Ts: down.Ts.Add(time.Minute)}}
|
||||||
|
if ServiceDownRule().Predicate(s) {
|
||||||
|
t.Fatal("already told about this transition, must be quiet")
|
||||||
|
}
|
||||||
|
// A second service goes down after that nudge — a new edge, so it fires.
|
||||||
|
s.Facts["service_down:web"] = ago("service_down:web", ServiceDownSource, `"down"`, time.Minute)
|
||||||
|
if !ServiceDownRule().Predicate(s) {
|
||||||
|
t.Fatal("a later transition must fire again")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -23,6 +23,8 @@
|
|||||||
package loop
|
package loop
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/kami/maven/internal/store"
|
"github.com/kami/maven/internal/store"
|
||||||
@@ -95,6 +97,32 @@ func (s State) Fact(key string) (store.Fact, bool) {
|
|||||||
return f, true
|
return f, true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// FactsUnder returns every gathered fact whose key starts with prefix, ordered
|
||||||
|
// by key so a caller that names them speaks them in a stable order. Facts with
|
||||||
|
// a zero Ts are skipped, the same "no data" rule Fact applies.
|
||||||
|
func (s State) FactsUnder(prefix string) []store.Fact {
|
||||||
|
var out []store.Fact
|
||||||
|
for k, f := range s.Facts {
|
||||||
|
if strings.HasPrefix(k, prefix) && !f.Ts.IsZero() {
|
||||||
|
out = append(out, f)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sort.Slice(out, func(i, j int) bool { return out[i].Key < out[j].Key })
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// NudgedSince reports whether rule already sent a nudge at or after ts.
|
||||||
|
//
|
||||||
|
// It is what makes a rule edge-triggered. A polled fact is written only when
|
||||||
|
// the value changes, so its Ts is the moment the service went down — but the
|
||||||
|
// predicate reads the current value, so a service that stays down keeps
|
||||||
|
// qualifying forever and cooldown alone only slows the repetition. Asking
|
||||||
|
// whether he was already told about THIS transition stops it.
|
||||||
|
func (s State) NudgedSince(rule string, ts time.Time) bool {
|
||||||
|
n, ok := s.LastNudge[rule]
|
||||||
|
return ok && !n.Ts.Before(ts)
|
||||||
|
}
|
||||||
|
|
||||||
// Since returns the duration since the latest fact for key, or (0,false).
|
// Since returns the duration since the latest fact for key, or (0,false).
|
||||||
// "false" ⇒ no data ⇒ shuts up when uncertain.
|
// "false" ⇒ no data ⇒ shuts up when uncertain.
|
||||||
func (s State) Since(key string) (time.Duration, bool) {
|
func (s State) Since(key string) (time.Duration, bool) {
|
||||||
|
|||||||
@@ -90,9 +90,44 @@ func Load() (Fixture, error) {
|
|||||||
if len(f.Cases) == 0 {
|
if len(f.Cases) == 0 {
|
||||||
return Fixture{}, fmt.Errorf("fixture has no cases")
|
return Fixture{}, fmt.Errorf("fixture has no cases")
|
||||||
}
|
}
|
||||||
|
if err := checkIDs(f); err != nil {
|
||||||
|
return Fixture{}, err
|
||||||
|
}
|
||||||
return f, nil
|
return f, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// checkIDs refuses a fixture where a case note and a filler note share an id.
|
||||||
|
//
|
||||||
|
// Every case is scored over its own notes plus the whole filler set, and the
|
||||||
|
// two stores disagree about what a repeated id means: the sqlite store upserts
|
||||||
|
// on it, the in-memory store appends. So one collision makes a case score
|
||||||
|
// differently on the two backends, and it reads as an embedder or gate
|
||||||
|
// difference, which is the one thing this harness exists to measure (Vikunja
|
||||||
|
// #386). It was dodged once by hand during #373 by renaming two ids.
|
||||||
|
//
|
||||||
|
// Checked in Load rather than in the test, so every caller of the fixture is
|
||||||
|
// covered and not only the one that remembers to look.
|
||||||
|
func checkIDs(f Fixture) error {
|
||||||
|
filler := make(map[string]bool, len(f.Filler))
|
||||||
|
for _, n := range f.Filler {
|
||||||
|
if n.ID == "" {
|
||||||
|
return fmt.Errorf("filler note with an empty id")
|
||||||
|
}
|
||||||
|
if filler[n.ID] {
|
||||||
|
return fmt.Errorf("duplicate filler note id %q", n.ID)
|
||||||
|
}
|
||||||
|
filler[n.ID] = true
|
||||||
|
}
|
||||||
|
for _, c := range f.Cases {
|
||||||
|
for _, n := range c.Notes {
|
||||||
|
if filler[n.ID] {
|
||||||
|
return fmt.Errorf("case %s: note id %q collides with a filler note", c.ID, n.ID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// NewStore builds an empty store for one case, plus a function to release it.
|
// NewStore builds an empty store for one case, plus a function to release it.
|
||||||
// A factory rather than a store because every case needs a clean index — notes
|
// A factory rather than a store because every case needs a clean index — notes
|
||||||
// from case A must not be visible to case B's query.
|
// from case A must not be visible to case B's query.
|
||||||
|
|||||||
@@ -337,3 +337,28 @@ func marginSweep(t *testing.T, emb router.Embedder, f Fixture) string {
|
|||||||
}
|
}
|
||||||
return b.String()
|
return b.String()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestFillerIDCollisionIsRefused — the guard that keeps a fixture edit from
|
||||||
|
// looking like a backend difference (Vikunja #386).
|
||||||
|
func TestFillerIDCollisionIsRefused(t *testing.T) {
|
||||||
|
f := Fixture{
|
||||||
|
SchemaVersion: SchemaVersion,
|
||||||
|
Cases: []Case{{ID: "ru-001", Notes: []StoredNote{{ID: "f1", Text: "..."}}}},
|
||||||
|
Filler: []StoredNote{{ID: "f1", Text: "..."}},
|
||||||
|
}
|
||||||
|
if err := checkIDs(f); err == nil {
|
||||||
|
t.Fatal("a case note reusing a filler id must be refused")
|
||||||
|
}
|
||||||
|
f.Filler = append(f.Filler, StoredNote{ID: "f1", Text: "..."})
|
||||||
|
if err := checkIDs(Fixture{SchemaVersion: SchemaVersion, Filler: f.Filler}); err == nil {
|
||||||
|
t.Fatal("a duplicate filler id must be refused")
|
||||||
|
}
|
||||||
|
ok := Fixture{
|
||||||
|
SchemaVersion: SchemaVersion,
|
||||||
|
Cases: []Case{{ID: "ru-001", Notes: []StoredNote{{ID: "n1", Text: "..."}}}},
|
||||||
|
Filler: []StoredNote{{ID: "f1", Text: "..."}},
|
||||||
|
}
|
||||||
|
if err := checkIDs(ok); err != nil {
|
||||||
|
t.Fatalf("a clean fixture must pass: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -30,6 +30,18 @@ type Item struct {
|
|||||||
Key string
|
Key string
|
||||||
FactKey string
|
FactKey string
|
||||||
Label string // RU text surfaced when this item is still missing.
|
Label string // RU text surfaced when this item is still missing.
|
||||||
|
// Optional — a missing one is not worth a nudge on its own.
|
||||||
|
//
|
||||||
|
// Every item was implicitly required until 04-08-2026, because there was
|
||||||
|
// no field, so a skipped stretch read exactly like skipped medication and
|
||||||
|
// #280's first behaviour could not hold (Vikunja #473). A checklist where
|
||||||
|
// everything is mandatory is a checklist he learns to ignore.
|
||||||
|
//
|
||||||
|
// It changes two things and nothing else: an all-optional routine never
|
||||||
|
// nudges, and a nudge that does fire names the optional stragglers after
|
||||||
|
// the required ones, in softer words. Evidence, the window and the day
|
||||||
|
// plan treat both kinds alike — a missing optional item is still missing.
|
||||||
|
Optional bool
|
||||||
}
|
}
|
||||||
|
|
||||||
// Routine — one daily checklist. WindowStart/WindowEnd are "HH:MM" local
|
// Routine — one daily checklist. WindowStart/WindowEnd are "HH:MM" local
|
||||||
@@ -60,12 +72,37 @@ type Status struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Candidate — a routine that's due for its one-per-day nag: the window has
|
// Candidate — a routine that's due for its one-per-day nag: the window has
|
||||||
// reached NudgeAt and at least one item is still unevidenced.
|
// reached NudgeAt and at least one REQUIRED item is still unevidenced. Missing
|
||||||
|
// carries the optional stragglers too, so the one message she is allowed per
|
||||||
|
// day per routine can mention them; they never cause it.
|
||||||
type Candidate struct {
|
type Candidate struct {
|
||||||
Routine Routine
|
Routine Routine
|
||||||
Missing []Item
|
Missing []Item
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Required reports the missing items that are not optional. The nudge fires on
|
||||||
|
// these; the rest ride along.
|
||||||
|
func Required(missing []Item) []Item {
|
||||||
|
var out []Item
|
||||||
|
for _, it := range missing {
|
||||||
|
if !it.Optional {
|
||||||
|
out = append(out, it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionalOnly is the other half of Required.
|
||||||
|
func OptionalOnly(missing []Item) []Item {
|
||||||
|
var out []Item
|
||||||
|
for _, it := range missing {
|
||||||
|
if it.Optional {
|
||||||
|
out = append(out, it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
// Validate reports the first structural problem with a routine set: missing
|
// Validate reports the first structural problem with a routine set: missing
|
||||||
// name/items, an unparseable HH:MM, an inverted window, a duplicate item key
|
// name/items, an unparseable HH:MM, an inverted window, a duplicate item key
|
||||||
// within a routine, or an out-of-range weekday. Called at config load so a
|
// within a routine, or an out-of-range weekday. Called at config load so a
|
||||||
@@ -191,7 +228,11 @@ func Due(routines []Routine, facts map[string]store.Fact, last map[string]time.T
|
|||||||
missing = append(missing, it)
|
missing = append(missing, it)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if len(missing) == 0 {
|
// A day where only the optional items were skipped is a fine day, and
|
||||||
|
// nagging about it is what teaches him to stop listening (Vikunja
|
||||||
|
// #473). The optional ones still travel in Missing so the message can
|
||||||
|
// mention them when it is being sent anyway.
|
||||||
|
if len(Required(missing)) == 0 {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if prev, seen := last[r.Name]; seen && sameDay(prev, now) {
|
if prev, seen := last[r.Name]; seen && sameDay(prev, now) {
|
||||||
|
|||||||
@@ -182,3 +182,40 @@ func TestDueRespectsExplicitNudgeAt(t *testing.T) {
|
|||||||
t.Fatalf("expected candidate at explicit nudge_at, got %d", len(out))
|
t.Fatalf("expected candidate at explicit nudge_at, got %d", len(out))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestOptionalItemsDoNotEarnANudge — behaviour 1 of #280, which could not hold
|
||||||
|
// while every item was implicitly required (Vikunja #473).
|
||||||
|
func TestOptionalItemsDoNotEarnANudge(t *testing.T) {
|
||||||
|
r := Routine{
|
||||||
|
Name: "утро",
|
||||||
|
WindowStart: "07:00",
|
||||||
|
WindowEnd: "10:00",
|
||||||
|
Items: []Item{
|
||||||
|
{Key: "meds", FactKey: "meds", Label: "таблетки"},
|
||||||
|
{Key: "stretch", FactKey: "stretch", Label: "растяжка", Optional: true},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
now := time.Date(2026, 8, 4, 10, 0, 0, 0, time.UTC)
|
||||||
|
took := map[string]store.Fact{"meds": {Key: "meds", Ts: now.Add(-2 * time.Hour)}}
|
||||||
|
|
||||||
|
// Only the stretch was skipped: nothing to say.
|
||||||
|
if due := Due([]Routine{r}, took, map[string]time.Time{}, now); len(due) != 0 {
|
||||||
|
t.Fatalf("an optional item alone must not nudge, got %+v", due)
|
||||||
|
}
|
||||||
|
// The medication was skipped: she says so, and mentions the stretch too.
|
||||||
|
due := Due([]Routine{r}, map[string]store.Fact{}, map[string]time.Time{}, now)
|
||||||
|
if len(due) != 1 {
|
||||||
|
t.Fatalf("a missing required item must nudge, got %+v", due)
|
||||||
|
}
|
||||||
|
if got := Required(due[0].Missing); len(got) != 1 || got[0].Key != "meds" {
|
||||||
|
t.Fatalf("Required = %+v, want the meds item alone", got)
|
||||||
|
}
|
||||||
|
if got := OptionalOnly(due[0].Missing); len(got) != 1 || got[0].Key != "stretch" {
|
||||||
|
t.Fatalf("OptionalOnly = %+v, want the stretch item alone", got)
|
||||||
|
}
|
||||||
|
// The window still reports it as missing — optional is not invisible.
|
||||||
|
st := Evaluate(r, map[string]store.Fact{}, now.Add(-time.Hour))
|
||||||
|
if len(st.Missing) != 2 {
|
||||||
|
t.Fatalf("Evaluate must still list both, got %+v", st.Missing)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -975,6 +975,9 @@ var fallbackNudges = map[string]string{
|
|||||||
}
|
}
|
||||||
|
|
||||||
func fallbackNudge(c loop.Candidate) string {
|
func fallbackNudge(c loop.Candidate) string {
|
||||||
|
if down := loop.DownServices(c.State); len(down) > 0 {
|
||||||
|
return "Не отвечает: " + strings.Join(down, ", ") + "."
|
||||||
|
}
|
||||||
if s, ok := fallbackNudges[c.Rule.Name]; ok {
|
if s, ok := fallbackNudges[c.Rule.Name]; ok {
|
||||||
return s
|
return s
|
||||||
}
|
}
|
||||||
@@ -990,6 +993,11 @@ func buildNudgePrompt(c loop.Candidate) string {
|
|||||||
if f, ok := c.State.Facts[c.Rule.Name]; ok && f.Key != "" && f.Key != c.Rule.Name {
|
if f, ok := c.State.Facts[c.Rule.Name]; ok && f.Key != "" && f.Key != c.Rule.Name {
|
||||||
ctxParts = append(ctxParts, "Что именно: "+f.Key)
|
ctxParts = append(ctxParts, "Что именно: "+f.Key)
|
||||||
}
|
}
|
||||||
|
if down := loop.DownServices(c.State); len(down) > 0 {
|
||||||
|
// The names come from the same helper the rule fired on, so the model
|
||||||
|
// is never handed a service that is actually up.
|
||||||
|
ctxParts = append(ctxParts, "Какие сервисы лежат: "+strings.Join(down, ", "))
|
||||||
|
}
|
||||||
if d, ok := c.State.Since(c.Rule.Name); ok {
|
if d, ok := c.State.Since(c.Rule.Name); ok {
|
||||||
ctxParts = append(ctxParts, "Прошло: "+ruDur(d))
|
ctxParts = append(ctxParts, "Прошло: "+ruDur(d))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -142,16 +142,21 @@ func phraseNudge(c loop.Candidate) (body, summary string) {
|
|||||||
}
|
}
|
||||||
return body, "take a break"
|
return body, "take a break"
|
||||||
case "service_down":
|
case "service_down":
|
||||||
// the fact value is json `"down"`; the key carries the service name.
|
// One fact per kuma monitor, so the nudge names the service. The rule
|
||||||
body = "a service on homesrv is down — check journalctl."
|
// and this share loop.DownServices, so the message cannot name a
|
||||||
summary = "service down on homesrv"
|
// service the predicate did not fire on.
|
||||||
if f, ok := c.State.Fact("service_down"); ok {
|
down := loop.DownServices(c.State)
|
||||||
if f.Key != "" && f.Key != "service_down" {
|
switch len(down) {
|
||||||
body = fmt.Sprintf("%s on homesrv is down — check journalctl.", f.Key)
|
case 0:
|
||||||
summary = fmt.Sprintf("%s down on homesrv", f.Key)
|
return "a service on homesrv is down — check journalctl.", "service down on homesrv"
|
||||||
}
|
case 1:
|
||||||
|
return fmt.Sprintf("%s on homesrv is down — check journalctl.", down[0]),
|
||||||
|
fmt.Sprintf("%s down on homesrv", down[0])
|
||||||
|
default:
|
||||||
|
list := strings.Join(down, ", ")
|
||||||
|
return fmt.Sprintf("%s on homesrv are down — check journalctl.", list),
|
||||||
|
fmt.Sprintf("%d services down on homesrv", len(down))
|
||||||
}
|
}
|
||||||
return body, summary
|
|
||||||
default:
|
default:
|
||||||
// generic: name the rule + severity; the LLM impl replaces this with
|
// generic: name the rule + severity; the LLM impl replaces this with
|
||||||
// a prompted phrase. the Stub never editorializes beyond the rule name.
|
// a prompted phrase. the Stub never editorializes beyond the rule name.
|
||||||
|
|||||||
@@ -78,12 +78,14 @@ func TestPhraseNudgeBreakDeskDuration(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestPhraseNudgeServiceDownNamedService(t *testing.T) {
|
func TestPhraseNudgeServiceDownNamedService(t *testing.T) {
|
||||||
// a service_down fact whose Key is the specific service name → the phrase
|
// one fact per kuma monitor → the phrase names the monitor that is down.
|
||||||
// names the service, not just "service down".
|
|
||||||
now := time.Now().UTC()
|
now := time.Now().UTC()
|
||||||
st := loop.State{
|
st := loop.State{
|
||||||
Now: now,
|
Now: now,
|
||||||
Facts: map[string]store.Fact{"service_down": {Key: "nginx", Ts: now, Source: "poll:healthcheck", Value: `"down"`}},
|
Facts: map[string]store.Fact{
|
||||||
|
"service_down:nginx": {Key: "service_down:nginx", Ts: now, Source: loop.ServiceDownSource, Value: `"down"`},
|
||||||
|
"service_down:db": {Key: "service_down:db", Ts: now, Source: loop.ServiceDownSource, Value: `"up"`},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
c := loop.Candidate{Rule: loop.ServiceDownRule(), Severity: loop.Sev4, State: st}
|
c := loop.Candidate{Rule: loop.ServiceDownRule(), Severity: loop.Sev4, State: st}
|
||||||
pn, _ := NewStub().PhraseNudge(context.Background(), c)
|
pn, _ := NewStub().PhraseNudge(context.Background(), c)
|
||||||
@@ -96,12 +98,12 @@ func TestPhraseNudgeServiceDownNamedService(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestPhraseNudgeServiceDownGenericKey(t *testing.T) {
|
func TestPhraseNudgeServiceDownGenericKey(t *testing.T) {
|
||||||
// the rule key itself ("service_down") rather than a specific service →
|
// the old aggregate key, still in the store from before the per-monitor
|
||||||
// the generic phrase, not a phantom "service_down down on homesrv".
|
// facts landed → the generic phrase, never a phantom "service_down down".
|
||||||
now := time.Now().UTC()
|
now := time.Now().UTC()
|
||||||
st := loop.State{
|
st := loop.State{
|
||||||
Now: now,
|
Now: now,
|
||||||
Facts: map[string]store.Fact{"service_down": {Key: "service_down", Ts: now, Source: "poll:healthcheck", Value: `"down"`}},
|
Facts: map[string]store.Fact{"service_down": {Key: "service_down", Ts: now, Source: loop.ServiceDownSource, Value: `"down"`}},
|
||||||
}
|
}
|
||||||
c := loop.Candidate{Rule: loop.ServiceDownRule(), Severity: loop.Sev4, State: st}
|
c := loop.Candidate{Rule: loop.ServiceDownRule(), Severity: loop.Sev4, State: st}
|
||||||
pn, _ := NewStub().PhraseNudge(context.Background(), c)
|
pn, _ := NewStub().PhraseNudge(context.Background(), c)
|
||||||
@@ -110,6 +112,26 @@ func TestPhraseNudgeServiceDownGenericKey(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Two monitors down at once must both be named — he needs to know the blast
|
||||||
|
// radius, and "a service is down" was the whole defect being fixed here.
|
||||||
|
func TestPhraseNudgeServiceDownNamesEveryDownMonitor(t *testing.T) {
|
||||||
|
now := time.Now().UTC()
|
||||||
|
st := loop.State{
|
||||||
|
Now: now,
|
||||||
|
Facts: map[string]store.Fact{
|
||||||
|
"service_down:nginx": {Key: "service_down:nginx", Ts: now, Source: loop.ServiceDownSource, Value: `"down"`},
|
||||||
|
"service_down:db": {Key: "service_down:db", Ts: now, Source: loop.ServiceDownSource, Value: `"down"`},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
c := loop.Candidate{Rule: loop.ServiceDownRule(), Severity: loop.Sev4, State: st}
|
||||||
|
pn, _ := NewStub().PhraseNudge(context.Background(), c)
|
||||||
|
for _, want := range []string{"nginx", "db"} {
|
||||||
|
if !strings.Contains(pn.Body, want) {
|
||||||
|
t.Fatalf("body should name %q, got %q", want, pn.Body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestPhraseNudgeUnknownRuleFallsBack(t *testing.T) {
|
func TestPhraseNudgeUnknownRuleFallsBack(t *testing.T) {
|
||||||
// a rule without a dedicated template — generic fallback names the rule +
|
// a rule without a dedicated template — generic fallback names the rule +
|
||||||
// severity gist. never empty.
|
// severity gist. never empty.
|
||||||
|
|||||||
@@ -71,6 +71,7 @@
|
|||||||
{ "id": "ru-note-003", "utterance": "заметка про настройку vlan на свитче", "lang": "ru", "intent": "note", "tags": ["homelab"] },
|
{ "id": "ru-note-003", "utterance": "заметка про настройку vlan на свитче", "lang": "ru", "intent": "note", "tags": ["homelab"] },
|
||||||
{ "id": "ru-note-004", "utterance": "запиши идею: гидропоника на балконе", "lang": "ru", "intent": "note" },
|
{ "id": "ru-note-004", "utterance": "запиши идею: гидропоника на балконе", "lang": "ru", "intent": "note" },
|
||||||
{ "id": "ru-note-005", "utterance": "запиши что сосед просил номер электрика", "lang": "ru", "intent": "note" },
|
{ "id": "ru-note-005", "utterance": "запиши что сосед просил номер электрика", "lang": "ru", "intent": "note" },
|
||||||
|
{ "id": "ru-note-006", "utterance": "добавь в задачи купить молоко", "lang": "ru", "intent": "note", "tags": ["capture"], "note": "an explicit capture marker — the model called it an act and rewrote the payload (Vikunja #467), stage 0 claims it" },
|
||||||
{ "id": "en-note-001", "utterance": "note: rotate the kuma api key", "lang": "en", "intent": "note", "tags": ["homelab"] },
|
{ "id": "en-note-001", "utterance": "note: rotate the kuma api key", "lang": "en", "intent": "note", "tags": ["homelab"] },
|
||||||
|
|
||||||
{ "id": "ru-sys-001", "utterance": "сколько сейчас времени в киеве", "lang": "ru", "intent": "system", "tags": ["time"] },
|
{ "id": "ru-sys-001", "utterance": "сколько сейчас времени в киеве", "lang": "ru", "intent": "system", "tags": ["time"] },
|
||||||
|
|||||||
+48
-1
@@ -1,6 +1,9 @@
|
|||||||
package router
|
package router
|
||||||
|
|
||||||
import "strings"
|
import (
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
// Task capture and task listing, matched deterministically (Vikunja #130).
|
// Task capture and task listing, matched deterministically (Vikunja #130).
|
||||||
//
|
//
|
||||||
@@ -201,3 +204,47 @@ func IsTaskListQuery(text string) bool {
|
|||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TaskCaptureGrammar — stage 0 for an explicit capture marker, so the resident
|
||||||
|
// model never sees it (Vikunja #467).
|
||||||
|
//
|
||||||
|
// Capture was built to ride the note intent, deliberately: #130 said no eighth
|
||||||
|
// intent, and while the classifier was routing, a note-shaped utterance with a
|
||||||
|
// marker in it reached actionNote and captureTaskFromNote claimed it there. The
|
||||||
|
// router pre-empted that. Measured 2026-08-02: "добавь в задачи купить молоко"
|
||||||
|
// routed act, so captureTaskFromNote was never consulted, the act arm found no
|
||||||
|
// allowlisted fn, and the gate asked "Что сделать?". Every capture utterance
|
||||||
|
// tried filed nothing.
|
||||||
|
//
|
||||||
|
// The model also rewrote the payload on the way — "купить молоко" came back as
|
||||||
|
// "сделать покупку молока". A task must read as the words he said, which is a
|
||||||
|
// second reason to answer this before the model rather than to prompt around
|
||||||
|
// it.
|
||||||
|
//
|
||||||
|
// The marker list is data (task_phrases.json) and the parse strips urgency, so
|
||||||
|
// the pattern here matches any utterance and the decision is ParseTaskCapture's
|
||||||
|
// to make — same shape as the wake-word act grammar, which also matches broadly
|
||||||
|
// and refuses in Build. Intent stays note: the daemon's note path is where
|
||||||
|
// capture lives, and nothing about the contract with the model changes.
|
||||||
|
func TaskCaptureGrammar() Grammar {
|
||||||
|
return Grammar{
|
||||||
|
Name: "task-capture",
|
||||||
|
Pattern: regexp.MustCompile(`(?s)^\s*(.+)$`),
|
||||||
|
Build: func(m []string) (Decision, bool) {
|
||||||
|
c, ok := ParseTaskCapture(m[1])
|
||||||
|
if !ok {
|
||||||
|
return Decision{}, false // not a capture — fall through
|
||||||
|
}
|
||||||
|
return Decision{
|
||||||
|
Stage: 0,
|
||||||
|
Intent: IntentNote,
|
||||||
|
Confidence: 1.0,
|
||||||
|
// The capture text, not the raw utterance: it is what the
|
||||||
|
// clarify gate reads as the payload. captureTaskFromNote
|
||||||
|
// re-parses the utterance itself, so the task text comes from
|
||||||
|
// the same place either way.
|
||||||
|
Slots: Slots{Text: c.Text},
|
||||||
|
}, true
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -27,6 +27,9 @@
|
|||||||
"добавь в список",
|
"добавь в список",
|
||||||
"добавь задачу",
|
"добавь задачу",
|
||||||
"запиши в задачи",
|
"запиши в задачи",
|
||||||
|
"запиши в список дел",
|
||||||
|
"запиши в список задач",
|
||||||
|
"запиши в список",
|
||||||
"запиши задачу",
|
"запиши задачу",
|
||||||
"новая задача",
|
"новая задача",
|
||||||
"поставь задачу",
|
"поставь задачу",
|
||||||
|
|||||||
@@ -85,3 +85,37 @@ func TestIsTaskListQuery(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestTaskCaptureGrammarClaimsTheMarker — the capture marker is answered at
|
||||||
|
// stage 0, so the model never gets to call it an act (Vikunja #467).
|
||||||
|
func TestTaskCaptureGrammarClaimsTheMarker(t *testing.T) {
|
||||||
|
g := TaskCaptureGrammar()
|
||||||
|
captures := map[string]string{
|
||||||
|
"добавь в задачи купить молоко": "купить молоко",
|
||||||
|
"запиши в список дел купить хлеб": "купить хлеб",
|
||||||
|
"поставь задачу вынести мусор": "вынести мусор",
|
||||||
|
"добавь в задачи срочно оплатить дом": "оплатить дом",
|
||||||
|
}
|
||||||
|
for in, want := range captures {
|
||||||
|
m := g.Pattern.FindStringSubmatch(in)
|
||||||
|
if m == nil {
|
||||||
|
t.Fatalf("%q did not match the grammar pattern", in)
|
||||||
|
}
|
||||||
|
d, ok := g.Build(m)
|
||||||
|
if !ok {
|
||||||
|
t.Fatalf("%q must be claimed as a capture", in)
|
||||||
|
}
|
||||||
|
if d.Intent != IntentNote || d.Slots.Text != want {
|
||||||
|
t.Errorf("%q → intent=%s text=%q, want note/%q", in, d.Intent, d.Slots.Text, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Everything without a marker falls through, including a marker with no
|
||||||
|
// task after it and a question about the list.
|
||||||
|
for _, in := range []string{"надо бы поспать", "добавь в задачи", "какие у меня задачи?", "перезапусти nginx"} {
|
||||||
|
if m := g.Pattern.FindStringSubmatch(in); m != nil {
|
||||||
|
if _, ok := g.Build(m); ok {
|
||||||
|
t.Errorf("%q must fall through to the cascade", in)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -87,3 +87,68 @@ func (s *Store) ReconcileStaleDeliveryAttempts(ctx context.Context, now time.Tim
|
|||||||
}
|
}
|
||||||
return int(n), nil
|
return int(n), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DeliveryAttempt — one row of the outbox, as a reader sees it.
|
||||||
|
type DeliveryAttempt struct {
|
||||||
|
ID int64
|
||||||
|
Kind string // nudge|reminder
|
||||||
|
Rule string // set for nudges
|
||||||
|
ReminderID int64 // set for reminders
|
||||||
|
Channel string
|
||||||
|
Status string // one of the Delivery* constants
|
||||||
|
Created time.Time
|
||||||
|
Completed time.Time // zero while pending
|
||||||
|
HasComplete bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// ListDeliveryAttempts returns recent attempts, newest first. An empty status
|
||||||
|
// means every status; anything else filters on it.
|
||||||
|
//
|
||||||
|
// The table was write-only until 04-08-2026: rows were recorded and nothing
|
||||||
|
// could read them, so the tests for #368 and #370 had to reach past the store
|
||||||
|
// into store.DB, which is the tell (Vikunja #390). A durable record nobody can
|
||||||
|
// read answers no question, and "why did Maven go quiet" is supposed to be a
|
||||||
|
// query rather than a mystery.
|
||||||
|
//
|
||||||
|
// Status is the filter that earns its place, because the two questions actually
|
||||||
|
// asked are "what got dropped" and "what is still pending". Neither is
|
||||||
|
// answerable by reading the whole list on a busy day.
|
||||||
|
func (s *Store) ListDeliveryAttempts(ctx context.Context, status string, limit int) ([]DeliveryAttempt, error) {
|
||||||
|
if limit <= 0 {
|
||||||
|
limit = 50
|
||||||
|
}
|
||||||
|
q := `SELECT id, kind, rule, reminder_id, channel, status, created_ts, completed_ts
|
||||||
|
FROM delivery_attempts`
|
||||||
|
args := []any{}
|
||||||
|
if status != "" {
|
||||||
|
q += ` WHERE status = ?`
|
||||||
|
args = append(args, status)
|
||||||
|
}
|
||||||
|
q += ` ORDER BY created_ts DESC, id DESC LIMIT ?`
|
||||||
|
args = append(args, limit)
|
||||||
|
|
||||||
|
rows, err := s.db.QueryContext(ctx, q, args...)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("list delivery attempts: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var out []DeliveryAttempt
|
||||||
|
for rows.Next() {
|
||||||
|
var a DeliveryAttempt
|
||||||
|
var created int64
|
||||||
|
var completed *int64
|
||||||
|
if err := rows.Scan(&a.ID, &a.Kind, &a.Rule, &a.ReminderID, &a.Channel, &a.Status, &created, &completed); err != nil {
|
||||||
|
return nil, fmt.Errorf("list delivery attempts: scan: %w", err)
|
||||||
|
}
|
||||||
|
a.Created = time.UnixMilli(created)
|
||||||
|
if completed != nil {
|
||||||
|
a.Completed, a.HasComplete = time.UnixMilli(*completed), true
|
||||||
|
}
|
||||||
|
out = append(out, a)
|
||||||
|
}
|
||||||
|
if err := rows.Err(); err != nil {
|
||||||
|
return nil, fmt.Errorf("list delivery attempts: %w", err)
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -32,3 +32,53 @@ func TestDroppedDeliveryAttemptRoundTrips(t *testing.T) {
|
|||||||
t.Fatalf("status: want %q, got %q", DeliveryDropped, status)
|
t.Fatalf("status: want %q, got %q", DeliveryDropped, status)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestListDeliveryAttempts — the read path the outbox lacked until #390. The
|
||||||
|
// two questions it must answer are "what was dropped" and "what is pending".
|
||||||
|
func TestListDeliveryAttempts(t *testing.T) {
|
||||||
|
ctx := context.Background()
|
||||||
|
s := newTestStore(t)
|
||||||
|
base := time.Date(2026, 8, 4, 9, 0, 0, 0, time.UTC)
|
||||||
|
|
||||||
|
sent, err := s.BeginDeliveryAttempt(ctx, "nudge", "water", 0, "telegram", "h1", base)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := s.CompleteDeliveryAttempt(ctx, sent, DeliverySent, base.Add(time.Second)); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
dropped, err := s.BeginDeliveryAttempt(ctx, "nudge", "care", 0, "telegram", "h2", base.Add(time.Minute))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := s.CompleteDeliveryAttempt(ctx, dropped, DeliveryDropped, base.Add(time.Minute)); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err := s.BeginDeliveryAttempt(ctx, "reminder", "", 7, "voice", "h3", base.Add(2*time.Minute)); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
all, err := s.ListDeliveryAttempts(ctx, "", 10)
|
||||||
|
if err != nil || len(all) != 3 {
|
||||||
|
t.Fatalf("ListDeliveryAttempts = %d rows, err=%v, want 3", len(all), err)
|
||||||
|
}
|
||||||
|
// Newest first.
|
||||||
|
if all[0].Kind != "reminder" || all[0].ReminderID != 7 {
|
||||||
|
t.Fatalf("newest row is %+v, want the reminder", all[0])
|
||||||
|
}
|
||||||
|
if all[0].HasComplete {
|
||||||
|
t.Fatalf("a pending row must have no completion time: %+v", all[0])
|
||||||
|
}
|
||||||
|
if !all[2].HasComplete || !all[2].Completed.Equal(base.Add(time.Second)) {
|
||||||
|
t.Fatalf("completed row lost its time: %+v", all[2])
|
||||||
|
}
|
||||||
|
|
||||||
|
only, err := s.ListDeliveryAttempts(ctx, DeliveryDropped, 10)
|
||||||
|
if err != nil || len(only) != 1 || only[0].Rule != "care" {
|
||||||
|
t.Fatalf("dropped filter = %+v, err=%v", only, err)
|
||||||
|
}
|
||||||
|
pending, err := s.ListDeliveryAttempts(ctx, DeliveryPending, 10)
|
||||||
|
if err != nil || len(pending) != 1 || pending[0].Kind != "reminder" {
|
||||||
|
t.Fatalf("pending filter = %+v, err=%v", pending, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -254,6 +254,41 @@ func (s *Store) LatestFactBySource(ctx context.Context, key, source string) (Fac
|
|||||||
return scanFact(row)
|
return scanFact(row)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// LatestFactsByPrefix — the latest non-voided fact for every key that starts
|
||||||
|
// with prefix, newest-per-key, ordered by key.
|
||||||
|
//
|
||||||
|
// The loop's gatherer loads the keys its rules declare, which works while the
|
||||||
|
// key set is static. Kuma's monitors are not: one fact per monitor means the
|
||||||
|
// keys are only known once the gauge is read, so the rule declares the prefix
|
||||||
|
// and this read resolves it per tick. `_` and `%` are escaped — a monitor name
|
||||||
|
// is user text and must not act as a LIKE wildcard.
|
||||||
|
func (s *Store) LatestFactsByPrefix(ctx context.Context, prefix string) ([]Fact, error) {
|
||||||
|
esc := strings.NewReplacer(`\`, `\\`, `%`, `\%`, `_`, `\_`).Replace(prefix)
|
||||||
|
rows, err := s.db.QueryContext(ctx, `
|
||||||
|
SELECT id, ts, kind, key, value, source, confidence, voids_id
|
||||||
|
FROM facts f
|
||||||
|
WHERE key LIKE ? ESCAPE '\'
|
||||||
|
AND id NOT IN (SELECT voids_id FROM facts WHERE voids_id IS NOT NULL)
|
||||||
|
AND id = (SELECT id FROM facts g
|
||||||
|
WHERE g.key = f.key
|
||||||
|
AND g.id NOT IN (SELECT voids_id FROM facts WHERE voids_id IS NOT NULL)
|
||||||
|
ORDER BY g.ts DESC, g.id DESC LIMIT 1)
|
||||||
|
ORDER BY key`, esc+"%")
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("facts by prefix %q: %w", prefix, err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
var out []Fact
|
||||||
|
for rows.Next() {
|
||||||
|
f, err := scanFact(rows)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
out = append(out, f)
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
// Since returns how long ago the latest non-voided fact for key landed, or
|
// Since returns how long ago the latest non-voided fact for key landed, or
|
||||||
// (0, ErrNoFact). Implements the `since(key)==null → don't fire` guard from
|
// (0, ErrNoFact). Implements the `since(key)==null → don't fire` guard from
|
||||||
// the spec — silence on no-data is "shuts up when uncertain".
|
// the spec — silence on no-data is "shuts up when uncertain".
|
||||||
|
|||||||
@@ -0,0 +1,62 @@
|
|||||||
|
package store
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// One fact per kuma monitor means the loop cannot name its keys at wiring time,
|
||||||
|
// so it asks for the family by prefix. The read must return the newest row per
|
||||||
|
// key and stop at the prefix boundary.
|
||||||
|
func TestLatestFactsByPrefix(t *testing.T) {
|
||||||
|
s := newTestStore(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
now := time.Now().UTC().Truncate(time.Millisecond)
|
||||||
|
write := func(key, val string, at time.Time) int64 {
|
||||||
|
id, err := s.SetValue(ctx, KindEnv, key, "poll:uptimekuma", val, at)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("SetValue %s: %v", key, err)
|
||||||
|
}
|
||||||
|
return id
|
||||||
|
}
|
||||||
|
write("service_down:db", "up", now.Add(-2*time.Hour))
|
||||||
|
write("service_down:db", "down", now.Add(-time.Hour)) // newer wins
|
||||||
|
write("service_down:web", "up", now.Add(-time.Hour))
|
||||||
|
write("service_downtime", "irrelevant", now) // no colon, not in the family
|
||||||
|
write("water", "250ml", now)
|
||||||
|
|
||||||
|
got, err := s.LatestFactsByPrefix(ctx, "service_down:")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("LatestFactsByPrefix: %v", err)
|
||||||
|
}
|
||||||
|
if len(got) != 2 {
|
||||||
|
t.Fatalf("got %d facts, want 2: %+v", len(got), got)
|
||||||
|
}
|
||||||
|
if got[0].Key != "service_down:db" || got[0].Value != `"down"` {
|
||||||
|
t.Errorf("first = %s=%s, want the newest db row", got[0].Key, got[0].Value)
|
||||||
|
}
|
||||||
|
if got[1].Key != "service_down:web" {
|
||||||
|
t.Errorf("second = %s, want service_down:web", got[1].Key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A monitor name is user text. An underscore in it must match itself, not act
|
||||||
|
// as a LIKE wildcard and drag in every other monitor.
|
||||||
|
func TestLatestFactsByPrefixEscapesWildcards(t *testing.T) {
|
||||||
|
s := newTestStore(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
now := time.Now().UTC().Truncate(time.Millisecond)
|
||||||
|
for _, k := range []string{"a_b:one", "axb:two"} {
|
||||||
|
if _, err := s.SetValue(ctx, KindEnv, k, "poll:uptimekuma", "down", now); err != nil {
|
||||||
|
t.Fatalf("SetValue %s: %v", k, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
got, err := s.LatestFactsByPrefix(ctx, "a_b:")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("LatestFactsByPrefix: %v", err)
|
||||||
|
}
|
||||||
|
if len(got) != 1 || got[0].Key != "a_b:one" {
|
||||||
|
t.Fatalf("got %+v, want only a_b:one", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -219,6 +219,35 @@ ALTER TABLE reminders ADD COLUMN next_fire_ts INTEGER;`, // #2
|
|||||||
// event, and the old rows would otherwise be recited as extra meetings.
|
// event, and the old rows would otherwise be recited as extra meetings.
|
||||||
// The filter is exact — it keeps any key whose summary part still has a
|
// The filter is exact — it keeps any key whose summary part still has a
|
||||||
// letter or a digit in it.
|
// letter or a digit in it.
|
||||||
|
|
||||||
|
// #19 — unstick the routines accepted before the fire-forever fix
|
||||||
|
// (Vikunja #377, follow-up to #366). Accepting used to leave accepted_ts
|
||||||
|
// NULL and a live one-shot reminder behind, and the tick loop skips a row
|
||||||
|
// with no accepted_ts, so every non-weekly routine accepted before that fix
|
||||||
|
// has been silent ever since.
|
||||||
|
//
|
||||||
|
// Three statements, in this order, per stuck row: adopt created_ts as the
|
||||||
|
// acceptance time, cancel the reminder that is still holding the schedule,
|
||||||
|
// then let go of it. Cancelling before clearing matters — clearing first
|
||||||
|
// loses the only pointer to the reminder and leaves it to fire on its own.
|
||||||
|
//
|
||||||
|
// created_ts rather than a fresh timestamp because a migration has no
|
||||||
|
// clock, and because the first interval should be measured from when he
|
||||||
|
// said yes. A routine whose interval has already elapsed nudges on the next
|
||||||
|
// tick, which is what being unstuck looks like.
|
||||||
|
//
|
||||||
|
// Weekly rows are included deliberately. Theirs was the case that kept
|
||||||
|
// working, because the cron reminder reschedules itself — so leaving them
|
||||||
|
// alone would give them both a cron reminder and a tick-loop schedule for
|
||||||
|
// one habit, and he would hear it twice.
|
||||||
|
`UPDATE reminders
|
||||||
|
SET status = 'cancelled'
|
||||||
|
WHERE status = 'pending'
|
||||||
|
AND id IN (SELECT reminder_id FROM proposed_routines
|
||||||
|
WHERE status = 'accepted' AND accepted_ts IS NULL AND reminder_id IS NOT NULL);
|
||||||
|
UPDATE proposed_routines
|
||||||
|
SET accepted_ts = created_ts, reminder_id = NULL
|
||||||
|
WHERE status = 'accepted' AND accepted_ts IS NULL;`,
|
||||||
}
|
}
|
||||||
|
|
||||||
// migrate applies every migration with a number greater than the DB's current
|
// migrate applies every migration with a number greater than the DB's current
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package store
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"testing"
|
"testing"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
func userVersion(t *testing.T, s *Store) int {
|
func userVersion(t *testing.T, s *Store) int {
|
||||||
@@ -80,3 +81,69 @@ func TestCollapsedCalendarKeysAreDropped(t *testing.T) {
|
|||||||
t.Fatalf("%d calendar rows left, want the 2 that identify their event", got)
|
t.Fatalf("%d calendar rows left, want the 2 that identify their event", got)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestStuckRoutinesAreBackfilled — routines accepted before the fire-forever
|
||||||
|
// fix have accepted_ts NULL and a live reminder, so the tick loop skips them
|
||||||
|
// and they have been silent ever since (Vikunja #377). The migration touches
|
||||||
|
// live reminders, which is why it is tested against a real store.
|
||||||
|
func TestStuckRoutinesAreBackfilled(t *testing.T) {
|
||||||
|
ctx := context.Background()
|
||||||
|
s := newTestStore(t)
|
||||||
|
created := time.Date(2026, 7, 1, 9, 0, 0, 0, time.UTC)
|
||||||
|
|
||||||
|
rem, err := s.CreateReminder(ctx, created.Add(time.Hour), "полить цветы", "")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
healthy, err := s.CreateReminder(ctx, created.Add(2*time.Hour), "не трогать", "")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err := s.db.ExecContext(ctx,
|
||||||
|
`INSERT INTO proposed_routines (action, object, interval_days, status, created_ts, reminder_id, accepted_ts)
|
||||||
|
VALUES ('water', 'plants', 7, 'accepted', ?, ?, NULL)`,
|
||||||
|
created.UnixMilli(), rem); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
// An already-healthy accepted row, and a still-open proposal: neither is
|
||||||
|
// this migration's business.
|
||||||
|
if _, err := s.db.ExecContext(ctx,
|
||||||
|
`INSERT INTO proposed_routines (action, object, interval_days, status, created_ts, accepted_ts)
|
||||||
|
VALUES ('feed', 'cat', 1, 'accepted', ?, ?)`,
|
||||||
|
created.UnixMilli(), created.UnixMilli()); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := s.db.ExecContext(ctx, migrations[18]); err != nil {
|
||||||
|
t.Fatalf("migration 19: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
accepted, err := s.ListAcceptedRoutines(ctx)
|
||||||
|
if err != nil || len(accepted) != 2 {
|
||||||
|
t.Fatalf("ListAcceptedRoutines = %d rows, err=%v, want 2", len(accepted), err)
|
||||||
|
}
|
||||||
|
stuck := accepted[0]
|
||||||
|
if stuck.Object != "plants" {
|
||||||
|
stuck = accepted[1]
|
||||||
|
}
|
||||||
|
if stuck.AcceptedTs == nil || !stuck.AcceptedTs.Equal(created) {
|
||||||
|
t.Fatalf("accepted_ts = %v, want the creation time", stuck.AcceptedTs)
|
||||||
|
}
|
||||||
|
if stuck.ReminderID != nil {
|
||||||
|
t.Fatalf("reminder_id = %v, want it let go", stuck.ReminderID)
|
||||||
|
}
|
||||||
|
// The reminder it was holding is cancelled, and nothing else is.
|
||||||
|
var status string
|
||||||
|
if err := s.db.QueryRowContext(ctx, `SELECT status FROM reminders WHERE id = ?`, rem).Scan(&status); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if status != ReminderCancelled {
|
||||||
|
t.Fatalf("linked reminder status = %q, want cancelled", status)
|
||||||
|
}
|
||||||
|
if err := s.db.QueryRowContext(ctx, `SELECT status FROM reminders WHERE id = ?`, healthy).Scan(&status); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if status != "pending" {
|
||||||
|
t.Fatalf("unrelated reminder status = %q, want it untouched", status)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -8,14 +8,37 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
// The three states a proposal can be in. A proposal starts 'proposed' and
|
// RoutineStatus — the state a proposal is in. A defined type, not a bare
|
||||||
// moves once, either way, and never moves again.
|
// string, because the legal set used to live in a comment: nothing caught a
|
||||||
|
// typo at compile time, nothing enumerated the set for a test, and a bad value
|
||||||
|
// surfaced as a /routines row that neither accepts nor dismisses (Vikunja #46,
|
||||||
|
// #410).
|
||||||
|
type RoutineStatus string
|
||||||
|
|
||||||
|
// The three states a proposal can be in. A proposal starts proposed and moves
|
||||||
|
// once, either way, and never moves again.
|
||||||
const (
|
const (
|
||||||
RoutineProposed = "proposed"
|
RoutineProposed RoutineStatus = "proposed"
|
||||||
RoutineAccepted = "accepted"
|
RoutineAccepted RoutineStatus = "accepted"
|
||||||
RoutineDismissed = "dismissed"
|
RoutineDismissed RoutineStatus = "dismissed"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// RoutineStatuses — the legal set, and the single source of truth a test can
|
||||||
|
// range over. Adding a state means adding it here.
|
||||||
|
var RoutineStatuses = []RoutineStatus{RoutineProposed, RoutineAccepted, RoutineDismissed}
|
||||||
|
|
||||||
|
// Valid reports whether s is one of RoutineStatuses.
|
||||||
|
func (s RoutineStatus) Valid() bool {
|
||||||
|
for _, v := range RoutineStatuses {
|
||||||
|
if s == v {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s RoutineStatus) String() string { return string(s) }
|
||||||
|
|
||||||
// ProposedRoutine — a detected pattern the system wants to nudge about on a
|
// ProposedRoutine — a detected pattern the system wants to nudge about on a
|
||||||
// repeating interval. Status 'proposed' means awaiting human confirmation;
|
// repeating interval. Status 'proposed' means awaiting human confirmation;
|
||||||
// 'accepted' means the human confirmed and the tick loop now owns the schedule;
|
// 'accepted' means the human confirmed and the tick loop now owns the schedule;
|
||||||
@@ -30,7 +53,7 @@ type ProposedRoutine struct {
|
|||||||
Action string
|
Action string
|
||||||
Object string
|
Object string
|
||||||
IntervalDays float64
|
IntervalDays float64
|
||||||
Status string // proposed | accepted | dismissed
|
Status RoutineStatus
|
||||||
CreatedTs time.Time
|
CreatedTs time.Time
|
||||||
ReminderID *int64
|
ReminderID *int64
|
||||||
AcceptedTs *time.Time
|
AcceptedTs *time.Time
|
||||||
@@ -40,6 +63,7 @@ type ProposedRoutine struct {
|
|||||||
var (
|
var (
|
||||||
ErrProposedRoutineNotFound = errors.New("store: proposed routine not found")
|
ErrProposedRoutineNotFound = errors.New("store: proposed routine not found")
|
||||||
ErrProposedRoutineExists = errors.New("store: proposed routine already exists for this action+object")
|
ErrProposedRoutineExists = errors.New("store: proposed routine already exists for this action+object")
|
||||||
|
ErrRoutineStatus = errors.New("store: unknown routine status")
|
||||||
)
|
)
|
||||||
|
|
||||||
// CreateProposedRoutine inserts a new proposed routine. Returns
|
// CreateProposedRoutine inserts a new proposed routine. Returns
|
||||||
@@ -51,6 +75,16 @@ var (
|
|||||||
// keep finding the pattern, and every re-propose is refused here. Maven is not
|
// keep finding the pattern, and every re-propose is refused here. Maven is not
|
||||||
// a nag.
|
// a nag.
|
||||||
//
|
//
|
||||||
|
// The object stays a local string. It is not resolved against Nexus and it
|
||||||
|
// carries no canonical entity ref (asked on the PR 4 review, decided here,
|
||||||
|
// Vikunja #410). Nexus owns identity for things the ecosystem acts on, and
|
||||||
|
// nothing acts on a routine object: it is the word he used, replayed back to
|
||||||
|
// him in a nudge, and compared only against itself for the UNIQUE key. Two
|
||||||
|
// spellings of the same watering can are two routines, and that is the right
|
||||||
|
// answer when the point is to say the sentence he would say. Canonical refs
|
||||||
|
// arrive here only if a routine ever drives a Hexis call, which is Vikunja
|
||||||
|
// #272, not this.
|
||||||
|
//
|
||||||
// Vikunja #43: this is called both from the voice fact-write path (for the
|
// Vikunja #43: this is called both from the voice fact-write path (for the
|
||||||
// immediate spoken confirmation) and from the digestion tick's proactive
|
// immediate spoken confirmation) and from the digestion tick's proactive
|
||||||
// scan (cmd/mavend/tick.go's detectPatterns, via patterns.go's
|
// scan (cmd/mavend/tick.go's detectPatterns, via patterns.go's
|
||||||
@@ -102,8 +136,13 @@ func (s *Store) ListProposedRoutines(ctx context.Context) ([]ProposedRoutine, er
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ListProposedRoutinesByStatus returns routines in one status, newest first.
|
// ListProposedRoutinesByStatus returns routines in one status, newest first.
|
||||||
// An empty status returns every row.
|
// An empty status returns every row; an unknown one is refused rather than
|
||||||
func (s *Store) ListProposedRoutinesByStatus(ctx context.Context, status string) ([]ProposedRoutine, error) {
|
// silently answering with nothing, since a typo and a genuinely empty state
|
||||||
|
// read the same otherwise.
|
||||||
|
func (s *Store) ListProposedRoutinesByStatus(ctx context.Context, status RoutineStatus) ([]ProposedRoutine, error) {
|
||||||
|
if status != "" && !status.Valid() {
|
||||||
|
return nil, fmt.Errorf("%w: %q", ErrRoutineStatus, status)
|
||||||
|
}
|
||||||
q := `SELECT id, action, object, interval_days, status, created_ts, reminder_id, accepted_ts, last_fired_ts
|
q := `SELECT id, action, object, interval_days, status, created_ts, reminder_id, accepted_ts, last_fired_ts
|
||||||
FROM proposed_routines`
|
FROM proposed_routines`
|
||||||
var args []any
|
var args []any
|
||||||
|
|||||||
@@ -235,7 +235,7 @@ func TestListProposedRoutinesByStatus(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
cases := []struct {
|
cases := []struct {
|
||||||
status string
|
status RoutineStatus
|
||||||
want int
|
want int
|
||||||
}{
|
}{
|
||||||
{RoutineProposed, 0},
|
{RoutineProposed, 0},
|
||||||
@@ -266,3 +266,59 @@ func TestLookupMissingProposedRoutine(t *testing.T) {
|
|||||||
t.Fatal("want nil for missing routine")
|
t.Fatal("want nil for missing routine")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Every legal status must survive the database. The status column is written
|
||||||
|
// by three different UPDATE statements with the value spelled inline, so a
|
||||||
|
// constant that drifts from its SQL is exactly the failure this catches: the
|
||||||
|
// row would come back in a state no Go code compares equal to.
|
||||||
|
func TestRoutineStatusRoundTrip(t *testing.T) {
|
||||||
|
ctx := context.Background()
|
||||||
|
s := newTestStore(t)
|
||||||
|
now := time.Now().UTC()
|
||||||
|
|
||||||
|
write := map[RoutineStatus]func(id int64) error{
|
||||||
|
RoutineProposed: func(int64) error { return nil },
|
||||||
|
RoutineAccepted: func(id int64) error { return s.AcceptProposedRoutine(ctx, id, now) },
|
||||||
|
RoutineDismissed: func(id int64) error { return s.DismissProposedRoutine(ctx, id) },
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, want := range RoutineStatuses {
|
||||||
|
if !want.Valid() {
|
||||||
|
t.Fatalf("%q is in RoutineStatuses but not Valid()", want)
|
||||||
|
}
|
||||||
|
object := "object-" + want.String()
|
||||||
|
id, err := s.CreateProposedRoutine(ctx, "полить", object, 3, now)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("CreateProposedRoutine(%s): %v", want, err)
|
||||||
|
}
|
||||||
|
if err := write[want](id); err != nil {
|
||||||
|
t.Fatalf("move to %s: %v", want, err)
|
||||||
|
}
|
||||||
|
got, err := s.LookupProposedRoutine(ctx, "полить", object)
|
||||||
|
if err != nil || got == nil {
|
||||||
|
t.Fatalf("LookupProposedRoutine(%s): %v", want, err)
|
||||||
|
}
|
||||||
|
if got.Status != want {
|
||||||
|
t.Errorf("status = %q, want %q", got.Status, want)
|
||||||
|
}
|
||||||
|
list, err := s.ListProposedRoutinesByStatus(ctx, want)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("ListProposedRoutinesByStatus(%s): %v", want, err)
|
||||||
|
}
|
||||||
|
if len(list) != 1 {
|
||||||
|
t.Errorf("status %s: listed %d rows, want 1", want, len(list))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A typo used to read as "nothing is in that state", which is the same answer
|
||||||
|
// a correct query gives on an empty table.
|
||||||
|
func TestListByStatusRefusesAnUnknownStatus(t *testing.T) {
|
||||||
|
s := newTestStore(t)
|
||||||
|
if _, err := s.ListProposedRoutinesByStatus(context.Background(), "accpeted"); !errors.Is(err, ErrRoutineStatus) {
|
||||||
|
t.Fatalf("err = %v, want ErrRoutineStatus", err)
|
||||||
|
}
|
||||||
|
if RoutineStatus("accpeted").Valid() {
|
||||||
|
t.Error("a typo must not be Valid()")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -97,7 +97,59 @@ func (p *OpenMeteoProvider) CurrentWeather(ctx context.Context, location string)
|
|||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// locationCandidates — the spellings to try for a place taken out of a spoken
|
||||||
|
// sentence, in order. He says "какая погода в Казани", so the word arrives in
|
||||||
|
// the prepositional case and the geocoder wants the nominative (Vikunja #421).
|
||||||
|
//
|
||||||
|
// Two cheap reversals cover most of what he says: a final "е" is usually a
|
||||||
|
// nominative "а" (Москве → Москва) or nothing at all (Лондоне → Лондон), and a
|
||||||
|
// final "и" is usually a soft sign (Казани → Казань). Indeclinable names —
|
||||||
|
// Тбилиси, Сочи, Осло — are already nominative and the first candidate answers.
|
||||||
|
//
|
||||||
|
// Nothing here is a guess about the weather: a wrong candidate finds no city
|
||||||
|
// and the caller says so. It only decides which strings are worth asking about.
|
||||||
|
func locationCandidates(location string) []string {
|
||||||
|
out := []string{location}
|
||||||
|
add := func(s string) {
|
||||||
|
if s == "" || s == location {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for _, seen := range out {
|
||||||
|
if seen == s {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
out = append(out, s)
|
||||||
|
}
|
||||||
|
r := []rune(location)
|
||||||
|
if len(r) < 4 {
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
stem := string(r[:len(r)-1])
|
||||||
|
switch r[len(r)-1] {
|
||||||
|
case 'е', 'Е':
|
||||||
|
add(stem + "а")
|
||||||
|
add(stem)
|
||||||
|
case 'и', 'И':
|
||||||
|
add(stem + "ь")
|
||||||
|
add(stem)
|
||||||
|
case 'у', 'У', 'ю', 'Ю':
|
||||||
|
add(stem + "а")
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
func (p *OpenMeteoProvider) geocode(ctx context.Context, location string) (lat, lon float64, name string, err error) {
|
func (p *OpenMeteoProvider) geocode(ctx context.Context, location string) (lat, lon float64, name string, err error) {
|
||||||
|
for _, cand := range locationCandidates(location) {
|
||||||
|
lat, lon, name, err = p.geocodeOne(ctx, cand)
|
||||||
|
if err == nil {
|
||||||
|
return lat, lon, name, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0, 0, "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *OpenMeteoProvider) geocodeOne(ctx context.Context, location string) (lat, lon float64, name string, err error) {
|
||||||
u := fmt.Sprintf("https://geocoding-api.open-meteo.com/v1/search?name=%s&count=1&language=ru&format=json", url.QueryEscape(location))
|
u := fmt.Sprintf("https://geocoding-api.open-meteo.com/v1/search?name=%s&count=1&language=ru&format=json", url.QueryEscape(location))
|
||||||
req, err := http.NewRequestWithContext(ctx, http.MethodGet, u, nil)
|
req, err := http.NewRequestWithContext(ctx, http.MethodGet, u, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -121,7 +173,7 @@ func (p *OpenMeteoProvider) geocode(ctx context.Context, location string) (lat,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if len(geo.Results) == 0 {
|
if len(geo.Results) == 0 {
|
||||||
return 0, 0, "", fmt.Errorf("location %q not found", location)
|
return 0, 0, "", fmt.Errorf("%w: %q", ErrLocationUnknown, location)
|
||||||
}
|
}
|
||||||
|
|
||||||
r := geo.Results[0]
|
r := geo.Results[0]
|
||||||
|
|||||||
@@ -83,3 +83,29 @@ func TestStubProvider(t *testing.T) {
|
|||||||
t.Fatalf("StubProvider: want ErrNotConfigured, got %v", err)
|
t.Fatalf("StubProvider: want ErrNotConfigured, got %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestLocationCandidates — he speaks the prepositional case and the geocoder
|
||||||
|
// wants the nominative (Vikunja #421).
|
||||||
|
func TestLocationCandidates(t *testing.T) {
|
||||||
|
cases := map[string][]string{
|
||||||
|
"Москве": {"Москве", "Москва", "Москв"},
|
||||||
|
"Казани": {"Казани", "Казань", "Казан"},
|
||||||
|
"Лондоне": {"Лондоне", "Лондона", "Лондон"},
|
||||||
|
"Тбилиси": {"Тбилиси", "Тбились", "Тбилис"},
|
||||||
|
"Berlin": {"Berlin"},
|
||||||
|
"Уфе": {"Уфе"}, // too short to strip — asked as spoken
|
||||||
|
}
|
||||||
|
for in, want := range cases {
|
||||||
|
got := locationCandidates(in)
|
||||||
|
if len(got) != len(want) {
|
||||||
|
t.Errorf("locationCandidates(%q) = %v, want %v", in, got, want)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for i := range got {
|
||||||
|
if got[i] != want[i] {
|
||||||
|
t.Errorf("locationCandidates(%q) = %v, want %v", in, got, want)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -7,6 +7,13 @@ import (
|
|||||||
|
|
||||||
var ErrNotConfigured = errors.New("weather: not configured")
|
var ErrNotConfigured = errors.New("weather: not configured")
|
||||||
|
|
||||||
|
// ErrLocationUnknown — the geocoder has no such place. A named city that does
|
||||||
|
// not resolve must read differently from a provider outage: one is "I do not
|
||||||
|
// know that place", the other is "I could not reach the service", and
|
||||||
|
// answering for the default location instead is the defect this replaces
|
||||||
|
// (Vikunja #421).
|
||||||
|
var ErrLocationUnknown = errors.New("weather: location not found")
|
||||||
|
|
||||||
type Weather struct {
|
type Weather struct {
|
||||||
Location string `json:"location"`
|
Location string `json:"location"`
|
||||||
Temperature float64 `json:"temperature"`
|
Temperature float64 `json:"temperature"`
|
||||||
|
|||||||
Reference in New Issue
Block a user