Krzysztof kuhy Rudnicki
24dbffc432
Without this the schedule would be device-local, which is the failure this
whole feature has to avoid: the phone sets five meals, the PC still derives
four, and the PC's gate nags for a 12:00 checkpoint the phone never offered
and can never satisfy. So sync lands before either edit surface, not after.
The history rides the existing `budget` CRDT record as one
`sched:<YYYY-MM-DD>` field per entry, exactly like the budget's own `hist:`
fields. merge_record is per-field LWW over the *union* of field names and both
devices push the merged record, so a device that predates the feature relays
the fields untouched -- no coordinated release. There is a test for precisely
that: merging our push with a budget-only peer keeps both schedule entries.
Verified the two languages agree on the wire, not just in their own suites --
Python and Dart both emit
{"sched:1970-01-01":{"f":8,"l":20,"n":4},"sched:2026-08-16":{"f":8,"l":20,"n":5}}
The Hlc is derived from the *parsed* timestamp on both sides, which matters
because the epoch fallback formats differently in each language
(1970-01-01T00:00:00+00:00 vs ...000Z) and a string comparison would diverge.
Two guards worth naming:
- A device with no history contributes no `sched:` fields at all, so an unset
default can never outrank a peer's real schedule; and an empty merge result
is never written back, so a pre-feature peer cannot erase a real history.
- Dart's `_syncBudget` synthesises a local record when the schedule has been
edited but the budget never has -- `budgetToLog(null, ...)` returns an empty
Log and would otherwise drop the schedule fields too. Its budget value
carries an epoch stamp, so it loses every LWW race against a real edit.
sync_merge/_schedule.py and sync_merge_schedule.dart are separate modules
rather than additions to the budget adapters, which were at 186 and 170 lines
against the 250 cap. Each declares its own record-id constant so the Dart
pair does not import each other.
772 Python tests at 100% branch coverage, 619 Dart.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0159b4E5hh512jYUeaJVNxfM
|
||
|---|---|---|
| .github/workflows | ||
| app | ||
| diet_guard | ||
| docs | ||
| packaging/aur | ||
| scripts | ||
| .gitignore | ||
| .mcp.json | ||
| .pre-commit-config.yaml | ||
| CLAUDE.md | ||
| DESIGN_AUDIT_TODO.md | ||
| diet-guard-gate.service | ||
| diet-guard-gate.timer | ||
| diet-guard-sync.service | ||
| install.sh | ||
| LICENSE | ||
| pyproject.toml | ||
| README.md | ||
| requirements.txt | ||
diet_guard
A log-to-unlock gate: locks the desktop until a meal is logged once a meal slot (08:00 / 12:00 / 16:00 / 20:00) has elapsed without one, and tracks a sealed daily calorie/macro budget.
Install
bash install.sh
This installs the package + dependencies into system Python's user
site-packages (the systemd service runs /usr/bin/python directly, not a
venv — see CLAUDE.md), installs the systemd user timer, seals your daily
budget, and locks the budget file immutable.
Usage
python -m diet_guard init # one-time: compute and seal today's budget
python -m diet_guard gate --demo # test the lock window (safe, closeable)
python -m diet_guard averages # weekly/monthly average kcal vs budget
Averages
averages prints the mean kcal/day for this week, last week, this month and
last month, each labelled under / slightly over / very over.
Three rules make the number honest, and all three are mirrored in the phone app and the gate's History tab:
- the mean is over logged days only -- a day you forgot to log is not a zero-calorie day, and averaging it in as one would make every gap in the log read as "well under budget";
- the yardstick is the mean of the budgets that applied on those same days,
not today's budget, so editing the budget never retroactively reclassifies a
past week (same reason the calendar uses
.budget_history); - today is excluded -- every period ends at yesterday, because a half-logged today drags the mean far enough to flip the band. On a Monday "this week" therefore reports no logged days yet rather than a flattering number.
The band boundaries are the calendar's own (at or under budget / up to 20% over / more than 20% over), so a period and its day cells can never disagree about what "over" means.
The timer runs the gate automatically every ~30 minutes; no manual invocation is needed once installed.
MCP server
An optional Model Context Protocol server
lets an MCP client (Claude Code and its subagents) query today's intake and log
meals as typed tools instead of shelling out to the CLI. It runs in its own
venv (~/.venvs/diet-guard-mcp) so the mcp SDK never touches the
dependency-light system/CLI python path.
Tools:
get_status— today's consumed kcal + macros, the consumption band (on track/approaching limit/OVER BUDGET, or none when no budget is sealed), plus due / logged / current meal slots.list_today— today's logged meals (description, kcal, macros, source, slot).get_slots— the day's fixed meal slots and the current one.get_averages— average kcal/day for this/last week and this/last month, each with its band (under/slightly_over/very_over). Returns the intake and the band only — never the period's average budget.log_meal(description, grams=, kcal=, protein=, carbs=, fat=, slot=, confirm=False)— gated write: withconfirm=Falseit previews the resolved nutrition and target slot and mutates nothing; onlyconfirm=Trueappends the entry. The gate is intrinsic — never add this tool to a permission allowlist, since a client's auto-approve mode would otherwise bypass the human confirmation.
The read tools deliberately never expose the raw daily budget number (only the
qualitative band), nor the sealed .budget file, the shared HMAC key, or the
sync token — the budget stays hidden by design.
Setup:
bash scripts/setup_mcp.sh # create the venv and install diet_guard[mcp]
Then restart Claude Code in this repo and approve the project MCP server
(registered in .mcp.json).
Development
python -m venv .venv && .venv/bin/pip install -r requirements.txt
.venv/bin/pre-commit install && .venv/bin/pre-commit install --hook-type pre-push
.venv/bin/python -m pytest diet_guard/tests/ --cov=diet_guard --cov-branch --cov-fail-under=100
See CLAUDE.md for scheduling details and production deployment gotchas,
and docs/design.md for the original feature spec.