Merge pull request 'Retire PROGRESS.md, the backlog and the feature ranking' (#87) from task/447-retire-progress-md-the-backlog-and-the-f into task/446-doc-reorg-tier-the-tree-retire-the-three

.claude/prose-dictionary.yaml

@@ -1,160 +0,0 @@
-# Maven project dictionary for the direct-prose skill.
-#
-# These terms override every word preference in the skill's word-choice tables.
-# Each entry exists because the name drifted in real docs or real answers, not
-# because the word looked improvable.
-#
-# Format and the rule for adding a term: ~/.claude/skills/direct-prose/references/modes.md
-
-terms:
-  resident_model:
-    name: resident model
-    meaning: the one always-warm Qwen3-1.7B llama-server that both routes and phrases
-    avoid:
-      - the model
-      - the LLM
-      - the 1.7B
-      - the phraser model
-    examples:
-      good: The resident model emits GBNF-constrained JSON.
-      bad: The 1.7B emits GBNF-constrained JSON.
-
-  router:
-    name: router
-    meaning: the stage that turns an utterance into a Decision with one of 7 intents
-    avoid:
-      - orchestrator
-      - intent classifier
-      - dispatcher
-
-  classifier:
-    name: classifier
-    meaning: the embedder nearest-neighbour path that runs when the router is off or errors
-    avoid:
-      - the fallback
-      - the floor
-      - the old router
-    examples:
-      good: A router error falls through to the classifier.
-      bad: A router error falls through to the floor.
-
-  cascade:
-    name: cascade
-    meaning: the ordered path stage 0, then router, then classifier
-    avoid:
-      - the pipeline
-      - the chain
-      - the fallback chain
-
-  stage_0:
-    name: stage 0
-    meaning: the deterministic rules that answer before the resident model is called
-    avoid:
-      - the fast path
-      - bypass
-      - deterministic assist
-      - preemption
-    examples:
-      good: Stage 0 routes agenda questions to IntentQuery.
-      bad: The bypass routes agenda questions to IntentQuery.
-
-  query_source:
-    name: query source
-    meaning: one entry in querySources, which either claims a turn or passes
-    avoid:
-      - arm
-      - handler
-      - branch
-      - answerer
-    examples:
-      good: Kiwix is the last query source before the model answers from memory.
-      bad: Kiwix is the last arm before the model answers from memory.
-
-  personal_boundary:
-    name: personal boundary
-    meaning: the query source that stops a question about him from reaching the world
-    avoid:
-      - the boundary
-      - the privacy gate
-      - the personal filter
-
-  clarify:
-    name: clarify
-    meaning: the turn outcome where Maven asks instead of acting
-    avoid:
-      - refusal
-      - rejection
-      - punt
-    examples:
-      good: The gate produced two false clarifies.
-      bad: The gate produced two false refusals.
-
-  fact:
-    name: fact
-    meaning: a keyed, supersedable row in the fact store
-    avoid:
-      - memory entry
-      - datum
-      - record
-
-  note:
-    name: note
-    meaning: free text he captured, indexed for recall
-    avoid:
-      - memo
-      - entry
-
-  memory:
-    name: memory
-    meaning: the embedded index over notes and facts that backs recall
-    avoid:
-      - RAG store
-      - vector db
-      - long-term memory
-
-  nudge:
-    name: nudge
-    meaning: one proactive message the digestion worker proposes and the dispatcher sends
-    avoid:
-      - suggestion
-      - proposal
-      - proactive prompt
-      - reminder
-    examples:
-      good: A fact can close the nudge that asked for it.
-      bad: A fact can close the suggestion that asked for it.
-
-  digestion_worker:
-    name: digestion worker
-    meaning: the background engine that consolidates memory and proposes nudges
-    avoid:
-      - digestion tick
-      - background engine
-      - reflection loop
-
-  reach:
-    name: reach
-    meaning: an outbound channel Maven speaks through, such as telegram, ntfy or voice
-    avoid:
-      - sink
-      - delivery channel
-      - notification backend
-
-  ecosystem:
-    name: ecosystem
-    meaning: Nexus, Praxis and Hexis together
-    avoid:
-      - the services
-      - the integrations
-      - upstream
-
-  act:
-    name: act
-    meaning: the intent that runs a capability through Hexis
-    avoid:
-      - action
-      - command
-      - execution
-    examples:
-      good: An act with no allowlisted fn is gated to a clarify.
-      bad: An action with no allowlisted fn is gated to a clarify.

.claude/settings.json

@@ -1,20 +0,0 @@
-{
-  "hooks": {
-    "SessionStart": [
-      {
-        "hooks": [
-          {
-            "type": "command",
-            "command": "f=.claude/prose-dictionary.yaml; [ -f \"$f\" ] && jq -Rs '{hookSpecificOutput:{hookEventName:\"SessionStart\",additionalContext:(\"Project prose dictionary. These terms override every word preference in the direct-prose output style. Use the name, never the avoid list.\\n\\n\"+.)}}' \"$f\" 2>/dev/null || true",
-            "statusMessage": "Loading prose dictionary"
-          },
-          {
-            "type": "command",
-            "command": "f=HANDOFF.md; [ -f \"$f\" ] && jq -Rs '{hookSpecificOutput:{hookEventName:\"SessionStart\",additionalContext:(\"An unconsumed HANDOFF.md is present. Run the pickup skill before anything else: read it, read the Vikunja task it names, restate the assumption set in at most five bullets, and wait for the user to confirm before writing code. It is a claim from the previous session, not truth. Delete it once consumed.\\n\\n\"+.)}}' \"$f\" 2>/dev/null || true",
-            "statusMessage": "Loading handoff"
-          }
-        ]
-      }
-    ]
-  }
-}

.claude/skills/pickup/SKILL.md

@@ -1,78 +0,0 @@
----
-name: pickup
-description: Start a work session on a Maven task. Runs task start, reads the brief and the disposable handoff, restates the assumption set, and waits for correction before touching code. Use at the start of any session that continues earlier work, when the user says "pickup", "continue", "resume", or names a Vikunja task id.
----
-
-# Pickup
-
-The point of this skill is the pause in step 5. Every wasted session in this repo
-started with an agent that inferred the goal instead of stating it back.
-
-## 0. Get on the branch
-
-```sh
-task start <vikunja-id>
-```
-
-`~/.local/bin/task` owns the branch, the identity and the PR. It cuts
-`task/<id>-<slug>` off `origin/master` and sets the commit author to the `claude`
-gitea user. It writes `TASK.md` from the Vikunja task, and pulls any waiting
-review comments into `.task/review-comments.md`. Do not hand-roll any of that.
-
-`TASK.md` is the brief and it is immutable. If it says a PR already exists, this
-is a review-fix session and not new work. Read the comments first.
-
-## 1. Read the handoff
-
-`HANDOFF.md` at the repo root, if it exists. It is gitignored, it belongs to one
-session, and it holds only what is needed to resume. Treat it as a claim from the
-previous agent, not as truth. It can be stale or wrong.
-
-If there is no handoff, that is normal. It means the last session closed clean.
-
-## 2. Read the durable state
-
-In this order, and stop as soon as you have enough:
-
-- The Vikunja task, by id. Project Maven is ID 2, MCP at `http://localhost:9100/mcp`.
-  The task description and its comments hold the goal, the constraints, and the
-  assumption ledger. This outranks the handoff on every conflict.
-- `CLAUDE.md`, the section that covers the area you are about to touch.
-- The one file under `docs/` that owns the area. Check its `Last verified` line.
-  If the sha is behind the code you are reading, say so in step 4 and trust the code.
-
-Do not read the dated files under `docs/evals/`. They are measurements from one day,
-never updated. Read one only when you need the number it recorded.
-
-If no task id is known, ask for one before doing anything else. Work without a task
-is work nobody can resume.
-
-## 3. Look at the ground
-
-`git status`, `git log --oneline -5`, and the diff on the current branch. What the
-repo says beats what any document says.
-
-## 4. Restate, then stop
-
-Write at most five bullets and stop. Do not write code, do not open files to "check
-one thing first", do not start with a small safe change.
-
-```
-Task:        V-359, one line.
-Done:        what is already on the branch.
-Next:        the one thing this session does.
-Constraints: what would make this wrong.
-Assuming:    the beliefs that, if false, waste the session.
-```
-
-Then ask: is this right? Wait for the answer.
-
-A corrected assumption goes into the Vikunja task as a comment, not into the handoff.
-The handoff dies tonight. The task does not.
-
-## 5. Then begin
-
-- Delete `HANDOFF.md`. It has been consumed and must not outlive this step.
-- On master, cut the branch: `scripts/task-branch.sh <id> <slug>`.
-- One task per session. When context passes roughly half, run `/wrap` rather than
-  pushing on. A compacted session is a session that forgot why it made a choice.

.claude/skills/wrap/SKILL.md

@@ -1,94 +0,0 @@
----
-name: wrap
-description: Close a Maven work session cleanly. Runs the tests, updates the durable docs, commits in reviewable slices with the Vikunja ref, pushes so the PR opens, records state in Vikunja, and leaves a disposable handoff only if work remains. Use when the user says "wrap", "wrap up", "done for now", or when context passes roughly half.
----
-
-# Wrap
-
-Run every step. A partial wrap is worse than none, because the next session trusts
-the parts that did run.
-
-## 1. Prove it works
-
-`make test`. If something fails, fix it or say plainly in the handoff and in Vikunja
-that it fails, with the output. Never wrap on an untested claim.
-
-## 2. Update the durable docs
-
-Ask what a future agent would have to learn the hard way, and write that down.
-
-- `CLAUDE.md` when a fact an agent needs before touching code has changed: routing
-  behaviour, a measured number, a flag default, a constraint. A commit that changed
-  routing or phrasing without touching the matching CLAUDE.md section is a bug.
-  Correct stale text in place. Do not append a new paragraph next to the wrong one.
-- `AGENTS.md` when the recipe to build, run or preview changed.
-- The one file under `docs/` that owns the area, plus its `Last verified: <date> @ <sha>`
-  line. Only a doc directly under `docs/` carries that line.
-- A new dated file under `docs/evals/` when you measured something. Never edit an
-  existing dated file. A newer measurement is a new file, and the living doc points
-  at it.
-
-Nothing that must survive tonight goes anywhere else. Not into the handoff, not into
-a commit message, not into a comment in the code.
-
-## 3. Commit in slices
-
-Under 300 changed lines per commit in non-markdown files, enforced by `.githooks/pre-commit`.
-Markdown is exempt and may land as one batch.
-
-Each commit is one idea, subject in the repo's voice, lowercase area prefix, and it
-ends with the Vikunja ref:
-
-```
-router: narrow the single-token rule (V-359)
-```
-
-If a change genuinely cannot split under 300 lines, say why in the commit body before
-reaching for `--no-verify`.
-
-## 4. Land it
-
-```sh
-task pr
-```
-
-It refuses a dirty tree, pushes, opens or refreshes the PR against the repo default
-branch, labels the Vikunja task in-review, comments the PR url on it, and pushes an
-ntfy. Do not push by hand and do not call `tea` yourself.
-
-## 5. Record what `task pr` cannot know
-
-Comment on the Vikunja task: what you measured, what is still open. List every
-assumption that turned out to be wrong. If the session found new work, create a task
-for it now rather than describing it in prose.
-
-This step is what makes the handoff disposable.
-
-## 6. Leave the handoff, or leave none
-
-If the task is finished, delete `HANDOFF.md` and stop. An empty root is the correct
-end state.
-
-If work remains, write `HANDOFF.md` with nothing but what the next agent needs to
-resume, and no history:
-
-```markdown
-# Handoff — <date>
-
-Task: V-359 <one line>
-Branch: task/359-<slug>, cut from master
-
-## Where I stopped
-<two sentences, mid-thought detail that is nowhere else>
-
-## Next action
-<the single concrete next step>
-
-## Do not
-<the trap I nearly fell into, or the approach already ruled out>
-```
-
-Nothing else goes in it. No summary of what landed, that is in git and Vikunja. No
-design rationale, that is in `docs/`. No fact an agent needs on any task, that is in
-`CLAUDE.md`. If a line in the handoff would still matter next week, it is in the wrong
-file.

.githooks/commit-msg

@@ -1,30 +0,0 @@
-#!/bin/sh
-# Every commit names the Vikunja task it belongs to.
-#
-#   router: narrow the single-token rule (V-359)
-#
-# V- and not #, because Gitea autolinks #359 to a Gitea issue, which is a
-# different tracker and a wrong link.
-#
-# Exempt: merges, reverts, fixup/squash, and the initial commit.
-
-msg_file=$1
-subject=$(sed -n '1p' "$msg_file")
-
-case "$subject" in
-	Merge\ *|Revert\ *|fixup!\ *|squash!\ *|amend!\ *) exit 0 ;;
-esac
-
-if [ -f "$(git rev-parse --git-dir)/MERGE_HEAD" ]; then
-	exit 0
-fi
-
-if printf '%s' "$subject" | grep -qE '\(V-[0-9]+\)$'; then
-	exit 0
-fi
-
-echo "commit-msg: subject must end with a Vikunja task ref." >&2
-echo "  got:  $subject" >&2
-echo "  want: router: narrow the single-token rule (V-359)" >&2
-echo "  No task yet? Create one. Work without a task is work nobody can resume." >&2
-exit 1

.githooks/pre-commit

@@ -1,30 +0,0 @@
-#!/bin/sh
-# Two guards, both bypassable with --no-verify when you mean it.
-#   1. master is not a working branch.
-#   2. a code commit stays under 300 changed lines.
-# Markdown is exempt from the size cap on purpose: docs land as one batch.
-
-branch=$(git symbolic-ref --short HEAD 2>/dev/null)
-
-case "$branch" in
-	master|main)
-		echo "pre-commit: refusing to commit on $branch." >&2
-		echo "  task start <vikunja-id>   # branch off origin/master, write TASK.md" >&2
-		exit 1
-		;;
-esac
-
-# Added + deleted lines across staged files that are not markdown.
-# numstat prints "-\t-\t<path>" for binaries; those count 0 and that is fine,
-# a binary blob is not the kind of diff this cap exists to stop.
-loc=$(git diff --cached --numstat -- . ':(exclude)*.md' |
-	awk '$1 ~ /^[0-9]+$/ { a += $1 } $2 ~ /^[0-9]+$/ { d += $2 } END { print a + d + 0 }')
-
-if [ "$loc" -gt 300 ]; then
-	echo "pre-commit: $loc changed lines in non-markdown files, cap is 300." >&2
-	echo "  Split it. Each commit should be one reviewable idea." >&2
-	echo "  git reset <path> to unstage, or --no-verify if this genuinely cannot split." >&2
-	exit 1
-fi
-
-exit 0

.gitignore

@@ -9,7 +9,6 @@
 /mavwaked
 /mavmaild
 /mavupdate
-/mavgpud
 
 # Certs (private keys, don't commit)
 certs/
@@ -41,9 +40,6 @@ deploy/telegram.env
 deploy/zenmoney.token
 # IMAP password, read by mavmaild (never in argv, never committed)
 deploy/imap.password
-# Compose interpolation secrets — MAVEN_AMBIENT_TOKEN today. docker compose
-# reads this file itself; it is not an env_file on any service.
-/.env
 
 # Temp files
 /tmp/
@@ -54,19 +50,7 @@ opencode.json
 # Test coverage output
 coverage.out
 
-# Agent worktrees and local agent state. The workflow itself is tracked: the
-# hooks, the skills and the prose dictionary are how a session behaves, so they
-# get reviewed like code. Everything else under .claude/ is scratch.
-/.claude/*
-!/.claude/settings.json
-!/.claude/prose-dictionary.yaml
-!/.claude/skills/
-
-# The disposable handoff. One session, then deleted. Never committed:
-# anything worth keeping belongs in Vikunja, CLAUDE.md or docs/.
-/HANDOFF.md
+# Agent worktrees and local agent state
+.claude/
 /models/stt
 /models/tts
-
-# root .env — MAVEN_AMBIENT_TOKEN and friends, same class as deploy/telegram.env
-.env

CLAUDE.md

@@ -28,21 +28,6 @@ model is a one-line change to `phraser.model_path` in `deploy/mavend.json`.
 See `docs/rearchitecture.md` for the target architecture, `docs/design.md` for the folded design spec, and
 `AGENTS.md` for local-preview + model-download recipes.
 
-**Model work is moving to the workstation** (owner's call, 2026-08-02). homesrv cannot grow a
-GPU and the workstation has 16GB of VRAM. So the resident model, STT and TTS become preferred
-remotes with a floor on homesrv. The workstation is never assumed up. Fall back silently when
-it would only do the job better. Name the gap when the 1.7B cannot do it at all. The embedder
-stays on homesrv permanently, because it backs that floor. Read `docs/offload.md` before
-touching a daemon seam or adding a model caller. Vikunja #483 is the umbrella, #484 to #487
-are the work.
-
-Both halves are wired as of 2026-08-03. Routing and replies prefer the workstation silently
-through `modelSeam`; nudge and reminder phrasing prefer it silently inside the phraser. A
-world question goes through `LLMPhraser.PhraseWorld` and names the gap when the card is not
-free — `worldGap` in `cmd/mavend/worldmodel.go`, which he hears instead of an invented
-answer. A box with no `workstation` block behaves exactly as it did before the seam: naming
-a gap requires a gap. The offload table in `docs/offload.md` says which caller is which.
-
 ## Build & test
 
 CGO daemons (`mavend`, `mavsttd`, `mavttsd`, `mavenclient`) need the vendored toolchain
@@ -142,23 +127,13 @@ on in deploy** — this section used to say it was wired `nil`, which stopped be
 Cascade order: `stage0.go` exact-match fast-path → LLM router (when non-nil) → classifier
 fallback. Any LLM error falls through to the classifier so a turn never breaks on the model.
 
-Measured on the 77-case RU fixture. **Re-measured 2026-08-02: the classifier scores 68.8%
-full accuracy at p50 16.6µs**, not the 36.8% at p50 31ms that stood here from
-`docs/evals/2026-07-31-model-bakeoff.md`. That older figure predates the stage 0 rules and the
-seed additions, both of which now score inside the classifier baseline. Qwen3-1.7B scores
-77.9% intent-only / 72.7% through the cascade. So the router buys about 4 points of accuracy,
-not a doubling, and the trade is worth re-arguing rather than assuming. **The ≈2.7s figure
-that stood here until 2026-08-02 was contention, not the model.** See `docs/evals/2026-07-31-routing.md` line 61, which measures the LLM router at
+Measured on the 77-case RU fixture (`docs/evals/2026-07-31-model-bakeoff.md`): the classifier scores
+36.8% full accuracy at p50 31ms; Qwen3-1.7B scores 67.5% intent-only / 72.7% through the
+cascade at p50 ≈825ms. Accuracy roughly doubled, latency is ~27× worse, and that trade was
+accepted deliberately. **The ≈2.7s figure that stood here until 2026-08-02 was contention,
+not the model.** See `docs/evals/2026-07-31-routing.md` line 61, which measures the LLM router at
 p50 825ms / p95 1.2s / max 3.0s and the full cascade at p50 0.80-1.04s. Do not plan latency
-work off the bakeoff table.
-
-**The numbers above are the homesrv floor, not the ceiling.** With the workstation up, routing
-completes through `llm.Pair` against gemma-4-12b and scores **84.4% full / 93.5% intent-only at
-p50 329ms** — better than the resident model and about 2.5× faster (`docs/evals/2026-08-02-workstation-gemma4-12b.md`,
-Vikunja #485). The workstation is never assumed up, so both sets of numbers are live. Judge a
-routing change against the classifier and the resident model, since those are what always answer.
-
-`Confidence: 1.0` used to be hardcoded in `llmrouter.go`, so the LLM
+work off the bakeoff table. `Confidence: 1.0` used to be hardcoded in `llmrouter.go`, so the LLM
 path could never ask for clarification (6/6 refusal cases missed on the fixture) — Vikunja
 #359. Fixed 31-07-2026 with structural signal (single-token utterance, keyless fact, act with
 no allowlisted fn) feeding the same stage-3 gate the classifier path already had — see
@@ -229,11 +204,8 @@ world questions, so she needs to read external sources. What replaces it:
 
 ## Web UI conventions
 
-Server-rendered pages share `cmd/mavweb/static/ui.css` (served at `/ui.css`) and the shell
-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
+Server-rendered pages share `cmd/mavweb/static/ui.css` (served at `/ui.css`) and the `nav`
+partial (`navHTML` in `cmd/mavweb/main.go`, `{{template "nav" "<active-page>"}}`). No
 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`.
 
@@ -241,60 +213,3 @@ data pans on a phone. Local preview + headless screenshot recipe is in `AGENTS.m
 
 This repo is project **Maven** (ID 2) in Vikunja. MCP: `http://localhost:9100/mcp` (or
 `http://192.168.1.104:9100/mcp` from workpc). Feature/bug/deploy tasks go there.
-
-Vikunja is the durable task store. A task holds the goal, the constraints and the
-assumption ledger. Work without a task id is work nobody can resume, so a session that
-has no id asks for one before it starts.
-
-## Session workflow
-
-`~/.local/bin/task` owns the branch, the commit identity and the PR. One task, one
-session, one PR.
-
-```sh
-task start <vikunja-id>   # branch off origin/master, write TASK.md, fetch review comments
-task pr                   # push, open or refresh the PR, label Vikunja, notify
-task comments             # re-pull this branch's review comments into .task/
-```
-
-Around that, `/pickup` opens a session and `/wrap` closes it. Wrap at roughly half
-context rather than letting the session compact.
-
-Five stores, and each one owns something the others must not hold:
-
-| Store | Holds | Lifetime |
-|---|---|---|
-| Vikunja task | goal, constraints, assumption ledger, status | durable |
-| `CLAUDE.md`, `AGENTS.md` | what an agent must know before touching code | durable |
-| `docs/` | design, measurements, decisions | durable |
-| `TASK.md` | the brief for this branch, written by `task start`, immutable | one branch |
-| `HANDOFF.md` | only what the next agent needs to resume | one session |
-
-`TASK.md` and `.task/` are excluded through `.git/info/exclude`. `HANDOFF.md` is
-gitignored and injected at session start. If a line in the handoff would still matter
-next week, it is in the wrong file.
-
-Docs are tiered by path, so staleness is visible from the filename. Files directly under
-`docs/` are living and carry a `Last verified: <date> @ <sha>` line. Files under
-`docs/evals/` are dated measurements and are never edited after the day, so a newer
-number is a new file. Files under `docs/archive/` are dead and read by nobody by default.
-
-## Git guards
-
-Two hooks in `.githooks/`, tracked, wired with `core.hooksPath`. Fresh clone:
-
-```sh
-git config core.hooksPath .githooks
-```
-
-- `pre-commit` refuses master, and refuses more than 300 changed lines in non-markdown
-  files. Markdown is exempt and may land as one batch.
-- `commit-msg` requires the subject to end with `(V-<id>)`. `V-` and not `#`, because
-  Gitea autolinks `#123` to a Gitea issue, which is the wrong tracker.
-
-Two more guards live outside the repo, in `~/.claude/hooks/`. `diff-budget.sh` blocks
-further edits past 600 changed lines on a `task/` branch. `prose_lint_hook.py` checks
-prose on every write. Both measure against `origin/master`, so a local master that is
-ahead of the remote makes the diff budget read high.
-
-`--no-verify` exists. Using it means saying why in the commit body.

Makefile

@@ -16,11 +16,11 @@ PIPER_BIN     := $(shell pwd)/deps/piper/piper
 PIPER_MODEL   := $(shell pwd)/models/tts/ru_RU-irina-medium.onnx
 PIPER_ESPEAK  := $(shell pwd)/deps/piper/espeak-ng-data
 
-.PHONY: simulate stt-fixtures test-stt-golden all build build-stt build-tts build-daemon build-client build-waked build-web build-poll build-caldav clean test fmt-check vet run-stt run-tts run-web download-embedder deps-go eval-router eval-recall eval-phrasing eval-models build-gpud
+.PHONY: simulate stt-fixtures test-stt-golden all build build-stt build-tts build-daemon build-client build-waked build-web build-poll build-caldav clean test fmt-check vet run-stt run-tts run-web download-embedder deps-go eval-router eval-recall eval-phrasing eval-models
 
 all: build
 
-build: build-stt build-tts build-daemon build-client build-waked build-web build-poll build-caldav build-mail build-update build-gpud
+build: build-stt build-tts build-daemon build-client build-waked build-web build-poll build-caldav build-mail build-update
 
 build-stt:
 	CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" LD_LIBRARY_PATH="$(shell pwd)/deps/lib" \
@@ -59,12 +59,6 @@ build-mail:
 build-update:
 	$(GO) build $(GOFLAGS) -o mavupdate ./cmd/mavupdate/
 
-# mavgpud runs on the workstation, not here. It is built with the rest so a
-# broken supervisor is caught by `make build` on homesrv rather than by the
-# workstation refusing to serve. Copy the binary over, do not `make deploy` it.
-build-gpud:
-	$(GO) build $(GOFLAGS) -o mavgpud ./cmd/mavgpud/
-
 run-web: build-web
 	./mavweb -addr :9200 -voice 127.0.0.1:9100
 

cmd/mavend/actions_fact.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/kami/maven/internal/ipc"
 	"github.com/kami/maven/internal/router"
-	"github.com/kami/maven/internal/store"
 )
 
 // actionFact handles router.IntentFact: persist a tapped self-fact, index
@@ -16,41 +15,14 @@ func (h *reactiveHandler) actionFact(ctx context.Context, dec router.Decision) s
 	if !dec.Slots.HasKey {
 		return "не разобрала, что записать — попробуй иначе."
 	}
-	// A question is never a fact about him (#470). "какая последняя версия
-	// языка Go?" used to land here, and the value stored was whatever the
-	// model invented for it, at confidence 1.00, indexed for recall under the
-	// question's own text. Two such rows then claimed seven unrelated world
-	// questions through recall and silently disabled world answering.
-	//
-	// The routing error itself is not fixed here — the answer is to answer.
-	// Sending the turn down the query chain is what he asked for anyway, and
-	// it costs a mis-routed capture nothing: an explicit "запиши ..." is not
-	// question-shaped, so it never takes this branch.
-	if router.IsQuestionShaped(dec.Utterance) {
-		log.Printf("voice: fact write refused, utterance is a question: %q (key %q) — answering as a query",
-			dec.Utterance, dec.Slots.Key)
-		q := dec
-		q.Intent = router.IntentQuery
-		// The key the model extracted is its guess at what to store, not a
-		// fact he has. Left in place, queryFactByKey would read it back and
-		// claim the turn before any real source ran.
-		q.Slots.Key, q.Slots.HasKey = "", false
-		q.Slots.Value = ""
-		return h.actionQuery(ctx, q)
-	}
 	now := h.now()
 	req := ipc.WriteFactReq{
-		Ts:     now,
-		Kind:   "self",
-		Key:    dec.Slots.Key,
-		Value:  dec.Slots.Value,
-		Source: "tap:voice",
-		// Not 1.00 unconditionally any more (#470). A value he said is
-		// evidence; a value the model supplied for words he never said is a
-		// guess, and writing a guess at full confidence is the same mistake
-		// the act path already refuses under "LLM output is not
-		// authorization".
-		Confidence: factConfidence(dec.Utterance, dec.Slots.Value),
+		Ts:         now,
+		Kind:       "self",
+		Key:        dec.Slots.Key,
+		Value:      dec.Slots.Value,
+		Source:     "tap:voice",
+		Confidence: 1.0,
 		// Subject: the key doubles as the entity-resolution candidate —
 		// a voice-tapped fact's key is usually the thing/person it's
 		// about ("espresso_machine", "kate"), so queueing it for Nexus
@@ -64,25 +36,17 @@ func (h *reactiveHandler) actionFact(ctx context.Context, dec router.Decision) s
 		log.Printf("voice: write fact: %v", err)
 		return "не получилось сохранить факт."
 	}
-	// Index the fact in long-term memory (best-effort, must not fail the fact
-	// write). Facts aren't in the notes table, so this is the only recall path
-	// for them — "когда я пил воду?" reads back from here.
-	//
-	// The indexed text is the fact, not the utterance (#493). queryMemory
-	// returns a fact's stored text verbatim, so what goes in here is what he
-	// hears; storing the utterance meant recall answered with his own sentence
-	// rather than the value. The utterance stays alongside as provenance —
-	// readable on /trace, never the answer and never embedded.
+	// Index the fact utterance in long-term memory (best-effort, must not
+	// fail the fact write). Facts aren't in the notes table, so this is the
+	// only recall path for them — "когда я пил воду?" reads back from here.
 	if h.memStore != nil {
-		text := store.FactRecallText(dec.Slots.Key, dec.Slots.Value)
-		if vec, err := router.EmbedPassage(ctx, h.embedder, text); err != nil {
+		if vec, err := router.EmbedPassage(ctx, h.embedder, dec.Utterance); err != nil {
 			log.Printf("voice: embed fact for memory: %v", err)
 		} else if err := h.memStore.Insert(ctx, "fact:"+dec.Slots.Key+":"+strconv.FormatInt(now.Unix(), 10), vec, map[string]string{
-			"source":    "voice",
-			"type":      "fact",
-			"text":      text,
-			"utterance": dec.Utterance,
-			"ts":        strconv.FormatInt(now.Unix(), 10),
+			"source": "voice",
+			"type":   "fact",
+			"text":   dec.Utterance,
+			"ts":     strconv.FormatInt(now.Unix(), 10),
 		}); err != nil {
 			log.Printf("voice: memory insert fact: %v", err)
 		}

cmd/mavend/actions_query.go

@@ -13,7 +13,6 @@ import (
 	"github.com/kami/maven/internal/ipc"
 	"github.com/kami/maven/internal/memory"
 	"github.com/kami/maven/internal/morning"
-	"github.com/kami/maven/internal/phraser"
 	"github.com/kami/maven/internal/router"
 	"github.com/kami/maven/internal/rss"
 	"github.com/kami/maven/internal/store"
@@ -390,11 +389,6 @@ func (h *reactiveHandler) queryWeather(ctx context.Context, t *queryTurn) (strin
 	if errors.Is(err, weather.ErrNotConfigured) {
 		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 {
 		log.Printf("voice: weather: %v", err)
 		return "не получилось узнать погоду.", true
@@ -439,14 +433,6 @@ func (h *reactiveHandler) queryMemory(ctx context.Context, t *queryTurn) (string
 		return "", false
 	}
 	text := hit.Meta["text"]
-	// The score cleared the gate and the topic still has to match (#470). A
-	// note about his slow network scored high enough to answer "почему небо
-	// синее?", because the right-note and must-be-silent score ranges overlap
-	// and no threshold sits between them.
-	if !memory.RecallAllowed(t.dec.Utterance, text) {
-		log.Printf("voice: recall %q rejected for %q: a world question and no shared topic word", text, t.dec.Utterance)
-		return "", false
-	}
 	// A note is phrased in Maven's voice; a fact is read back as it was
 	// stored.
 	if hit.Meta["type"] == "note" {
@@ -482,12 +468,6 @@ func (h *reactiveHandler) queryNotes(ctx context.Context, t *queryTurn) (string,
 	if !memory.ConfidentScores(noteScores, h.queryMinScore, h.queryMinMargin) {
 		return "", false
 	}
-	// Same topic veto as queryMemory above: the best note must be about what
-	// he asked, not merely the nearest vector in the index.
-	if !memory.RecallAllowed(t.dec.Utterance, notes[0].Text) {
-		log.Printf("voice: note %q rejected for %q: a world question and no shared topic word", notes[0].Text, t.dec.Utterance)
-		return "", false
-	}
 	texts := make([]string, len(notes))
 	for i, n := range notes {
 		texts[i] = n.Text
@@ -543,7 +523,10 @@ func (h *reactiveHandler) queryWeb(ctx context.Context, t *queryTurn) (string, b
 	// the question he actually asked. She answers the question, she does not
 	// recite the page.
 	snippet := page.Title + "\n" + crawl.TrimRunes(page.Text, webPageContextRunes)
-	reply := h.phraseSource(ctx, "web", t.dec.Utterance, []string{snippet})
+	reply, perr := h.phraser.PhraseQuery(ctx, t.dec.Utterance, []string{snippet})
+	if perr != nil {
+		log.Printf("voice: web: phrase: %v", perr)
+	}
 	if reply == "" {
 		// No phraser (or it failed): read back the top of the page rather than
 		// pretend the fetch did not happen.
@@ -609,7 +592,14 @@ func (h *reactiveHandler) querySearch(ctx context.Context, t *queryTurn) (string
 	// question he asked, not something to recite. The trim is one budget over the
 	// joined block, so a long first snippet cannot crowd out the rest.
 	evidence := crawl.TrimRunes(strings.Join(resp.Snippets(), "\n"), h.search.runes)
-	reply := h.phraseSource(ctx, "search", t.dec.Utterance, []string{evidence})
+	var reply string
+	if h.phraser != nil {
+		var perr error
+		reply, perr = h.phraser.PhraseQuery(ctx, t.dec.Utterance, []string{evidence})
+		if perr != nil {
+			log.Printf("voice: search: phrase: %v", perr)
+		}
+	}
 	if reply == "" {
 		// No phraser, or it failed. Read back the best evidence rather than
 		// pretend the search did not happen.
@@ -690,7 +680,14 @@ func (h *reactiveHandler) queryKiwix(ctx context.Context, t *queryTurn) (string,
 	// Handed over the same way a note or a page is: context for the question he
 	// asked, not something to recite.
 	snippet := top.Title + "\n" + crawl.TrimRunes(page.Text, h.kiwix.runes)
-	reply := h.phraseSource(ctx, "kiwix", t.dec.Utterance, []string{snippet})
+	var reply string
+	if h.phraser != nil {
+		var perr error
+		reply, perr = h.phraser.PhraseQuery(ctx, t.dec.Utterance, []string{snippet})
+		if perr != nil {
+			log.Printf("voice: kiwix: phrase: %v", perr)
+		}
+	}
 	if reply == "" {
 		// No phraser, or it failed. Read back the best hit rather than pretend
 		// the search did not happen.
@@ -720,7 +717,7 @@ func (h *reactiveHandler) queryKiwix(ctx context.Context, t *queryTurn) (string,
 // not be sent to an upstream engine at all. The guard closes both holes with
 // the same test.
 func (h *reactiveHandler) queryPersonal(ctx context.Context, t *queryTurn) (string, bool) {
-	if !h.isPersonalTurn(ctx, t) {
+	if !isPersonalQuery(t.dec.Utterance) {
 		return "", false
 	}
 	log.Printf("voice: %q is about him and his own data did not answer it; not asking the world", t.dec.Utterance)
@@ -745,9 +742,7 @@ var personalMarkers = []*regexp.Regexp{
 	regexp.MustCompile(`(?i)\bdid\s+i\b`),
 }
 
-// isPersonalQuery — the offline floor under the boundary. Possession only, and
-// deliberately still narrow: it answers when there is no embedder to ask, and a
-// broad guess made blind is worse than a narrow one.
+// isPersonalQuery reports whether the utterance asks about something of his.
 func isPersonalQuery(utterance string) bool {
 	if utterance == "" {
 		return false
@@ -760,45 +755,11 @@ func isPersonalQuery(utterance string) bool {
 	return false
 }
 
-// isPersonalTurn — the boundary test. The seeds decide when the embedder is
-// there, which is every deployed box; the possession markers are the floor
-// underneath, for a handler with no embedder or a turn whose vector never got
-// computed. Same shape as the cascade: the better test leads, the offline one
-// always answers.
-func (h *reactiveHandler) isPersonalTurn(ctx context.Context, t *queryTurn) bool {
-	h.boundary.load(ctx, h.embedder)
-	if personal, world, ok := h.boundary.score(t.vec); ok {
-		if personal > world {
-			log.Printf("voice: %q scores personal %.4f vs world %.4f", t.dec.Utterance, personal, world)
-			return true
-		}
-		return false
-	}
-	return isPersonalQuery(t.dec.Utterance)
-}
-
-// queryGeneral — general knowledge, the last source before giving up. It always
-// claims: either a model answers, or Maven names the gap, or she says she does
-// not know.
-//
-// This is the sharpest case for the naming half. Nothing has been fetched, so
-// there is no passage to fall back on and no floor under the answer except the
-// model's weights — and a 1.7B's weights are where the invented answers come
-// from. With a workstation configured and asleep he is told that, rather than
-// told something false in a confident voice. With no workstation configured at
-// all the resident model answers exactly as it does today: naming a gap requires
-// a gap, and on that box the 1.7B is the whole product.
+// queryGeneral — general knowledge from the phraser, the last source before
+// giving up. It always claims: either the model answers or Maven says she
+// doesn't know.
 func (h *reactiveHandler) queryGeneral(ctx context.Context, t *queryTurn) (string, bool) {
-	if h.phraser == nil {
-		// No model of any size. That is not the workstation being asleep, so it
-		// is not that gap: it is simply not knowing.
-		return "не знаю.", true
-	}
-	reply, err := h.phraseWorld(ctx, t.dec.Utterance, nil)
-	if errors.Is(err, phraser.ErrNoWorldModel) {
-		log.Printf("voice: %q needs the world model and it is not available", t.dec.Utterance)
-		return worldGap, true
-	}
+	reply, err := h.phraser.PhraseQuery(ctx, t.dec.Utterance, nil)
 	if err != nil || reply == "" {
 		return "не знаю.", true
 	}

cmd/mavend/actions_query_personal_test.go

@@ -19,10 +19,6 @@ func TestIsPersonalQuery(t *testing.T) {
 		"when is my meeting",
 		"do i have anything today",
 		"did i take my vitamins",
-		// Speech, but only the forms possession already covers ("did i").
-		// The verb forms the floor cannot see are the seeds' job, scored in
-		// TestONNXPersonalBoundary.
-		"what did i say about backups",
 	} {
 		if !isPersonalQuery(s) {
 			t.Errorf("isPersonalQuery(%q) = false, want true", s)
@@ -37,10 +33,6 @@ func TestIsPersonalQuery(t *testing.T) {
 		"почему небо синее",
 		"столица франции",
 		"how do i boil an egg",
-		// The floor is possession-only by design: a speech verb it cannot see
-		// passes here and is caught by the seeds instead.
-		"что я говорил про бэкапы?",
-		"как я говорил, почему небо синее",
 		"",
 	} {
 		if isPersonalQuery(s) {

cmd/mavend/capture.go

@@ -100,7 +100,7 @@ func (l llmCompleter) Complete(ctx context.Context, system, user string) (string
 // grammar, or a llama-server too old to honour one, gets the plain text it used
 // to get rather than an empty meeting summary.
 func unwrapSummary(raw string) string {
-	s := phraser.StripThink(strings.TrimSpace(raw))
+	s := stripThink(strings.TrimSpace(raw))
 	start := strings.Index(s, "{")
 	end := strings.LastIndex(s, "}")
 	if start < 0 || end <= start {

cmd/mavend/clarify.go

@@ -106,11 +106,11 @@ func trimClarifyExpired(s string) string {
 // out, and "" when nothing was parked. Call it right after
 // resolveClarifyAnswer: a live question is answered there, an expired one is
 // only reported here — the words themselves still go on to be routed fresh.
-func (h *reactiveHandler) clarifyExpiredNotice(ctx context.Context) string {
+func (h *reactiveHandler) clarifyExpiredNotice() string {
 	if h.clarifyStore == nil {
 		return ""
 	}
-	if !h.clarifyStore.TakeExpired(dialogueIDOf(ctx), h.now()) {
+	if !h.clarifyStore.TakeExpired(voiceDialogueID, h.now()) {
 		return ""
 	}
 	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
 // canned "не поняла". Returns ("", false) when there is nothing to ask about, so
 // the caller falls back to the canned reply.
-func (h *reactiveHandler) askClarify(ctx context.Context, dec router.Decision) (string, bool) {
+func (h *reactiveHandler) askClarify(dec router.Decision) (string, bool) {
 	if h.clarifyStore == nil {
 		return "", false
 	}
@@ -165,7 +165,7 @@ func (h *reactiveHandler) askClarify(ctx context.Context, dec router.Decision) (
 	if !ok {
 		return "", false
 	}
-	h.clarifyStore.Put(dialogueIDOf(ctx), &dialogue.PendingQuestion{
+	h.clarifyStore.Put(voiceDialogueID, &dialogue.PendingQuestion{
 		Intent:      dialogue.Intent(dec.Intent),
 		Slots:       toDialogueSlots(dec.Slots),
 		Missing:     []dialogue.Slot{slot},
@@ -192,7 +192,7 @@ func (h *reactiveHandler) resolveClarifyAnswer(ctx context.Context, text string)
 	if h.clarifyStore == nil {
 		return "", false
 	}
-	q := h.clarifyStore.Get(dialogueIDOf(ctx), h.now())
+	q := h.clarifyStore.Get(voiceDialogueID, h.now())
 	if q == nil {
 		return "", false
 	}
@@ -206,9 +206,9 @@ func (h *reactiveHandler) resolveClarifyAnswer(ctx context.Context, text string)
 	// would fire at 11:00 saying "напомни" and nothing else.
 	q.Utterance = foldAnswerIntoUtterance(q.Utterance, merged.Text)
 	if len(dialogue.StillMissing(q.Missing, merged)) > 0 {
-		return h.reaskOrGiveUp(ctx, q, merged, text), true
+		return h.reaskOrGiveUp(q, merged, text), true
 	}
-	h.clarifyStore.Delete(dialogueIDOf(ctx))
+	h.clarifyStore.Delete(voiceDialogueID)
 
 	// 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
@@ -217,7 +217,7 @@ func (h *reactiveHandler) resolveClarifyAnswer(ctx context.Context, text string)
 	// a reminder with no time, which answered "не получилось разобрать время
 	// напоминания." — an error for a request she never finished asking about.
 	// Re-enter the loop instead, one question at a time as before.
-	if reply, asked := h.askRemainingGap(ctx, q, intent, merged); asked {
+	if reply, asked := h.askRemainingGap(q, intent, merged); asked {
 		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
 // 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.
-func (h *reactiveHandler) askRemainingGap(ctx context.Context, q *dialogue.PendingQuestion, intent router.Intent, merged dialogue.Slots) (string, bool) {
+func (h *reactiveHandler) askRemainingGap(q *dialogue.PendingQuestion, intent router.Intent, merged dialogue.Slots) (string, bool) {
 	remaining := dialogue.StillMissing(wantedSlots[intent], merged)
 	if len(remaining) == 0 {
 		return "", false
@@ -270,7 +270,7 @@ func (h *reactiveHandler) askRemainingGap(ctx context.Context, q *dialogue.Pendi
 	if !ok || !q.CanAsk() {
 		return "", false
 	}
-	h.clarifyStore.Put(dialogueIDOf(ctx), &dialogue.PendingQuestion{
+	h.clarifyStore.Put(voiceDialogueID, &dialogue.PendingQuestion{
 		Intent:      q.Intent,
 		Slots:       merged,
 		Missing:     []dialogue.Slot{remaining[0]},
@@ -287,13 +287,13 @@ func (h *reactiveHandler) askRemainingGap(ctx context.Context, q *dialogue.Pendi
 // 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
 // let the request go. Never returns "" — a mute give-up reads as "done".
-func (h *reactiveHandler) reaskOrGiveUp(ctx context.Context, q *dialogue.PendingQuestion, merged dialogue.Slots, text string) string {
+func (h *reactiveHandler) reaskOrGiveUp(q *dialogue.PendingQuestion, merged dialogue.Slots, text string) string {
 	question := ""
 	if len(q.Missing) > 0 {
 		question = clarifyQuestions[q.Missing[0]]
 	}
 	if question == "" || !q.CanAsk() {
-		h.clarifyStore.Delete(dialogueIDOf(ctx))
+		h.clarifyStore.Delete(voiceDialogueID)
 		log.Printf("voice: clarify — gave up on %v after %d question(s), answer was %q", q.Missing, q.Attempts, text)
 		return clarifyGaveUp
 	}
@@ -302,7 +302,7 @@ func (h *reactiveHandler) reaskOrGiveUp(ctx context.Context, q *dialogue.Pending
 	q.Slots = merged
 	q.Attempts++
 	q.Asked = h.now()
-	h.clarifyStore.Put(dialogueIDOf(ctx), q)
+	h.clarifyStore.Put(voiceDialogueID, q)
 	log.Printf("voice: clarify — answer %q did not fill %v, asking again (attempt %d)", text, q.Missing, q.Attempts)
 	return question
 }

cmd/mavend/clarify_test.go

@@ -81,7 +81,7 @@ func TestClarifyReminderCompletesOnAnswer(t *testing.T) {
 	ctx := context.Background()
 	h, st, _ := newClarifyHandler(t)
 
-	question, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder, router.Slots{Text: "напомни позвонить маме"}, "напомни позвонить маме"))
+	question, asked := h.askClarify(clarifyDec(router.IntentReminder, router.Slots{Text: "напомни позвонить маме"}, "напомни позвонить маме"))
 	if !asked || question != "Когда?" {
 		t.Fatalf("expected the time question, got %q asked=%v", question, asked)
 	}
@@ -112,7 +112,7 @@ func TestClarifyFactCompletesOnAnswer(t *testing.T) {
 	ctx := context.Background()
 	h, st, _ := newClarifyHandler(t)
 
-	if _, asked := h.askClarify(ctx, clarifyDec(router.IntentFact, router.Slots{Text: "запиши"}, "запиши")); !asked {
+	if _, asked := h.askClarify(clarifyDec(router.IntentFact, router.Slots{Text: "запиши"}, "запиши")); !asked {
 		t.Fatal("a fact with no key should be asked about")
 	}
 	if reply, handled := h.resolveClarifyAnswer(ctx, "пил воду"); !handled || reply == clarifyGaveUp {
@@ -128,7 +128,7 @@ func TestClarifyAnswerAfterTTLIsANewRequest(t *testing.T) {
 	ctx := context.Background()
 	h, st, now := newClarifyHandler(t)
 
-	if _, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
+	if _, asked := h.askClarify(clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
 		t.Fatal("expected a question")
 	}
 	*now = now.Add(clarifyTTL + time.Second)
@@ -147,7 +147,7 @@ func TestClarifyAsksThreeTimesThenSaysSo(t *testing.T) {
 	ctx := context.Background()
 	h, st, _ := newClarifyHandler(t)
 
-	if _, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
+	if _, asked := h.askClarify(clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
 		t.Fatal("expected a first question")
 	}
 	// Two more unclear answers ⇒ two more questions (3 asks in total).
@@ -185,7 +185,7 @@ func TestClarifyMaxAttemptsIsConfigurable(t *testing.T) {
 	h, _, _ := newClarifyHandler(t)
 	h.clarifyMaxAttempts = 1
 
-	if _, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
+	if _, asked := h.askClarify(clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
 		t.Fatal("expected a question")
 	}
 	if reply, handled := h.resolveClarifyAnswer(ctx, "ну не знаю"); !handled || reply != clarifyGaveUp {
@@ -199,7 +199,7 @@ func TestClarifyRestatedAnswerWins(t *testing.T) {
 	ctx := context.Background()
 	h, st, _ := newClarifyHandler(t)
 
-	if _, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder, router.Slots{Text: "напомни позвонить маме"}, "напомни позвонить маме")); !asked {
+	if _, asked := h.askClarify(clarifyDec(router.IntentReminder, router.Slots{Text: "напомни позвонить маме"}, "напомни позвонить маме")); !asked {
 		t.Fatal("expected a question")
 	}
 	// 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)
 	marker := filepath.Join(t.TempDir(), "not-allowed-ran")
 
-	if _, asked := h.askClarify(ctx, clarifyDec(router.IntentAct, router.Slots{Text: "сделай это"}, "сделай это")); !asked {
+	if _, asked := h.askClarify(clarifyDec(router.IntentAct, router.Slots{Text: "сделай это"}, "сделай это")); !asked {
 		t.Fatal("an act with no fn should be asked about")
 	}
 	reply, handled := h.resolveClarifyAnswer(ctx, "rm "+marker)
@@ -260,7 +260,7 @@ func TestClarifiedDestructiveActStillNeedsConfirm(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if _, asked := h.askClarify(ctx, clarifyDec(router.IntentAct, router.Slots{Text: "сделай это"}, "сделай это")); !asked {
+	if _, asked := h.askClarify(clarifyDec(router.IntentAct, router.Slots{Text: "сделай это"}, "сделай это")); !asked {
 		t.Fatal("expected a question")
 	}
 	reply, handled := h.resolveClarifyAnswer(ctx, "delete_backups")
@@ -284,7 +284,7 @@ func TestNoQuestionWhenNothingIsMissing(t *testing.T) {
 		clarifyDec(router.IntentQuery, router.Slots{Text: "ммм"}, "ммм"),
 		clarifyDec(router.IntentNote, router.Slots{Text: "..."}, "..."),
 	} {
-		if question, asked := h.askClarify(context.Background(), dec); asked {
+		if question, asked := h.askClarify(dec); asked {
 			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
 // TTL: she must say the old request is gone AND still answer the new words.
 func TestClarifyExpiryIsAnnouncedAndWordsStillRoute(t *testing.T) {
-	ctx := withDialogueID(context.Background(), dialogueIDFor(sourceText, ""))
+	ctx := context.Background()
 	h, _, now := newClarifyHandler(t)
 	emb := router.NewHashEmbedder(1024)
 	h.embedder = emb
 	h.router = buildRouter(emb, h.matcher, 0.55, nil)
 
-	if _, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
+	if _, asked := h.askClarify(clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
 		t.Fatal("expected a question")
 	}
 	*now = now.Add(clarifyTTL + time.Second)
 
-	reply := h.handleText(ctx, "", "как дела")
+	reply := h.handleText(ctx, "как дела")
 	if !isClarifyExpired(reply) {
 		t.Fatalf("expired question must be announced first, got %q", reply)
 	}
 	if trimClarifyExpired(reply) == "" {
 		t.Fatalf("the new words must still be answered, got only the notice: %q", reply)
 	}
-	if h.clarifyStore.Get(textDialogueID, h.now()) != nil {
+	if h.clarifyStore.Get(voiceDialogueID, h.now()) != nil {
 		t.Fatal("the expired question must be gone")
 	}
 	// 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)
 	}
 }
@@ -340,7 +340,7 @@ func TestClarifyAsksAboutTheSecondGapToo(t *testing.T) {
 	ctx := context.Background()
 	h, st, _ := newClarifyHandler(t)
 
-	question, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder, router.Slots{}, "напомни"))
+	question, asked := h.askClarify(clarifyDec(router.IntentReminder, router.Slots{}, "напомни"))
 	if !asked || question != "О чём напомнить?" {
 		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.clarifyMaxAttempts = 1
 
-	if _, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder, router.Slots{}, "напомни")); !asked {
+	if _, asked := h.askClarify(clarifyDec(router.IntentReminder, router.Slots{}, "напомни")); !asked {
 		t.Fatal("expected the subject question")
 	}
 	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
 // answered the confirm and never heard that the older request was let go.
 func TestExpiryNoticeSurvivesAConfirmTurn(t *testing.T) {
-	ctx := withDialogueID(context.Background(), dialogueIDFor(sourceText, ""))
+	ctx := context.Background()
 	h, _, now := newClarifyHandler(t)
 
-	if _, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
+	if _, asked := h.askClarify(clarifyDec(router.IntentReminder, router.Slots{Text: "напомни"}, "напомни")); !asked {
 		t.Fatal("expected a question")
 	}
 	// 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)}
 	*now = now.Add(clarifyTTL + time.Second)
 
-	reply := h.handleText(ctx, "", "нет")
+	reply := h.handleText(ctx, "нет")
 	if !isClarifyExpired(reply) {
 		t.Fatalf("the expired question must be announced on a confirm turn too, got %q", reply)
 	}
@@ -461,92 +461,7 @@ func TestExpiryNoticeSurvivesAConfirmTurn(t *testing.T) {
 	if h.pending != nil {
 		t.Fatal("the confirm must still have been consumed")
 	}
-	if h.clarifyStore.Get(textDialogueID, h.now()) != nil {
+	if h.clarifyStore.Get(voiceDialogueID, h.now()) != nil {
 		t.Fatal("the expired question must be gone")
 	}
 }
-
-// The other half of the subject question: his answer must fill the empty slot,
-// not replace the request. Slots.Text used to be the whole raw utterance for
-// every intent, so the branch that fills a text slot could only ever overwrite
-// (Vikunja #383). Here the parked request holds the hour and the answer holds
-// what to say at it, and the reminder that lands has both.
-func TestClarifySubjectAnswerFillsRatherThanClobbers(t *testing.T) {
-	ctx := context.Background()
-	h, st, _ := newClarifyHandler(t)
-	at := h.now().Add(2 * time.Hour)
-
-	question, asked := h.askClarify(ctx, clarifyDec(router.IntentReminder,
-		router.Slots{Time: at, HasTime: true}, "напомни в 11"))
-	if !asked || question != "О чём напомнить?" {
-		t.Fatalf("expected the subject question, got %q asked=%v", question, asked)
-	}
-
-	reply, handled := h.resolveClarifyAnswer(ctx, "позвонить маме")
-	if !handled {
-		t.Fatal("the answer to an open question must be consumed as an answer")
-	}
-	if reply == clarifyGaveUp {
-		t.Fatalf("a good answer must not drop the request: %q", reply)
-	}
-
-	reminders, err := st.DueReminders(ctx, h.now().Add(48*time.Hour))
-	if err != nil || len(reminders) != 1 {
-		t.Fatalf("clarified reminder was not created: reminders=%v err=%v", reminders, err)
-	}
-	if !strings.Contains(reminders[0].Payload, "маме") {
-		t.Fatalf("the answer never reached the reminder: %q", reminders[0].Payload)
-	}
-	if !strings.Contains(reminders[0].Payload, "11") {
-		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)
-	}
-}

cmd/mavend/confirm.go

@@ -107,18 +107,14 @@ func (h *reactiveHandler) confirmResolvers(ctx context.Context) []confirmResolve
 				return pr != nil && !h.now().After(pr.expiry)
 			},
 			yes: func() string {
-				// Voice does NOT accept (Vikunja #367). Accepting hands the
-				// tick loop a standing new reason to speak, which is the same
-				// tier as enabling a tool — and DESIGN.md § "surface caps
-				// authority" says a room mic, reachable by anyone present, is
-				// structurally incapable of layer 3. So a spoken "да" leaves
-				// the row 'proposed' and points at the authed page, where the
-				// accept button is gated at step-up. The convenience of
-				// answering out loud stays; the authority does not move.
-				//
-				// Acceptance itself is recorded by /routines, and the tick
-				// loop nudges on the interval from there (Vikunja #366).
-				return "поняла — подтверди на странице рутин, и начну напоминать."
+				// Only record the acceptance. The tick loop reads accepted
+				// routines and nudges on their own interval. Building a
+				// reminder here made a routine fire exactly once (Vikunja #366).
+				if err := h.dataStore.AcceptProposedRoutine(ctx, pr.routineID, h.now()); err != nil {
+					log.Printf("voice: accept proposed routine: %v", err)
+					return "не получилось запомнить рутину."
+				}
+				return "буду напоминать."
 			},
 			no: func() string {
 				if err := h.dataStore.DismissProposedRoutine(ctx, pr.routineID); err != nil {

cmd/mavend/ecosystem_acts.go

@@ -514,14 +514,11 @@ func (h *reactiveHandler) handleHexisAct(ctx context.Context, dec router.Decisio
 
 	// Resolve the utterance text as an entity reference through Nexus. An
 	// 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()
-	entityID, displayName, ambiguous, err := h.ecosystem.resolveEntityReference(ctx, subject, nil)
+	entityID, displayName, ambiguous, err := h.ecosystem.resolveEntityReference(ctx, dec.Slots.Text, nil)
 	if err != nil {
 		h.recordEcosystemTrace(ctx, "nexus", "resolve", traceStatusForError(err), started,
-			mergeFields(traceErrorFields(err), map[string]any{"subject": redactSubject(subject)}))
+			mergeFields(traceErrorFields(err), map[string]any{"subject": redactSubject(dec.Slots.Text)}))
 		if unauthorizedEcosystemError(err) {
 			return "экосистема отклоняет доступ, проверь токен."
 		}
@@ -538,7 +535,7 @@ func (h *reactiveHandler) handleHexisAct(ctx context.Context, dec router.Decisio
 	}
 	if entityID == "" {
 		h.recordEcosystemTrace(ctx, "nexus", "resolve", traceNotFound, started,
-			map[string]any{"subject": redactSubject(subject)})
+			map[string]any{"subject": redactSubject(dec.Slots.Text)})
 		return ""
 	}
 	h.recordEcosystemTrace(ctx, "nexus", "resolve", traceOK, started,
@@ -572,21 +569,10 @@ func (h *reactiveHandler) handleHexisAct(ctx context.Context, dec router.Decisio
 	}
 	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
 	for i, c := range caps {
-		name := strings.ToLower(c.Name)
-		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 {
+		if strings.Contains(strings.ToLower(c.Name), verbLower) ||
+			(c.Description != "" && strings.Contains(strings.ToLower(c.Description), verbLower)) {
 			matches = append(matches, &caps[i])
 		}
 	}
@@ -646,29 +632,3 @@ func (h *reactiveHandler) execHexis(ctx context.Context, capID, capName, entityI
 	})
 	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)
-}

cmd/mavend/entityname.go

@@ -1,59 +0,0 @@
-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
-}

cmd/mavend/entityname_test.go

@@ -1,133 +0,0 @@
-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")
-	}
-}

cmd/mavend/factgate.go

@@ -1,82 +0,0 @@
-package main
-
-import (
-	"log"
-	"strings"
-	"unicode"
-)
-
-// ungroundedConfidence — what a self fact is worth when its value appears
-// nowhere in what he said. Below `query_min_score` is not the point (recall
-// gates on vector distance, not on this number); the point is that
-// `/history` and every future reader can tell a value he said from a value
-// the model supplied.
-const ungroundedConfidence = 0.6
-
-// factConfidence scores a self fact by whether its value is grounded in the
-// utterance it came from. Grounded stays 1.00, which is what a tapped fact
-// has always been worth. Ungrounded drops, and says so in the log.
-//
-// An empty value is grounded by definition: the key alone carries the fact
-// ("поужинал"), and there is nothing for the model to have invented.
-func factConfidence(utterance, value string) float64 {
-	if strings.TrimSpace(value) == "" {
-		return 1.0
-	}
-	if valueGrounded(utterance, value) {
-		return 1.0
-	}
-	log.Printf("voice: fact value %q is not in %q — writing at confidence %.2f",
-		value, utterance, ungroundedConfidence)
-	return ungroundedConfidence
-}
-
-// valueGrounded reports whether every word of value traces back to a word he
-// actually said. The comparison is on a 4-rune prefix, so the model's
-// normalization survives ("пил воду" → "вода") while an invented value
-// ("1.20" for a question about Go) does not.
-func valueGrounded(utterance, value string) bool {
-	said := factTokens(utterance)
-	words := factTokens(value)
-	if len(words) == 0 {
-		return true
-	}
-	for _, w := range words {
-		if !anyTokenMatches(said, w) {
-			return false
-		}
-	}
-	return true
-}
-
-func anyTokenMatches(said []string, w string) bool {
-	for _, s := range said {
-		if s == w || sameStem(s, w) {
-			return true
-		}
-	}
-	return false
-}
-
-// sameStem is inflection tolerance and nothing more: it compares all but the
-// last rune of the shorter word, and never fewer than three. Russian marks
-// case on the ending, so "пил воду" and the stored "вода" are the same word he
-// said, while "1.20" and "версия" are not. A word of three runes or fewer must
-// match outright, where a shorter prefix would match half the language.
-func sameStem(a, b string) bool {
-	ar, br := []rune(a), []rune(b)
-	shorter := min(len(ar), len(br))
-	n := shorter - 1
-	if n < 3 || len(ar) < n || len(br) < n {
-		return false
-	}
-	return string(ar[:n]) == string(br[:n])
-}
-
-// factTokens lowercases and splits on everything that is not a letter or a
-// digit, the same shape planTokens uses in the router.
-func factTokens(s string) []string {
-	return strings.FieldsFunc(strings.ToLower(s), func(r rune) bool {
-		return !unicode.IsLetter(r) && !unicode.IsDigit(r)
-	})
-}

cmd/mavend/factgate_test.go

@@ -1,125 +0,0 @@
-package main
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/kami/maven/internal/ipc"
-	"github.com/kami/maven/internal/memory"
-	"github.com/kami/maven/internal/router"
-	"github.com/kami/maven/internal/tool"
-	"github.com/kami/maven/internal/voice"
-)
-
-func newFactGateHandler(t *testing.T, now time.Time) (*reactiveHandler, ipc.CoreAPI) {
-	t.Helper()
-	st := newTestStore(t)
-	api := ipc.NewStoreAPI(st)
-	emb := router.NewHashEmbedder(1024)
-	h := &reactiveHandler{
-		api:       api,
-		embedder:  emb,
-		router:    buildRouter(emb, tool.NewMatcher(api), 0.55, nil),
-		replier:   voice.NewStubReplier(),
-		now:       func() time.Time { return now },
-		memStore:  memory.NewInMemoryStore(),
-		dataStore: st,
-	}
-	return h, api
-}
-
-// The write half of #470: a question routed to IntentFact must not become a
-// fact about him, and must not leave a vector behind for recall to serve.
-func TestActionFact_QuestionIsNotWritten(t *testing.T) {
-	ctx := context.Background()
-	h, api := newFactGateHandler(t, time.Now())
-
-	reply := h.actionFact(ctx, router.Decision{
-		Intent:    router.IntentFact,
-		Utterance: "какая последняя версия языка Go?",
-		Slots:     router.Slots{Key: "go_version", HasKey: true, Value: `"1.20"`},
-	})
-
-	if _, err := api.LatestFact(ctx, "go_version"); err == nil {
-		t.Fatal("a question was stored as a fact about him")
-	}
-	hits, err := h.memStore.Search(ctx, mustEmbedPassage(t, h, "какая последняя версия языка Go?"), 3)
-	if err != nil {
-		t.Fatalf("memory search: %v", err)
-	}
-	if len(hits) != 0 {
-		t.Fatalf("the question was indexed for recall: %+v", hits)
-	}
-	// It went down the query chain instead. Nothing is configured to answer a
-	// world question in this harness, so "не знаю." is the honest outcome —
-	// what matters is that the turn was answered, not stored.
-	if reply == "" {
-		t.Fatal("the turn was neither stored nor answered")
-	}
-}
-
-// The capture that must survive the gate: an explicit instruction to record,
-// even though it contains an interrogative.
-func TestActionFact_ExplicitCaptureStillWrites(t *testing.T) {
-	ctx := context.Background()
-	h, api := newFactGateHandler(t, time.Now())
-
-	h.actionFact(ctx, router.Decision{
-		Intent:    router.IntentFact,
-		Utterance: "запиши что я пил воду",
-		Slots:     router.Slots{Key: "water", HasKey: true, Value: `"вода"`},
-	})
-
-	f, err := api.LatestFact(ctx, "water")
-	if err != nil {
-		t.Fatalf("an explicit capture was refused: %v", err)
-	}
-	if f.Confidence != 1.0 {
-		t.Errorf("confidence = %v, want 1.0 for a value he said", f.Confidence)
-	}
-	// #493: what recall reads back is the fact, not the sentence he said.
-	// queryMemory returns a fact's text verbatim, so the utterance sitting here
-	// meant "запиши что я пил воду" was the answer to "когда я пил воду?".
-	hits, err := h.memStore.Search(ctx, mustEmbedPassage(t, h, "вода"), 3)
-	if err != nil {
-		t.Fatalf("memory search: %v", err)
-	}
-	if len(hits) != 1 {
-		t.Fatalf("the fact was not indexed once: %+v", hits)
-	}
-	if got := hits[0].Meta["text"]; got != "water — вода" {
-		t.Errorf("indexed text = %q, want the fact", got)
-	}
-	if got := hits[0].Meta["utterance"]; got != "запиши что я пил воду" {
-		t.Errorf("utterance provenance = %q, want it kept alongside", got)
-	}
-}
-
-func TestFactConfidence(t *testing.T) {
-	cases := []struct {
-		utterance, value string
-		want             float64
-	}{
-		{"запиши что я пил воду", `"вода"`, 1.0},
-		{"я выпил кофе", `"кофе"`, 1.0},
-		{"поужинал", "", 1.0},
-		{"отметь что я полил кактус", `"полил кактус"`, 1.0},
-		{"какая последняя версия языка Go", `"1.20"`, ungroundedConfidence},
-		{"кто премьер Японии", `"Тонио Озаки"`, ungroundedConfidence},
-	}
-	for _, c := range cases {
-		if got := factConfidence(c.utterance, c.value); got != c.want {
-			t.Errorf("factConfidence(%q, %q) = %v, want %v", c.utterance, c.value, got, c.want)
-		}
-	}
-}
-
-func mustEmbedPassage(t *testing.T, h *reactiveHandler, text string) []float32 {
-	t.Helper()
-	vec, err := router.EmbedQuery(context.Background(), h.embedder, text)
-	if err != nil {
-		t.Fatalf("embed %q: %v", text, err)
-	}
-	return vec
-}

cmd/mavend/followup.go

@@ -1,79 +1,24 @@
 package main
 
 import (
-	"context"
 	"time"
 
 	"github.com/kami/maven/internal/dialogue"
 	"github.com/kami/maven/internal/router"
 )
 
-// voiceDialogueID — the dialogue-session key for the microphone, and the
-// clarify key for it too. This is a single-user box (ponytail), so one slot
-// suffices; a second speaker would need per-speaker ids, which waits on
-// voice-print attribution (see PROGRESS multi-user deferral).
+// voiceDialogueID — the single dialogue-session key. This is a single-user box
+// (ponytail), so one slot suffices; a second speaker would need per-speaker ids,
+// which waits on voice-print attribution (see PROGRESS multi-user deferral).
 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
-// 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
-// carried by hand here. Adding a field to either struct without adding it to
-// BOTH functions loses a slot silently — nothing fails to build. The tests in
-// slotsparity_test.go fail when the field sets or the converters stop matching;
-// when they do, fix these two functions, not the tests.
-
-// toDialogueSlots projects the router's slots onto the dialogue layer's copy.
+// toDialogueSlots projects the router's slots onto the dialogue layer's subset
+// (everything except the fact Value, which the dialogue layer doesn't carry).
 func toDialogueSlots(s router.Slots) dialogue.Slots {
 	return dialogue.Slots{
 		Time:    s.Time,
 		HasTime: s.HasTime,
 		Key:     s.Key,
-		Value:   s.Value,
 		HasKey:  s.HasKey,
 		Text:    s.Text,
 		Fn:      s.Fn,
@@ -82,10 +27,11 @@ func toDialogueSlots(s router.Slots) dialogue.Slots {
 	}
 }
 
-// applyDialogueSlots writes dialogue slots back onto router slots.
+// applyDialogueSlots writes inherited dialogue slots back onto router slots,
+// preserving router-only fields (Value) the dialogue layer never touched.
 func applyDialogueSlots(base router.Slots, d dialogue.Slots) router.Slots {
 	base.Time, base.HasTime = d.Time, d.HasTime
-	base.Key, base.Value, base.HasKey = d.Key, d.Value, d.HasKey
+	base.Key, base.HasKey = d.Key, d.HasKey
 	base.Text = d.Text
 	base.Fn, base.Args, base.HasFn = d.Fn, d.Args, d.HasFn
 	return base

cmd/mavend/main.go

@@ -251,7 +251,6 @@ func run(args []string) error {
 				Listen:       cfg.Phraser.Listen,
 				NGpuLayers:   cfg.Phraser.NGpuLayers,
 				NCtx:         cfg.Phraser.NCtx,
-				CacheRAMMiB:  cacheRAMMiB(cfg.Phraser.CacheRAMMiB),
 				Timeout:      time.Duration(cfg.Phraser.Timeout),
 				LLMNudges:    cfg.Phraser.LLMNudges,
 				ContextBlock: contextBlockFn(cfg, time.Now),
@@ -526,7 +525,6 @@ func run(args []string) error {
 					Listen:       cfg.Phraser.Listen,
 					NGpuLayers:   cfg.Phraser.NGpuLayers,
 					NCtx:         cfg.Phraser.NCtx,
-					CacheRAMMiB:  cacheRAMMiB(cfg.Phraser.CacheRAMMiB),
 					Timeout:      time.Duration(cfg.Phraser.Timeout),
 					LLMNudges:    cfg.Phraser.LLMNudges,
 					ContextBlock: contextBlockFn(cfg, time.Now),
@@ -790,22 +788,6 @@ func personaFacts(cfg *config.Config) persona.Facts {
 	return f
 }
 
-// cacheRAMMiB resolves phraser.cache_ram_mib into the phraser's field. Unset
-// means 512 MiB and not "whatever the server does", because the server's own
-// default is 8 GiB of prompt cache and that is what put 7.9 GB of RSS and half
-// a gigabyte of swap on homesrv for a 1.1 GB model. A negative value is the
-// deliberate opt-out: no flag is passed, the server's default applies, and the
-// operator owns the consequence.
-func cacheRAMMiB(configured int) int {
-	if configured == 0 {
-		return 512
-	}
-	if configured < 0 {
-		return 0
-	}
-	return configured
-}
-
 // contextBlockFn returns the per-turn renderer of the shared context block.
 // Per turn, not once at startup, because the block states the current time.
 func contextBlockFn(cfg *config.Config, now func() time.Time) func() string {

cmd/mavend/modelseam_test.go

@@ -1,91 +0,0 @@
-package main
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/kami/maven/internal/config"
-	"github.com/kami/maven/internal/llm"
-)
-
-// No `workstation` block is the shipping deploy. The seam must then be the
-// resident client itself, with nothing probing anything.
-func TestModelSeamUnconfiguredIsResidentOnly(t *testing.T) {
-	resident := llm.New("http://127.0.0.1:1", time.Second)
-	hot, pair := modelSeam(&config.Config{}, resident)
-	if pair != nil {
-		t.Error("built a pair with no workstation configured")
-	}
-	if hot == nil {
-		t.Fatal("no seam at all, so the cascade would route with the classifier")
-	}
-}
-
-// A workstation with no resident model behind it has no floor, and a Pair with
-// no floor is a configuration mistake rather than a degraded mode.
-func TestModelSeamWithoutResidentIsNil(t *testing.T) {
-	cfg := &config.Config{Workstation: &config.WorkstationConfig{URL: "http://127.0.0.1:1"}}
-	cfg.Workstation.Health = strings.TrimRight(cfg.Workstation.URL, "/") + "/health"
-	hot, pair := modelSeam(cfg, nil)
-	if hot != nil || pair != nil {
-		t.Errorf("built a seam with no floor: hot=%v pair=%v", hot, pair)
-	}
-}
-
-// The configured case: the seam is the pair, and the pair notices a workstation
-// that answers /health.
-func TestModelSeamPrefersAnAnsweringWorkstation(t *testing.T) {
-	up := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusOK)
-	}))
-	defer up.Close()
-
-	cfg := &config.Config{Workstation: &config.WorkstationConfig{
-		URL:   up.URL,
-		Probe: config.Duration(10 * time.Millisecond),
-	}}
-	cfg.Workstation.Health = strings.TrimRight(cfg.Workstation.URL, "/") + "/health"
-
-	hot, pair := modelSeam(cfg, llm.New("http://127.0.0.1:1", time.Second))
-	if pair == nil || hot == nil {
-		t.Fatal("no pair built for a configured workstation")
-	}
-	defer pair.Stop()
-
-	deadline := time.Now().Add(2 * time.Second)
-	for !pair.Available() && time.Now().Before(deadline) {
-		time.Sleep(5 * time.Millisecond)
-	}
-	if !pair.Available() {
-		t.Fatal("the pair never saw a workstation that answers /health")
-	}
-}
-
-// A card held by a CPT run answers 503, and that must read as unavailable
-// rather than as an error a turn has to handle.
-func TestModelSeamHeldCardIsUnavailable(t *testing.T) {
-	busy := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		http.Error(w, "model not loaded", http.StatusServiceUnavailable)
-	}))
-	defer busy.Close()
-
-	cfg := &config.Config{Workstation: &config.WorkstationConfig{
-		URL:   busy.URL,
-		Probe: config.Duration(10 * time.Millisecond),
-	}}
-	cfg.Workstation.Health = strings.TrimRight(cfg.Workstation.URL, "/") + "/health"
-
-	_, pair := modelSeam(cfg, llm.New("http://127.0.0.1:1", time.Second))
-	if pair == nil {
-		t.Fatal("no pair built for a configured workstation")
-	}
-	defer pair.Stop()
-
-	time.Sleep(50 * time.Millisecond)
-	if pair.Available() {
-		t.Error("a 503 from the supervisor read as available")
-	}
-}

cmd/mavend/morning_nudge_test.go

@@ -1,39 +0,0 @@
-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)
-	}
-}

cmd/mavend/patterns_test.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/kami/maven/internal/config"
 	"github.com/kami/maven/internal/delivery"
-	"github.com/kami/maven/internal/ipc"
 	"github.com/kami/maven/internal/loop"
 	"github.com/kami/maven/internal/pattern"
 	"github.com/kami/maven/internal/store"
@@ -284,81 +283,3 @@ func TestTickProposalCooldownSpacesAnnouncements(t *testing.T) {
 		}
 	}
 }
-
-// TestVoiceYesDoesNotAcceptRoutine — Vikunja #367. Accepting a routine hands
-// the tick loop a standing new reason to speak, which DESIGN.md puts at layer
-// 3, and voice is structurally incapable of layer 3. A spoken "да" must park
-// the decision for the authed page, not flip the row itself.
-func TestVoiceYesDoesNotAcceptRoutine(t *testing.T) {
-	st := newTestStore(t)
-	ctx := context.Background()
-	now := refNow()
-	seedRefillEvents(t, st, ctx, now, pattern.MinEvents-1)
-
-	h := &reactiveHandler{api: ipc.NewStoreAPI(st), dataStore: st, now: func() time.Time { return now }}
-
-	// The MinEvents'th event is the one that makes the pattern detectable, and
-	// it goes through the voice path so the proposal is parked for a y/n.
-	last := now.Add(time.Duration(pattern.MinEvents-1) * 7 * 24 * time.Hour)
-	factID, err := st.WriteFact(ctx, last, store.KindSelf, "cat_water", "refill", "voice", 1.0, sql.NullInt64{})
-	if err != nil {
-		t.Fatalf("write fact: %v", err)
-	}
-	if phrase := h.detectPattern(ctx, factID, "cat_water", "refill", last); phrase == "" {
-		t.Fatal("expected a parked routine proposal")
-	}
-
-	reply, handled := h.resolveConfirm(ctx, "да")
-	if !handled {
-		t.Fatal("the spoken yes should be consumed by the routine confirm")
-	}
-	if !strings.Contains(reply, "рутин") {
-		t.Fatalf("reply should send him to the routines page, got %q", reply)
-	}
-
-	rows, err := st.ListProposedRoutinesByStatus(ctx, store.RoutineAccepted)
-	if err != nil {
-		t.Fatalf("list accepted: %v", err)
-	}
-	if len(rows) != 0 {
-		t.Fatalf("voice accepted a routine: %+v", rows)
-	}
-	proposed, err := st.ListProposedRoutinesByStatus(ctx, store.RoutineProposed)
-	if err != nil {
-		t.Fatalf("list proposed: %v", err)
-	}
-	if len(proposed) != 1 {
-		t.Fatalf("proposed routines = %d, want 1 (still waiting for the page)", len(proposed))
-	}
-}
-
-// TestVoiceNoStillDismissesRoutine — declining does not move the boundary
-// outward, so voice keeps it. Only acceptance is gated.
-func TestVoiceNoStillDismissesRoutine(t *testing.T) {
-	st := newTestStore(t)
-	ctx := context.Background()
-	now := refNow()
-	seedRefillEvents(t, st, ctx, now, pattern.MinEvents-1)
-
-	h := &reactiveHandler{api: ipc.NewStoreAPI(st), dataStore: st, now: func() time.Time { return now }}
-
-	last := now.Add(time.Duration(pattern.MinEvents-1) * 7 * 24 * time.Hour)
-	factID, err := st.WriteFact(ctx, last, store.KindSelf, "cat_water", "refill", "voice", 1.0, sql.NullInt64{})
-	if err != nil {
-		t.Fatalf("write fact: %v", err)
-	}
-	if phrase := h.detectPattern(ctx, factID, "cat_water", "refill", last); phrase == "" {
-		t.Fatal("expected a parked routine proposal")
-	}
-
-	if _, handled := h.resolveConfirm(ctx, "нет"); !handled {
-		t.Fatal("the spoken no should be consumed by the routine confirm")
-	}
-	rows, err := st.ListProposedRoutinesByStatus(ctx, store.RoutineDismissed)
-	if err != nil {
-		t.Fatalf("list dismissed: %v", err)
-	}
-	if len(rows) != 1 {
-		t.Fatalf("dismissed routines = %d, want 1", len(rows))
-	}
-}

cmd/mavend/personalboundary.go

@@ -1,154 +0,0 @@
-package main
-
-import (
-	"context"
-	"log"
-	"math"
-	"sync"
-
-	"github.com/kami/maven/internal/router"
-)
-
-// The personal boundary decides one thing: is this question about him. It used
-// to decide it by matching possession words, and that was the whole defect
-// behind Vikunja #495. "что я говорил про бэкапы?" is his data by definition —
-// nothing outside the box has ever heard him say anything — and it carried no
-// possession word, so it walked past the boundary into SearXNG and came back
-// answered out of a Habr article about somebody else's backups.
-//
-// The first fix was one more marker class, `я говорил|сказал|писал|…`, plus a
-// carve-out so "как я говорил, почему небо синее" stayed a world question. Both
-// halves are a lexicon, and a lexicon is the wrong instrument here: Russian
-// gives every verb a dozen surface forms, the preamble list has no end, and
-// every utterance the list misses is one that reaches the world. It also drifts
-// silently — a missing verb looks exactly like no bug.
-//
-// So the boundary asks the embedder instead. Two frozen seed sets — questions
-// about him, questions about the world — are embedded once, and the turn's own
-// query vector, already computed by queryEmbed upstream, is scored against
-// both. Nearest side wins. Word order, verb form and unseen phrasing stop
-// mattering, which is exactly what a lexicon could not do.
-//
-// Measured 03-08-2026 against multilingual-e5-small on 19 held-out utterances,
-// none of them a seed: 19 right (TestONNXPersonalBoundary). A 20th, "as i said,
-// what is the population of india", missed by +0.008 during the first pass and
-// is a world seed now, which is why it is not in the held-out set. True
-// positives clear the world side by +0.014 to +0.089 and the nearest true
-// negative sits at -0.005, so the gate is the sign of the difference and
-// nothing tighter: the margins are too thin to justify a threshold, and the
-// asymmetry favours claiming anyway. A false claim costs one honest "не знаю";
-// a false pass sends his life to an upstream engine.
-//
-// The embedder is the one model CLAUDE.md pins to homesrv permanently, and it
-// is what makes this affordable: no llama-server call, no network, one cosine
-// per seed against a vector the turn already has.
-
-// personalSeeds — questions about him. Frozen: they are scoring data, so
-// editing one moves the boundary and must be re-measured, not eyeballed. Cover
-// both classes the boundary owns, possession and first-person speech, in both
-// languages.
-var personalSeeds = []string{
-	"что я говорил про это",
-	"я тебе рассказывал об этом?",
-	"что я записал про врача",
-	"я упоминал эту тему?",
-	"что у меня сегодня",
-	"когда моя встреча",
-	"what did i say about this",
-	"did i mention this to you",
-}
-
-// worldSeeds — questions the world can answer, including the two shapes that
-// look personal and are not: a first-person preamble on a world question ("как
-// я говорил, ..."), and first person without possession ("что я могу
-// посмотреть вечером"). Refusing those is the opposite mistake and the older
-// comment on personalMarkers already named it.
-var worldSeeds = []string{
-	"почему небо синее",
-	"какая столица франции",
-	"как сварить борщ",
-	"кто написал эту книгу",
-	"what is the capital of france",
-	"how do i boil an egg",
-	"как я говорил, почему небо синее",
-	"as i said, why is the sky blue",
-	"as i said, what is the population of india",
-	"что я могу посмотреть вечером",
-	"что мне почитать про историю",
-	"что я должен знать про питон",
-	"what can i watch tonight",
-}
-
-// personalBoundary holds the embedded seeds. Zero value is usable and means
-// "not loaded yet"; a handler built without an embedder never loads and the
-// boundary falls back to personalMarkers.
-type personalBoundary struct {
-	once     sync.Once
-	personal [][]float32
-	world    [][]float32
-	loaded   bool
-}
-
-// load embeds both seed sets, once per process. Seeds are embedded on the QUERY
-// side, like the utterance they are compared with — a question against a
-// question. Mixing sides would measure the e5 prefix, not the meaning.
-func (b *personalBoundary) load(ctx context.Context, emb router.Embedder) {
-	b.once.Do(func() {
-		if emb == nil {
-			return
-		}
-		embedAll := func(ss []string) [][]float32 {
-			out := make([][]float32, 0, len(ss))
-			for _, s := range ss {
-				v, err := router.EmbedQuery(ctx, emb, s)
-				if err != nil {
-					log.Printf("voice: personal boundary seeds unavailable (%v); falling back to possession markers", err)
-					return nil
-				}
-				out = append(out, v)
-			}
-			return out
-		}
-		p, w := embedAll(personalSeeds), embedAll(worldSeeds)
-		if p == nil || w == nil {
-			return
-		}
-		b.personal, b.world, b.loaded = p, w, true
-	})
-}
-
-// score returns the best similarity to each side. ok is false when the seeds
-// are not loaded, which is the caller's signal to use the markers instead.
-func (b *personalBoundary) score(vec []float32) (personal, world float64, ok bool) {
-	if !b.loaded || len(vec) == 0 {
-		return 0, 0, false
-	}
-	best := func(seeds [][]float32) float64 {
-		m := -1.0
-		for _, s := range seeds {
-			if c := cosine(vec, s); c > m {
-				m = c
-			}
-		}
-		return m
-	}
-	return best(b.personal), best(b.world), true
-}
-
-// cosine — same math as internal/router and internal/memory, small enough that
-// importing one of them for it would be the larger coupling.
-func cosine(a, b []float32) float64 {
-	if len(a) != len(b) {
-		return 0
-	}
-	var dot, na, nb float64
-	for i := range a {
-		dot += float64(a[i]) * float64(b[i])
-		na += float64(a[i]) * float64(a[i])
-		nb += float64(b[i]) * float64(b[i])
-	}
-	if na == 0 || nb == 0 {
-		return 0
-	}
-	return dot / (math.Sqrt(na) * math.Sqrt(nb))
-}

cmd/mavend/personalboundary_test.go

@@ -1,94 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/kami/maven/internal/router"
-)
-
-// A handler with no embedder never loads the seeds, so the boundary falls back
-// to the possession markers. That is the offline floor and it must keep working
-// — an embedder that fails to load must not open the boundary.
-func TestBoundaryFallsBackToMarkersWithNoEmbedder(t *testing.T) {
-	h := personalHandler()
-	if !h.isPersonalTurn(context.Background(), &queryTurn{
-		dec: router.Decision{Utterance: "во сколько у меня встреча"},
-	}) {
-		t.Error("no embedder: a possession question must still be personal")
-	}
-	if h.isPersonalTurn(context.Background(), &queryTurn{
-		dec: router.Decision{Utterance: "почему небо синее"},
-	}) {
-		t.Error("no embedder: a world question must still pass")
-	}
-}
-
-// TestONNXPersonalBoundary — the number that matters, scored against the
-// embedder homesrv actually runs. Opt-in via MAVEN_ONNX_LIB, exactly like
-// TestONNXRecall in internal/memory/recalleval.
-//
-// Every case here is held out: none of these strings is a seed. The #495
-// regression is the first row — "что я говорил про бэкапы?" reached SearXNG and
-// was answered from a Habr article, and no possession word appears in it.
-func TestONNXPersonalBoundary(t *testing.T) {
-	lib := os.Getenv("MAVEN_ONNX_LIB")
-	if lib == "" {
-		t.Skip("MAVEN_ONNX_LIB unset — see AGENTS.md § Embedder model for intent routing")
-	}
-	dir := filepath.Join("../..", "models/embedder/multilingual-e5-small")
-	emb, err := router.NewONNXEmbedder(filepath.Join(dir, "model_quantized.onnx"), filepath.Join(dir, "tokenizer.json"), lib)
-	if err != nil {
-		t.Skipf("onnx embedder unavailable: %v", err)
-	}
-	defer emb.Close()
-
-	cases := []struct {
-		utterance string
-		personal  bool
-	}{
-		{"что я говорил про бэкапы?", true},
-		{"что я сказал вчера про отпуск", true},
-		{"я писал что-нибудь про сервер", true},
-		{"я упоминал про конференцию?", true},
-		{"что я отмечал по поводу переезда", true},
-		{"я рассказывал тебе про новую работу?", true},
-		{"во сколько у меня встреча", true},
-		{"когда мой следующий отпуск", true},
-		{"what did i say about backups", true},
-		{"did i tell you about the doctor", true},
-		{"как я говорил, почему небо синее", false},
-		{"как уже я говорил, какая столица франции", false},
-		{"почему трава зелёная", false},
-		{"столица франции", false},
-		{"как мне сварить борщ", false},
-		{"что мне посмотреть вечером", false},
-		{"я хочу узнать про рим", false},
-		{"кто такой гагарин", false},
-		{"how do i boil an egg", false},
-	}
-
-	h := &reactiveHandler{embedder: emb}
-	ctx := context.Background()
-	wrong := 0
-	for _, c := range cases {
-		vec, err := router.EmbedQuery(ctx, emb, c.utterance)
-		if err != nil {
-			t.Fatalf("embed %q: %v", c.utterance, err)
-		}
-		turn := &queryTurn{dec: router.Decision{Utterance: c.utterance}, vec: vec}
-		got := h.isPersonalTurn(ctx, turn)
-		p, w, ok := h.boundary.score(vec)
-		if !ok {
-			t.Fatal("seeds did not load with a working embedder")
-		}
-		if got != c.personal {
-			wrong++
-			t.Errorf("%q: personal=%v want %v (personal %.4f world %.4f)", c.utterance, got, c.personal, p, w)
-		}
-		t.Logf("personal=%-5v personal %.4f world %.4f delta %+.4f  %s", got, p, w, p-w, c.utterance)
-	}
-	t.Logf("personal boundary: %d/%d held-out utterances correct", len(cases)-wrong, len(cases))
-}

cmd/mavend/reactive_notes_test.go

@@ -2,14 +2,12 @@ package main
 
 import (
 	"context"
-	"strings"
 	"testing"
 	"time"
 
 	"github.com/kami/maven/internal/ipc"
 	"github.com/kami/maven/internal/memory"
 	"github.com/kami/maven/internal/router"
-	"github.com/kami/maven/internal/store"
 	"github.com/kami/maven/internal/tool"
 	"github.com/kami/maven/internal/voice"
 )
@@ -87,38 +85,3 @@ 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)
-	}
-}

cmd/mavend/replier_llm.go

@@ -2,33 +2,122 @@ package main
 
 import (
 	"context"
+	"encoding/json"
+	"strings"
+	"time"
 
+	"github.com/kami/maven/internal/llm"
+	"github.com/kami/maven/internal/persona"
 	"github.com/kami/maven/internal/phraser"
 	"github.com/kami/maven/internal/router"
 	"github.com/kami/maven/internal/voice"
 )
 
-// llmReplier is the daemon-side wiring around phraser.Replier: it owns the
-// deterministic floor, and nothing else. The phrasing itself, the prompt and the
-// output parsing live in internal/phraser so the eval can score them (#396).
+// completer is the LLM seam for the replier (subset of router.Completer).
+// *llm.Client satisfies it.
+type completer interface {
+	Complete(ctx context.Context, r llm.Req) (string, error)
+}
+
+// llmReplier phrases reactive confirmations with the resident model
+// (Qwen3-1.7B). Stub is the
+// floor on any error (offline-safe). Maven speaks as "she", feminine RU.
 type llmReplier struct {
-	p    *phraser.Replier
+	c    completer
 	stub *voice.StubReplier
+
+	// block renders the shared context block per turn (who he is, the time).
+	// nil ⇒ the prompt stands alone.
+	block func() string
 }
 
-func newLLMReplier(c phraser.Completer, block func() string) *llmReplier {
-	return &llmReplier{p: phraser.NewReplier(c, block), stub: voice.NewStubReplier()}
+func newLLMReplier(c completer, block func() string) *llmReplier {
+	return &llmReplier{c: c, stub: voice.NewStubReplier(), block: block}
 }
 
-// Reply never fails: a clarify, a model error and an unusable generation all
-// answer from the stub, which is what keeps a turn from breaking on the model.
+const replySystem = `Ты — Maven, домашняя ассистентка (о себе — в женском роде). Владелец — мужчина, говоришь с ним на "ты", в единственном числе; никогда не "вы"/"ваш" и не "он"/"его". Подтверди действие РОВНО ОДНИМ коротким предложением (≤120 символов), по-русски, спокойно и без официальных формулировок. Не задавай вопросов, не повторяй слова, не добавляй ничего после точки. Отвечай ТОЛЬКО одним объектом JSON с полями "response" (текст) и "mood" (ровно одно из: neutral, happy, thinking, tired, confused).
+Пример: {"response": "Записала, что ты выпил стакан воды.", "mood": "neutral"}
+Никогда не пиши "..." в поле response.`
+
 func (r *llmReplier) Reply(d router.Decision) string {
 	if d.Clarify {
 		return r.stub.Reply(d)
 	}
-	out, err := r.p.PhraseReply(context.Background(), d)
-	if err != nil || out == "" {
+	ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
+	defer cancel()
+	out, err := r.c.Complete(ctx, llm.Req{
+		System:        persona.Prepend(r.block, replySystem),
+		User:          replyContext(d),
+		Grammar:       phraser.ResponseGrammar,
+		MaxTokens:     512,
+		RepeatPenalty: 1.3,
+	})
+	if err != nil {
 		return r.stub.Reply(d)
 	}
-	return out
+	out = stripThink(out)
+	if response, _ := parseResponseMood(out); response != "" {
+		return response
+	}
+	// fallback: try plain-text parsing
+	if out = firstSentence(out); out != "" {
+		return out
+	}
+	return r.stub.Reply(d)
+}
+
+// firstSentence trims the model's output to a single clean confirmation: first
+// line, first sentence, whitespace-normalized — the last-line defense against a
+// small model that rambles past the first period despite the prompt + stop.
+// stripThink removes the <think> block that Thinking-variant models emit.
+func stripThink(s string) string {
+	if i := strings.LastIndex(s, "</think>"); i >= 0 {
+		s = strings.TrimSpace(s[i+8:])
+	}
+	return s
+}
+
+func firstSentence(s string) string {
+	s = strings.TrimSpace(s)
+	if i := strings.IndexByte(s, '\n'); i >= 0 {
+		s = s[:i]
+	}
+	// keep up to and including the first sentence-ending punctuation.
+	if i := strings.IndexAny(s, ".!?"); i >= 0 {
+		s = s[:i+1]
+	}
+	return strings.TrimSpace(s)
+}
+
+// parseResponseMood extracts {"response","mood"} from LLM output, tolerant
+// of thinking tokens and extra text before/after the JSON block.
+func parseResponseMood(raw string) (response, mood string) {
+	cleaned := strings.TrimSpace(raw)
+	start := strings.Index(cleaned, "{")
+	end := strings.LastIndex(cleaned, "}")
+	if start < 0 || end < 0 || end <= start {
+		return "", ""
+	}
+	var parsed struct {
+		Response string `json:"response"`
+		Mood     string `json:"mood"`
+	}
+	if err := json.Unmarshal([]byte(cleaned[start:end+1]), &parsed); err != nil {
+		return "", ""
+	}
+	return parsed.Response, parsed.Mood
+}
+
+// replyContext renders the decision into a compact RU description for the model.
+func replyContext(d router.Decision) string {
+	switch d.Intent {
+	case router.IntentFact:
+		return "записала факт: " + d.Slots.Key + " " + d.Slots.Value
+	case router.IntentNote:
+		return "сохранила заметку: " + d.Slots.Text
+	case router.IntentReminder:
+		return "поставила напоминание: " + d.Slots.Text
+	default:
+		return string(d.Intent) + ": " + d.Slots.Text
+	}
 }

cmd/mavend/replier_llm_test.go

@@ -5,22 +5,28 @@ import (
 	"testing"
 
 	"github.com/kami/maven/internal/llm"
+	"github.com/kami/maven/internal/phraser"
 	"github.com/kami/maven/internal/router"
 	"github.com/kami/maven/internal/voice"
 )
 
-// The phrasing itself is tested in internal/phraser. What is left here is the
-// only thing the daemon adds: the stub floor, on the three ways a reply can
-// fail to arrive.
-type stubCompleter struct {
+type mockCompleter struct {
 	out string
 	err error
 }
 
-func (s stubCompleter) Complete(_ context.Context, _ llm.Req) (string, error) { return s.out, s.err }
+func (m mockCompleter) Complete(_ context.Context, _ llm.Req) (string, error) { return m.out, m.err }
 
-func TestLLMReplierPassesTheModelReplyThrough(t *testing.T) {
-	r := newLLMReplier(stubCompleter{out: `{"response":"записала, кофе закончился","mood":"neutral"}`}, nil)
+func TestLLMReplierReturnsLLMReply(t *testing.T) {
+	r := newLLMReplier(mockCompleter{out: `{"response":"записала, кофе закончился","mood":"neutral"}`}, nil)
+	got := r.Reply(router.Decision{Intent: router.IntentNote, Slots: router.Slots{Text: "кофе закончился"}})
+	if got != "записала, кофе закончился" {
+		t.Errorf("got %q, want %q", got, "записала, кофе закончился")
+	}
+}
+
+func TestLLMReplierFallsBackToPlainText(t *testing.T) {
+	r := newLLMReplier(mockCompleter{out: "записала, кофе закончился"}, nil)
 	got := r.Reply(router.Decision{Intent: router.IntentNote, Slots: router.Slots{Text: "кофе закончился"}})
 	if got != "записала, кофе закончился" {
 		t.Errorf("got %q, want %q", got, "записала, кофе закончился")
@@ -28,30 +34,54 @@ func TestLLMReplierPassesTheModelReplyThrough(t *testing.T) {
 }
 
 func TestLLMReplierFallsBackToStubOnError(t *testing.T) {
-	r := newLLMReplier(stubCompleter{err: errReplierTest}, nil)
-	assertStub(t, r, router.Decision{Intent: router.IntentNote}, "llm error")
-}
-
-func TestLLMReplierFallsBackToStubOnEmpty(t *testing.T) {
-	r := newLLMReplier(stubCompleter{out: ""}, nil)
-	assertStub(t, r, router.Decision{Intent: router.IntentNote}, "empty llm")
-}
-
-func TestLLMReplierClarifyUsesStub(t *testing.T) {
-	r := newLLMReplier(stubCompleter{out: "я всё поняла"}, nil)
-	assertStub(t, r, router.Decision{Clarify: true}, "clarify")
-}
-
-func assertStub(t *testing.T, r *llmReplier, d router.Decision, what string) {
-	t.Helper()
-	got, want := r.Reply(d), voice.NewStubReplier().Reply(d)
+	r := newLLMReplier(mockCompleter{err: errTestLLMDown}, nil)
+	noteDec := router.Decision{Intent: router.IntentNote}
+	got := r.Reply(noteDec)
+	want := voice.NewStubReplier().Reply(noteDec)
 	if got != want {
-		t.Errorf("on %s: got %q, want stub %q", what, got, want)
+		t.Errorf("on llm error: got %q, want stub %q", got, want)
 	}
 }
 
-var errReplierTest = errTest("llm down")
+func TestLLMReplierFallsBackToStubOnEmpty(t *testing.T) {
+	r := newLLMReplier(mockCompleter{out: ""}, nil)
+	noteDec := router.Decision{Intent: router.IntentNote}
+	got := r.Reply(noteDec)
+	want := voice.NewStubReplier().Reply(noteDec)
+	if got != want {
+		t.Errorf("on empty llm: got %q, want stub %q", got, want)
+	}
+}
+
+func TestLLMReplierClarifyUsesStub(t *testing.T) {
+	r := newLLMReplier(mockCompleter{out: "я всё поняла"}, nil)
+	clarifyDec := router.Decision{Clarify: true}
+	got := r.Reply(clarifyDec)
+	want := voice.NewStubReplier().Reply(clarifyDec)
+	if got != want {
+		t.Errorf("on clarify: got %q, want stub %q", got, want)
+	}
+}
+
+var errTestLLMDown = errTest("llm down")
 
 type errTest string
 
 func (e errTest) Error() string { return string(e) }
+
+// grammarRecorder captures the request so the grammar can be asserted on.
+type grammarRecorder struct{ req llm.Req }
+
+func (g *grammarRecorder) Complete(_ context.Context, r llm.Req) (string, error) {
+	g.req = r
+	return `{"response":"записала","mood":"neutral"}`, nil
+}
+
+func TestLLMReplierCarriesTheResponseGrammar(t *testing.T) {
+	rec := &grammarRecorder{}
+	r := newLLMReplier(rec, nil)
+	r.Reply(router.Decision{Intent: router.IntentNote, Slots: router.Slots{Text: "кофе закончился"}})
+	if rec.req.Grammar != phraser.ResponseGrammar {
+		t.Errorf("grammar = %q, want phraser.ResponseGrammar", rec.req.Grammar)
+	}
+}

cmd/mavend/simulator_test.go

@@ -1043,26 +1043,3 @@ func TestSimulatorRefusesBackwardsSteps(t *testing.T) {
 		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()))
-	}
-}

cmd/mavend/slotsparity_test.go

@@ -1,71 +0,0 @@
-package main
-
-import (
-	"reflect"
-	"testing"
-	"time"
-
-	"github.com/kami/maven/internal/dialogue"
-	"github.com/kami/maven/internal/router"
-)
-
-// TestSlotsParity — dialogue.Slots is a hand-kept copy of router.Slots
-// (dialogue must not import router: import cycle). Drift is silent, so this
-// test compares the two field sets by name and type. If it fails, add the new
-// field to both structs AND to toDialogueSlots/applyDialogueSlots in
-// followup.go — do not relax the test.
-func TestSlotsParity(t *testing.T) {
-	fields := func(v any) map[string]string {
-		rt := reflect.TypeOf(v)
-		out := make(map[string]string, rt.NumField())
-		for i := 0; i < rt.NumField(); i++ {
-			f := rt.Field(i)
-			out[f.Name] = f.Type.String()
-		}
-		return out
-	}
-	rf, df := fields(router.Slots{}), fields(dialogue.Slots{})
-	for name, typ := range rf {
-		dt, ok := df[name]
-		if !ok {
-			t.Errorf("router.Slots.%s (%s) missing from dialogue.Slots", name, typ)
-			continue
-		}
-		if dt != typ {
-			t.Errorf("field %s: router has %s, dialogue has %s", name, typ, dt)
-		}
-	}
-	for name, typ := range df {
-		if _, ok := rf[name]; !ok {
-			t.Errorf("dialogue.Slots.%s (%s) missing from router.Slots", name, typ)
-		}
-	}
-}
-
-// TestSlotsRoundTrip — the converters carry every field. A field the parity
-// test accepts can still be dropped in transit, so round-trip a fully
-// populated value and compare.
-func TestSlotsRoundTrip(t *testing.T) {
-	full := router.Slots{
-		Time:    time.Date(2026, 8, 2, 11, 0, 0, 0, time.UTC),
-		HasTime: true,
-		Fn:      "restart",
-		Args:    []string{"nginx"},
-		HasFn:   true,
-		Key:     "water",
-		Value:   `"drank"`,
-		HasKey:  true,
-		Text:    "выпил воды",
-	}
-	// Every field must be non-zero, or the round-trip proves nothing.
-	rv := reflect.ValueOf(full)
-	for i := 0; i < rv.NumField(); i++ {
-		if rv.Field(i).IsZero() {
-			t.Fatalf("field %s is zero: extend this fixture so the round-trip covers it",
-				rv.Type().Field(i).Name)
-		}
-	}
-	if got := applyDialogueSlots(router.Slots{}, toDialogueSlots(full)); !reflect.DeepEqual(got, full) {
-		t.Errorf("round-trip lost a slot:\n got %+v\nwant %+v", got, full)
-	}
-}

cmd/mavend/tick.go

@@ -10,17 +10,22 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"log"
 	"os"
 	"path/filepath"
+	"strings"
 	"sync"
 	"time"
 
+	"github.com/kami/maven/internal/calendar"
 	"github.com/kami/maven/internal/config"
 	"github.com/kami/maven/internal/delivery"
+	"github.com/kami/maven/internal/ipc"
 	"github.com/kami/maven/internal/loop"
 	"github.com/kami/maven/internal/morning"
+	"github.com/kami/maven/internal/pattern"
 	"github.com/kami/maven/internal/phraser"
 	"github.com/kami/maven/internal/routine"
 	"github.com/kami/maven/internal/store"
@@ -310,6 +315,597 @@ func (t *tickLoop) repeatPhrase(rule string) (body, summary string) {
 	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
 // (autotuneInterval, see run) so it doesn't write a fact every tick. for each
 // rule:
@@ -382,3 +978,101 @@ func (t *tickLoop) trace() *loop.TickTrace {
 	defer t.mu.Unlock()
 	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,
+	}
+}

cmd/mavend/tick_api.go

@@ -1,111 +0,0 @@
-// 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,
-	}
-}

cmd/mavend/tick_digest.go

@@ -1,233 +0,0 @@
-// 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)
-	}
-}

cmd/mavend/tick_morning.go

@@ -1,197 +0,0 @@
-// 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
-}

cmd/mavend/tick_routines.go

@@ -1,234 +0,0 @@
-// 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)
-		}
-	}
-}

cmd/mavend/tick_test.go

@@ -584,7 +584,7 @@ func TestDigestSev4BypassesQueue(t *testing.T) {
 	ctx := context.Background()
 	now := refNow()
 	markPresent(t, st, ctx, now)
-	if _, err := st.SetValue(ctx, store.KindSelf, "service_down:db", "poll:uptimekuma", "down", now); err != nil {
+	if _, err := st.SetValue(ctx, store.KindSelf, "service_down", "poll:uptimekuma", "down", now); err != nil {
 		t.Fatalf("seed service_down: %v", err)
 	}
 	sink := &fakeSink{}

cmd/mavend/voice.go

@@ -76,10 +76,6 @@ type reactiveHandler struct {
 	tts      tts.Synthesizer
 	router   *router.Router
 	embedder router.Embedder // reused for note write/query (same model as the classifier)
-	// boundary — the embedded seed sets behind the personal boundary
-	// (personalboundary.go). Zero value is usable and loads on first query;
-	// with no embedder it never loads and the boundary uses personalMarkers.
-	boundary personalBoundary
 	// api — the CoreAPI the handler reads and writes through. Wired with the
 	// bare store adapter and UPGRADED by main once the daemonAPI exists; see
 	// upgradeAPI.
@@ -220,9 +216,9 @@ func (h *reactiveHandler) upgradeAPI(api ipc.CoreAPI) {
 // handleText — the core reactive path without stt/tts. Used by the IPC Chat
 // endpoint (and eventually by telegram). Splits out the audio bookends from
 // HandlePushToTalk so text channels share the same routing logic.
-func (h *reactiveHandler) handleText(ctx context.Context, conversation, text string) string {
+func (h *reactiveHandler) handleText(ctx context.Context, text string) string {
 	log.Printf("voice: handleText: %q", text)
-	return h.runTurn(withDialogueID(ctx, dialogueIDFor(sourceText, conversation)), text, sourceText)
+	return h.runTurn(ctx, text, sourceText)
 }
 
 // turnSource — which channel this utterance arrived on, in the same provenance
@@ -255,7 +251,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
 	// 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.
-	expiredNotice := h.clarifyExpiredNotice(ctx)
+	expiredNotice := h.clarifyExpiredNotice()
 
 	// 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
@@ -351,10 +347,7 @@ func (h *reactiveHandler) runTurn(ctx context.Context, text string, src turnSour
 	// and park the request (clarify.go); otherwise the replier's canned reply
 	// stands.
 	if dec.Clarify {
-		if reply := h.hexisBeforeClarify(ctx, dec); reply != "" {
-			return withNotice(expiredNotice, reply)
-		}
-		if question, asked := h.askClarify(ctx, dec); asked {
+		if question, asked := h.askClarify(dec); asked {
 			return withNotice(expiredNotice, question)
 		}
 	}

cmd/mavend/voicewire.go

@@ -48,11 +48,7 @@ type voiceWiring struct {
 	// mcp — the MCP client, nil unless the `mcp` block configures an enabled
 	// server (Vikunja #251). Its tools land in the same allowlist as every
 	// other act, so nothing else here has to know about it.
-	// pair — the workstation model with the resident one as the floor, nil
-	// unless a `workstation` block names an address. Held here only so the
-	// prober is stopped on shutdown; callers were handed it at build time.
-	pair *llm.Pair
-	mcp  *mcpWiring
+	mcp *mcpWiring
 	// home — the Home Assistant client, nil unless the `smarthome` block is
 	// enabled (Vikunja #256). Its devices land in the same allowlist as every
 	// other act, so nothing else here has to know about it.
@@ -80,9 +76,6 @@ func (w *voiceWiring) close() {
 	if w.ttsClient != nil {
 		_ = w.ttsClient.Close()
 	}
-	if w.pair != nil {
-		w.pair.Stop()
-	}
 	w.mcp.close()
 }
 
@@ -146,7 +139,6 @@ func wireVoice(cfg *config.Config, coreAPI ipc.CoreAPI, phr phraser.Phraser, mem
 		emb = router.NewHashEmbedder(1024)
 	}
 	w.embedder = emb
-	repairFactVectors(dataStore, emb)
 	checkStoredEmbedder(dataStore, emb)
 
 	// ----- tool executor (the enabled act allowlist, store-backed) -----
@@ -196,18 +188,6 @@ func wireVoice(cfg *config.Config, coreAPI ipc.CoreAPI, phr phraser.Phraser, mem
 		// the new llama-server when the resident model is swapped (Vikunja #250).
 		llmClient = llmClientFor(lp, 60*time.Second)
 	}
-	// The workstation model sits above that one when it is configured and its
-	// card is free. hot is what the router and the replier complete through:
-	// either the pair, or the resident client alone, or nothing at all.
-	hot, pair := modelSeam(cfg, llmClient)
-	w.pair = pair
-	// The phraser gets the same pair, which is what carries the workstation model
-	// into the paths that do not go through `hot`: world questions (the naming
-	// half), and the digestion worker's nudge and reminder phrasing (the silent
-	// half). Wiring, so it happens once and before the voice server listens.
-	if lp, ok := phr.(*phraser.LLMPhraser); ok && pair != nil {
-		lp.UseRemote(pair)
-	}
 	// ----- router (the cascade; floor examples seed the classifier) -----
 	// The act matcher's allowlist is exactly the enabled tool names — the
 	// router only matches acts the executor can run (one source of truth).
@@ -219,7 +199,7 @@ func wireVoice(cfg *config.Config, coreAPI ipc.CoreAPI, phr phraser.Phraser, mem
 	// against the classifier's 50.0%, at about 1s a turn instead of 30ms (see
 	// config.VoiceConfig.LLMRouter). The classifier always stays wired as the
 	// fallback, so a model error never breaks a turn.
-	rtr := buildRouter(emb, matcher, threshold, pickLLMRouter(cfg.Voice.UseLLMRouter(), hot))
+	rtr := buildRouter(emb, matcher, threshold, pickLLMRouter(cfg.Voice.UseLLMRouter(), llmClient))
 
 	// ----- sessions registry (shared with voicesink) -----
 	sessions := voice.NewSessions()
@@ -238,10 +218,7 @@ func wireVoice(cfg *config.Config, coreAPI ipc.CoreAPI, phr phraser.Phraser, mem
 	// ----- dialogue (multi-turn slot carry-over; 2-min follow-up window) -----
 	// Store-backed when the daemon passes a store, so a restart mid-conversation
 	// keeps the thread (Vikunja #363). Sessions past their TTL are dropped on
-	// load, never revived. Clarify's parked question stays in memory only, 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.
+	// load, never revived. Clarify's parked question stays in memory only.
 	var dialogueSessions *dialogue.SessionStore
 	if dataStore != nil {
 		dialogueSessions = dialogue.NewPersistentSessionStore(2*time.Minute, dataStore)
@@ -256,8 +233,8 @@ func wireVoice(cfg *config.Config, coreAPI ipc.CoreAPI, phr phraser.Phraser, mem
 
 	// ----- replier (LLM-backed when the engine is on, Stub floor otherwise) -----
 	replier := voice.Replier(voice.NewStubReplier())
-	if hot != nil {
-		replier = newLLMReplier(hot, contextBlockFn(cfg, time.Now))
+	if llmClient != nil {
+		replier = newLLMReplier(llmClient, contextBlockFn(cfg, time.Now))
 	}
 
 	// ----- the handler (the reactive path; closes over stt / tts / router / coreAPI / memory) -----
@@ -314,42 +291,7 @@ func wireVoice(cfg *config.Config, coreAPI ipc.CoreAPI, phr phraser.Phraser, mem
 // pickLLMRouter returns the LLM router when the operator asked for it and there
 // is a llama-server to talk to, and nil otherwise. nil is safe: the cascade then
 // routes with the classifier, so an unusable setting costs accuracy, not turns.
-// modelSeam builds the completion seam the hot paths use: routing and replies.
-//
-// With no `workstation` block it is the resident client and nothing probes
-// anything, which is today's deploy exactly. With one, it is an llm.Pair that
-// prefers the workstation and falls back to the resident model silently — the
-// silent half of the degradation rule (docs/offload.md), because the big model
-// is only better here and the 1.7B is today's shipping quality. He is never
-// told which of the two phrased his reply.
-//
-// A nil resident client means the phraser is not an LLM phraser. There is then
-// no floor, and a Pair with no floor is a configuration mistake rather than a
-// degraded mode, so the seam is nil and the cascade routes with the classifier.
-func modelSeam(cfg *config.Config, resident *llm.Client) (router.Completer, *llm.Pair) {
-	if resident == nil {
-		if cfg.Workstation != nil {
-			log.Printf("voice: a workstation is configured but there is no resident model to floor it with — ignoring the block")
-		}
-		return nil, nil
-	}
-	if cfg.Workstation == nil {
-		return resident, nil
-	}
-	ws := cfg.Workstation
-	pair := llm.NewPair(
-		llm.New(ws.URL, time.Duration(ws.Timeout)),
-		resident,
-		ws.Health,
-		time.Duration(ws.Probe),
-	)
-	pair.Start(context.Background())
-	log.Printf("voice: workstation model at %s, probed every %s, resident model as the floor",
-		ws.URL, time.Duration(ws.Probe))
-	return pair, pair
-}
-
-func pickLLMRouter(enabled bool, c router.Completer) *router.LLMRouter {
+func pickLLMRouter(enabled bool, c *llm.Client) *router.LLMRouter {
 	if !enabled {
 		return nil
 	}
@@ -383,11 +325,6 @@ func buildRouter(emb router.Embedder, acts router.ActMatcher, threshold float64,
 	// is an agenda question and must not.
 	grammars = append(grammars, router.AgendaQueryGrammars()...)
 	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{
 		Grammars:   grammars,
 		Classifier: cls,
@@ -401,34 +338,11 @@ func buildRouter(emb router.Embedder, acts router.ActMatcher, threshold float64,
 	})
 }
 
-// seedDir is the directory containing intent seed files, relative to the repo
-// root. Each file is named <intent>.txt and holds one training example per
-// line (blank lines and lines starting with # are ignored).
+// seedDir is the directory containing intent seed files. Each file is named
+// <intent>.txt and contains one training example per line (blank lines and
+// lines starting with # are ignored). Relative to the working directory.
 const seedDir = "models/seeds"
 
-// 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
 // doesn't return ErrNoIntents. Loads examples from seedDir — one file per
 // intent (act.txt, reminder.txt, fact.txt, note.txt, query.txt). When the
@@ -453,11 +367,11 @@ func seedClassifier(c *router.Classifier) {
 		}
 		total += n
 	}
-	log.Printf("voice: loaded %d seed examples from %s", total, seedPath())
+	log.Printf("voice: loaded %d seed examples from %s", total, seedDir)
 }
 
 func loadSeedFile(c *router.Classifier, intent router.Intent) (int, error) {
-	path := filepath.Join(seedPath(), string(intent)+".txt")
+	path := filepath.Join(seedDir, string(intent)+".txt")
 	f, err := os.Open(path)
 	if err != nil {
 		return 0, fmt.Errorf("open %s: %w", path, err)
@@ -505,36 +419,6 @@ func seedTools(api ipc.CoreAPI, tools []config.ToolConfig) {
 	log.Printf("voice: seeded %d act tools from config", n)
 }
 
-// repairFactVectors brings stored fact vectors in line with the facts they name
-// (#493), once per box, before the embedder marker is even looked at.
-//
-// Automatic and not a flag, unlike -reembed: only voice-tapped facts are in
-// this index, so the work is tens of embeddings rather than the thousands of
-// notes that made the backfill a deliberate act. And the box that needs it is
-// broken in a way nobody can see — recall answers with the wrong text and
-// nothing logs an error — so waiting for an operator to know to run it is how
-// the defect survived four restarts in the first place.
-func repairFactVectors(dataStore *store.Store, emb router.Embedder) {
-	if dataStore == nil {
-		return
-	}
-	res, err := dataStore.RepairFactVectors(context.Background(),
-		// EmbedPassage, the stored side, same as every other writer of these
-		// vectors.
-		func(ctx context.Context, text string) ([]float32, error) {
-			return router.EmbedPassage(ctx, emb, text)
-		})
-	if err != nil {
-		log.Printf("voice: fact vector repair failed, no marker written and nothing half-done — retried next start: %v", err)
-		return
-	}
-	if res.Skipped || res.Rewritten+res.Dropped == 0 {
-		return
-	}
-	log.Printf("voice: fact vector repair — %d re-embedded from the fact they name, %d dropped as voided or superseded, %d already right, took %s (#493)",
-		res.Rewritten, res.Dropped, res.Kept, res.Took.Round(time.Millisecond))
-}
-
 // reembedOnStart is the -reembed flag (set in run()). Opt-in on purpose: see
 // runReembed.
 var reembedOnStart bool

cmd/mavend/weatherq.go

@@ -1,13 +1,10 @@
 // Package main — weatherq.go holds the weather-query keyword helpers: does
-// this utterance ask about weather at all, and which place (if any) did he
-// name. Both are plain keyword matching, not NLU — extend this file rather
-// than voice.go for anything in that shape.
+// this utterance ask about weather at all, and which city (if any) did it
+// name. Both are plain substring/lookup matching, not NLU — extend this file
+// rather than voice.go for anything in that shape.
 package main
 
-import (
-	"regexp"
-	"strings"
-)
+import "strings"
 
 // isWeatherQuery returns true if the utterance is about weather.
 func isWeatherQuery(u string) bool {
@@ -22,49 +19,40 @@ func isWeatherQuery(u string) bool {
 		strings.Contains(lower, "temperature")
 }
 
-// weatherPlace — the place he named, after "в"/"во"/"in". One or two words,
-// letters and dashes only, so "в Нижнем Новгороде" and "in New York" both
-// come through whole and "в 5 утра" does not.
-var weatherPlace = regexp.MustCompile(`(?i)(?:^|\s)(?:в|во|in)\s+([\p{L}-]+(?:\s+[\p{L}-]+)?)`)
-
-// weatherNonPlaces — words that follow "в" in a weather question and are not
-// cities. "какая погода в доме" is the smart-home sensor, not Open-Meteo, and
-// "тепло в комнате" is the same question about the same room.
-var weatherNonPlaces = map[string]bool{
-	"доме": true, "квартире": true, "комнате": true, "спальне": true,
-	"гостиной": true, "кухне": true, "гараже": true, "офисе": true,
-	"выходные": true, "субботу": true, "воскресенье": true, "понедельник": true,
-	"вторник": true, "среду": true, "четверг": true, "пятницу": true,
-	"обед": true, "обеде": true, "утро": true, "утром": true, "вечер": true,
-	"вечером": true, "ночь": true, "ночью": true, "целом": true, "принципе": true,
+// weatherCities — the city names an utterance may name explicitly, as
+// lowercase substrings mapped to the provider's spelling. This is a
+// convenience for "какая погода в Лондоне", NOT a source of default truth:
+// nothing here is used unless he actually said it.
+var weatherCities = map[string]string{
+	"москв":    "Moscow",
+	"moscow":   "Moscow",
+	"питер":    "Saint Petersburg",
+	"spb":      "Saint Petersburg",
+	"петербур": "Saint Petersburg",
+	"лондон":   "London",
+	"london":   "London",
+	"париж":    "Paris",
+	"paris":    "Paris",
+	"берлин":   "Berlin",
+	"berlin":   "Berlin",
+	"нью-йорк": "New York",
+	"new york": "New York",
 }
 
-// extractWeatherLocation returns the place he named, or the configured default
+// extractWeatherLocation returns the city he named, or the configured default
 // when he named none. It returns "" when he named none AND no default is
 // configured — the caller must then say it does not know.
 //
-// It used to be a hand-written table of six cities in two spellings each
-// (Vikunja #421). Anything outside it — Kazan, Tbilisi — was dropped silently
-// and answered for the default location, which reads as a correct answer about
-// 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.
+// It used to return "Moscow" in that case. That is a made-up answer presented
+// as fact: reading out Moscow's temperature to someone who is not in Moscow is
+// wrong in exactly the way maven must never be wrong. voice.weather
+// .default_location is the only source of an unstated location.
 func extractWeatherLocation(u, defaultLoc string) string {
-	m := weatherPlace.FindStringSubmatch(u)
-	if m == nil {
-		return defaultLoc
+	lower := strings.ToLower(u)
+	for substr, name := range weatherCities {
+		if strings.Contains(lower, substr) {
+			return name
+		}
 	}
-	place := strings.TrimSpace(m[1])
-	first := strings.ToLower(strings.Fields(place)[0])
-	if weatherNonPlaces[first] {
-		return defaultLoc
-	}
-	return place
+	return defaultLoc
 }

cmd/mavend/weatherq_test.go

@@ -1,33 +0,0 @@
-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)
-		}
-	}
-}

cmd/mavend/worldmodel.go

@@ -1,60 +0,0 @@
-package main
-
-import (
-	"context"
-	"errors"
-	"log"
-
-	"github.com/kami/maven/internal/phraser"
-)
-
-// worldPhraser — the naming half of the degradation rule (docs/offload.md), as
-// the query sources see it. Only *phraser.LLMPhraser implements it, so the
-// Stub and every test double stay exactly as they are.
-type worldPhraser interface {
-	PhraseWorld(ctx context.Context, utterance string, sources []string) (string, error)
-}
-
-// worldGap — what he hears when the question is about the world, the workstation
-// model is the one configured to answer it, and that machine is not answering.
-//
-// It says the true thing. The resident 1.7B is not a worse answer here, it is an
-// invented one: "Война и мир" came back with Левитан as its author, and a
-// question about his meeting came back as a swimming competition in Nottingham.
-// Naming the gap is the rule CLAUDE.md already applies to a sibling service
-// being down.
-const worldGap = "сейчас не могу ответить — большая модель недоступна, а придумывать не хочу."
-
-// phraseWorld asks the world model, or reports the gap.
-//
-// The three outcomes come straight from LLMPhraser.PhraseWorld: no workstation
-// configured means the resident model answers as it always has, a workstation
-// that is up answers, and a workstation that is down returns
-// phraser.ErrNoWorldModel. A phraser that has no world seam at all — the Stub,
-// and the doubles in the tests — is the first of those three.
-func (h *reactiveHandler) phraseWorld(ctx context.Context, utterance string, sources []string) (string, error) {
-	if h.phraser == nil {
-		return "", phraser.ErrNoWorldModel
-	}
-	if w, ok := h.phraser.(worldPhraser); ok {
-		return w.PhraseWorld(ctx, utterance, sources)
-	}
-	return h.phraser.PhraseQuery(ctx, utterance, sources)
-}
-
-// phraseSource asks the world model to answer from a passage someone already
-// fetched — a live search result, a ZIM article, a page he named. It returns ""
-// rather than the gap phrase, because these callers hold something better than a
-// gap: the passage itself, which their own floor reads back to him. Nothing is
-// invented either way, and a real quote beats "не могу сейчас".
-func (h *reactiveHandler) phraseSource(ctx context.Context, name, utterance string, sources []string) string {
-	reply, err := h.phraseWorld(ctx, utterance, sources)
-	switch {
-	case errors.Is(err, phraser.ErrNoWorldModel):
-		log.Printf("voice: %s: no world model, reading the source back instead", name)
-		return ""
-	case err != nil:
-		log.Printf("voice: %s: phrase: %v", name, err)
-	}
-	return reply
-}

cmd/mavend/worldmodel_test.go

@@ -1,85 +0,0 @@
-package main
-
-import (
-	"context"
-	"strings"
-	"testing"
-
-	"github.com/kami/maven/internal/phraser"
-	"github.com/kami/maven/internal/router"
-)
-
-// gapPhraser — a phraser whose world model is configured and asleep, which is
-// the state the naming half exists for.
-type gapPhraser struct {
-	*phraser.Stub
-	worldCalls int
-}
-
-func (g *gapPhraser) PhraseWorld(context.Context, string, []string) (string, error) {
-	g.worldCalls++
-	return "", phraser.ErrNoWorldModel
-}
-
-func worldTurn(utterance string) *queryTurn {
-	return &queryTurn{dec: router.Decision{Intent: router.IntentQuery, Utterance: utterance}}
-}
-
-// A world question with the workstation asleep says so. The resident model is
-// not asked, because what it produces here is an invention with no signal that
-// it is one.
-func TestQueryGeneralNamesTheGap(t *testing.T) {
-	g := &gapPhraser{Stub: phraser.NewStub()}
-	h := &reactiveHandler{phraser: g}
-	reply, ok := h.queryGeneral(context.Background(), worldTurn("почему небо голубое"))
-	if !ok {
-		t.Fatal("queryGeneral passed on the last source in the chain")
-	}
-	if reply != worldGap {
-		t.Fatalf("reply = %q, want the named gap", reply)
-	}
-	if g.worldCalls != 1 {
-		t.Fatalf("PhraseWorld called %d times, want 1", g.worldCalls)
-	}
-}
-
-// A phraser with no world seam at all — the Stub, and every box with no
-// `workstation` block — answers exactly as it did before this seam existed.
-func TestQueryGeneralWithoutAWorldModelIsUnchanged(t *testing.T) {
-	h := &reactiveHandler{phraser: phraser.NewStub()}
-	reply, ok := h.queryGeneral(context.Background(), worldTurn("почему небо голубое"))
-	if !ok {
-		t.Fatal("queryGeneral passed on the last source in the chain")
-	}
-	if reply != "не знаю." {
-		t.Fatalf("reply = %q, want the Stub's answer", reply)
-	}
-}
-
-// The gap is spoken aloud by a Russian voice, so it is Russian, feminine and
-// informal. "не хочу" and "не могу" are her own verbs; there is no "вы" and no
-// English in it.
-func TestWorldGapIsInPersona(t *testing.T) {
-	for _, bad := range []string{"вы", "ваш", "рад ", "дорогой", "милый"} {
-		if strings.Contains(worldGap, bad) {
-			t.Errorf("the gap phrase contains %q: %s", bad, worldGap)
-		}
-	}
-	if strings.ContainsAny(worldGap, "abcdefghijklmnopqrstuvwxyz") {
-		t.Errorf("the gap phrase has Latin letters in it: %s", worldGap)
-	}
-}
-
-// The sources that hold a passage read it back rather than name a gap. He gets a
-// real quote instead of "не могу сейчас", and nothing is invented either way.
-func TestASourceWithAPassageReadsItBackInsteadOfNamingTheGap(t *testing.T) {
-	g := &gapPhraser{Stub: phraser.NewStub()}
-	h := &reactiveHandler{phraser: g}
-	if got := h.phraseSource(context.Background(), "search", "почему небо голубое",
-		[]string{"Рэлеевское рассеяние."}); got != "" {
-		t.Fatalf("phraseSource = %q, want \"\" so the caller's own floor reads the passage back", got)
-	}
-	if g.worldCalls != 1 {
-		t.Fatalf("PhraseWorld called %d times, want 1", g.worldCalls)
-	}
-}

cmd/mavgpud/gpu.go

@@ -1,117 +0,0 @@
-package main
-
-import (
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-)
-
-// The card is an AMD 7900 GRE with 16GB, driven by amdgpu and ROCm. Everything
-// here reads sysfs and forks nothing: rocm-smi is not even installed on the
-// workstation, and a poll that costs a subprocess every second is a poll that
-// gets tuned down until it is useless.
-
-// gpuProc — one process holding the compute engine.
-type gpuProc struct {
-	PID  int
-	Comm string
-	VRAM int64 // bytes, as the kernel accounts them to this process
-}
-
-// probe reads the two sysfs trees the supervisor decides from.
-//
-// kfdRoot is /sys/class/kfd/kfd/proc, one directory per ROCm process. The
-// directory appears when the process initialises HIP, which is well before it
-// allocates anything large. That is the whole reason this works: the job that
-// is about to want the card announces itself while it is still starting up,
-// so we see the contender rather than only the winner of an allocation race.
-//
-// drmDev is /sys/class/drm/cardN/device, which reports total and used VRAM for
-// the card as a whole.
-type probe struct {
-	kfdRoot string
-	drmDev  string
-}
-
-// foreign lists every ROCm process that is not ours. selfPID is the supervisor's
-// llama-server child, or 0 when it is not running.
-//
-// An unreadable kfd tree returns no processes and no error. That is deliberate
-// and it is the safe direction only because startVRAM also has to agree before
-// anything launches: a supervisor that cannot see the KFD never sees free VRAM
-// either, because the CPT run holding the card shows up in the drm totals.
-func (p probe) foreign(selfPID int) []gpuProc {
-	entries, err := os.ReadDir(p.kfdRoot)
-	if err != nil {
-		return nil
-	}
-	var out []gpuProc
-	for _, e := range entries {
-		pid, err := strconv.Atoi(e.Name())
-		if err != nil || pid == selfPID {
-			continue
-		}
-		out = append(out, gpuProc{
-			PID:  pid,
-			Comm: readComm(pid),
-			VRAM: p.procVRAM(e.Name()),
-		})
-	}
-	return out
-}
-
-// procVRAM sums the per-node vram_* files under one process directory. The
-// suffix is the KFD topology node id (vram_35881 on this card), so it is
-// globbed rather than named, and a machine with two cards sums both.
-func (p probe) procVRAM(pid string) int64 {
-	matches, err := filepath.Glob(filepath.Join(p.kfdRoot, pid, "vram_*"))
-	if err != nil {
-		return 0
-	}
-	var total int64
-	for _, m := range matches {
-		total += readInt(m)
-	}
-	return total
-}
-
-// freeVRAM reports the bytes the card has left. Used only to decide whether to
-// start: a shortfall here means llama-server would refuse to load anyway. It is
-// never used to decide to stop, because by the time free VRAM has dropped the
-// other job has already failed its allocation, which is exactly the outcome
-// yielding exists to prevent.
-func (p probe) freeVRAM() int64 {
-	total := readInt(filepath.Join(p.drmDev, "mem_info_vram_total"))
-	used := readInt(filepath.Join(p.drmDev, "mem_info_vram_used"))
-	if total <= 0 {
-		return 0
-	}
-	if free := total - used; free > 0 {
-		return free
-	}
-	return 0
-}
-
-func readInt(path string) int64 {
-	b, err := os.ReadFile(path)
-	if err != nil {
-		return 0
-	}
-	n, err := strconv.ParseInt(strings.TrimSpace(string(b)), 10, 64)
-	if err != nil {
-		return 0
-	}
-	return n
-}
-
-// readComm names the contender for the log. The log is the instrument for the
-// open question in Vikunja #488: whether a process can want this card without
-// ever registering on the KFD, which a Vulkan or video-decode job would.
-func readComm(pid int) string {
-	b, err := os.ReadFile(filepath.Join("/proc", strconv.Itoa(pid), "comm"))
-	if err != nil {
-		return "?"
-	}
-	return strings.TrimSpace(string(b))
-}

cmd/mavgpud/gpu_test.go

@@ -1,103 +0,0 @@
-package main
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strconv"
-	"testing"
-)
-
-// fakeKFD builds the sysfs shape the workstation actually has: one directory
-// per ROCm process, each holding a vram_<node> file. Sampled from the live box
-// on 02-08-2026, where the CPT run appeared as proc/478104/vram_35881.
-func fakeKFD(t *testing.T, vramByPID map[int]int64) string {
-	t.Helper()
-	root := t.TempDir()
-	for pid, vram := range vramByPID {
-		dir := filepath.Join(root, strconv.Itoa(pid))
-		if err := os.MkdirAll(dir, 0o755); err != nil {
-			t.Fatal(err)
-		}
-		f := filepath.Join(dir, "vram_35881")
-		if err := os.WriteFile(f, []byte(strconv.FormatInt(vram, 10)+"\n"), 0o644); err != nil {
-			t.Fatal(err)
-		}
-	}
-	return root
-}
-
-func TestForeignExcludesOurChild(t *testing.T) {
-	root := fakeKFD(t, map[int]int64{478104: 12791693312, 999: 4096})
-	p := probe{kfdRoot: root}
-
-	all := p.foreign(0)
-	if len(all) != 2 {
-		t.Fatalf("with no child running, both processes are foreign, got %d", len(all))
-	}
-
-	ours := p.foreign(999)
-	if len(ours) != 1 || ours[0].PID != 478104 {
-		t.Fatalf("our own llama-server must not count as a contender, got %+v", ours)
-	}
-	if ours[0].VRAM != 12791693312 {
-		t.Errorf("per-process VRAM = %d, want the value from vram_35881", ours[0].VRAM)
-	}
-}
-
-// An empty KFD tree is the state that permits a start, so it must read as empty
-// rather than as an error the caller has to interpret.
-func TestForeignEmptyAndMissing(t *testing.T) {
-	if got := (probe{kfdRoot: t.TempDir()}).foreign(0); len(got) != 0 {
-		t.Errorf("empty kfd tree: got %d processes, want 0", len(got))
-	}
-	if got := (probe{kfdRoot: "/nonexistent"}).foreign(0); got != nil {
-		t.Errorf("missing kfd tree: got %+v, want nil", got)
-	}
-}
-
-func TestFreeVRAM(t *testing.T) {
-	dev := t.TempDir()
-	write := func(name, v string) {
-		if err := os.WriteFile(filepath.Join(dev, name), []byte(v), 0o644); err != nil {
-			t.Fatal(err)
-		}
-	}
-	// The live numbers from the workstation while the CPT run held the card.
-	write("mem_info_vram_total", "17163091968\n")
-	write("mem_info_vram_used", "13396389888\n")
-	p := probe{drmDev: dev}
-	if got, want := p.freeVRAM(), int64(3766702080); got != want {
-		t.Errorf("freeVRAM = %d, want %d", got, want)
-	}
-	if got := (probe{drmDev: "/nonexistent"}).freeVRAM(); got != 0 {
-		t.Errorf("unreadable card reports %d free, want 0 so nothing starts", got)
-	}
-}
-
-// With no model loaded the supervisor must still answer, and it must answer 503
-// rather than hanging or proxying into a closed port. Maven reads this endpoint
-// on a timer forever, including while the workstation is busy.
-func TestHealthAndProxyRefuseWhenNotReady(t *testing.T) {
-	s := &supervisor{run: newRunner("/bin/true", nil, "")}
-	h := s.handler(mustURL(t, "http://127.0.0.1:1"))
-
-	for _, path := range []string{"/health", "/v1/chat/completions"} {
-		w := httptest.NewRecorder()
-		h.ServeHTTP(w, httptest.NewRequest(http.MethodGet, path, nil))
-		if w.Code != http.StatusServiceUnavailable {
-			t.Errorf("%s with no model: got %d, want 503", path, w.Code)
-		}
-	}
-}
-
-func mustURL(t *testing.T, s string) *url.URL {
-	t.Helper()
-	u, err := url.Parse(s)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return u
-}

cmd/mavgpud/main.go

@@ -1,247 +0,0 @@
-// mavgpud — the workstation's GPU supervisor.
-//
-// It runs on the workstation (an AMD 7900 GRE, 16GB), not on homesrv, and it is
-// deployed separately from the Maven daemons. Maven does not participate in any
-// of this and never asks for a start: it reads /health through internal/llm.Pair
-// and either gets the big model or falls back to the resident 1.7B.
-//
-// The rule, from Vikunja #488: keep llama-server loaded whenever the card is
-// free, unload it when it has been idle too long or when another process needs
-// the card. Not on demand, because a 7-14B takes tens of seconds to load and a
-// world question would be answered by a gap every time the card had been quiet.
-// Not always on, because that holds 16GB against the owner's own jobs.
-package main
-
-import (
-	"context"
-	"encoding/json"
-	"flag"
-	"log"
-	"net/http"
-	"net/http/httputil"
-	"net/url"
-	"os"
-	"os/signal"
-	"sync/atomic"
-	"syscall"
-	"time"
-)
-
-type config struct {
-	Listen    string `json:"listen"`     // what Maven talks to
-	LlamaAddr string `json:"llama_addr"` // where llama-server binds
-	LlamaBin  string `json:"llama_bin"`
-	// LlamaArgs must include the flags that bind LlamaAddr. They are passed
-	// through untouched so the model, context size and layer count stay the
-	// owner's business and not this daemon's schema.
-	LlamaArgs []string `json:"llama_args"`
-
-	KFDRoot   string `json:"kfd_root"`
-	DRMDevice string `json:"drm_device"`
-
-	Poll        duration `json:"poll"`
-	IdleTimeout duration `json:"idle_timeout"`
-	StopGrace   duration `json:"stop_grace"`
-	MinFreeVRAM int64    `json:"min_free_vram_bytes"`
-	// EvictAfter and StartAfter are counted in polls, not seconds. Both exist
-	// to damp flapping: a one-tick blip from a short-lived rocm process must
-	// not evict the model, and a card that has just been released must not be
-	// grabbed before the previous job has finished unmapping.
-	EvictAfter int `json:"evict_after_polls"`
-	StartAfter int `json:"start_after_polls"`
-}
-
-func defaults() config {
-	return config{
-		Listen:      ":8080",
-		LlamaAddr:   "127.0.0.1:8081",
-		KFDRoot:     "/sys/class/kfd/kfd/proc",
-		DRMDevice:   "/sys/class/drm/card1/device",
-		Poll:        duration(time.Second),
-		IdleTimeout: duration(15 * time.Minute),
-		StopGrace:   duration(20 * time.Second),
-		MinFreeVRAM: 15 << 30,
-		EvictAfter:  2,
-		StartAfter:  5,
-	}
-}
-
-// duration lets the config file say "15m" instead of counting nanoseconds.
-type duration time.Duration
-
-func (d *duration) UnmarshalJSON(b []byte) error {
-	var s string
-	if err := json.Unmarshal(b, &s); err != nil {
-		return err
-	}
-	v, err := time.ParseDuration(s)
-	if err != nil {
-		return err
-	}
-	*d = duration(v)
-	return nil
-}
-
-func main() {
-	path := flag.String("config", "/etc/mavgpud.json", "config file")
-	flag.Parse()
-
-	cfg := defaults()
-	b, err := os.ReadFile(*path)
-	if err != nil {
-		log.Fatalf("mavgpud: read config: %v", err)
-	}
-	if err := json.Unmarshal(b, &cfg); err != nil {
-		log.Fatalf("mavgpud: parse config: %v", err)
-	}
-	if cfg.LlamaBin == "" {
-		log.Fatal("mavgpud: llama_bin is required")
-	}
-
-	base := "http://" + cfg.LlamaAddr
-	run := newRunner(cfg.LlamaBin, cfg.LlamaArgs, base+"/health")
-	sup := &supervisor{
-		cfg:   cfg,
-		probe: probe{kfdRoot: cfg.KFDRoot, drmDev: cfg.DRMDevice},
-		run:   run,
-	}
-	sup.touch()
-
-	ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
-	defer cancel()
-
-	target, err := url.Parse(base)
-	if err != nil {
-		log.Fatalf("mavgpud: llama_addr: %v", err)
-	}
-	srv := &http.Server{Addr: cfg.Listen, Handler: sup.handler(target)}
-	go func() {
-		log.Printf("mavgpud: listening on %s, model %s", cfg.Listen, cfg.LlamaBin)
-		if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
-			log.Fatalf("mavgpud: listen: %v", err)
-		}
-	}()
-
-	sup.loop(ctx)
-
-	// The card must come back before we do. A supervisor that exits leaving
-	// llama-server holding 14GB is worse than one that never ran.
-	shut, done := context.WithTimeout(context.Background(), 5*time.Second)
-	defer done()
-	_ = srv.Shutdown(shut)
-	run.stop(time.Duration(cfg.StopGrace))
-}
-
-type supervisor struct {
-	cfg   config
-	probe probe
-	run   *runner
-
-	lastReq atomic.Int64 // unix nanos of the last request Maven sent
-
-	foreignStreak int
-	clearStreak   int
-}
-
-func (s *supervisor) touch() { s.lastReq.Store(time.Now().UnixNano()) }
-
-func (s *supervisor) idle() time.Duration {
-	return time.Since(time.Unix(0, s.lastReq.Load()))
-}
-
-// handler serves the two things the workstation exposes.
-//
-// /health is answered locally and always, with no GPU cost and no round trip,
-// because it is the only thing Maven reads and Maven reads it on a timer
-// forever. Everything else is llama-server's API, reverse-proxied. Proxying
-// rather than pointing Maven straight at llama-server is what makes the idle
-// window measurable: the supervisor cannot otherwise know when the model was
-// last used.
-func (s *supervisor) handler(target *url.URL) http.Handler {
-	proxy := httputil.NewSingleHostReverseProxy(target)
-	mux := http.NewServeMux()
-	mux.HandleFunc("/health", func(w http.ResponseWriter, r *http.Request) {
-		if !s.run.isReady() {
-			http.Error(w, "model not loaded", http.StatusServiceUnavailable)
-			return
-		}
-		w.Header().Set("Content-Type", "application/json")
-		_, _ = w.Write([]byte(`{"status":"ok"}`))
-	})
-	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		if !s.run.isReady() {
-			http.Error(w, "model not loaded", http.StatusServiceUnavailable)
-			return
-		}
-		s.touch()
-		proxy.ServeHTTP(w, r)
-	})
-	return mux
-}
-
-func (s *supervisor) loop(ctx context.Context) {
-	t := time.NewTicker(time.Duration(s.cfg.Poll))
-	defer t.Stop()
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		case <-t.C:
-			s.tick(ctx)
-		}
-	}
-}
-
-// tick is the whole decision. Yielding is checked before starting, and presence
-// on the KFD is what triggers it — not a VRAM threshold. A ROCm process
-// registers under /sys/class/kfd/kfd/proc when it initialises HIP, before it
-// allocates, so we see a contender during its startup rather than after it has
-// already failed to get the memory it wanted.
-func (s *supervisor) tick(ctx context.Context) {
-	others := s.probe.foreign(s.run.pid())
-	if len(others) > 0 {
-		s.foreignStreak++
-		s.clearStreak = 0
-	} else {
-		s.foreignStreak = 0
-		s.clearStreak++
-	}
-
-	if s.run.running() {
-		s.run.refreshReady(ctx)
-		switch {
-		case s.foreignStreak >= s.cfg.EvictAfter:
-			log.Printf("mavgpud: yielding the card to %s", describe(others))
-			s.run.stop(time.Duration(s.cfg.StopGrace))
-		case s.idle() > time.Duration(s.cfg.IdleTimeout):
-			log.Printf("mavgpud: idle for %s, unloading", s.idle().Round(time.Second))
-			s.run.stop(time.Duration(s.cfg.StopGrace))
-		}
-		return
-	}
-
-	if s.clearStreak < s.cfg.StartAfter {
-		return
-	}
-	if free := s.probe.freeVRAM(); free < s.cfg.MinFreeVRAM {
-		return
-	}
-	s.touch() // the idle clock starts at load, not at the last request before it
-	if err := s.run.start(); err != nil {
-		log.Printf("mavgpud: start llama-server: %v", err)
-	}
-}
-
-// describe names the contenders in the log. This log is the instrument for the
-// open question in #488: whether polling the KFD misses a job that wants the
-// card without registering there.
-func describe(procs []gpuProc) string {
-	out := ""
-	for i, p := range procs {
-		if i > 0 {
-			out += ", "
-		}
-		out += p.Comm
-	}
-	return out
-}

cmd/mavgpud/runner.go

@@ -1,146 +0,0 @@
-package main
-
-import (
-	"context"
-	"log"
-	"net/http"
-	"os/exec"
-	"sync"
-	"syscall"
-	"time"
-)
-
-// runner owns one llama-server process. Owning it is the point of the daemon:
-// the workstation cannot keep a 7-14B resident, because that holds 16GB against
-// the owner's CPT runs, Correx and the manga-recap pipeline. So the thing that
-// stays up is this, which costs no VRAM, and the model comes and goes under it.
-type runner struct {
-	bin  string
-	args []string
-	// ready is llama-server's own /health, which answers "is a model loaded".
-	// Loading a 7-14B takes tens of seconds, so started is not ready.
-	readyURL string
-
-	mu    sync.Mutex
-	cmd   *exec.Cmd
-	ready bool
-	// yielding — stop() has sent the signal and the exit that follows is ours.
-	// llama-server aborts on SIGTERM (its static teardown throws, upstream
-	// ggml-org/llama.cpp), so a routine yield and a real crash produce the same
-	// "signal: aborted" and used to log identically (Vikunja #491).
-	yielding bool
-	http     *http.Client
-}
-
-func newRunner(bin string, args []string, readyURL string) *runner {
-	return &runner{
-		bin: bin, args: args, readyURL: readyURL,
-		http: &http.Client{Timeout: 2 * time.Second},
-	}
-}
-
-// pid is the child's, or 0. The GPU probe needs it to tell our own model apart
-// from a contender.
-func (r *runner) pid() int {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if r.cmd == nil || r.cmd.Process == nil {
-		return 0
-	}
-	return r.cmd.Process.Pid
-}
-
-func (r *runner) running() bool { return r.pid() != 0 }
-
-// isReady reports the cached readiness. The supervisor loop refreshes it; the
-// health handler only reads, so answering /health never costs a round trip.
-func (r *runner) isReady() bool {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	return r.ready
-}
-
-// start launches llama-server. It returns as soon as the process exists, not
-// when the model is loaded.
-func (r *runner) start() error {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if r.cmd != nil {
-		return nil
-	}
-	cmd := exec.Command(r.bin, r.args...)
-	// Own process group, so stop kills anything llama-server spawned rather
-	// than leaving it holding VRAM after we have declared the card yielded.
-	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
-	if err := cmd.Start(); err != nil {
-		return err
-	}
-	r.cmd, r.ready, r.yielding = cmd, false, false
-	log.Printf("mavgpud: started llama-server pid=%d", cmd.Process.Pid)
-	go func() {
-		err := cmd.Wait()
-		r.mu.Lock()
-		yielded := r.yielding
-		r.cmd, r.ready, r.yielding = nil, false, false
-		r.mu.Unlock()
-		if yielded {
-			log.Printf("mavgpud: llama-server stopped, card yielded (%v)", err)
-			return
-		}
-		log.Printf("mavgpud: llama-server exited: %v", err)
-	}()
-	return nil
-}
-
-// stop ends llama-server and waits for the VRAM to come back. SIGTERM first so
-// it unmaps cleanly, SIGKILL after the grace window. Returning before the
-// process is gone would let the supervisor report a free card while 14GB is
-// still mapped, which is the one lie that would make yielding useless.
-func (r *runner) stop(grace time.Duration) {
-	r.mu.Lock()
-	cmd := r.cmd
-	r.ready = false
-	if cmd != nil && cmd.Process != nil {
-		// The exit that follows is ours, not a crash.
-		r.yielding = true
-	}
-	r.mu.Unlock()
-	if cmd == nil || cmd.Process == nil {
-		return
-	}
-	pgid := -cmd.Process.Pid
-	_ = syscall.Kill(pgid, syscall.SIGTERM)
-	deadline := time.Now().Add(grace)
-	for time.Now().Before(deadline) {
-		if !r.running() {
-			return
-		}
-		time.Sleep(100 * time.Millisecond)
-	}
-	log.Printf("mavgpud: llama-server did not exit in %s, killing", grace)
-	_ = syscall.Kill(pgid, syscall.SIGKILL)
-}
-
-// refreshReady asks llama-server whether the model is loaded. Called once per
-// supervisor tick, never per request.
-func (r *runner) refreshReady(ctx context.Context) {
-	if !r.running() {
-		return
-	}
-	ok := false
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, r.readyURL, nil)
-	if err == nil {
-		resp, err := r.http.Do(req)
-		if err == nil {
-			ok = resp.StatusCode == http.StatusOK
-			resp.Body.Close()
-		}
-	}
-	r.mu.Lock()
-	was := r.ready
-	r.ready = ok
-	r.mu.Unlock()
-	if ok && !was {
-		log.Printf("mavgpud: model ready")
-	}
-}

cmd/mavgpud/runner_test.go

@@ -1,59 +0,0 @@
-package main
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-)
-
-// fakeServer writes an executable standing in for llama-server: it ignores
-// SIGTERM the way the real one effectively does — by dying messily rather than
-// cleanly — and reports a non-zero status.
-func fakeServer(t *testing.T, body string) string {
-	t.Helper()
-	path := filepath.Join(t.TempDir(), "fake-llama-server")
-	if err := os.WriteFile(path, []byte("#!/bin/sh\n"+body+"\n"), 0o755); err != nil {
-		t.Fatal(err)
-	}
-	return path
-}
-
-// A deliberate stop is a yield, and the log has to say so.
-//
-// llama-server aborts inside its own static teardown on SIGTERM, so the exit
-// status of a routine yield is identical to that of a real crash. Reading the
-// mavgpud log, the two were indistinguishable (Vikunja #491).
-func TestStopMarksTheExitAsAYield(t *testing.T) {
-	r := newRunner(fakeServer(t, "while : ; do sleep 1 ; done"), nil, "")
-	if err := r.start(); err != nil {
-		t.Fatalf("start: %v", err)
-	}
-	r.mu.Lock()
-	if r.yielding {
-		t.Error("a freshly started server is already marked as yielding")
-	}
-	r.mu.Unlock()
-
-	r.stop(2 * time.Second)
-	deadline := time.Now().Add(2 * time.Second)
-	for time.Now().Before(deadline) {
-		if !r.running() {
-			return
-		}
-		time.Sleep(10 * time.Millisecond)
-	}
-	t.Fatal("the child outlived stop")
-}
-
-// Stopping when nothing is running must not arm the flag for the next child.
-// The next exit after that would be a real crash logged as a yield.
-func TestStopWithNoChildDoesNotArmTheFlag(t *testing.T) {
-	r := newRunner("/nonexistent", nil, "")
-	r.stop(10 * time.Millisecond)
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if r.yielding {
-		t.Error("stop armed the yield flag with no child running")
-	}
-}

cmd/mavpoll/main.go

@@ -140,10 +140,6 @@ type poller struct {
 	wgIface    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
 	// capability, off by default like weather and telegram.
 	zen      *zenmoney.Client
@@ -337,96 +333,50 @@ func maxSeverity(a netdataAlarms) string {
 	return sev
 }
 
-// ---- kuma: monitor_status gauge → one fact per monitor ---------------------
+// ---- kuma: monitor_status gauge → aggregate service_down -------------------
 
 // Kuma exposes Prometheus text: `monitor_status{...,monitor_name="X"} V` where
-// V is 1=up 0=down 2=pending 3=maintenance. We write one fact per monitor,
-// keyed `service_down:<monitor name>`, because the nudge has to say WHICH
-// service is down. The aggregate this used to write could not, which is why
-// the rule shipped disabled.
-var (
-	kumaLine = regexp.MustCompile(`^monitor_status\{([^}]*)\}\s+([0-9.eE+-]+)`)
-	kumaName = regexp.MustCompile(`monitor_name="([^"]*)"`)
-)
+// V is 1=up 0=down 2=pending 3=maintenance. We reduce to one aggregate the
+// existing ServiceDownRule consumes: "down" if ANY monitor reads 0, else "up".
+// Per-service granularity is a later add (a fact per monitor) — the MVP nudge
+// only needs "something is down".
+var kumaLine = regexp.MustCompile(`^monitor_status\{([^}]*)\}\s+([0-9.eE+-]+)`)
 
 func (p *poller) pollKuma(ctx context.Context, now time.Time) error {
 	body, err := p.get(ctx, p.kumaURL, p.kumaKey)
 	if err != nil {
 		return err
 	}
-	states := kumaMonitors(body)
-	if len(states) == 0 {
+	down, seen := kumaAnyDown(body)
+	if !seen {
 		return fmt.Errorf("no monitor_status metrics (auth/endpoint wrong?)")
 	}
-	var firstErr error
-	for name, val := range states {
-		if err := p.writeIfChanged(ctx, kumaFactKey(name), kumaSource, val, now); err != nil && firstErr == nil {
-			firstErr = err // one bad monitor must not blind the rest
-		}
+	val := "up"
+	if down {
+		val = "down"
 	}
-	// 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
+	return p.writeIfChanged(ctx, "service_down", "poll:uptimekuma", val, now)
 }
 
-// kumaSource — the provenance the loop rule requires. Written here, checked in
-// loop.ServiceDownRule; a poller under any other source cannot fire it.
-const kumaSource = "poll:uptimekuma"
-
-// 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)
+// kumaAnyDown parses kuma's Prometheus text: down=true if any monitor reads 0
+// (pending=2/maintenance=3 are not "down"). seen=false ⇒ no monitor_status
+// lines matched at all (wrong endpoint or auth rejected before the body).
+func kumaAnyDown(body []byte) (down, seen bool) {
 	for _, line := range strings.Split(string(body), "\n") {
 		m := kumaLine.FindStringSubmatch(strings.TrimSpace(line))
 		if m == nil {
 			continue
 		}
-		nm := kumaName.FindStringSubmatch(m[1])
-		if nm == nil || strings.TrimSpace(nm[1]) == "" {
-			continue
-		}
+		seen = true
 		v, err := strconv.ParseFloat(m[2], 64)
 		if err != nil {
 			continue
 		}
-		out[strings.TrimSpace(nm[1])] = kumaState(v)
-	}
-	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"
+		if v == 0 {
+			down = true
+		}
 	}
+	return down, seen
 }
 
 // ---- helpers ---------------------------------------------------------------

cmd/mavpoll/main_test.go

@@ -35,46 +35,22 @@ func TestMaxSeverity(t *testing.T) {
 	}
 }
 
-func TestKumaMonitorsNamesEveryOne(t *testing.T) {
+func TestKumaAnyDown(t *testing.T) {
 	cases := []struct {
-		name string
-		body string
-		want map[string]string
+		body       string
+		down, seen bool
 	}{
-		{"empty body", "", map[string]string{}},
-		{"help line only", `# HELP monitor_status ...`, map[string]string{}},
-		{
-			"one up one down",
-			`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{}},
+		{"", false, false},
+		{`monitor_status{monitor_name="web"} 1`, false, true},
+		{`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
+		{`# HELP monitor_status ...`, false, false},
 	}
 	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			got := kumaMonitors([]byte(c.body))
-			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)
+		down, seen := kumaAnyDown([]byte(c.body))
+		if down != c.down || seen != c.seen {
+			t.Errorf("kumaAnyDown(%q) = (%v,%v), want (%v,%v)", c.body, down, seen, c.down, c.seen)
+		}
 	}
 }
 

cmd/mavweb/ambient_test.go

@@ -139,10 +139,7 @@ func TestHandleAmbientIgnoresNonMeetings(t *testing.T) {
 }
 
 func TestHandleAmbientAuth(t *testing.T) {
-	// "завтра" 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"}`
+	body := `{"title":"Планёрка 10:00","posted_at":"2026-08-03T09:40:00Z"}`
 
 	newReq := func(hdr, val string) *http.Request {
 		r := httptest.NewRequest(http.MethodPost, "/api/ambient", strings.NewReader(body))
@@ -248,31 +245,3 @@ 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")
-	}
-}

cmd/mavweb/chat.html

@@ -1,24 +0,0 @@
-{{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"}}

cmd/mavweb/handlers_test.go

@@ -54,9 +54,7 @@ type fakeCore struct {
 	revertErr   error
 
 	// for handleNotifications tests
-	nudgesErr     error
-	attempts      []ipc.DeliveryAttempt
-	attemptStatus string
+	nudgesErr error
 
 	// for handleHistory tests
 	historyFacts []ipc.Fact
@@ -79,7 +77,7 @@ func (f *fakeCore) MCPServers(context.Context) ([]ipc.MCPServerStatus, error) {
 	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
 	if f.chatErr != nil {
 		return "", f.chatErr
@@ -1253,35 +1251,3 @@ func TestHandleWS_AssertedSession_PassesGate(t *testing.T) {
 		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)
-		}
-	}
-}

cmd/mavweb/main.go

@@ -75,23 +75,6 @@ var morningHTML string
 //go:embed events.html
 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 ──
 //
 // Two template pieces that wrap every page:
@@ -152,40 +135,74 @@ var sidebarSections = []struct {
 	},
 }
 
-// pageIcon returns the ethos-icons.svg symbol id for the given page. The
-// sidebar template wraps it in the <use> reference.
+func sidebarActive(url, key string, activeKey string) string {
+	if key == activeKey {
+		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 {
 	switch key {
 	case "dash":
-		return "i-grid"
+		return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-grid"/></svg>`
 	case "history":
-		return "i-clock"
+		return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-clock"/></svg>`
 	case "trace":
-		return "i-wave"
+		return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-wave"/></svg>`
 	case "notifications":
-		return "i-bell"
+		return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-bell"/></svg>`
 	case "tasks":
-		return "i-grid"
+		return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-grid"/></svg>`
 	case "reminders":
-		return "i-calendar"
+		return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-calendar"/></svg>`
 	case "routines":
-		return "i-repeat"
+		return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-repeat"/></svg>`
 	case "morning":
-		return "i-calendar"
+		return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-calendar"/></svg>`
 	case "chat":
-		return "i-message"
+		return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-message"/></svg>`
 	case "voice":
-		return "i-mic"
+		return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-mic"/></svg>`
 	case "ecosystem":
-		return "i-grid"
+		return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-grid"/></svg>`
 	case "tools":
-		return "i-settings"
+		return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-settings"/></svg>`
 	case "models":
-		return "i-wave"
+		return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-wave"/></svg>`
 	case "passkey":
-		return "i-lock"
+		return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-lock"/></svg>`
 	default:
-		return "i-search"
+		return `<svg class=icon width="14" height="14"><use href="/ethos-icons.svg#i-search"/></svg>`
 	}
 }
 
@@ -225,12 +242,63 @@ 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">&times;</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.
 func shellFuncs() template.FuncMap {
 	return template.FuncMap{
-		"pageTitle":       pageTitle,
-		"pageIcon":        pageIcon,
-		"sidebarSections": func() any { return sidebarSections },
+		"pageTitle":   pageTitle,
+		"sidebarHTML": sidebarHTML,
 		"ago": func(t time.Time) string {
 			if t.IsZero() {
 				return "never"
@@ -245,21 +313,21 @@ func shellFuncs() template.FuncMap {
 // 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
 // CoreAPI, never writes — the store IS the audit trail, this just shows it.
-var dashTmpl = template.Must(template.New("dash").Funcs(shellFuncs()).Parse(shellHTML + dashHTML))
+var dashTmpl = template.Must(template.New("dash").Funcs(shellFuncs()).Parse(shellTopHTML + dashHTML + shellBottomHTML))
 
 // ecosystemTmpl — read-only view of the Nexus/Praxis/Hexis siblings, whose only
 // human surface is here (they ship no web UI of their own).
-var ecosystemTmpl = template.Must(template.New("ecosystem").Funcs(shellFuncs()).Parse(shellHTML + ecosystemHTML))
+var ecosystemTmpl = template.Must(template.New("ecosystem").Funcs(shellFuncs()).Parse(shellTopHTML + ecosystemHTML + shellBottomHTML))
 
 // eventsTmpl — the unified intake journal (Vikunja #283), read-only. Same
 // shape as trace.html and morning.html: server-rendered, refreshed on reload.
-var eventsTmpl = template.Must(template.New("events").Funcs(shellFuncs()).Parse(shellHTML + eventsHTML))
+var eventsTmpl = template.Must(template.New("events").Funcs(shellFuncs()).Parse(shellTopHTML + eventsHTML + shellBottomHTML))
 
 // morningTmpl — read-only view of today's checklist state per configured
 // morning routine (internal/morning). Same shape as trace.html: a plain
 // server-rendered page, refreshed on reload — no live-update loop, since
 // checklist state changes on the scale of minutes, not seconds.
-var morningTmpl = template.Must(template.New("morning").Funcs(shellFuncs()).Parse(shellHTML + morningHTML))
+var morningTmpl = template.Must(template.New("morning").Funcs(shellFuncs()).Parse(shellTopHTML + morningHTML + shellBottomHTML))
 
 func noCache(h http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -679,23 +747,107 @@ var toolsTmpl = template.Must(template.New("tools").Funcs(func() template.FuncMa
 	m := shellFuncs()
 	m["join"] = strings.Join
 	return m
-}()).Parse(shellHTML + toolsHTML))
+}()).Parse(shellTopHTML + toolsHTML + shellBottomHTML))
 
-var historyTmpl = template.Must(template.New("history").Funcs(shellFuncs()).Parse(shellHTML + historyHTML))
+const toolsHTML = `{{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"}}`
 
-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
+// routinesHTML — proposed routine review surface. One row per thing maven
 // noticed, in her words, with at most two actions: accept or dismiss.
-var routinesTmpl = template.Must(template.New("routines").Funcs(shellFuncs()).Parse(shellHTML + routinesHTML))
+const routinesHTML = `{{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"}}`
+
+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 {
 	m := shellFuncs()
@@ -707,7 +859,7 @@ var traceTmpl = template.Must(template.New("trace").Funcs(func() template.FuncMa
 	}
 	m["join"] = strings.Join
 	return m
-}()).Parse(shellHTML + traceHTML))
+}()).Parse(shellTopHTML + traceHTML + shellBottomHTML))
 
 func handleHistory(w http.ResponseWriter, r *http.Request, core ipc.CoreAPI) {
 	if core == nil {
@@ -741,59 +893,12 @@ func handleNotifications(w http.ResponseWriter, r *http.Request, core ipc.CoreAP
 		http.Error(w, "notifications error: "+err.Error(), http.StatusBadGateway)
 		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")
-	if err := notificationsTmpl.Execute(w, map[string]any{
-		"Nudges":   nudges,
-		"Attempts": deliveryRows(attempts),
-		"Status":   status,
-	}); err != nil {
+	if err := notificationsTmpl.Execute(w, map[string]any{"Nudges": nudges}); err != nil {
 		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) {
 	if core == nil {
 		http.Error(w, "reminders disabled (no -core)", http.StatusServiceUnavailable)
@@ -1020,10 +1125,9 @@ func fmtTaskDate(t *time.Time) string {
 	return t.Local().Format("02 Jan")
 }
 
-// routineView is one line on the page: what maven noticed, in her words, and
-// how long ago she noticed it. A view model, not a database row — the template
-// never formats an interval or a timestamp itself.
-type routineView struct {
+// routineRow is one line on the page: what maven noticed, in her words, and
+// how long ago she noticed it.
+type routineRow struct {
 	ID      int64
 	Phrase  string
 	Noticed string
@@ -1085,31 +1189,34 @@ func handleRoutines(w http.ResponseWriter, r *http.Request, core ipc.CoreAPI, se
 	w.Header().Set("Content-Type", "text/html; charset=utf-8")
 	if err := routinesTmpl.Execute(w, struct {
 		Msg      string
-		Proposed []routineView
-	}{msg, toRoutineViews(proposed)}); err != nil {
+		Proposed []routineRow
+	}{msg, routineRows(proposed)}); err != nil {
 		log.Printf("routines render: %v", err)
 	}
 }
 
-// toRoutineViews turns the wire rows into view models. The phrase comes from
+// routineRows turns the wire rows into display rows. The phrase comes from
 // pattern.PhraseRoutine so the page says the same thing maven's voice says.
-func toRoutineViews(rs []ipc.ProposedRoutine) []routineView {
-	out := make([]routineView, 0, len(rs))
+func routineRows(rs []ipc.ProposedRoutine) []routineRow {
+	out := make([]routineRow, 0, len(rs))
 	for _, r := range rs {
 		p := pattern.ProposedRoutine{Action: r.Action, Object: r.Object, IntervalDays: r.IntervalDays}
 		noticed := "just now"
 		if r.CreatedTs > 0 {
 			noticed = time.Since(time.UnixMilli(r.CreatedTs)).Round(time.Minute).String() + " ago"
 		}
-		out = append(out, routineView{ID: r.ID, Phrase: pattern.PhraseRoutine(&p), Noticed: noticed})
+		out = append(out, routineRow{ID: r.ID, Phrase: pattern.PhraseRoutine(&p), Noticed: noticed})
 	}
 	return out
 }
 
-// acceptRoutine marks a proposal accepted. This page is the ONLY surface that
-// may do it (Vikunja #367): accepting gives the tick loop a standing new
-// reason to speak, which DESIGN.md puts at layer 3, and the button here is
-// behind step-up. Voice can park the question and dismiss, never accept.
+// acceptRoutine creates the recurring reminder for a proposal, then marks the
+// proposal accepted and links the reminder to it. Weekly patterns get a cron
+// expression; any other interval fires once.
+//
+// TODO(vikunja#46): this mirrors the voice accept path in cmd/mavend/voice.go.
+// When the tick loop learns to read accepted proposals directly, both callers
+// should hand off to one place in core instead of each building a reminder.
 func acceptRoutine(ctx context.Context, core ipc.CoreAPI, id int64) error {
 	proposed, err := core.ListProposedRoutines(ctx)
 	if err != nil {
@@ -1498,7 +1605,32 @@ func handlePTT(w http.ResponseWriter, r *http.Request, voiceAddr string, session
 
 // chatTmpl — plain text conversation interface. No JS: form POSTs to /api/chat
 // and the handler redirects back to /chat with the response.
-var chatTmpl = template.Must(template.New("chat").Funcs(shellFuncs()).Parse(shellHTML + chatPageHTML))
+var chatTmpl = template.Must(template.New("chat").Funcs(shellFuncs()).Parse(shellTopHTML + chatPageHTML + shellBottomHTML))
+
+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.
 func handleChatPage(w http.ResponseWriter, r *http.Request, core ipc.CoreAPI) {
@@ -1549,13 +1681,7 @@ func handleChatAPI(w http.ResponseWriter, r *http.Request, core ipc.CoreAPI, ses
 		http.Redirect(w, r, "/chat", http.StatusSeeOther)
 		return
 	}
-	// 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)
+	reply, err := core.Chat(r.Context(), text)
 	if err != nil {
 		log.Printf("chat api: %v", err)
 		http.Redirect(w, r, "/chat", http.StatusSeeOther)

cmd/mavweb/models.go

@@ -31,7 +31,7 @@ type modelController interface {
 	SwapModel(ctx context.Context, req ipc.SwapModelReq) (ipc.SwapModelResp, error)
 }
 
-var modelsTmpl = template.Must(template.New("models").Funcs(shellFuncs()).Parse(shellHTML + modelsHTML))
+var modelsTmpl = template.Must(template.New("models").Funcs(shellFuncs()).Parse(shellTopHTML + modelsHTML + shellBottomHTML))
 
 const modelsHTML = `{{template "shellTop" "models"}}
 <h1>Resident model</h1>

cmd/mavweb/notifications.html

@@ -14,27 +14,5 @@
   <div>no notifications yet</div>
   <div class=hint>check back later or ask maven a question</div>
 </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"}}
 </html>

cmd/mavweb/routines.html

@@ -1,24 +0,0 @@
-{{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"}}

cmd/mavweb/shell.html

@@ -1,49 +0,0 @@
-{{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">&times;</button>
-        </div>
-        <div class=inspector-body id=inspectorBody></div>
-      </div>
-    </aside>
-  </div>
-</div>
-<script src=/mavweb.js></script>
-{{end}}

cmd/mavweb/tools.html

@@ -1,58 +0,0 @@
-{{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"}}

deploy/mavend.json

@@ -8,19 +8,18 @@
   "//disabled_rules": [
     "Nudge rules that are not wired at all. Names come from loop.DefaultRules:",
     "water, meal, break, service_down, netdata_critical.",
-    "service_down is back on: mavpoll now writes one fact per kuma monitor",
-    "(service_down:<name>), so the nudge names the service and pausing a monitor",
-    "in kuma silences that monitor. It is also edge-triggered, so a service that",
-    "stays down is one nudge, not one every fifteen minutes."
+    "service_down is off because it cannot say WHICH service — mavpoll folds the",
+    "whole kuma gauge into one boolean, so the nudge is always the generic 'a",
+    "service on homesrv is down'. Nothing to act on, every fifteen minutes.",
+    "Turn it back on once Vikunja #444 lands a fact per monitor."
   ],
-  "disabled_rules": [],
+  "disabled_rules": ["service_down"],
 
   "phraser": {
     "model_path": "/opt/maven/models/llm/qwen3/Qwen3-1.7B-UD-Q4_K_XL.gguf",
     "bin_path": "llama-server",
     "n_gpu_layers": 99,
     "n_ctx": 4096,
-    "cache_ram_mib": 512,
     "timeout": "60s",
     "llm_nudges": false
   },
@@ -40,23 +39,6 @@
     "proxy": "socks5://192.168.240.1:10808"
   },
 
-  "//workstation": [
-    "The big model on the desk PC (workpc, 7900 GRE 16GB), fronted by",
-    "mavgpud on port 8080. It runs gemma-4-12b and it is preferred over the",
-    "resident Qwen3-1.7B for routing and replies whenever the card is free.",
-    "The machine is never assumed up: it sleeps, and the card is often held by",
-    "a CPT run, in which case mavgpud answers 503 and Maven falls back to the",
-    "resident model without saying so. Deleting this block restores exactly",
-    "the behaviour homesrv had before it existed.",
-    "Addressed by LAN address, not container name: mavgpud runs on another",
-    "machine and there is no shared docker network to name it on."
-  ],
-  "workstation": {
-    "url": "http://192.168.1.105:8080",
-    "probe": "15s",
-    "timeout": "90s"
-  },
-
   "//search": [
     "The live web, searched after his own notes and before Kiwix. Only the",
     "query string leaves the box — never a note, a fact, the persona block or",
@@ -94,56 +76,6 @@
     "snippet_runes": 1500
   },
 
-  "//morning_routines": [
-    "The daily checklist (Vikunja #280). Each item is done when its fact_key",
-    "gets a non-voided fact inside the window, so 'выпил воды' closes water and",
-    "nothing has to be ticked by hand. nudge_at fires once, at the end of the",
-    "window, and only for what is still open. Weekdays empty = every day."
-  ],
-  "morning_routines": [
-    {
-      "name": "утро",
-      "window_start": "08:00",
-      "window_end": "11:00",
-      "nudge_at": "10:30",
-      "severity": 1,
-      "items": [
-        { "key": "medicine", "fact_key": "medicine", "label": "лекарство" },
-        { "key": "water",    "fact_key": "water",    "label": "вода" },
-        { "key": "pets",     "fact_key": "pets",     "label": "покормить кота" }
-      ]
-    }
-  ],
-
-  "//feeds": [
-    "RSS reading (Vikunja #258). Every item lands as a note with source",
-    "rss:<name>, which is also what puts entries in the intake journal that",
-    "/events reads. Only the feed URL leaves the box.",
-    "This is a starting pair, not a curated set — trim or extend it."
-  ],
-  "feeds": {
-    "poll_interval": "30m",
-    "max_items": 5,
-    "max_age": "24h",
-    "sources": [
-      { "name": "lwn",       "url": "https://lwn.net/headlines/newrss", "category": "технологии" },
-      { "name": "archlinux", "url": "https://archlinux.org/feeds/news/", "category": "технологии" }
-    ]
-  },
-
-  "//crawl": [
-    "Reading a web page (Vikunja #259). on_demand answers 'посмотри <URL>'.",
-    "No allow_hosts, so any public host he names is readable; private",
-    "addresses are refused unconditionally by internal/webfetch and do not",
-    "need listing. Setting allow_hosts here would also narrow on-demand,",
-    "which is the point of leaving it empty."
-  ],
-  "crawl": {
-    "on_demand": true,
-    "timeout": "10s",
-    "max_runes": 4000
-  },
-
   "digest": {
     "enabled": true,
     "window": "30m",
@@ -187,7 +119,7 @@
     "timeout": "400ms",
     "rate": 100,
     "max_hosts": 256,
-    "enabled": true
+    "enabled": false
   },
 
   "nexus":  { "url": "http://nexus:9740" },

deploy/mavgpud.json

@@ -1,32 +0,0 @@
-{
-  "listen": ":8080",
-  "llama_addr": "127.0.0.1:10000",
-  "llama_bin": "llama-server",
-  "llama_args": [
-    "-m", "/mnt/D/AI/gemma4/gemma-4-12B-it-qat-UD-Q4_K_XL.gguf",
-    "-md", "/mnt/D/AI/gemma4/mtp-gemma-4-12B-it-BF16.gguf",
-    "-ngl", "99",
-    "-fa", "on",
-    "-np", "1",
-    "--host", "127.0.0.1",
-    "--port", "10000",
-    "--ctx-size", "32768",
-    "--threads", "6",
-    "--batch-size", "2048",
-    "--ubatch-size", "512",
-    "--jinja",
-    "--chat-template-kwargs", "{\"enable_thinking\":false}",
-    "--spec-type", "draft-mtp",
-    "--spec-draft-n-max", "2"
-  ],
-
-  "kfd_root": "/sys/class/kfd/kfd/proc",
-  "drm_device": "/sys/class/drm/card1/device",
-
-  "poll": "1s",
-  "idle_timeout": "15m",
-  "stop_grace": "20s",
-  "min_free_vram_bytes": 10737418240,
-  "evict_after_polls": 2,
-  "start_after_polls": 5
-}

deploy/mavgpud.service

@@ -1,28 +0,0 @@
-[Unit]
-# Runs on the workstation (bugmachine), not on homesrv. Install as a systemd
-# user unit and turn on lingering, so the card is supervised after a reboot
-# with nobody logged in:
-#
-#   scp mavgpud workpc:~/.local/bin/mavgpud
-#   scp deploy/mavgpud.json workpc:~/.config/mavgpud.json
-#   scp deploy/mavgpud.service workpc:~/.config/systemd/user/mavgpud.service
-#   ssh workpc 'systemctl --user daemon-reload && systemctl --user enable --now mavgpud'
-#   sudo loginctl enable-linger kami
-Description=Maven GPU supervisor (holds llama-server while the card is free)
-After=network.target
-
-[Service]
-ExecStart=%h/.local/bin/mavgpud -config %h/.config/mavgpud.json
-Restart=always
-RestartSec=5
-# The card must come back when the supervisor goes down. mavgpud stops
-# llama-server on SIGTERM, so give it longer than stop_grace to do that.
-KillSignal=SIGTERM
-TimeoutStopSec=60
-# llama-server aborts inside its own static teardown on SIGTERM, so every
-# routine yield used to write a multi-gigabyte core into systemd-coredump
-# (Vikunja #491). Yielding is meant to happen several times a day.
-LimitCORE=0
-
-[Install]
-WantedBy=default.target

docker-compose.yml

@@ -79,16 +79,7 @@ services:
     <<: *image
     # voice.bind is 0.0.0.0:9100 in deploy/mavend.json so mavweb can reach it
     # cross-container. Verified 2026-07-06.
-    # -ambient-token turns on POST /api/ambient (Vikunja #126): the phone posts
-    # notification text, mavweb keeps only a meeting time. Empty ⇒ no route at
-    # all, which is what a missing MAVEN_AMBIENT_TOKEN gives. The value comes
-    # from the gitignored .env docker compose reads for interpolation, NOT from
-    # an env_file — flags are interpolated before any service env exists.
-    # Weakness worth naming: mavweb takes this as a flag, so it is visible in
-    # `ps` inside this container, unlike the zenmoney and IMAP secrets which are
-    # read from files.
     command: ["mavweb", "-addr", ":9201", "-voice", "mavend:9100", "-core", "/run/maven/mavend.sock",
-              "-ambient-token", "${MAVEN_AMBIENT_TOKEN:-}",
               "-nexus", "http://nexus:9740", "-praxis", "http://praxis:8989", "-hexis", "http://hexis:9741"]
     depends_on: [mavend]
     # loopback-only on purpose: /tools defines+executes arbitrary argv and

docs/design.md

@@ -223,30 +223,6 @@ Not alternatives — layers:
 Router contract: `[{"intent":<enum>, key?, value?, text?, verb?}, ...]` over
 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
 
 One discriminator: **does the loop evaluate a predicate against it?**
@@ -389,29 +365,6 @@ lives in `source`; rules trust provenance.
   `source=poll:healthcheck`. A compromised poller must not be able to forge a
   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
 
 **Combiner — noisy-OR, not weighted sum.** These are independent-ish positive

docs/evals/2026-08-02-workstation-gemma4-12b.md

@@ -1,82 +0,0 @@
-# gemma-4-12b on the workstation, against the resident Qwen3-1.7B
-
-Measured 2026-08-02 on the fixtures as they stand. Dated file: it is not edited
-after today, and a newer number is a new file.
-
-Vikunja #485's first assumption was that a 7-14B measurably beats Qwen3-1.7B on
-the 77-case RU routing fixture and the 27-case talk fixture. It does, on both,
-and it is also faster.
-
-## The setup
-
-`gemma-4-12B-it-qat-UD-Q4_K_XL` with the `mtp-gemma-4-12B-it-BF16` draft model,
-served by `llama-server` b10220 on bugmachine (AMD 7900 GRE, 16GB), fronted by
-`mavgpud` on `192.168.1.105:8080`. Thinking is off through
-`--chat-template-kwargs '{"enable_thinking":false}'`, speculative decoding is
-`--spec-type draft-mtp --spec-draft-n-max 2`, context 32768. The exact line is
-`deploy/mavgpud.json`.
-
-Every number below crossed the LAN from homesrv. Note the trap: homesrv's shell
-exports `HTTP_PROXY`, Go honours it, and the runs need
-`env -u HTTP_PROXY -u HTTPS_PROXY -u http_proxy -u https_proxy`.
-
-## Routing, 77-case RU fixture
-
-| | full | intent-only | p50 | p95 |
-|---|---|---|---|---|
-| classifier alone (02-08) | 68.8% | — | 16.6µs | — |
-| Qwen3-1.7B through the cascade (31-07, 02-08) | 72.7% | 77.9% | 0.80-1.04s | — |
-| **gemma-4-12b through the cascade** | **84.4%** | **93.5%** | **329ms** | 429ms |
-| gemma-4-12b alone, no cascade | 55.8% | 85.7% | 335ms | 436ms |
-
-The workstation buys 11.7 points of full accuracy over the resident model. It
-buys 15.6 points of intent-only, at a third of the latency. The router's p50 was
-never the model's fault, which the 02-08 contention finding already said. A 12B
-on a free 16GB card answers a routing turn in a third of a second.
-
-Two things the table hides.
-
-The alone-versus-cascade gap is slots, not intents. gemma reads the intent right
-85.7% of the time on its own. It loses full accuracy on seven fact keys
-(`вода` instead of `water`, `ужин` instead of `meal`) and on six reminder times
-with no time slot. Stage 0 and the daemon's own extractor repair
-both, which is why the cascade is 28 points higher. The lesson is that the
-cascade earns its keep even under a much better model, not that it is scaffolding
-to remove.
-
-`errors: 6` in the alone row are declines on single-token and ambiguous
-utterances, all of which the cascade caught. The remaining defects through the
-cascade are three `query→fact` confusions, one `chat→query`, and one false
-clarify.
-
-## Talk, 27-case conversational fixture
-
-| | pass | notes |
-|---|---|---|
-| Qwen3-1.7B (31-07) | 20/27 | 11-17/27 for the 0.8B before it |
-| **gemma-4-12b** | **25/27 (92.6%)** | chat 8/9, knowledge 9/9, query 8/9 |
-
-Knowledge is the interesting column: 9/9, in Russian, with real answers about
-Rayleigh scattering, SSD versus HDD and thunder delay. That is the case the
-1.7B cannot do at all and the reason the naming half of the degradation rule
-exists.
-
-Two failures, and one of them is the persona defect the CPT (#122) targets:
-`query-notes-do-not-answer` wrote `заплатил` where Maven needs the feminine
-form. The other is `chat-joke`, where the model told a joke without using any of
-the words the check looks for. Run-to-run variance is about one case: a second
-run scored 24/27 with `chat-followup-server` also off-topic.
-
-## Nudge phrasing, 15-case fixture
-
-15/15, every check, no errors. `mood`, `lang`, `length`, `feminine`,
-`hisgender`, `address`, `cringe` and `ontopic` all clean.
-
-## What this settles and what it does not
-
-Settled: the size question. A 12B on the workstation beats the resident model on
-every fixture we have, and it is faster. The offload argument holds.
-
-Not settled: how often the card is free. That is #485's second assumption and
-only the `mavgpud` log answers it, after a week of the owner's normal work. A
-model that is better whenever it is up is worth little if it is never up.

docs/evals/2026-08-03-llama-prompt-cache.md

@@ -1,84 +0,0 @@
-# Where the resident model's 7.9GB of RSS goes (2026-08-03, homesrv)
-
-Measured for Vikunja #499. The deployed llama-server held 7.9GB RSS for a 1.1GB
-model file. Half a gigabyte of it was in swap, on a box that also runs
-whisper.cpp, piper and the embedder.
-
-## Method
-
-`maven-mavend-1` was stopped for the measurement, with the owner's approval.
-Its own binary then ran on the host with the exact deployed command line. That
-binary is `/opt/maven/bin/llama-server`, version `1 (4c65955)`, a Vulkan build.
-
-```sh
-llama-server -m /mnt/hdd1/llms/qwen3/Qwen3-1.7B-UD-Q4_K_XL.gguf \
-  --host 127.0.0.1 --port 18099 -c 4096 -ngl 99 --no-webui
-```
-
-RSS was read from `/proc/<pid>/status` after load and after each of 8 distinct
-1521-token prompts. `smaps` of the deployed process was read first, from inside
-the container, since the host user cannot read another user's maps.
-
-## The cause: the prompt cache, not the weights and not the offload
-
-The startup log says it outright:
-
-```text
-srv load_model: prompt cache is enabled, size limit: 8192 MiB
-srv llama_server: n_parallel is set to auto, using n_parallel = 4 and kv_unified = true
-```
-
-The server saves the full KV state of every idle slot it evicts. It keeps up to
-8GiB of those states in host RAM (llama.cpp PR 16391). One saved prompt of 1521
-tokens costs 166.377 MiB. That is 112 kiB per token, exactly Qwen3-1.7B's KV
-footprint (28 layers x 2 x 1024 dims x 2 bytes).
-
-RSS at rest, and per distinct prompt:
-
-| Prompts served | RSS, default | RSS, `--cache-ram 512` |
-|---|---|---|
-| 0 (just loaded) | 443 MB | 411 MB |
-| 1 | 445 MB | 411 MB |
-| 4 | 958 MB | 929 MB |
-| 8 | 1641 MB | 932 MB |
-
-Uncapped, RSS climbs about 170MB per distinct prompt and does not stop until
-the 8GiB limit. Capped at 512 MiB it plateaus at 932MB from the fourth prompt
-on, with the cache holding steady at `3 prompts, 499.132 MiB` and evicting.
-
-The 7.9GB on the running daemon was that climb, weeks of it. Its `smaps` showed
-one 6.03GB anonymous mapping at 5.32GB resident plus a 1.45GB mapping at 1.27GB
-resident, and only 30MB of file-backed RSS.
-
-## The task's leading guess was wrong
-
-`-ngl 99` on the Vega iGPU costs almost no process RSS. A freshly loaded server
-has 95MB of anonymous RSS in total. RADV allocates device memory through the
-kernel, outside the process, and the log sees 8202 MiB free on `Vulkan0`. The
-weights are mmapped and file-backed, so they are evictable and do not pin RSS. The logit buffer is not visible in the numbers above at all.
-
-## Decision
-
-`--cache-ram 512` is now the default, wired as `phraser.cache_ram_mib` and set
-in `deploy/mavend.json`. 512 MiB caps total RSS near 1GB, an eighth of what the
-box carried. It still holds three of the 1521-token probes above. Maven's real
-routing and phrasing prompts are much shorter, so it holds more of those than
-the table suggests. `-c 4096` is untouched, as #499
-required. A negative `cache_ram_mib` passes no flag, for a llama-server too old
-to know it.
-
-Not changed: `n_parallel = 4`. With `kv_unified = true` the four slots share one
-4096-token KV cache, so they do not multiply it.
-
-The other half of #499 was that none of these lines were reachable. mavend
-scraped llama-server's stderr for the listen line and discarded it, and never
-piped stdout at all. Both streams now go to mavend's log with a `llama:` prefix.
-The last 12 startup lines go into the error when the server dies before it
-listens.
-
-## Deployed
-
-The `mavenai:latest` image was rebuilt and `maven-mavend-1` recreated the same
-day. The daemon's own log now carries the child's startup, it reads
-`prompt cache is enabled, size limit: 512 MiB`, and the resident server sat at
-439MB RSS after load and 613MB after one served turn.

docs/evals/2026-08-03-personal-boundary.md

@@ -1,46 +0,0 @@
-# Personal boundary, seed scoring vs possession markers, 2026-08-03
-
-Vikunja #495. `что я говорил про бэкапы?` walked past the personal boundary into
-SearXNG and came back answered from a Habr article. The boundary matched
-possession words only, so a first-person speech verb was not a personal
-question.
-
-## What changed
-
-The boundary now scores the turn's query vector against two frozen seed sets.
-It claims the turn when the personal side is nearer than the world side. Seeds
-and code are in `cmd/mavend/personalboundary.go`. The possession markers stay as
-the offline floor for a handler with no embedder.
-
-A regex speech class was written first and dropped. Russian gives every verb a
-dozen surface forms, and the "как я говорил, ..." preamble list has no end. Each
-form the lexicon missed was one more question reaching the world.
-
-## Measurement
-
-Embedder: multilingual-e5-small int8, the one homesrv runs. Both sides are
-embedded on the query side. Cases are held out, none of them a seed. `make test`
-runs the offline part. The scored part is opt-in through `MAVEN_ONNX_LIB`, like
-`TestONNXRecall`.
-
-    19/19 held-out utterances correct   (TestONNXPersonalBoundary)
-
-    true positive margins   +0.014 to +0.089
-    nearest true negative   -0.005  ("кто такой гагарин")
-
-One case missed during the first pass and is not held out any more: `as i said,
-what is the population of india`, +0.008 to the personal side. It is a world seed
-now.
-
-The gate is the sign of the difference and nothing tighter. The margins are too
-thin for a threshold. The asymmetry favours claiming: a false claim costs one
-honest "не знаю", a false pass sends his life to an upstream engine.
-
-`make eval-recall` unchanged, 18/27 answered at gate 0.55. Recall does not touch
-this path.
-
-## Not verified
-
-The live probe on the deployed box. The daemon was not rebuilt in this session.
-The reply to `что я говорил про бэкапы?` with no matching note is still untested
-against a real SearXNG.

docs/evals/2026-08-03-recall-topic-veto.md

@@ -1,65 +0,0 @@
-# Recall topic veto, what it costs and what it buys, 2026-08-03
-
-Vikunja #496. The task asked for a cross-language fix. Skip the topic veto in
-`memory.RecallAllowed` when the question and the hit are in different scripts.
-An English question would then stop losing a Russian note.
-
-No such case exists. No fixture case puts the question and its wanted note in
-different scripts. The case the task named is not one either.
-
-    en-hard-024
-      query  "what fixed the screen problem"
-      note   "the flicker went away once i swapped the display cable"
-
-Both are English. It is a paraphrase failure, not a language failure. A script
-test would not have changed a single case, and neither would a bilingual stem
-map.
-
-## What the veto is worth today
-
-Measured with the real embedder, multilingual-e5-small int8, gate 0.55, margin
-0.008. The first row is the veto as it ships. The second is `RecallAllowed`
-forced to true.
-
-| | cases passing | answered | false recall | silenced by gate |
-|---|---|---|---|---|
-| veto on | 22/32 | 17/27 | 0/5 | 2 |
-| veto off | 22/32 | 18/27 | 1/5 | 1 |
-
-The pass count does not move. The veto trades one true recall for one false one.
-It costs `en-hard-024` and it buys `ru-silent-029`:
-
-    ru-silent-029
-      query  "во сколько отходит поезд"
-      note   "погулял вдоль реки"        0.835, margin 0.019
-
-The second case counted as silenced by the gate is `ru-home-026` at margin
-0.001, which the margin gate stops. The veto has nothing to do with it.
-
-## Why no lexical rule separates the two
-
-`en-hard-024` and `ru-silent-029` are in the same lexical class. Both questions
-share zero content words with their hit, and neither carries a first-person
-marker. The scores sit on top of each other, 0.826 against 0.835, and so do the
-margins, 0.023 against 0.019. Only one thing separates them. A screen problem
-and a swapped display cable are the same event. A train and a river walk are
-not. The embedder scores that difference at nine thousandths.
-
-So the signal is semantic and the gate is lexical. Any rule cheap enough to sit
-in `RecallAllowed` and strong enough to recover `en-hard-024` also re-admits
-`ru-silent-029`, which puts false recall back to 1/5.
-
-One near-miss rule was tried on paper and rejected: let the veto pass when the
-hit itself is first person. It works on these two, because the English note says
-"i swapped" and the Russian note says only "погулял". It is backwards as a
-principle. A first-person note is exactly the personal note the veto keeps away
-from a world question. The rule would weaken the veto where it was designed to
-bite. It survives here only because Russian drops the pronoun.
-
-## Decision
-
-Accept the loss. `en-hard-024` stays silenced and false recall stays 0/5.
-
-The way out is a reranker, not a longer word list. Recall@3 is 85.2% against
-recall@1 at 70.4%, so the right note is usually in the returned set and ranked
-wrong. That is where the remaining points are, and it is not this task.

docs/offload.md

@@ -1,179 +0,0 @@
-# Offloading model work to the workstation
-
-*Last verified: 2026-08-03 @ 12530c8. Living doc: correct it in place, do not append.*
-
-Owner's call, 2026-08-02. Vikunja #483 is the umbrella. Tasks #484 to #487 are the
-work, and this file holds the shape and the rules all four must obey.
-
-## The goal
-
-homesrv cannot grow a GPU. The workstation has 16GB of VRAM. Move the model work
-to the workstation and leave homesrv running the logic that must be always-on,
-deterministic and cheap.
-
-## Why this is tractable
-
-The split already exists structurally. `mavsttd` and `mavttsd` are separate
-daemons that core reaches over a socket, not linked libraries. Moving them off-box
-is a transport change, not a redesign.
-
-The microphone is at the workstation, because that is where the owner sits and
-homesrv is headless. So speech-to-text and the wake word are already on the
-workstation side by construction. Audio never has to cross the LAN. Only the core
-turn does.
-
-## The constraint that shapes everything
-
-The workstation's GPU is often busy: CPT runs, experiments, Correx, the manga-recap
-pipeline. It also sleeps. homesrv does not.
-
-So an offloaded model is never *the* model. It is the preferred one, with a floor
-on homesrv. That is the shape the cascade already has, where a router error falls
-through to the classifier.
-
-## The degradation rule
-
-Two cases, and the line between them is sharp.
-
-**Fall back silently** when the workstation model would only do the job *better*:
-routing, phrasing, a nudge. Falling back costs nothing that exists today, because
-the resident Qwen3-1.7B is today's production quality. The owner should not be told
-that his reply was phrased by the smaller model.
-
-**Name the gap** when the resident model cannot do the job *at all*. A world
-question that a 1.7B answers by inventing is the case. A wrong answer is worse
-than "не могу сейчас". This is the rule CLAUDE.md already states for a sibling
-service being down.
-
-Nothing in between. A turn never breaks on the workstation being asleep.
-
-Both halves are wired, 03-08-2026. `LLMPhraser.PhraseWorld`
-(`internal/phraser/world.go`) is the naming half and has three outcomes, not two:
-
-| State | What he hears |
-|---|---|
-| no `workstation` block | the resident model answers, exactly as before the seam existed |
-| configured, card free | the workstation answers |
-| configured, asleep or busy | the gap, `worldGap` in `cmd/mavend/worldmodel.go` |
-
-The first row is the one worth stating. Naming a gap requires a gap. On a box with
-no second model the 1.7B is the whole product. Refusing every world question there
-would remove a capability the owner has today.
-
-A source holding a passage is on the naming half too: a live search, a ZIM
-article, a page he named. None of them says "не могу сейчас". They read the
-passage back, which is what `phraseSource` returning `""` selects. A real quote
-beats a gap, and neither path invents.
-
-## Admission control, not a scheduler
-
-There is no GPU arbiter. That is a service with its own failure modes, and nothing
-here needs work *distributed*. It needs admission control. The workstation
-advertises free VRAM over a health endpoint, and Maven treats it as one more query
-source that claims a turn or passes. llama-server also refuses to load when VRAM is
-short, so the failure is detectable without cooperation from the owner's other
-jobs.
-
-The caller must be able to ask "is this peer usable right now" without a turn
-hanging on a timeout. A dead remote is a normal state, not an error state.
-`internal/llm.Pair` is that check on the Maven side. A prober caches the answer,
-so `Available()` is an atomic read and no turn pays for a health check.
-
-llama-server does not stay up on the workstation. It cannot: a resident 7-14B
-would hold 16GB against the owner's CPT runs. So a supervisor there owns its
-lifecycle, keeps it loaded while the card is free, and unloads it on idle or
-when another process needs the card (owner's call, 2026-08-02, Vikunja #488).
-
-That supervisor is still not a scheduler, and the distinction is worth holding.
-It arbitrates nothing between callers. It reports whether it can take work and
-manages one process to back that answer. Maven never asks it to start anything
-and never learns that it did.
-
-Contention is decided by presence under `/sys/class/kfd/kfd/proc`, not by a VRAM
-threshold. A ROCm process registers there when it initialises HIP, before it
-allocates anything. So the supervisor sees a contender during that job's startup,
-and yields before the job loses the memory it asked for. A
-threshold reads the card too late. By the time free VRAM has dropped, the other
-job has already lost the allocation race. Free VRAM is still read, but only as a
-precondition for loading, never as the eviction signal. One blind spot is known.
-A job can take the card without registering on the KFD, as a Vulkan or a
-video-decode job would. `describe()` logs every contender's comm, and that log is
-how we find out whether the blind spot is real.
-
-`mavgpud` runs from a systemd unit on the workstation with
-`deploy/mavgpud.json` as its config, and `llama_args` is passed to llama-server
-untouched. The model, the context size, the layer count and the MTP flags are the
-owner's business and not this daemon's schema.
-
-## What stays on homesrv, permanently
-
-The **embedder** (multilingual-e5-small, ONNX, CPU). It backs the classifier, which
-must answer while the GPU is saturated. It is also cheap enough on CPU that moving
-it buys nothing. Four callers:
-
-| Caller | What for |
-|---|---|
-| `internal/router/classifier.go` | the routing floor |
-| `cmd/mavend/actions_query.go` (`queryEmbed`) | memory recall |
-| `cmd/mavend/feeds.go` | ingest embedding for every RSS item |
-| `internal/crawl/watch.go` | ingest embedding for every crawled page |
-
-`internal/speaker` becomes a fifth once it lands.
-
-## Inventory: what runs a model on homesrv today
-
-The **resident model** is one llama-server with seven callers, and 03-08-2026 is
-the date each of them stopped or did not stop being resident-only:
-
-| Caller | What for | Offloaded |
-|---|---|---|
-| `cmd/mavend/voicewire.go` | routing | silently, through `hot` |
-| `cmd/mavend/replier_llm.go` | replies | silently, through `hot` |
-| `cmd/mavend/tick.go` | digestion worker: `PhraseNudge`, `PhraseReminder` | silently, inside the phraser |
-| `cmd/mavend/actions_query.go` | world questions, and any fetched passage | names the gap |
-| `cmd/mavend/capture.go` | capture summarisation (unreachable, see #480) | no, holds its own client |
-| `cmd/mavend/mail.go` | mail extraction (off, no IMAP) | no, holds its own client |
-| `memoryeval.go`, `modelswap.go` | admin and evals | no, and deliberately |
-
-The last three rows are resident-only on purpose. `memoryeval.go` and
-`modelswap.go` measure and swap the resident model, so sending their work
-elsewhere would measure the wrong thing. `capture.go` and `mail.go` are
-background jobs that hold a gated background client (`llmBackgroundClientFor`),
-and that priority has no equivalent on the remote yet. Both are also unreachable
-on this deploy, so wiring them would ship an untestable path.
-
-The `tick.go` row needs one caveat. `phraser.llm_nudges` is `false` in deploy, so
-nudges come from templates and the seam under them changes nothing until that
-flips. It is wired anyway: `PhraseReminder` is on the same transport and is on.
-
-Then the embedder above, **whisper.cpp** in `mavsttd`, and **piper** in `mavttsd`.
-`mavwaked` uses no model at all: an energy-threshold VAD over 30ms frames.
-
-## Order
-
-1. **Transport** (#484). Nothing else is possible until a seam can cross a host.
-   `internal/netaddr` landed in PR #92. A seam address now carries its own scheme,
-   and a scheme-less one is still unix. A tcp seam requires a shared token, because
-   the filesystem permission that authenticated the unix socket is gone.
-2. **The resident model** (#485, #490). Wired. A `workstation` block builds an
-   `llm.Pair` in `modelSeam` (`cmd/mavend/voicewire.go`), routing and replies
-   complete through it, and the phraser holds the same pair (`UseRemote`). Both
-   halves of the rule are live: see the table above for which caller gets which.
-   Measured, `docs/evals/2026-08-02-workstation-gemma4-12b.md`: gemma-4-12b
-   through the cascade scores 84.4% full accuracy at p50 329ms. The resident
-   model scores 72.7% at p50 0.80-1.04s. On the talk fixture it is 25/27
-   against 20/27. Biggest quality delta. A 16GB card runs a 7-14B,
-   which fixes what the 1.7B gets wrong: world knowledge, and the persona the CPT
-   targets. The degradation path is already written and measured, since the
-   classifier scores 68.8% full accuracy at p50 16.6µs on its own.
-3. **Speech-to-text and text-to-speech** (#486). They gain a real margin, but on
-   quality alone, and both already work.
-4. **The wake word** (#487). Independent of all of the above.
-
-## Assumptions
-
-- The LAN is trusted enough that wireguard is supported but not required (owner's
-  call). What crosses the wire is still his utterances. That is why the tcp seam
-  carries its own token instead of assuming a network boundary.
-- The workstation is not expected to be up. Every child task must still serve a
-  turn while it is down.

docs/qa.md

@@ -1,62 +1,19 @@
 # QA plan: checking Maven properly
 
-*Last verified: 2026-08-02 @ 20aa2d5. Living doc: correct it in place, do not append.*
+*Last verified: 2026-08-02 @ 7079a24. Living doc: correct it in place, do not append.*
 
 Written 2026-08-01, after the 35-PR stack landed and the box came back up.
-Refreshed 2026-08-02 against the live list, after PRs #85-#90.
 
-42 of the 50 open Vikunja tasks are `QA:` tasks. They are verification work, not
+44 of the 50 open Vikunja tasks are `QA:` tasks. They are verification work, not
 build work. Most sat unverifiable while Maven was down for 11 days. That
 blocker is gone.
 
-The plan as written on 2026-08-01 named 40 task numbers. Ten open `QA:` tasks were
-missing and two of the named ones had closed. Every open task now appears below,
-the eight non-QA ones in the last two sections.
-
 This plan orders them by what unblocks what. Do sessions 1 and 2 first. Almost everything
 downstream assumes the voice loop works, and nobody has confirmed that since
 the redeploy.
 
 ---
 
-## What the 02-08-2026 run found
-
-Sessions 1, 2 and 3 all ran. Read these five before picking anything up.
-
-- **470: a question writes invented knowledge into memory.** Recall then serves
-  it back. `что дальше?` lands on `IntentFact` and stores the model's answer as a
-  `self` fact at confidence 1.00. Two junk rows then claimed seven unrelated
-  world questions through recall, outranking the search leg. A question about the
-  capital of Australia was answered `какая последняя версия языка Go?`. Two bad
-  writes silently disabled world answering, with nothing logged.
-- **466: a pending clarify is global.** One unanswerable clarify swallowed the
-  next three utterances from three separate sessions. With ntfy, telegram and
-  voice all live, a clarify raised on web chat eats the next telegram message.
-- **467: spoken task capture is dead.** The router calls the capture marker an
-  `act`, and capture is reachable only from the `note` intent.
-- **The classifier baseline in this repo was wrong**, and it flattered the
-  router. See session 2 and **464**.
-- **477: the model swap and the self-update cannot be triggered on this box.**
-  Both are built and both are correct in test. The swap needs a passkey and
-  WebAuthn is unconfigured. `mavupdate` needs to reach a socket that only an
-  in-container uid can open.
-
-- **479: an unconfigured capability lets the question escape to web search.**
-  Netscan off, asked `какие устройства в сети?`. She answered from the live web
-  with a general article about network hardware. A question about his LAN went to
-  an upstream engine. The crawler fails the same way.
-
-Twenty-one defects were filed on 02-08-2026: 462 through 482. Six tasks this plan
-had written off as blocked turned out to be ready to check. All six ran. Every
-one of them is code-correct and stops at the deploy.
-
-Three of the five config blockers in **472** were then cleared. The morning
-routine, ambient ingest, feeds, the crawler and netscan are all live. Two remain,
-and both are the owner's call: a token for each ecosystem sibling, and seed data
-in Nexus and Praxis.
-
----
-
 ## Before you start
 
 Two things bite anyone running these checks on homesrv.
@@ -79,75 +36,45 @@ Nothing here has been confirmed since the redeploy, and everything else assumes
 it works. Do this first.
 
 Closes or advances: **44** (conversation), **45** (text chat), **287** (voice
-session quality), **321** steps 3-5 (quiet mode), **288** (STT golden audio).
-
-**288 is not blocked.** The fixtures are committed under `cmd/mavsttd/testdata/`
-and `make test-stt-golden` runs today. This plan said otherwise until 02-08-2026.
-
-Steps 1 and 3-6 were run on 02-08-2026 and pass. Steps 2 and 7-9 still need a
-person at the box, because they need a microphone or a nudge to arrive.
-
-Steps 1 and 3-6 do not need a browser. `POST /api/chat` takes a form-encoded
-`text=` field and a cookie jar, and answers with the rendered `/chat` page:
-
-```sh
-curl -s --noproxy '*' -c jar -b jar -L -X POST \
-  http://127.0.0.1:9201/api/chat --data-urlencode 'text=привет'
-```
-
-Parse the whole page, not the last text node. The page carries nav and footer
-text. A naive tail of the Cyrillic nodes returns the wrong string, which makes
-turns look misaligned when they are not.
+session quality), **321** steps 3-5 (quiet mode), **288** (STT fixtures).
 
 1. Open `http://127.0.0.1:9201/chat` and hold a short conversation in Russian.
    Watch for three things: she answers in feminine forms (`рада`, `поняла`), she
    says `ты` and never `вы`, and no pet names appear.
-   **Passes** (02-08-2026, five turns): `я рада`, `поняла`, `помогла`,
-   `проверила`, `записала`, `грустна`, `ты` throughout, no pet names.
 2. Press push-to-talk on `/dash`. Say `привет`. Confirm a spoken reply comes
    back. This is the only check that covers mic to STT to core to TTS to
    speaker as one path. It is also the path the eleven-day outage most likely
    broke.
-3. Say `тихий режим`. Expect `тихий режим включён. буду реже напоминать.` **Passes.**
-4. Say `выключи тихий режим`. Expect `тихий режим выключен.` Negation must win. **Passes.**
+3. Say `тихий режим`. Expect `тихий режим включён. буду реже напоминать.`
+4. Say `выключи тихий режим`. Expect `тихий режим выключен.` Negation must win.
 5. Say `в комнате тихо`. Quiet mode must NOT flip. Confirm on `/history` that no
-   `quiet_hours` fact was written. **Passes**: no row written. She answers `пока
-   не умею отвечать на этот вопрос.`, so it lands on `IntentSystem` with no arm.
+   `quiet_hours` fact was written.
 6. Say `включи режим тишины`, then `сделай потише`. Both must flip quiet mode
-   on. These are the noun form and the comparative, added 01-08-2026. **Both pass.**
+   on. These are the noun form and the comparative, added 01-08-2026.
 7. Wait for a nudge, then say `потом` within twenty minutes. Expect `хорошо,
    вернусь к этому позже.` and the nudge row on `/notifications` reading
    `snoozed`. Say `потом` again with nothing pending: it must route as an
    ordinary utterance, not be swallowed.
 8. Wait for the water nudge, then say `выпил воды`. Expect the ordinary fact
-   reply and nothing extra. She must not congratulate you. Check
+   reply and nothing extra — she must not congratulate you. Check
    `/notifications`: the row reads `acted`. Then trigger another nudge and say
-   `готово`. Expect `отлично, отметила.` and the same outcome.
+   `готово`; expect `отлично, отметила.` and the same outcome.
 9. Note anything where she is slow, cuts off, or talks over herself. That is
    287's whole content and it has no written acceptance criteria yet.
-   **First evidence, in text** (02-08-2026): nothing breaks, but answers wander
-   and stitch unrelated topics. Asked whether he should move flats, she opened
-   with the weather. That is 287, and it is a phrasing problem, not a loop problem.
 
-**The wake path cannot be checked as deployed.** `mavwaked` and `mavenclient`
-appear in no compose file and run as no host process. Step 2 covers only
-push-to-talk, from `/dash` through mavsttd and mavttsd. Wake word and VAD
-are untested by construction. Decide whether they belong in compose or on a
-client machine, and say which in the deploy docs. Tracked as **463**.
-
-**319's single-token bug is fixed** (01-08-2026). Single-word Russian utterances no longer come
+**319 is fixed** (01-08-2026). Single-word Russian utterances no longer come
 back as `не совсем поняла — можешь переформулировать?`. `привет` and `поужинал`
 both pass now: `thinSingleToken` spares social singles and any token carrying a
-verb ending, and only thins a bare nominal like `вода`. A one-word utterance that
-still gets clarified in this session is a new case for the lexicon, not the old bug.
+verb ending, and only thins a bare nominal like `вода`. If a one-word utterance
+still gets clarified during the smoke test, that is a new case for the lexicon,
+not the old bug.
 
 ---
 
 ## Session 2: measurement (half a day, mostly waiting)
 
-Closes or advances: **320** items 2-4, **278** (make the eval lab routine).
-Also **248** (memory evaluation), **319** (the margin gate) and **323** (the
-startup timeout arm).
+Closes or advances: **320** items 2-4, **278** (make the eval lab routine),
+**319** (gate recalibration).
 
 The resident llama-server cannot be reached by the eval harness. It binds
 `--host 127.0.0.1 --port 0` inside the container, so the port is kernel-assigned
@@ -172,67 +99,14 @@ make eval-recall
 
 A large miss against 72.7% means the deploy differs from the bench harness.
 
-**Run on 02-08-2026 @ af9d213. The deploy matches the bench.** `eval-models`
-scored 56 of 77: 72.7% full, 77.9% intent-only, 2 false clarifies and 1 missed.
-That is the recorded figure to the decimal, and calendar sat at 2 of 2, so the
-stage 0 agenda rules hold. `eval-phrasing` scored 21 of 27 on the talk fixture
-against a recorded 20, and the 15 nudge templates passed every check.
+Two things to decide while the numbers are in front of you:
 
-Two numbers in this repo were wrong, and both flattered the resident model.
-
-- **The classifier is not 36.8% and not 31ms.** `make eval-router` reports
-  `classifier+onnx: 53/77 (68.8% full)` at p50 16.6µs. The figure repeated here
-  and in `CLAUDE.md` predates the stage 0 rules and the seed additions. Both now
-  score inside that baseline. The accuracy gap the router buys is
-  roughly 4 points, not 36. Re-argue the trade on the real numbers: **464**.
-- **Router latency was measured under contention again.** p50 1.126s, p95 1.58s,
-  max 3.24s, against a recorded p50 825ms. The resident model was serving the
-  daemon on the same iGPU throughout. Do not record this as a regression, and do
-  not record it as a measurement either. Stop the stack before timing the router.
-
-`classifier+hash` scores 19.5%, which is the no-ONNX degraded path and is not the
-failure floor the deploy uses. Do not quote it as the classifier baseline.
-
-Then three things to decide while the numbers are in front of you:
-
-- **319 is done.** 359 gave the LLM path a real confidence signal.
-  `thinSingleToken` was narrowed on 01-08-2026, and agenda questions moved to
-  stage 0. Missed clarify sits at 1 of 6 and false clarifies at 2. Item 2 point 2
-  closed on 02-08-2026: the `make eval-recall` margin sweep is the distribution
-  that was asked for, and `0.008` sits at the knee.
-
-  | delta | answered | false recall |
-  |---|---|---|
-  | 0.005 | 18/27 | 2/5 |
-  | **0.008** | **18/27** | **1/5** |
-  | 0.010 | 16/27 | 1/5 |
-
-  It removes four of five false recalls at no cost in answers, and the next step
-  costs two answers for nothing. The hand-picked value survives on evidence.
+- **319's gate recalibration.** The single-token rule needs narrowing or
+  dropping. This needs your judgement, not a threshold sweep. The fixture and the
+  daemon disagree about what is correct on two of the three false clarifies.
 - **278's real ask** is making the eval lab routine rather than building it. It
   is built. Decide whether it runs on a timer, on every merge, or on demand, and
   the task can close.
-- **248** is the memory evaluation loop. It ships, it writes notes, and it cannot
-  speak. `make eval-recall` covers the retrieval half. The open question is whether
-  a written evaluation nobody reads is worth the tick.
-
-**323 is down to one check.** PR #90 covered the spawn path and took phraser
-coverage to 76.9%. Only the 60s startup timeout arm is untested, because testing it
-needs a `StartupTimeout` field on `Config` rather than a test-only hack. While you
-are on the box, time a cold 1.7B load off spinning disk. If it runs near 60s, the
-default is too tight and the field earns itself twice.
-
-Warm, it is nowhere near. A second llama-server answered `/health` 1.8s after
-launch at `n_ctx 4096` on 02-08-2026. That is page cache, so it does not settle
-the question. A cold read needs a cache drop, which needs root.
-
-**`CheckFeminine` has a false positive.** On 02-08-2026 it failed
-`query-notes-do-not-answer` for `ты заплатил`, calling it masculine
-self-reference. Masculine second person is correct, because the owner is male.
-The check matches a masculine
-past-tense verb before `за` without confirming the subject is `я`. Fix it in
-`internal/phraser/eval/checks.go` before trusting a phrasing score to the case.
-The real talk-fixture score on that run is 22 of 27, not 21. Tracked as **462**.
 
 Item 4 of **320** needs a permission I do not have. Kill the `llama-server`
 pid under `maven-mavend-1`, post a turn, and confirm it still completes
@@ -241,278 +115,47 @@ check that the failure floor catches a mid-session model death.
 
 ---
 
-## Session 3: the interaction batch (a day, or five sittings)
+## Session 3: the interaction batch (a day, or three sittings)
 
 These need real use rather than a command, grouped by what one sitting covers.
 
-**Morning and delivery** (**280**, **281**, **128**, **282**, **283**, **285**):
-open `/morning`, walk the seven required behaviours, then check the four
-interruption outcomes and the digest gap. **282** needs the `desk_active` script
-enabled on the desk PC first, which is **15** and needs you at that machine.
-**283** is the event intake envelope every reach shares, so a delivery check
-exercises it whether you name it or not. **285** is not verification: the bridge
-framework works and the remaining ask is more adapters. Decide which reach comes
-next, or park it.
-
-Run 02-08-2026. **280 is blocked.** No morning routine is configured (**472**).
-`morning.Item` also has no required-versus-optional field, so behaviour 1 cannot
-hold whatever you configure (**473**). **281's digest gap is closed**, and
-its presence rule passes on inspection. Three of its five items need traffic the
-box has not had. **283 is blocked**: nothing feeds the intake journal. **128
-found the worst defect of the whole session, see below.**
-
-Three of 472's five blockers were cleared the same day, in `deploy/mavend.json`
-and `docker-compose.yml`.
-
-- A `morning_routines` block, one routine `утро` 08:00-11:00 with medicine,
-  water and pets. It is live: the dispatcher logged `dropped morning:утро (sev1,
-  presence=away)`, so the plan builds and the nudge is proposed. 280's
-  behaviours and 128 step 11 are checkable now. 473 still stands.
-- `-ambient-token` on mavweb, value in a gitignored `/.env` that docker compose
-  reads for interpolation. `/api/ambient` answers 401 without the token and 201
-  with it, storing `calendar_event_20260802_Standup`. 283 step 5 and 128 step 8
-  are unblocked. The token is a flag, so it shows in `ps` inside that container.
-  The zenmoney and IMAP secrets are read from files instead. Ingest also
-  reads the notification's wall clock as UTC and stores a 14:30 meeting at 18:30
-  (**482**).
-- `feeds` (two sources), `crawl.on_demand` and `netscan.enabled`. The intake
-  journal now fills: `/events` holds `scan:lan` and `ambient:notif` rows.
-
-Two are not mine to clear. No sibling has a `token` in `deploy/mavend.json`, so
-273 steps 6 and 8 need a credential decision. Nexus has no entities and Praxis no
-attention items, so 272 step 3 needs seed data whose content is the owner's call.
-
-For **285**, two facts bear on the choice. Synapse is already running on this box
-and healthy, so a Matrix reach has a live target and needs no new service. And
-mavweb is already a PWA with a service worker, which 285 itself calls the highest
-value adapter left. Today's reaches are ntfy, telegram and voice.
-
-**Query sources** (**258**, **286**): ask her something the RSS feeds answer and
-something only a ZIM answers, with the search block on. Live search leads and the
-ZIMs are the fallback since 02-08-2026. **286**'s remaining half is doc and
-git ingestion, which is build work, not a check.
-
-**Do not read `/trace` for this.** `/trace` is the nudge-rule trace: rule,
-severity, predicate, gate, selected. No query-source field exists anywhere in the
-codebase. The only evidence of which query source claimed a turn is the
-`voice: search:` and `voice: kiwix:` lines in `docker compose logs mavend`
-(`actions_query.go:589` and `:660`).
-
-Run 02-08-2026, 20 turns. **Search leads and the personal boundary holds.** Every
-world question that reached the boundary was claimed by search. All three
-personal questions produced no search and no kiwix line at all.
-
-The rest of this sitting went badly. **Kiwix has zero live coverage.** SearXNG
-returns four results for everything, including two invented nonsense terms. So
-`querySearch` always claims, and Kiwix is unreachable code as deployed. The ZIM
-half of the 02-08-2026 decision is unverified. A ZIM answer cannot signal a
-silent search failure, because a ZIM answer cannot happen.
-**Ordering defects** in feeds and calendar, plus 258 step 1's utterance not
-working: **474**. And the sitting independently found stage 2 of **470**.
+**Morning and delivery** (**280**, **281**, **128**, **282**): open `/morning`,
+walk the seven required behaviours, then check the four interruption outcomes
+and the digest gap. **282** needs the `desk_active` script enabled on the desk
+PC first, which is **15** and needs you at that machine.
 
 **Tasks and calendar** (**129**, **130**, **127**, **126**, **246**): capture a
 task by voice, confirm it lands, check prioritisation ordering is not nonsense.
 **246** (mail reader) also exercises the `IngestMail` rung that moved to
 `AuthWrite` this morning.
 
-Run 02-08-2026. **129 passes.** The page and the spoken answer agree on ordering.
-The undistinguished task carries no invented reason on either surface, which is
-the thing 129 asks for. **130 fails outright** and **127 half fails**:
-**467**, **469**. **246 cannot be run**: `mavmaild` is commented out in
-`docker-compose.yml` and there is no `email` block, so nothing in steps 4-13 is
-reachable. The `IngestMail` rung does sit at `AuthWrite`
-(`internal/auth/policy.go:96`, asserted in `auth_test.go:421`), verified by
-reading only.
-
 **Routines and patterns** (**43**, **46**, **247**, **254**): these need history
 to detect against. If the database is thin after the outage, they may have
 nothing to propose, which is not a failure. Check `/routines` before
 concluding anything.
 
-Run 02-08-2026. The answer is the middle case: **the detector ran and found
-nothing.** The tick loop is live, and `detectPatterns` is called unconditionally
-at `cmd/mavend/tick.go:227`. It has run about 25 times since the restart. It
-finds nothing because the events table is empty upstream of it. Rows land there
-only from `pattern.Extract` at fact-write time, and `Extract` requires the fact
-value to match a closed 7-action lexicon. All 200 facts on `/history` are
-`page_heartbeat`, `netdata_alarm`, `quiet_hours`, `name`, `service_down` and
-`рост`. Not one lexicon hit, so no event can exist, let alone the four one pair
-needs. **46 step 5 passes**: `/routines` renders `noticed 0` with the empty state
-and the hint string.
-
-Two things block this sitting, and both are build work. The seeding recipe on
-**43** goes through `sqlite3` and cannot work. And `pattern.Detect` has no
-minimum-interval floor, so seeding by hand mints a permanent false routine
-(**468**). Do not try to seed a pattern with four fast chat turns.
-
 **Ecosystem** (**272**, **273**, **276**): nexus, hexis and praxis are wired and
-logged clean at boot.
-
-Run 02-08-2026, read-only half. All three answer `/health` 200 and `/ecosystem`
-lists 18 Hexis capabilities with correct read-only and mutating badges. **272 and
-273 are blocked on empty data**, not on code. Nexus holds no entities, Praxis
-holds no attention items, and the Calls panel has never recorded a call. See
-**472**, and read its warning first. 273's trace fix has never been validated
-here. An empty Calls panel is exactly what the old bug looked like. The page is
-`/ecosystem`, not `/siblings`.
-
-**276 ran 02-08-2026 and the suite is sound.** 17 `TestEcosystem_` cases pass
-under `-race`, not the 10 the task describes. The mutation check bites: patching
-the Nexus-error branch of `handleHexisAct` to `return ""` fails
-`TestEcosystem_MalformedNexusResponseFailsClosed` on the expected line.
-
-Steps 4 and 6 could not be checked through chat, because no utterance reaches
-Praxis (**475**). «что требует внимания» routes to `intent=query` and is answered
-by the search leg, identically whether `ecosystem-praxis-1` is up or stopped. The
-degraded string never appears because its branch is never entered. Step 5 is
-blocked the same way: `перезапусти muzick indexer` clarifies on
-`HasFn:false`, and the router had already rewritten the entity name to
-`музик индексер` (**476**).
-
-Both steps were checked on `/ecosystem` instead, which reads Praxis directly.
-With Praxis stopped the card reads `praxis — unreachable` while Nexus and Hexis
-keep rendering. On `docker start` the card returns to `nothing needs attention.`
-with no mavend restart. Independent degradation and recovery both hold.
-
-**Operations** (**249**, **250**): both ran 02-08-2026. The code is correct and
-neither lever can be pulled on this box. See **477**.
-
-**250** passes steps 1, 2, 3, 9 and 10 on the deploy. The capability announces
-itself. `/models` names the model llama-server reports, not the config filename.
-Asking her to switch models does nothing. Removing `swap_models` renders `swap
-not configured`. Step 4's refusal half passes at HTTP 403, and the 403 comes from
-mavend rather than mavweb. WebAuthn is unconfigured, so the web gate fails open
-and the wire gate fails closed. Steps 5 to 8 need a passkey assertion nothing on
-this box can produce. They pass in test: 13 swap cases and 7 page cases covering
-drain, mid-swap refusal, rollback, failed rollback and the not-owned refusal.
-
-**249** passes steps 1 and 2. Step 3 stops it. `mavupdate` health-checks over
-`/run/maven/mavend.sock`, which is `srw------- 1 10001 999` inside a docker
-volume. The host owner cannot traverse `/var/lib/docker/volumes` and cannot
-connect to a socket owned by an in-container uid. `mavupdate` assumes a
-host-installed daemon and the deploy is containers. Do not sudo around this.
+logged clean at boot. **276** is the degraded-mode suite, which means taking
+siblings down on purpose. Worth doing while you are already in there.
 
 ---
 
-## Housekeeping (done 02-08-2026, and this section was mostly wrong)
+## Housekeeping (one sitting, no box needed)
 
-This section claimed eleven tasks were not verification work. **Three were not.
-The other eight are.** Every one of the eight has shipped, tested code behind it.
-The error ran one way: it wrote off work that is ready to check. Do not trust a
-"nothing is built" line in this plan without grepping for the package first.
+Four QA tasks will not close no matter how long they sit, because they are
+gated on something that does not exist:
 
-Relabelled to `Blocked:`, claim verified:
+- **125** zenmoney: needs a token you have not minted.
+- **256** Home Assistant: needs HA configured.
+- **257** Bluetooth: BLOCKED, no bluez on the box. Says so in the title.
+- **288** STT golden audio: needs fixtures generated.
 
-- **125** zenmoney. `internal/zenmoney/` ships and is tested against a fixture.
-  `deploy/zenmoney.token` does not exist and the compose mount is commented out.
-  One token unblocks it.
-- **256** Home Assistant. `internal/smarthome/` ships, the `smarthome` block sits
-  in `deploy/mavend.json` at `enabled: false`, and 8123 and 1883 are closed.
-- **14** cold-start unlock. The seam is real at `cmd/mavend/main.go:128` and
-  `internal/webauthn/prf.go` is in place. `lockedAPI` is gone, replaced by
-  `Server.Check` in `internal/ipc/server.go`. Gated on an authenticator that
-  implements the WebAuthn PRF extension, which is hardware, not code.
+Relabel these so they stop reading as backlog. They are not verification work
+that is pending, they are work that has not started.
 
-Left alone, because the claim here was false:
-
-- **284** simulator. `cmd/mavend/simulator_test.go`, three scenarios under
-  `cmd/mavend/testdata/scenarios/`, and a `simulate` target at `Makefile:98`.
-  **Run 02-08-2026: all three scenarios pass**, plus the determinism and
-  backwards-step guards. One defect found, see below.
-- **288** STT golden audio. Four WAVs and `golden_v1.json` are committed under
-  `cmd/mavsttd/testdata/`, the make targets exist, and `models/stt/ggml-small.bin`
-  is on the box. Session 1 lists 288 as blocked on fixtures, which is wrong.
-  **Run 02-08-2026: all four pass**, WER at or under ceiling with no drift.
-
-| fixture | transcript | WER | ceiling |
-|---|---|---|---|
-| ru_reminder | `Напомни мне через час позвонить маме.` | 0.00 | 0.10 |
-| ru_fact | `А отметь, что я выпил воды.` | 0.20 | 0.25 |
-| ru_query | `Что у меня сегодня по календарю?` | 0.00 | 0.10 |
-| en_act | `Restart the web server and check the disk space.` | 0.00 | 0.10 |
-
-That also settles a session 1 worry indirectly: whisper.cpp works on Vulkan
-after the redeploy. Only the mic and the wake path remain unproven.
-
-**The simulator routes with an empty seed set.** Every `make simulate` run logs
-`loaded 0 seed examples from models/seeds`, seven times per scenario. The test
-runs from `cmd/mavend`, and the seed path is relative to the repo root. The
-scenarios still pass, which means they pass without the classifier having any
-seeds to match against. Whatever 284 is proving, it is not proving the routing
-the deploy runs. Fix the path before trusting a green simulator.
-- **257** Bluetooth. The bluez half is genuinely absent. The LAN-scan half shipped
-  (`internal/netscan/`), and steps 1-9 run today. Only step 10 is Bluetooth, so
-  relabelling the whole task would bury real pending work.
-- **251** MCP, **253** hearing, **259** crawler. All three ship
-  (`internal/mcp/`, `internal/capture/`, `internal/crawl/`) with no external gate.
-  Fully checkable. `259`'s step 1 wants no `crawl` block in `deploy/mavend.json`,
-  and there is none, so it is already set up correctly.
-- **252** vision and **255** speaker recognition. Both ship. Each is blocked only
-  on a model download: a vision gguf with mmproj, and a speaker embedding model.
-  Neither is present under `/mnt/hdd1`. Their refusal-path steps run today.
-
-So the honest split is three blocked on a credential or hardware, two blocked on
-a download, and six ready to check. That is roughly a session of real QA this
-plan had written off as backlog.
-
-**All six ran on 02-08-2026.** Every one of them is code-correct and stops at the
-deploy. The pattern repeats often enough to be the headline: the packages pass,
-and the box cannot reach them.
-
-**251, MCP.** Steps 1, 2, 3, 4 and 13 pass. Package tests green under `-race`.
-Off-by-default is clean, and the SSRF refusal is exact: without `allow_private`
-the log reads `refusing to connect to a private address: 127.0.0.1` and `/tools`
-shows the server down with zero proposals. Steps 5 to 12 are blocked. `ss -lntp`
-shows the Vikunja MCP server on `127.0.0.1:9100` only, so no container reaches it
-at any address (**478**). `allow_private` does work, measured both ways.
-
-**253, hearing.** Steps 1, 2 and 17 pass. `internal/capture` covers 90.3%. Steps
-7 to 16 are blocked on something nobody can work around: no shipped client calls
-`CaptureStart`. There is no `cmd/mavheard`, no mavweb route, and `mavenclient`
-never calls it (**480**). Two of its QA steps are also stale.
-
-**257, netscan.** Steps 2, 3 and 9 pass at unit level. Step 1 fails. Steps 4 to 8
-need the block enabled. Step 10 is Bluetooth and stays skipped.
-
-**259, crawler.** Steps 1 and 15 pass. Step 2 fails. Steps 3 to 14 need a `crawl`
-block that nobody has written.
-
-Both were configured later the same day, and both work. `netscan.enabled: true`
-answers `какие устройства в сети?` with `нашла 3 устройства, из них 2 с вебом, 2 с
-ssh. список записала.` and the scan lands in the intake journal as `scan:lan`.
-`crawl.on_demand: true` answers `посмотри https://lwn.net — что там пишут?` from
-the real page. So **479** is one defect, not the routing defect it was filed as.
-An unconfigured capability declines its own turn instead of naming the gap.
-Nothing is wrong with the routing.
-
-257 step 1 and 259 step 2 fail the same way and share a task (**479**). An
-unconfigured capability does not name the gap, so the question escapes to web
-search. `какие устройства в сети?` was answered with a general article about
-network hardware. That is his LAN going to an upstream engine.
-
-**252 vision and 255 speaker.** Both confirmed blocked. The disk claim was
-re-verified rather than taken on trust: 16 text-only ggufs under `/mnt/hdd1`, no
-mmproj and no speaker embedding model. Everything not needing the model passes,
-including the two refusals that matter. `TestNewLocalRefusesNonPrivateEndpoints`
-rejects `https://api.openai.com`, and forget really deletes
-(`internal/store/memory.go:145` is a real `DELETE`, not a tombstone). Vision is
-19/19, speaker 22/22, media 16/16.
-
-**470 got worse, then closed.** Both poisoned facts showed `voided` on
-`/history` and the defect survived. Re-measured at 15:42, after four restarts:
-`почему небо синее?` still answered `какая последняя версия языка Go?` with no
-`search:` line. What came back was the question he typed, not the value the fact
-held. So the poison was a vector in the memory index, and `revert` did not
-remove it.
-
-Repaired in two parts. 470 stopped the writes: a question is never a fact, and a
-void drops the key's vectors. 493 fixed what the index holds. A fact is indexed
-as the fact and not as the utterance, and a correction drops its superseded
-vector too.
-
-A poisoned box now repairs itself on the next start. `RepairFactVectors`
-re-embeds every fact vector from the fact it names, and deletes the voided and
-superseded ones. It runs once, guarded by a marker, and logs what it did.
+Same treatment for the five plan-only tasks (**251** MCP, **252** vision,
+**253** hearing, **255** speaker recognition, **259** crawler). A `QA:` prefix on
+a plan is misleading.
 
 ---
 
@@ -528,39 +171,16 @@ Not QA. These are blocked on a decision or a credential only you have.
 | 355 | Deploy the Hexis auth change. Was blocked on Maven being under construction, which it no longer is. The client half is vendored and wired. |
 | 357 | Decide whether entity-existence validation is the permanent target guard or whether blessing lands in Nexus. |
 | 275 | Hexis native API and MCP parity. |
-| — | Decide on `-require-stepup`. Making it the default needs WebAuthn configured first, or it locks you out of your own admin surfaces. |
-
-317 and 354 closed on 01-08-2026. The step-up gate now covers `POST /api/chat` and
-`/routines`, and the nginx template is locked down with a `maven.<domain>` block for
-mavweb. The `-require-stepup` default is still your call.
-
----
-
-## Not this repo
-
-Two open tasks sit on the Maven board and are not Maven work. Move them or note
-where they land, so the board stops reading as 50 things Maven owes.
-
-- **358** replace the rowid execution cursor with a real seq column. This is Hexis,
-  and it must land before any execution retention or pruning does.
-- **362** mirror the router prompt reorder into the relabelling prompt. This is the
-  training workspace, enforced by `llm/check_prompt_parity.py` there, not here.
+| — | Decide on `-require-stepup`. Making it the default needs WebAuthn configured first, or it locks you out of your own admin surfaces. See **317**. |
+| — | Three nginx sites bind wildcard `:80` (`acme.conf`, `matrix`, `panel`), so the ecosystem's bind-level protection is not in effect and `allow`/`deny` is carrying it alone. See **354**. |
 
 ---
 
 ## Suggested order
 
 1. Session 1. If the voice loop is broken, nothing else matters.
-2. The `-require-stepup` and Kuma decisions. Five minutes, and it unblocks **16**.
-3. Session 2. **Run on 02-08-2026.** The numbers came back worse for the router
-   than the docs claimed. The classifier is 68.8%, not 36.8%, and 16.6µs, not
-   31ms. The router buys about 4 points of accuracy for four orders of magnitude
-   of latency. Whether that still earns its place is now an open question.
+2. The `-require-stepup` and Kuma decisions. Five minutes, unblocks **317** fully
+   and **16**.
+3. Session 2. The numbers tell you whether the router is worth its 90x latency.
 4. Housekeeping. Cheap, and it makes the remaining backlog honest.
-5. Session 3, split whichever way suits you. All five sittings ran on
-   02-08-2026. Read the per-sitting notes before repeating any of them.
-
-The next thing to fix is not in this plan. Four defects say the same sentence:
-a capability is built and no utterance reaches it. **466** (a clarify is global),
-**467** (capture is act-routed), **475** (attention is act-routed), **476** (the
-router rewrites entity names). Routing is where the work is.
+5. Session 3, split whichever way suits you.

internal/auth/auth_test.go

@@ -311,7 +311,7 @@ func TestGate_IpcServer_CheckWiredThroughSocket(t *testing.T) {
 	if fake.writes != 0 {
 		t.Errorf("auth refused but CoreAPI was called %d time(s); refused calls must not reach CoreAPI", fake.writes)
 	}
-	_, err = cli.Chat(context.Background(), "web", "привет")
+	_, err = cli.Chat(context.Background(), "привет")
 	if !errors.Is(err, ipc.ErrForbidden) {
 		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.Cleanup(func() { _ = cli.Close() })
-	reply, err := cli.Chat(context.Background(), "web", "привет")
+	reply, err := cli.Chat(context.Background(), "привет")
 	if err != nil {
 		t.Fatalf("Chat: %v", err)
 	}
@@ -373,7 +373,7 @@ func (r *recordingAPI) WriteFact(_ context.Context, _ ipc.WriteFactReq) (int64,
 	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++
 	return "echo: " + text, nil
 }

internal/calendar/ambient.go

@@ -68,28 +68,7 @@ var dayWords = map[string]int{
 // word ("завтра", "tomorrow") when the notification carries one, and the result
 // is refused if it lands more than ambientPastGrace in the past. A bare start
 // time gets DefaultReminderDuration.
-//
-// The clock reading is a wall clock in the daemon's local zone. See
-// EventFromNotificationIn.
 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() {
 		return Event{}, false
 	}
@@ -103,9 +82,8 @@ func EventFromNotificationIn(n Notification, loc *time.Location) (Event, bool) {
 		return Event{}, false
 	}
 
-	// The day is Posted's LOCAL day: a notification posted at 23:30Z saying
-	// "завтра в 09:00" is already tomorrow where he is standing.
-	y, m, d := n.Posted.In(loc).AddDate(0, 0, dayOffset(line)).Date()
+	y, m, d := n.Posted.AddDate(0, 0, dayOffset(line)).Date()
+	loc := n.Posted.Location()
 	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
 	// was inferred, so the honest reading is that the inference was wrong.

internal/calendar/ambient_test.go

@@ -74,12 +74,12 @@ func TestEventFromNotification(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			ev, ok := EventFromNotificationIn(Notification{
+			ev, ok := EventFromNotification(Notification{
 				Package: "com.google.android.gm",
 				Title:   tt.title,
 				Text:    tt.text,
 				Posted:  posted,
-			}, posted.Location())
+			})
 			if ok != tt.wantOK {
 				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) {
 				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 zone it
-			// was resolved against — never shifted into UTC.
+			// The event lands on the day the phone showed it, in the phone's
+			// location — not shifted into UTC.
 			if ev.Start.Location() != posted.Location() {
 				t.Errorf("location = %v, want %v", ev.Start.Location(), posted.Location())
 			}
@@ -162,10 +162,10 @@ func TestEventFromNotificationDayWords(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			ev, ok := EventFromNotificationIn(Notification{
+			ev, ok := EventFromNotification(Notification{
 				Package: "com.google.android.calendar",
 				Title:   tt.title, Text: tt.text, Posted: tt.posted,
-			}, tt.posted.Location())
+			})
 			if ok != tt.wantOK {
 				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
 // that into the key.
 func TestEventFromNotificationDropsDayWordFromSummary(t *testing.T) {
-	ev, ok := EventFromNotificationIn(Notification{
+	ev, ok := EventFromNotification(Notification{
 		Title:  "Завтра Планёрка 09:00",
 		Posted: time.Date(2026, 8, 3, 21, 0, 0, 0, time.UTC),
-	}, time.UTC)
+	})
 	if !ok {
 		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.
 func TestAmbientEventsAreStoredAtReducedConfidence(t *testing.T) {
-	ev, ok := EventFromNotificationIn(Notification{
+	ev, ok := EventFromNotification(Notification{
 		Title:  "Планёрка 10:00-10:30",
 		Posted: time.Date(2026, 8, 3, 9, 0, 0, 0, time.UTC),
-	}, time.UTC)
+	})
 	if !ok {
 		t.Fatal("expected an event")
 	}
@@ -237,52 +237,3 @@ 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)
-	}
-}

internal/calendar/calendar.go

@@ -18,7 +18,6 @@ import (
 	"sort"
 	"strings"
 	"time"
-	"unicode"
 )
 
 // Fact sources. A calendar event reaches the store as a
@@ -154,20 +153,14 @@ func Overlapping(events []Event, from, to time.Time) []Event {
 	return out
 }
 
-// safeKey makes a summary safe to use inside a fact key: letters and digits in
-// any script, plus dashes, with space and underscore folded to a dash.
-//
-// It kept ASCII only until 04-08-2026, and dropped everything else. His
-// calendar is Russian, so "Встреча с Аней" and "Обед с мамой" both reduced to
-// "--" and produced the same key on the same day — the second event of the day
-// silently overwrote the first (Vikunja #443). Letting the letters through is
-// what makes the key identify the event. Migration #18 drops the keys written
-// under the old rule; they are re-derived on the next poll.
+// safeKey makes a summary safe to use inside a fact key (ASCII alphanumerics
+// and dashes). Non-Latin summaries collapse to their punctuation, which is why
+// the day prefix carries the identity and this only disambiguates within a day.
 func safeKey(s string) string {
 	var b strings.Builder
 	for _, r := range s {
 		switch {
-		case unicode.IsLetter(r) || unicode.IsDigit(r) || r == '-':
+		case (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') || (r >= '0' && r <= '9') || r == '-':
 			b.WriteRune(r)
 		case r == ' ' || r == '_':
 			b.WriteRune('-')

internal/calendar/calendar_test.go

@@ -139,9 +139,6 @@ func TestSafeKey(t *testing.T) {
 		{"Hello_World", "Hello-World"},
 		{"special@#$chars!!", "specialchars"},
 		{"ALL_CAPS_123", "ALL-CAPS-123"},
-		// His calendar is Russian. These reduced to "--" and "--" (Vikunja #443).
-		{"Встреча с Аней", "Встреча-с-Аней"},
-		{"Обед с мамой", "Обед-с-мамой"},
 	}
 	for _, tt := range tests {
 		if got := safeKey(tt.in); got != tt.want {
@@ -266,19 +263,3 @@ func TestSourceTrust(t *testing.T) {
 		t.Errorf("Sources() = %v", Sources())
 	}
 }
-
-// Two Russian events on one day must not share a key. They did: safeKey kept
-// ASCII only, so both summaries collapsed to their spaces and the second event
-// overwrote the first in the store (Vikunja #443).
-func TestFactKeyDistinguishesRussianEventsOnOneDay(t *testing.T) {
-	day := time.Date(2026, 8, 4, 0, 0, 0, 0, time.UTC)
-	a := Event{Summary: "Встреча с Аней", Start: day.Add(10 * time.Hour), End: day.Add(11 * time.Hour)}
-	b := Event{Summary: "Обед с мамой", Start: day.Add(13 * time.Hour), End: day.Add(14 * time.Hour)}
-	if FactKeyIn(a, time.UTC) == FactKeyIn(b, time.UTC) {
-		t.Fatalf("both events keyed as %q", FactKeyIn(a, time.UTC))
-	}
-	// The day prefix still has to survive, because the store range-scans on it.
-	if !strings.HasPrefix(FactKeyIn(a, time.UTC), KeyPrefixForDay(day)) {
-		t.Fatalf("key %q lost the day prefix %q", FactKeyIn(a, time.UTC), KeyPrefixForDay(day))
-	}
-}

internal/config/config.go

@@ -149,11 +149,10 @@ type Config struct {
 	//
 	// 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
-	// and useless in practice. service_down was the case that forced it: it
-	// could not name the service it was nudging about, so being told "a service
-	// on homesrv is down" every fifteen minutes was noise with no action
-	// attached. That is fixed — one fact per kuma monitor — and the rule ships
-	// enabled again. The escape hatch stays.
+	// and useless in practice — kuma's service_down cannot name the service it
+	// is nudging about (Vikunja #444), so being told "a service on homesrv is
+	// down" every fifteen minutes is noise with no action attached. Turning it
+	// off beats learning to ignore her.
 	//
 	// A disabled rule is never gathered for, never evaluated, and never
 	// delivered on any channel. Unknown names are ignored, so removing a rule
@@ -225,11 +224,6 @@ type Config struct {
 	// See SearchConfig.
 	Search *SearchConfig `json:"search,omitempty"`
 
-	// Workstation — the big model on the owner's desktop, preferred over the
-	// resident one when its GPU is free. nil / absent / url empty ⇒ homesrv
-	// behaves exactly as it does today. See WorkstationConfig.
-	Workstation *WorkstationConfig `json:"workstation,omitempty"`
-
 	// Praxis — the ecosystem attention-state service. When configured, maven
 	// calls the Praxis HTTP tools API for attention listing and item lifecycle.
 	// Maven never touches Praxis's database directly (ecosystem invariant: no
@@ -602,9 +596,6 @@ type MorningRoutineItemConfig struct {
 	Key     string `json:"key"`
 	FactKey string `json:"fact_key"`
 	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
@@ -1114,44 +1105,6 @@ const (
 	DefaultKiwixSnippetRunes = 1500
 )
 
-// WorkstationConfig — the big model on the owner's desktop (workpc, a
-// 7900 GRE with 16GB), fronted by mavgpud.
-//
-// homesrv cannot grow a GPU, so the resident Qwen3-1.7B is the floor and this
-// is the preferred model above it (owner's call, 2026-08-02, docs/offload.md).
-// The workstation is never assumed up: its card is often held by a CPT run and
-// the machine sleeps. No block, or an empty URL, and homesrv behaves exactly as
-// it does today.
-//
-// Only the prompt crosses the LAN, and the workstation is not "the box". The
-// rules in CLAUDE.md about what may leave still apply.
-type WorkstationConfig struct {
-	// URL — where mavgpud listens, e.g. "http://192.168.1.105:8080". Empty ⇒
-	// the whole block is normalised to nil and nothing probes anything.
-	URL string `json:"url,omitempty"`
-
-	// Health — the admission endpoint. Empty ⇒ URL + "/health", which is what
-	// mavgpud serves. It answers 503 while the card is held, and that is the
-	// signal, so it must be the supervisor's endpoint and not llama-server's.
-	Health string `json:"health,omitempty"`
-
-	// Probe — how often admission is re-checked. 0 ⇒ DefaultWorkstationProbe.
-	// Nothing on the hot path waits for it: the answer is cached and read
-	// atomically, so this only sets how late Maven notices the card came back.
-	Probe Duration `json:"probe,omitempty"`
-
-	// Timeout — the per-request budget for a completion on the workstation.
-	// 0 ⇒ DefaultWorkstationTimeout. A big model on a LAN host is slower than
-	// the resident one, and a request that overruns falls back to the floor.
-	Timeout Duration `json:"timeout,omitempty"`
-}
-
-// Workstation defaults, applied in Normalise.
-const (
-	DefaultWorkstationProbe   = 15 * time.Second
-	DefaultWorkstationTimeout = 90 * time.Second
-)
-
 // SearchConfig — the self-hosted SearXNG instance she searches with.
 //
 // External search is allowed and off unless configured (CLAUDE.md). Configuring
@@ -1280,12 +1233,6 @@ type PhraserConfig struct {
 	NCtx       int      `json:"n_ctx,omitempty"`
 	Timeout    Duration `json:"timeout,omitempty"`
 
-	// CacheRAMMiB bounds llama-server's prompt cache. Omitted ⇒ 512 MiB, which
-	// is what keeps the resident model near 1 GB of RSS instead of the 7.9 GB
-	// measured on 2026-08-03. Set it to -1 to pass no flag at all and let the
-	// server apply its own 8 GiB default. See phraser.Config.CacheRAMMiB.
-	CacheRAMMiB int `json:"cache_ram_mib,omitempty"`
-
 	// LLMNudges — let the model word nudges again. Off by default: nudges are
 	// worded from hand-written Russian templates now (the model broke the
 	// persona and invented units). Chat, query and reminder phrasing always go
@@ -1553,24 +1500,6 @@ func (c *Config) applyDefaults() {
 		}
 	}
 
-	// No address, no preferred model. An unconfigured workstation is the
-	// default deploy and must be indistinguishable from today.
-	if c.Workstation != nil && strings.TrimSpace(c.Workstation.URL) == "" {
-		c.Workstation = nil
-	}
-	if c.Workstation != nil {
-		w := c.Workstation
-		if strings.TrimSpace(w.Health) == "" {
-			w.Health = strings.TrimRight(w.URL, "/") + "/health"
-		}
-		if w.Probe <= 0 {
-			w.Probe = Duration(DefaultWorkstationProbe)
-		}
-		if w.Timeout <= 0 {
-			w.Timeout = Duration(DefaultWorkstationTimeout)
-		}
-	}
-
 	if c.Voice != nil {
 		if c.Voice.RouterThreshold <= 0 {
 			c.Voice.RouterThreshold = DefaultRouterThreshold
@@ -1738,7 +1667,7 @@ func morningRoutinesFromConfig(mc []MorningRoutineConfig) []morning.Routine {
 	for i, r := range mc {
 		items := make([]morning.Item, len(r.Items))
 		for j, it := range r.Items {
-			items[j] = morning.Item{Key: it.Key, FactKey: it.FactKey, Label: it.Label, Optional: it.Optional}
+			items[j] = morning.Item{Key: it.Key, FactKey: it.FactKey, Label: it.Label}
 		}
 		weekdays := make([]time.Weekday, len(r.Weekdays))
 		for j, w := range r.Weekdays {

internal/config/config_test.go

@@ -413,56 +413,3 @@ func TestNormaliseFillsKiwixDefaults(t *testing.T) {
 		t.Error("rewrite: false was not honoured")
 	}
 }
-
-// A workstation with no address is not a workstation. The unconfigured deploy
-// must be indistinguishable from today, so the block is dropped rather than
-// left to fail one probe at a time.
-func TestNormaliseDropsAddresslessWorkstation(t *testing.T) {
-	for _, tc := range []struct {
-		name string
-		in   *WorkstationConfig
-	}{
-		{"no url", &WorkstationConfig{Probe: Duration(time.Second)}},
-		{"blank url", &WorkstationConfig{URL: "   "}},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			c := &Config{Workstation: tc.in}
-			c.applyDefaults()
-			if c.Workstation != nil {
-				t.Errorf("kept an unusable workstation block: %+v", c.Workstation)
-			}
-		})
-	}
-}
-
-// The health endpoint defaults to the supervisor's, not llama-server's: mavgpud
-// answers 503 while the card is held, and that refusal is the whole signal.
-func TestNormaliseFillsWorkstationDefaults(t *testing.T) {
-	c := &Config{Workstation: &WorkstationConfig{URL: "http://192.168.1.105:8080/"}}
-	c.applyDefaults()
-	if c.Workstation == nil {
-		t.Fatal("dropped a usable workstation block")
-	}
-	if got, want := c.Workstation.Health, "http://192.168.1.105:8080/health"; got != want {
-		t.Errorf("Health = %q, want %q", got, want)
-	}
-	if time.Duration(c.Workstation.Probe) != DefaultWorkstationProbe {
-		t.Errorf("Probe = %s, want %s", time.Duration(c.Workstation.Probe), DefaultWorkstationProbe)
-	}
-	if time.Duration(c.Workstation.Timeout) != DefaultWorkstationTimeout {
-		t.Errorf("Timeout = %s, want %s", time.Duration(c.Workstation.Timeout), DefaultWorkstationTimeout)
-	}
-}
-
-// An explicit health URL is left alone: the supervisor may sit behind something
-// that does not put /health at the root.
-func TestNormaliseKeepsExplicitWorkstationHealth(t *testing.T) {
-	c := &Config{Workstation: &WorkstationConfig{
-		URL:    "http://192.168.1.105:8080",
-		Health: "http://192.168.1.105:9000/ready",
-	}}
-	c.applyDefaults()
-	if got, want := c.Workstation.Health, "http://192.168.1.105:9000/ready"; got != want {
-		t.Errorf("Health = %q, want %q", got, want)
-	}
-}

internal/dialogue/clarify.go

@@ -57,14 +57,6 @@ func (q *PendingQuestion) CanAsk() bool {
 
 // ClarifyStore holds the parked questions. Same shape and locking as
 // 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 {
 	mu         sync.RWMutex
 	questions  map[string]*PendingQuestion

internal/ipc/api.go

@@ -60,19 +60,6 @@ type Nudge struct {
 	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.
 // Score is set by QueryNotes (0 on the write path).
 type Note struct {
@@ -534,12 +521,6 @@ type outcomesReq struct {
 type nReq struct {
 	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 {
 	Kind string `json:"kind"`
 	N    int    `json:"n"`
@@ -612,14 +593,8 @@ type MCPServerStatus struct {
 }
 
 // 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 {
-	Text         string `json:"text"`
-	Conversation string `json:"conversation,omitempty"`
+	Text string `json:"text"`
 }
 type chatResp struct {
 	Reply string `json:"reply"`
@@ -678,6 +653,127 @@ type acceptProposedRoutineReq struct {
 	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
 // event.Event field for field; the ipc package does not import internal/event
 // so the wire shape stays independent of the in-process type.

internal/ipc/client.go

@@ -8,15 +8,13 @@ import (
 	"net"
 	"sync"
 	"time"
-
-	"github.com/kami/maven/internal/netaddr"
 )
 
-// Client — the module side of the boundary. Wraps a connection to core and
-// satisfies CoreAPI, so a module imports ipc, holds a CoreAPI, and is
-// agnostic to whether it's been wired in-process (tests / daemon-embedded),
-// over a local unix socket, or over tcp to another host. The swappability is
-// the seam auth will insert into without touching module code.
+// Client — the module side of the boundary. Wraps a unix-socket connection
+// and satisfies CoreAPI, so a module imports ipc, holds a CoreAPI, and is
+// agnostic to whether it's been wired in-process (tests / daemon-embedded)
+// or over this socket (full topology). The swappability is the seam auth
+// will insert into without touching module code.
 //
 // One Client ⇒ one conn ⇒ one concurrent request at a time. A module that
 // wants parallel requests opens one Client per goroutine; the store is the
@@ -24,8 +22,7 @@ import (
 // per-Client lock keeps frame interleaving impossible by construction.
 type Client struct {
 	conn net.Conn
-	path string       // the address as configured, kept for errors and logs
-	addr netaddr.Addr // parsed, so a dropped conn can be re-dialed (core restart)
+	path string // kept so a dropped conn can be re-dialed (core restart)
 	mu   sync.Mutex
 }
 
@@ -68,7 +65,6 @@ var readOnlyMethods = map[Method]bool{
 	MethodRecentActiveFacts:     true,
 	MethodCalendarEvents:        true,
 	MethodRecentNudges:          true,
-	MethodDeliveryAttempts:      true,
 	MethodRecentEcoTraces:       true,
 	MethodQueryNotes:            true,
 	MethodRecentNotes:           true,
@@ -85,22 +81,14 @@ var readOnlyMethods = map[Method]bool{
 	MethodPing:                  true,
 }
 
-// Dial connects to core at path and returns a Client. The module owns its
-// Client lifecycle; Close on shutdown.
-//
-// path is a netaddr seam address: a bare path is the unix socket it has
-// always been, and "tcp://host:port?token=..." reaches a core on another
-// host. See internal/netaddr.
+// Dial connects to a core socket at path and returns a Client. The module
+// owns its Client lifecycle; Close on shutdown.
 func Dial(path string) (*Client, error) {
-	addr, err := netaddr.Parse(path)
+	c, err := net.Dial("unix", path)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("ipc: dial %s: %w", path, err)
 	}
-	c, err := netaddr.Dial(addr)
-	if err != nil {
-		return nil, fmt.Errorf("ipc: dial %s: %w", addr, err)
-	}
-	return &Client{conn: c, path: path, addr: addr}, nil
+	return &Client{conn: c, path: path}, nil
 }
 
 func (c *Client) Close() error {
@@ -201,9 +189,9 @@ func (c *Client) call(ctx context.Context, m Method, params, result any) error {
 // re-dials clean. Caller holds c.mu.
 func (c *Client) roundtrip(m Method, raw json.RawMessage, resp *Response) error {
 	if c.conn == nil {
-		conn, err := netaddr.Dial(c.addr)
+		conn, err := net.Dial("unix", c.path)
 		if err != nil {
-			return fmt.Errorf("%w: dial %s: %v", errWriteLost, c.addr, err)
+			return fmt.Errorf("%w: dial %s: %v", errWriteLost, c.path, err)
 		}
 		c.conn = conn
 	}
@@ -374,14 +362,6 @@ func (c *Client) RecentEcosystemTraces(ctx context.Context, n int) ([]EcosystemT
 	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) {
 	var out []Nudge
 	if err := c.call(ctx, MethodRecentNudges, nReq{N: n}, &out); err != nil {
@@ -632,9 +612,9 @@ func (c *Client) AcceptProposedRoutine(ctx context.Context, id int64) error {
 	return c.call(ctx, MethodAcceptProposedRoutine, acceptProposedRoutineReq{ID: id}, nil)
 }
 
-func (c *Client) Chat(ctx context.Context, conversation, text string) (string, error) {
+func (c *Client) Chat(ctx context.Context, text string) (string, error) {
 	var r chatResp
-	if err := c.call(ctx, MethodChat, chatReq{Text: text, Conversation: conversation}, &r); err != nil {
+	if err := c.call(ctx, MethodChat, chatReq{Text: text}, &r); err != nil {
 		return "", err
 	}
 	return r.Reply, nil

internal/ipc/coreapi.go

@@ -1,194 +0,0 @@
-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
-}

internal/ipc/frame.go

@@ -36,13 +36,6 @@ const maxFrame = 4 << 20
 // (we read the length but not the body), so the caller must close it.
 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
 // prefix + body. length-prefixed JSON (not a tighter binary schema) is the
 // deferred-but-picked wire format: debuggable with `socat`/`nc`, trivial to

internal/ipc/frame_test.go

@@ -1,142 +0,0 @@
-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")
-	}
-}

internal/ipc/ipc_test.go

@@ -401,7 +401,7 @@ func TestChatViaClient(t *testing.T) {
 	}
 	t.Cleanup(func() { _ = cli.Close() })
 
-	reply, err := cli.Chat(context.Background(), "web", "привет")
+	reply, err := cli.Chat(context.Background(), "привет")
 	if err != nil {
 		t.Fatalf("Chat: %v", err)
 	}
@@ -417,7 +417,7 @@ type chatTestAPI struct {
 	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 == "привет" {
 		return "и тебе привет!", nil
 	}

internal/ipc/maperr_test.go

@@ -1,148 +0,0 @@
-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"
-}

internal/ipc/server.go

@@ -2,18 +2,441 @@ package ipc
 
 import (
 	"context"
+	"database/sql"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"log"
 	"net"
+	"os"
 	"sync"
 	"sync/atomic"
 	"time"
 
-	"github.com/kami/maven/internal/netaddr"
+	"github.com/kami/maven/internal/store"
 	"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,
 // accepts module connections, frames requests to a CoreAPI and responses back.
 // One Server per daemon process; concurrent connections are handled in their
@@ -23,7 +446,6 @@ import (
 type Server struct {
 	api  atomic.Value // stores CoreAPI
 	path string
-	addr netaddr.Addr
 
 	ln     net.Listener
 	wg     sync.WaitGroup
@@ -188,29 +610,31 @@ type CheckFunc func(ctx context.Context, m Method, params json.RawMessage) error
 // MethodAssertStepUp dispatch calls this instead of going through CoreAPI.
 type StepUpFunc func(ctx context.Context) error
 
-// Listen creates a Server bound to path.
-//
-// A bare path is a unix socket, unchanged: its parent dir is 0700 and the
-// socket file itself is 0600, so only the same unix user can connect — the
-// current "auth floor", same radius as wg at the network boundary. A stale
-// socket is removed first so the daemon restarts cleanly.
-//
-// A "tcp://host:port?token=..." address binds a network listener instead, for
-// a module that lives on another host. There is no filesystem there to be the
-// auth floor, so netaddr checks the shared token before this package sees the
-// connection and a token is mandatory. See internal/netaddr.
+// Listen creates a Server bound to path. path's parent dir must exist and be
+// 0700 (we chmod it if we own it); the socket file itself is created 0600 so
+// only the same unix user can connect — the current "auth floor", same radius
+// as wg at the network boundary. Removing a stale socket at path first lets
+// the daemon restart cleanly.
 func Listen(path string, api CoreAPI) (*Server, error) {
-	addr, err := netaddr.Parse(path)
-	if err != nil {
-		return nil, err
+	_ = os.Remove(path) // stale socket from a crashed daemon; ignore missing
+	if err := os.MkdirAll(parentDir(path), 0o700); err != nil {
+		return nil, fmt.Errorf("ipc: mkdir socket dir: %w", err)
 	}
-	ln, err := netaddr.Listen(addr)
+	// umask could widen the perms on socket creation; tighten then chmod to
+	// be explicit. 0600 ⇒ read+write by owner only.
+	oldMask := unix.Umask(0o077)
+	ln, err := net.Listen("unix", path)
+	unix.Umask(oldMask)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("ipc: listen %s: %w", path, err)
+	}
+	if err := os.Chmod(path, 0o600); err != nil {
+		_ = ln.Close()
+		_ = os.Remove(path)
+		return nil, fmt.Errorf("ipc: chmod socket: %w", err)
 	}
 	s := &Server{
 		path: path,
-		addr: addr,
 		ln:   ln,
 		done: make(chan struct{}),
 	}
@@ -440,16 +864,6 @@ var methodTable = map[Method]handlerFunc{
 		}
 		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) {
 		out, err := api.RecentNudges(ctx, p.N)
 		if err != nil {
@@ -561,7 +975,7 @@ var methodTable = map[Method]handlerFunc{
 		return map[string]int64{"new_id": newID}, nil
 	}),
 	MethodChat: withParams(func(ctx context.Context, api CoreAPI, p chatReq) (chatResp, error) {
-		reply, err := api.Chat(ctx, p.Conversation, p.Text)
+		reply, err := api.Chat(ctx, p.Text)
 		return chatResp{Reply: reply}, err
 	}),
 	MethodTickTrace: withoutParams(func(ctx context.Context, api CoreAPI) (TickTrace, error) {
@@ -854,7 +1268,7 @@ func (s *Server) Close() error {
 		// missing the seal costs every write since the last clean shutdown.
 		log.Printf("ipc: %d connection(s) still busy after %s, closing anyway", s.liveConns(), closeGrace)
 	}
-	netaddr.Cleanup(s.addr)
+	_ = os.Remove(s.path)
 	return err
 }
 
@@ -924,6 +1338,25 @@ func (s *Server) Path() string { return s.path }
 // while the server is serving (dispatch loads api once per request via atomic).
 func (s *Server) SetAPI(api CoreAPI) { s.api.Store(api) }
 
+func parentDir(p string) string {
+	if i := lastIndexByte(p, '/'); i >= 0 {
+		if i == 0 {
+			return "/"
+		}
+		return p[:i]
+	}
+	return "."
+}
+
+func lastIndexByte(s string, b byte) int {
+	for i := len(s) - 1; i >= 0; i-- {
+		if s[i] == b {
+			return i
+		}
+	}
+	return -1
+}
+
 // peerCaller — read SO_PEERCRED off a unix conn to identify the connecting
 // process. Returns ok=false on a non-unix conn or a platform without
 // SO_PEERCRED; the caller then proceeds without a Caller (the socket perms

internal/ipc/storeapi.go

@@ -1,455 +0,0 @@
-// 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
-}

internal/ipc/unimplemented.go

@@ -68,9 +68,6 @@ func (UnimplementedCoreAPI) RecentActiveFactsByKind(ctx context.Context, kind st
 func (UnimplementedCoreAPI) CalendarEvents(ctx context.Context, from, to time.Time) ([]Fact, error) {
 	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) {
 	return nil, ErrNotImplemented
 }
@@ -144,6 +141,6 @@ func (UnimplementedCoreAPI) MCPServers(ctx context.Context) ([]MCPServerStatus,
 func (UnimplementedCoreAPI) DayPlan(ctx context.Context) (DayPlan, error) {
 	return DayPlan{}, ErrNotImplemented
 }
-func (UnimplementedCoreAPI) Chat(ctx context.Context, conversation, text string) (string, error) {
+func (UnimplementedCoreAPI) Chat(ctx context.Context, text string) (string, error) {
 	return "", ErrNotImplemented
 }

internal/ipc/wire.go

@@ -28,7 +28,6 @@ const (
 	MethodRecentActiveFacts      Method = "recent_active_facts_by_kind"
 	MethodCalendarEvents         Method = "calendar_events"
 	MethodRecentNudges           Method = "recent_nudges"
-	MethodDeliveryAttempts       Method = "delivery_attempts"
 	MethodRecentEcoTraces        Method = "recent_ecosystem_traces"
 	MethodWriteNote              Method = "write_note"
 	MethodQueryNotes             Method = "query_notes"

internal/llm/client.go

@@ -129,11 +129,6 @@ type Req struct {
 	RepeatPenalty float64
 	// Stop — sequences that end generation early (e.g. newline for a one-liner).
 	Stop []string
-	// Temperature — 0 (the zero value) is greedy decoding, and greedy is what
-	// every caller here wanted before this field existed. It is set only by the
-	// phraser, whose own transport has always sampled at 0.7: routing a phrasing
-	// call through this client must not quietly change how it decodes.
-	Temperature float64
 }
 
 type msg struct {
@@ -181,7 +176,7 @@ func (c *Client) Complete(ctx context.Context, r Req) (string, error) {
 		Messages:      []msg{{Role: "system", Content: r.System}, {Role: "user", Content: r.User}},
 		MaxTokens:     r.MaxTokens,
 		Grammar:       r.Grammar,
-		Temp:          r.Temperature,
+		Temp:          0,
 		RepeatPenalty: r.RepeatPenalty,
 		Stop:          r.Stop,
 	})

internal/llm/remote.go

@@ -1,193 +0,0 @@
-package llm
-
-import (
-	"context"
-	"errors"
-	"log"
-	"net/http"
-	"sync/atomic"
-	"time"
-)
-
-// Pair — a preferred model on another host, with the resident one as the floor.
-//
-// homesrv cannot grow a GPU and the workstation has 16GB of VRAM, so the big
-// model runs there and the resident Qwen3-1.7B stays here. See docs/offload.md.
-// The workstation is never assumed up: its GPU is often busy with CPT runs and
-// the manga-recap pipeline, and the machine sleeps. So the remote is preferred,
-// never required, and Pair is what makes "preferred" mean something precise.
-//
-// This is admission control, not a scheduler. There is no arbiter deciding who
-// gets the card. A prober asks the remote whether it will take work, caches the
-// answer, and every request reads that cached answer in nanoseconds. Routing
-// sits on the hot path at p50 825ms and must never wait on a machine that may
-// be asleep, so no request ever pays for a health check itself.
-//
-// Pair satisfies nothing by itself. Callers pick a method by which half of the
-// degradation rule they live under:
-//
-//   - Complete falls back silently. For routing, replies, and nudge phrasing,
-//     where the big model is only better and the 1.7B is today's shipping
-//     quality. He is not told which model phrased his reply.
-//   - CompleteRemote returns ErrRemoteUnavailable instead of falling back. For
-//     a world question, or a long Kiwix or search passage, where a 1.7B
-//     confabulates rather than summarises. A named gap beats an invented
-//     answer.
-type Pair struct {
-	remote *Client
-	floor  *Client
-
-	// up — the cached admission answer, written only by the prober goroutine
-	// and read by every request. Atomic so the read costs nanoseconds and no
-	// request ever contends with the prober.
-	up atomic.Bool
-
-	health   string
-	interval time.Duration
-	http     *http.Client
-	stop     chan struct{}
-}
-
-// ErrRemoteUnavailable — the workstation model was required and is not
-// answering. Callers on the naming half of the degradation rule turn this into
-// a gap in the reply ("не могу сейчас"), never into a guess from the floor.
-var ErrRemoteUnavailable = errors.New("llm: workstation model unavailable")
-
-// ErrNoFloor — a Pair was built with no resident model to fall back to. A
-// configuration mistake: the floor is the whole point.
-var ErrNoFloor = errors.New("llm: no floor client")
-
-// NewPair builds the two-model arrangement. remote may be nil, which is the
-// unconfigured deploy and must behave exactly as the box behaves today: every
-// call goes to the floor and nothing probes anything.
-//
-// health is the URL the prober asks. llama-server's /health answers "is a model
-// loaded and ready", which is the useful signal here, because llama-server
-// refuses to load at all when VRAM is short. That makes a busy card detectable
-// without any cooperation from the owner's other jobs.
-func NewPair(remote, floor *Client, health string, interval time.Duration) *Pair {
-	p := &Pair{
-		remote:   remote,
-		floor:    floor,
-		health:   health,
-		interval: interval,
-		http:     &http.Client{Timeout: probeTimeout},
-		stop:     make(chan struct{}),
-	}
-	return p
-}
-
-// probeTimeout — a remote that cannot answer /health this fast is not going to
-// serve a turn either. Short on purpose: the prober runs on its own goroutine,
-// but a slow probe still delays the moment Maven notices the card came back.
-const probeTimeout = 2 * time.Second
-
-// Start begins probing. It returns immediately, and the first probe runs before
-// the first tick so a remote that is already up is used on the first turn
-// rather than after one interval of falling back. Safe to call with a nil
-// remote; it does nothing.
-func (p *Pair) Start(ctx context.Context) {
-	if p.remote == nil || p.health == "" {
-		return
-	}
-	go func() {
-		p.probe(ctx)
-		t := time.NewTicker(p.interval)
-		defer t.Stop()
-		for {
-			select {
-			case <-ctx.Done():
-				return
-			case <-p.stop:
-				return
-			case <-t.C:
-				p.probe(ctx)
-			}
-		}
-	}()
-}
-
-// Stop ends the prober. Idempotent.
-func (p *Pair) Stop() {
-	select {
-	case <-p.stop:
-	default:
-		close(p.stop)
-	}
-}
-
-// Available reports whether the workstation will take work right now. It reads
-// a cached flag, so it is safe to call per turn on the hot path. A false answer
-// is never stale in the direction that matters: the worst case is that Maven
-// falls back for up to one probe interval after the card frees up.
-func (p *Pair) Available() bool {
-	return p.remote != nil && p.up.Load()
-}
-
-func (p *Pair) probe(ctx context.Context) {
-	ctx, cancel := context.WithTimeout(ctx, probeTimeout)
-	defer cancel()
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, p.health, nil)
-	if err != nil {
-		p.set(false)
-		return
-	}
-	resp, err := p.http.Do(req)
-	if err != nil {
-		p.set(false)
-		return
-	}
-	defer resp.Body.Close()
-	p.set(resp.StatusCode == http.StatusOK)
-}
-
-// set records the admission answer and logs only the transitions. A machine
-// that sleeps every night would otherwise write one line per interval forever.
-func (p *Pair) set(up bool) {
-	if p.up.Swap(up) == up {
-		return
-	}
-	if up {
-		log.Printf("llm: workstation model available at %s", p.health)
-	} else {
-		log.Printf("llm: workstation model unavailable, falling back to the resident model")
-	}
-}
-
-// Complete runs r on the workstation when it will take work, and on the
-// resident model otherwise. A remote that fails mid-request falls back too: the
-// admission answer is a cache and can be one interval out of date, so an error
-// here is expected rather than exceptional.
-//
-// This is the silent half of the degradation rule. It must be indistinguishable
-// from today's behaviour when the workstation is down.
-func (p *Pair) Complete(ctx context.Context, r Req) (string, error) {
-	if p.floor == nil {
-		return "", ErrNoFloor
-	}
-	if p.Available() {
-		out, err := p.remote.Complete(ctx, r)
-		if err == nil {
-			return out, nil
-		}
-		// The cached answer was wrong. Correct it now rather than sending the
-		// next request into the same hole, then fall back.
-		p.set(false)
-	}
-	return p.floor.Complete(ctx, r)
-}
-
-// CompleteRemote runs r on the workstation or refuses. It never falls back,
-// because for a world question the resident 1.7B does not answer worse, it
-// invents. Callers turn ErrRemoteUnavailable into a named gap.
-func (p *Pair) CompleteRemote(ctx context.Context, r Req) (string, error) {
-	if !p.Available() {
-		return "", ErrRemoteUnavailable
-	}
-	out, err := p.remote.Complete(ctx, r)
-	if err != nil {
-		p.set(false)
-		return "", errors.Join(ErrRemoteUnavailable, err)
-	}
-	return out, nil
-}

internal/llm/remote_test.go

@@ -1,210 +0,0 @@
-package llm
-
-import (
-	"context"
-	"errors"
-	"net/http"
-	"net/http/httptest"
-	"sync/atomic"
-	"testing"
-	"time"
-)
-
-// completionServer stands in for a llama-server. It counts what reached it, so
-// a test can say which of the two models answered.
-func completionServer(t *testing.T, reply string, hits *atomic.Int64) *httptest.Server {
-	t.Helper()
-	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		hits.Add(1)
-		w.Header().Set("Content-Type", "application/json")
-		_, _ = w.Write([]byte(`{"choices":[{"message":{"content":"` + reply + `"}}]}`))
-	}))
-	t.Cleanup(s.Close)
-	return s
-}
-
-func healthServer(t *testing.T, ok *atomic.Bool) *httptest.Server {
-	t.Helper()
-	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if !ok.Load() {
-			w.WriteHeader(http.StatusServiceUnavailable)
-			return
-		}
-		w.WriteHeader(http.StatusOK)
-	}))
-	t.Cleanup(s.Close)
-	return s
-}
-
-// waitFor polls until cond holds or the deadline passes. The prober runs on its
-// own goroutine, so a test has to wait for it rather than assume it has run.
-func waitFor(t *testing.T, cond func() bool) bool {
-	t.Helper()
-	deadline := time.Now().Add(2 * time.Second)
-	for time.Now().Before(deadline) {
-		if cond() {
-			return true
-		}
-		time.Sleep(5 * time.Millisecond)
-	}
-	return false
-}
-
-// The unconfigured deploy. No remote, no probing, every call to the floor —
-// exactly what the box does today.
-func TestNoRemoteGoesToTheFloor(t *testing.T) {
-	var floorHits atomic.Int64
-	floor := completionServer(t, "floor", &floorHits)
-
-	p := NewPair(nil, New(floor.URL, time.Second), "", time.Second)
-	p.Start(context.Background())
-	defer p.Stop()
-
-	if p.Available() {
-		t.Fatal("a Pair with no remote reports available")
-	}
-	out, err := p.Complete(context.Background(), Req{User: "привет"})
-	if err != nil {
-		t.Fatalf("complete: %v", err)
-	}
-	if out != "floor" || floorHits.Load() != 1 {
-		t.Fatalf("out = %q, floor hits = %d", out, floorHits.Load())
-	}
-}
-
-// The workstation is up, so it answers and the resident model is not touched.
-func TestAvailableRemoteAnswers(t *testing.T) {
-	var remoteHits, floorHits atomic.Int64
-	remote := completionServer(t, "remote", &remoteHits)
-	floor := completionServer(t, "floor", &floorHits)
-	up := &atomic.Bool{}
-	up.Store(true)
-	health := healthServer(t, up)
-
-	p := NewPair(New(remote.URL, time.Second), New(floor.URL, time.Second), health.URL, 20*time.Millisecond)
-	p.Start(context.Background())
-	defer p.Stop()
-	if !waitFor(t, p.Available) {
-		t.Fatal("prober never saw the remote come up")
-	}
-
-	out, err := p.Complete(context.Background(), Req{User: "привет"})
-	if err != nil {
-		t.Fatalf("complete: %v", err)
-	}
-	if out != "remote" || floorHits.Load() != 0 {
-		t.Fatalf("out = %q, floor hits = %d", out, floorHits.Load())
-	}
-}
-
-// The card is busy, so /health refuses and Complete degrades silently. This is
-// the constraint from 483: the workstation being down is indistinguishable from
-// today's behaviour.
-func TestBusyCardFallsBackSilently(t *testing.T) {
-	var remoteHits, floorHits atomic.Int64
-	remote := completionServer(t, "remote", &remoteHits)
-	floor := completionServer(t, "floor", &floorHits)
-	health := healthServer(t, &atomic.Bool{}) // never ok
-
-	p := NewPair(New(remote.URL, time.Second), New(floor.URL, time.Second), health.URL, 20*time.Millisecond)
-	p.Start(context.Background())
-	defer p.Stop()
-	time.Sleep(60 * time.Millisecond)
-
-	out, err := p.Complete(context.Background(), Req{User: "привет"})
-	if err != nil {
-		t.Fatalf("complete: %v", err)
-	}
-	if out != "floor" || remoteHits.Load() != 0 {
-		t.Fatalf("out = %q, remote hits = %d", out, remoteHits.Load())
-	}
-}
-
-// The cached admission answer can be one interval out of date, so a remote that
-// dies between probes must still not break the turn.
-func TestRemoteErrorMidRequestFallsBack(t *testing.T) {
-	var floorHits atomic.Int64
-	dead := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusInternalServerError)
-	}))
-	defer dead.Close()
-	floor := completionServer(t, "floor", &floorHits)
-	up := &atomic.Bool{}
-	up.Store(true)
-	health := healthServer(t, up)
-
-	p := NewPair(New(dead.URL, time.Second), New(floor.URL, time.Second), health.URL, time.Hour)
-	p.Start(context.Background())
-	defer p.Stop()
-	if !waitFor(t, p.Available) {
-		t.Fatal("prober never saw the remote come up")
-	}
-
-	out, err := p.Complete(context.Background(), Req{User: "привет"})
-	if err != nil {
-		t.Fatalf("complete: %v", err)
-	}
-	if out != "floor" || floorHits.Load() != 1 {
-		t.Fatalf("out = %q, floor hits = %d", out, floorHits.Load())
-	}
-	// The failed request must have corrected the cached answer, so the next
-	// one does not walk into the same hole.
-	if p.Available() {
-		t.Fatal("a failed remote request left the admission answer up")
-	}
-}
-
-// The naming half of the degradation rule. A world question must not be handed
-// to the resident model, because it answers by inventing.
-func TestCompleteRemoteNamesTheGap(t *testing.T) {
-	var floorHits atomic.Int64
-	floor := completionServer(t, "floor", &floorHits)
-	health := healthServer(t, &atomic.Bool{}) // never ok
-
-	p := NewPair(New("http://127.0.0.1:1", time.Second), New(floor.URL, time.Second), health.URL, 20*time.Millisecond)
-	p.Start(context.Background())
-	defer p.Stop()
-	time.Sleep(60 * time.Millisecond)
-
-	if _, err := p.CompleteRemote(context.Background(), Req{User: "почему небо голубое"}); !errors.Is(err, ErrRemoteUnavailable) {
-		t.Fatalf("err = %v, want ErrRemoteUnavailable", err)
-	}
-	if floorHits.Load() != 0 {
-		t.Fatalf("CompleteRemote fell back to the floor %d times", floorHits.Load())
-	}
-}
-
-// Routing sits on the hot path and must never pay for a health check. Available
-// reads a cached flag, so it costs no network at all.
-func TestAvailableDoesNotProbe(t *testing.T) {
-	var probes atomic.Int64
-	health := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		probes.Add(1)
-		w.WriteHeader(http.StatusOK)
-	}))
-	defer health.Close()
-
-	p := NewPair(New("http://127.0.0.1:1", time.Second), New("http://127.0.0.1:1", time.Second), health.URL, time.Hour)
-	p.Start(context.Background())
-	defer p.Stop()
-	if !waitFor(t, p.Available) {
-		t.Fatal("prober never ran")
-	}
-
-	before := probes.Load()
-	for range 1000 {
-		p.Available()
-	}
-	if got := probes.Load(); got != before {
-		t.Fatalf("1000 Available calls made %d probes", got-before)
-	}
-}
-
-// A Pair with no floor is a configuration mistake, and it must say so rather
-// than silently having nowhere to degrade to.
-func TestNoFloorIsAnError(t *testing.T) {
-	p := NewPair(nil, nil, "", time.Second)
-	if _, err := p.Complete(context.Background(), Req{User: "привет"}); !errors.Is(err, ErrNoFloor) {
-		t.Fatalf("err = %v, want ErrNoFloor", err)
-	}
-}

internal/loop/explain_test.go

@@ -103,7 +103,7 @@ func TestExplainGate_PresenceAway(t *testing.T) {
 func TestExplainGate_PresenceAwayOpsBypass(t *testing.T) {
 	now := refTime()
 	s := State{Now: now, Presence: store.Away,
-		Facts: map[string]store.Fact{"service_down:db": factAt("service_down:db", "poll:uptimekuma", `"down"`, now.Add(-1*time.Minute))},
+		Facts: map[string]store.Fact{"service_down": factAt("service_down", "poll:uptimekuma", `"down"`, now.Add(-1*time.Minute))},
 	}
 	r := ServiceDownRule() // Sev4 ops
 	passed, blocked, d := ExplainGate(s, r)
@@ -259,8 +259,8 @@ func TestExplainTick_WinnerRecorded(t *testing.T) {
 		Now:      now,
 		Presence: store.Present,
 		Facts: map[string]store.Fact{
-			"water":           factAt("water", "tap:water", `"250ml"`, now.Add(-4*time.Hour)),
-			"service_down:db": factAt("service_down:db", "poll:uptimekuma", `"down"`, now.Add(-1*time.Minute)),
+			"water":        factAt("water", "tap:water", `"250ml"`, now.Add(-4*time.Hour)),
+			"service_down": factAt("service_down", "poll:uptimekuma", `"down"`, now.Add(-1*time.Minute)),
 		},
 	}
 	cand, trace := ExplainTick(s, DefaultRules())

internal/loop/gate_test.go

@@ -198,12 +198,12 @@ func TestTickNeverDogpilesAndPicksLoudest(t *testing.T) {
 		Now:      now,
 		Presence: store.Present,
 		Facts: map[string]store.Fact{
-			"water":           ago("water", "tap:water", `"250ml"`, 5*time.Hour),
-			"meal":            ago("meal", "voice", `"lunch"`, 8*time.Hour),
-			"desk_active":     ago("desk_active", "infer:hyprland", "1", 30*time.Second),
-			"break":           ago("break", "voice", `"walk"`, 3*time.Hour),
-			"service_down:db": ago("service_down:db", "poll:uptimekuma", `"down"`, time.Minute),
-			"netdata_alarm":   ago("netdata_alarm", "poll:netdata", `"critical"`, time.Minute),
+			"water":         ago("water", "tap:water", `"250ml"`, 5*time.Hour),
+			"meal":          ago("meal", "voice", `"lunch"`, 8*time.Hour),
+			"desk_active":   ago("desk_active", "infer:hyprland", "1", 30*time.Second),
+			"break":         ago("break", "voice", `"walk"`, 3*time.Hour),
+			"service_down":  ago("service_down", "poll:uptimekuma", `"down"`, 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.

internal/loop/gather.go

@@ -91,20 +91,6 @@ func (g *Gatherer) GatherState(ctx context.Context, now time.Time) (State, []sto
 		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.
 	// "active" = the feedback tuner's persisted base if one exists, else the
 	// rule's static Base. LatestFactBySource is the trust-by-provenance read

internal/loop/gather_test.go

@@ -1,47 +0,0 @@
-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")
-	}
-}

internal/loop/loop_test.go

@@ -82,7 +82,7 @@ func TestTickOpsHardSurvivesAwayAndQuiet(t *testing.T) {
 		Presence:   store.Away,
 		QuietHours: true,
 		Facts: map[string]store.Fact{
-			"service_down:db": factAt("service_down:db", "poll:uptimekuma", `"down"`, now.Add(-1*time.Minute)),
+			"service_down": factAt("service_down", "poll:uptimekuma", `"down"`, now.Add(-1*time.Minute)),
 		},
 	}
 	got := Tick(s, DefaultRules())
@@ -99,7 +99,7 @@ func TestTickServiceSourceTrustRefusesForgedTrigger(t *testing.T) {
 		Now:      now,
 		Presence: store.Present,
 		Facts: map[string]store.Fact{
-			"service_down:db": factAt("service_down:db", "ambient", `"down"`, now.Add(-1*time.Minute)),
+			"service_down": factAt("service_down", "ambient", `"down"`, now.Add(-1*time.Minute)),
 		},
 	}
 	if got := Tick(s, DefaultRules()); got != nil {
@@ -115,8 +115,8 @@ func TestTickOneNudgePerTickMaxSeverityWins(t *testing.T) {
 		Now:      now,
 		Presence: store.Present,
 		Facts: map[string]store.Fact{
-			"water":           factAt("water", "tap:water", `"250ml"`, now.Add(-4*time.Hour)),
-			"service_down:db": factAt("service_down:db", "poll:uptimekuma", `"down"`, now.Add(-1*time.Minute)),
+			"water":        factAt("water", "tap:water", `"250ml"`, now.Add(-4*time.Hour)),
+			"service_down": factAt("service_down", "poll:uptimekuma", `"down"`, now.Add(-1*time.Minute)),
 		},
 	}
 	got := Tick(s, DefaultRules())

internal/loop/rules.go

@@ -28,13 +28,6 @@ type Rule struct {
 	// 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.
 	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
@@ -105,58 +98,23 @@ func BreakRule() Rule {
 	}
 }
 
-// ServiceDownPrefix — mavpoll writes one fact per kuma monitor under this
-// prefix, `service_down:<monitor name>`. The suffix is the name he hears.
-const ServiceDownPrefix = "service_down:"
-
-// 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.
+// ServiceDownRule — sev4 ops hard: the `service_down` aggregate fact reads
+// "down". Source must be poll:uptimekuma — kuma is the source of truth for
+// service up/down (mavpoll writes this key). The predicate is provenance-scoped:
+// a compromised poller writing under a different source can't forge the trigger.
 func ServiceDownRule() Rule {
 	return Rule{
-		Name:         "service_down",
-		Severity:     Sev4,
-		Cooldown:     Cooldown{Base: 15 * time.Minute, Min: 5 * time.Minute, Max: 1 * time.Hour},
-		WantPrefixes: []string{ServiceDownPrefix},
+		Name:            "service_down",
+		Severity:        Sev4,
+		Cooldown:        Cooldown{Base: 15 * time.Minute, Min: 5 * time.Minute, Max: 1 * time.Hour},
+		InertWhenNoData: []string{"service_down"},
 		Predicate: func(s State) bool {
-			var newest time.Time
-			for _, f := range s.FactsUnder(ServiceDownPrefix) {
-				if f.Source != ServiceDownSource || f.Value != `"down"` {
-					continue
-				}
-				if f.Ts.After(newest) {
-					newest = f.Ts
-				}
+			f, ok := s.Fact("service_down")
+			if !ok || f.Ts.IsZero() {
+				return false
 			}
-			if newest.IsZero() {
-				return false // nothing down, or no data at all → shut up
-			}
-			return !s.NudgedSince("service_down", newest)
+			// value is json `"down"`; trivial check keyed off source provenance.
+			return f.Source == "poll:uptimekuma" && f.Value == `"down"`
 		},
 	}
 }