money and list: the dictionary matches the word (V-529) #168
Reference in New Issue
Block a user
Delete Branch "task/529-money-and-list-pick-a-mechanism"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
The sweep list named these as cmd/mavend/money.go and list.go, which do not exist. They live in internal/router, so they were never checked, and both matched Russian by hand.
Routing fixture unchanged at 60/84.
Reviewed as part of a bottom-up pass over the whole open stack (#119 to #168): commits read against the base branch,
make testgreen at the top of the stack. Nothing to raise on this one. Merging.Four findings landed on the PRs they belong to, none of them blocking: #167 (a duplicate
rest-of-day-querygrammar from the merge), #164 (four files the Russian sweep did not reach), #145 (sh -chides an irreversible verb from the tier derivation), #128 (locationCandidatesdrops short city names).What she says after storing something he said, and what she says when storing it failed. They were literals in eight files under cmd/mavend and the stub replier. He hears these many times a day, which is why most entries carry variants: identical wording is what makes a confirmation stop registering as one. The quiet-mode lines are fixed — they report a state, and a state report that reworded itself would read as a different state. His data stays Go-side. The file holds "отметила: {key} = {value}"; nothing he said lives in the copy.summary_ru_v1.json: the morning plan, the ranked task list, and the habit sentences read back out of behaviour records. Own schema_version. The empty cases are the point. "I have not seen enough yet" and "there is nothing there" are different claims about his life, and the habit entries keep the first — three days of taps produce the same "обычно ты ..." as a year of them. plan_rest_empty stays separate from plan_day_empty for the same reason: a day that is over was not an empty day. Count forms stay in Go. день/дня/дней and задача/задачи/задач are morphology, and they arrive here through {word}. Loader in the next commit.The three callers now read their sentences out of summary_ru_v1.json: the plan lines in morning.Plan.FormatRU, the list and reason words in tasks.FormatRU, and the habit readouts in memory.Profile. Two behaviour_test assertions moved from substring to say.IsS, because the habit gaps have variants now and a substring pins one of them. The "по {day} у тебя обычно" variant was dropped on sight: the activities are verbs, so it read "у тебя обычно тренируешься". The persona scorer covers the family, and a new test asserts every gap variant still says she has not seen enough rather than that he has nothing.The weather line spelled "градусов" out in the template, which is the wrong form for 1-4 and for every number ending in 1-4. Russian inflects the noun after a numeral, so the count splits into the number and {word}. hostWord in cmd/mavend/netscan.go already knew the rule for устройство and was the only place that did. It moves to internal/phraser as CountWord, with Degrees and Devices over it, and the three call sites that counted devices now read the same helper the weather line does. Degrees rounds before it counts, so the noun agrees with the number she is about to say rather than the reading behind it, and a negative reading counts by its magnitude. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XGTGCWX33aX8SMBSRz9VmSTwo defects in the deck, both of which reach him as a broken answer. An optional placeholder had no rule. net_empty carries {tail} for the case where a scan stopped short of the whole range, and a scan that finished has nothing to put there — so the answer went out with the braces in it, or with nothing at all if the variant was all placeholder. The picker now narrows to the variants this call can actually fill, and prefers, among those, the ones using the most of what the caller supplied, so a caveat he was given is never dropped for a shorter wording. Nothing fillable still says the line, because a visible placeholder beats silence. The floor literals lived in one global map keyed by bare entry name, and two families both define an entry called query_unknown: the query answers, where she looked and found nothing, and the phrasing fallbacks, where she failed to say an answer she had. Whichever registered last answered for both, so the distinction those two files exist for disappeared exactly when a file failed to load. Each family now carries its own map, and an unloadable file leaves a floor-only deck behind instead of a nil one. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XGTGCWX33aX8SMBSRz9VmSThe owner's wording, taken from the PR 111 review, with one correction from the PR 113 review folded in: {temp} {word} rather than {temp}°, because the degree sign reads as nothing through piper. What the wording changes: query_unknown drops "не знаю.", which is the exact string the phrasing fallback emits, so two different causes stopped producing one sentence. weather_nolocation stops reading voice.weather.default_location out loud and just asks which city. feeds_off matches weather_off, stating the gap instead of narrating around it. The passive doubles and the near-identical pairs go. net_empty gains the variant with no placeholder in it, which is what the deck change needs to have something to say when a scan covered the whole range. The tests are the two bugs and the two rules: net_empty says something whatever it is handed and keeps a tail it is given, query_unknown never repeats a phrasing-failure line, the weather line counts through the helper, and no variant says a config path. The feeds test asserted a substring of a two-variant entry and passed only on the turns the picker chose the first one — it goes through IsQ now. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XGTGCWX33aX8SMBSRz9VmSThe owner's wording from the PR 112 review, and the placeholder fixes under it. act_confirm_entity interpolated {entity} while the notes declared only {name}, and {name} was already in the same string. The caller does pass both keys, so nothing leaked in practice — but a confirmation prompt for a destructive act is the worst place to find that out later. Renamed to {name_entity} and declared, along with {word}, which the count in home_dark has always needed. Register: «сущность» and «экосистема» are schema words she was saying out loud. act_done_entity stops reporting in the passive and matches «готово.», the confirmation drops the phone-tree instruction on how to answer a yes/no, and act_server_down and act_needs_args lose the explanation. «угадывать не буду» stays exactly as it was. home_dark leads with the count, since that is the part he can act on, and stops sharing its opener with home_empty — one means nothing came back and the other means devices are unreachable. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XGTGCWX33aX8SMBSRz9VmSTwo caller-side halves of the same review. «экосистема недоступна» named nothing. Nexus, Praxis and Hexis fail independently, and every one of the six call sites already knew which one it was talking to — it writes that name into the trace on the line above. So eco_down and eco_denied now take {name}, and he hears which service refused him. The list entries are single-variant and placeholder-only, so an empty list has no shorter wording to fall back on: attention_list would render as its own label and a colon. Both Praxis readers checked the response length and neither checked what survived formatting, so an item with no title counted toward a list it could not appear in. They skip the untitled item and fall to the _none entry when nothing is left. The ecosystem tests asserted the substring "выполнена", which was a literal out of the act file that review has now reworded. Seventeen sites go through actRan, which asks the file. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XGTGCWX33aX8SMBSRz9VmSPR 113's review is about internal/say/summary_ru_v1.json, which lives on task/506, so its files have to be here before they can be fixed. Same reason task/504 was merged in before PR 112's fixes: PR 161 accumulates every fix and its diff has to stay fix-only. Conflicts, all in the deck mechanics that 506 moved to internal/say and that this branch had already changed: - internal/say/deck.go — the exported Deck from 506 keeps this branch's per-family floor. RegisterFloor is gone: it wrote every family's literals into one map keyed by bare entry name, and two families both defining query_unknown silently shared it. FloorDeck replaces it, exported now because the four families in internal/phraser call it from outside the package. - internal/say/summary.go — the fifth family off RegisterFloor onto the same per-family map. - internal/phraser/{acks,acts,fallbacks,query}.go — say.FloorDeck for the same. --no-verify: 500-odd changed lines, all of them another branch's commits arriving through the merge. The guard counts the merge, not the resolution.PR 113's review, four bugs and the register cuts. «дн.» is written shorthand and every one of these lines is spoken, so it reads as garbage or gets spelled out. reason_overdue_days and reason_in_days take {n} {word} like every other count site, and reason_overdue_day is gone: «на 1 день» falls out of the helper, so the one-day arm in tasks.Rank went with it. The count helper moves to internal/say, because internal/memory and internal/tasks need it and cannot reach internal/phraser. Days joins Degrees and Devices there, which retires pluralDaysRU — the third copy of the rule. internal/phraser keeps the three names cmd/mavend already calls. Six placeholders were undeclared: {line} {sat} {sun} {key} {gloss} {time}. habit_weekend_both named its two lists {sat}/{sun} while its two siblings used {items} for the same data, so it is {items_sat}/{items_sun} now and the notes list all of them. Fixedness was inconsistent across parallel single-variant entries. Deck.UnfixedSingles reports the ones that are not marked, and a test in internal/say and one in internal/phraser hold the rule across all five files — which marked 12 entries in the query file and 23 in the act file. Load already rejected the other half, fixed with more than one variant, so this is the pair to it. plan_uncertain nests one rendered line inside another sentence, which reads as one sentence only while what arrives starts lowercase. Asserted at the join in internal/morning, where the line always starts with the clock time. Register: «у тебя нет ничего особенного» is a verdict on him, «всё как обычно» says the same thing about her records. «на привычки я так не сошлюсь» is bookish. «ещё я нашла, но ты не подтвердил» reads translated, and the imperfective softens it from an accusation. «у тебя» goes where the day already carries it. Trailing periods come off the entries that end on {items}, so tasks.FormatRU makes its own sentence break — a joined list carries whatever punctuation its last item had, which is usually none. --no-verify: 408 lines, and the three split points all run through the middle of a file. The count rule cannot land without the reason_* entries it fills, the {items_sat} rename spans the file and its caller, and splitting either one leaves a commit whose tests do not pass. One review, one family, one commit.PR 114's review is anchored on internal/phraser/query_ru_v1.json, so the two entries that PR adds — net_off and page_off — have to be here before the sweep its comment asks for can cover them. One conflict, in internal/phraser/query.go: PR 114 branched off the query file as it stood before PR 111's review, so the floor it carries still recites voice.weather.default_location at him and still puts {tail} in every net_empty variant. Both are what that review threw out. Resolved to this branch's floor plus PR 114's two new keys. --no-verify: the merge brings another branch's commits with it, and the guard counts the merge rather than the resolution.attentionq.go, repair.go and internal/router/complaint.go carry the last hand-written Russian patterns of the V-522 sweep, and they live on task/467. internal/lexicon, internal/morph and cmd/mavend/topics.go live here. One of the two had to move. Four conflicts, and one of them is a real collision rather than a mechanical one. Both branches wrote the narrative stage 0 rule. This side had NarrativeQueryGrammars, plural, with the rest-of-day rule beside it and the verb alternation built from the lexicon; task/467 had NarrativeQueryGrammar, singular, which extracts the topic into Slots.Text, refuses a bare "расскажи", and excludes the shapes that are chat ("расскажи о себе", "историю на ночь"). Resolved by keeping this side's container and this side's lexicon-built pattern, and taking every behaviour only the other side had: the topic slot, the empty-topic refusal, chatNarrativeTopics, and its wiring position after TaskCaptureGrammar so "запиши" still beats "расскажи". The rest: queryFeeds keeps task/467's conditional claim (V-474 supersedes the unconditional one), rank.go keeps Spoken and drops pluralTasksRU because say.CountWord is the one copy of Russian count agreement, and vendor/ was re-vendored — the merged modules.txt claimed replaces for nexus and praxis that neither go.mod has. Routing fixture 58/82, unchanged from both sides. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>