Give the stage 0 grammar set one home (V-693)
buildRouter held the real set and baselineGrammars in eval_test.go restated it by hand, in the daemon's order, with its own comment saying so. Three test files score against the fixture and nothing compared the two lists. They had already drifted: BareCaptureGrammar went into the daemon with V-557 and never into the fixture, so every routing measurement since has scored a set nobody runs. That is the failure CLAUDE.md warns about by name, and a diff test would have caught it one grammar late. The list moves to router.StageZeroGrammars in internal/router/stagezero.go, with the ordering comments, which are the load-bearing part. buildRouter and the fixture both call it. One list cannot drift from itself. Measured before and after on the 96-case fixture: classifier+onnx 72/96, 75.0% intent, 33.3% destination, identical either way, and the deterministic claim and reach hash ratchets do not move. So the missing grammar cost no measurable accuracy. That is the point rather than a reprieve: the fixture had been scoring the wrong set for four days and nothing could say so. The invariants caveat is deleted, both entries, since V-692 landed the other guard in the previous commit. The reasoning for both now sits in docs/routing.md beside the subsystem, which is where a fix's durable record belongs. Unrelated and pre-existing: TestONNXPersonalBoundary fails on "я рассказывал тебе про байкал?" (personal 0.9068, world 0.9413) at the merge base too.
This commit is contained in:
@@ -255,35 +255,12 @@ func newBaselineClassifier(t *testing.T, emb router.Embedder) *router.Classifier
|
||||
return cls
|
||||
}
|
||||
|
||||
// baselineGrammars — the stage-0 rule set in the daemon's order (buildRouter in
|
||||
// cmd/mavend/voicewire.go). Split out of newBaselineRouter so the claim
|
||||
// measurement can run the same rules one at a time and see which of them
|
||||
// contend for the same utterance, which the cascade hides by stopping at the
|
||||
// first match.
|
||||
// baselineGrammars — the stage 0 rule set the daemon runs, from the one place
|
||||
// it is written down (V-693). It used to restate the list by hand, and by the
|
||||
// time the guard was written the two had already drifted by one grammar.
|
||||
// Kept as a name because the claim measurement reads it as "the baseline set".
|
||||
func baselineGrammars(acts router.ActMatcher) []router.Grammar {
|
||||
grammars := router.DefaultGrammars(acts)
|
||||
grammars = append(grammars, router.SystemTimeDateGrammars()...)
|
||||
// Same order as buildRouter (voicewire.go). The fixture is only worth
|
||||
// anything while its grammar set is the daemon's grammar set.
|
||||
grammars = append(grammars, router.AgendaQueryGrammars()...)
|
||||
// After the agenda rules and before the feed and list rules, same as
|
||||
// voicewire.go: "что такое лента" is a definition question and the feed
|
||||
// rule would claim it on the noun alone (V-655). Missing here until V-659,
|
||||
// so the fixture was scoring a grammar set the daemon does not run.
|
||||
grammars = append(grammars, router.WorldQueryGrammars()...)
|
||||
grammars = append(grammars, router.FeedQueryGrammar())
|
||||
// The list side of the same exposure: a phrasing with no possessive in it
|
||||
// ("список дел") routed system and never reached queryTasks (Vikunja #467).
|
||||
grammars = append(grammars, router.TaskListGrammar())
|
||||
grammars = append(grammars, router.ListGrammars()...)
|
||||
grammars = append(grammars, router.ReminderGrammar())
|
||||
grammars = append(grammars, router.PraxisGrammars()...)
|
||||
grammars = append(grammars, router.TaskStatusGrammar())
|
||||
grammars = append(grammars, router.TaskCaptureGrammar())
|
||||
// "расскажи про X" is a world question the model called a fact, and the
|
||||
// rule goes last because it matches on the first word alone (Vikunja #498).
|
||||
grammars = append(grammars, router.NarrativeQueryGrammars()...)
|
||||
return grammars
|
||||
return router.StageZeroGrammars(acts)
|
||||
}
|
||||
|
||||
// seedOrder — fixed iteration order over the corpus. Not cosmetic: a few
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
package router
|
||||
|
||||
// StageZeroGrammars — the stage 0 rule set, in the order the daemon runs it.
|
||||
//
|
||||
// It lives here because it used to live in two places (V-693). `buildRouter` in
|
||||
// cmd/mavend/voicewire.go held the real set and `baselineGrammars` in
|
||||
// internal/router/eval/eval_test.go restated it by hand, in the daemon's order,
|
||||
// with its own comment saying so. Three test files score against the fixture,
|
||||
// and nothing compared the two lists. By 2026-08-11 they had already drifted:
|
||||
// BareCaptureGrammar was in the daemon and not in the fixture, so every routing
|
||||
// measurement scored a set nobody ran. That is the failure CLAUDE.md warned
|
||||
// about by name, and a diff test would have caught it one grammar late. One
|
||||
// list cannot drift from itself.
|
||||
//
|
||||
// The order is the contract, not the membership. Each rule below says why it
|
||||
// sits where it sits, and a rule inserted in the wrong place changes which
|
||||
// utterances the cascade never reaches. Read the comment above a line before
|
||||
// moving it, and read docs/routing.md before adding one.
|
||||
//
|
||||
// The classifier, the extractor, the threshold and the model arm are the
|
||||
// daemon's to assemble. This function returns the rules and nothing else, so
|
||||
// the fixture can also run them one at a time and see which of them contend for
|
||||
// the same utterance, which the cascade hides by stopping at the first match.
|
||||
func StageZeroGrammars(acts ActMatcher) []Grammar {
|
||||
grammars := DefaultGrammars(acts)
|
||||
grammars = append(grammars, SystemTimeDateGrammars()...)
|
||||
// After the time/date rules on purpose: "какой сегодня день" is a clock
|
||||
// question and must keep reaching replySystem, while "что у меня сегодня"
|
||||
// is an agenda question and must not.
|
||||
grammars = append(grammars, AgendaQueryGrammars()...)
|
||||
// Same reason as the agenda rules, for the feeds: "что нового в лентах?"
|
||||
// routed system and answered "пока не умею" (Vikunja #474).
|
||||
// After the agenda rules, which are the narrower claim, and BEFORE the feed
|
||||
// and list rules, which are not: "что такое лента" is a definition question
|
||||
// and the feed rule would take it on the noun alone (V-655).
|
||||
grammars = append(grammars, WorldQueryGrammars()...)
|
||||
grammars = append(grammars, FeedQueryGrammar())
|
||||
// The list side of the same exposure: a phrasing with no possessive in it
|
||||
// ("список дел") routed system and never reached queryTasks (Vikunja #467).
|
||||
grammars = append(grammars, TaskListGrammar())
|
||||
grammars = append(grammars, ListGrammars()...)
|
||||
grammars = append(grammars, ReminderGrammar())
|
||||
// Before the capture marker, because "отметь" is a capture verb and "отметь
|
||||
// второй пункт" is not a note. The Praxis rules are the narrower claim — a
|
||||
// lifecycle verb AND an item named — so they get first refusal (Vikunja #516).
|
||||
grammars = append(grammars, PraxisGrammars()...)
|
||||
// After Praxis, whose bare "закрой" claim this rule cannot reach (it needs the
|
||||
// board noun), and before the capture marker, which would otherwise read
|
||||
// "убери из задач купить молоко" as a new task (Vikunja #512).
|
||||
grammars = append(grammars, TaskStatusGrammar())
|
||||
// Before the capture markers, which all need an object. A capture verb
|
||||
// alone is a fact with no key, and the clarify path asks for it rather than
|
||||
// letting the model invent an answer (Vikunja #557).
|
||||
grammars = append(grammars, BareCaptureGrammar()...)
|
||||
// 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, TaskCaptureGrammar())
|
||||
// After the capture marker, so "запиши" still wins over "расскажи", and
|
||||
// last overall because it matches on the first word alone: "расскажи про
|
||||
// X" is a world question the model called a fact (Vikunja #498).
|
||||
grammars = append(grammars, NarrativeQueryGrammars()...)
|
||||
return grammars
|
||||
}
|
||||
Reference in New Issue
Block a user