Go to file
Krzysztof kuhy Rudnicki e23f7ac3b4
Some checks are pending
pre-commit / pre-commit (push) Waiting to run
Tests / test (3.10) (push) Waiting to run
Tests / test (3.11) (push) Waiting to run
Tests / test (3.12) (push) Waiting to run
release-apk / release (APK) (push) Waiting to run
Push under a persisted per-install uuid, not a fixed role id
diet_guard pushed as "pc" (Python), "phone" (Android) and "desktop" (web).
A role constant collides the moment a second machine takes the same role,
and after a reinstall the new install inherits the previous one's CRDT
identity -- the same reasoning home_inventory already records for choosing a
uuid. Both halves now mint a uuid once and persist it: the PC in
~/.local/share/diet_guard/.device_id, the app under SharedPreferences
'crdt.nodeId' (the key todo and home_inventory already use).

The old constant survives as the legacy id and is passed to sync_log /
syncLog, so devices/<legacy>/ is skipped as this device's own. Without that
every tick would re-download and re-merge this device's own pre-migration
log as though a peer had written it -- idempotent under LWW, but hundreds of
KB, 96 times a day. It drops to None once that path is reclaimed; a test
covers both states, including a negative control proving the skip is the
legacy id's doing.

All four documents move together (food_log, food_bank, food_bank_manual,
budget), and the hist:<date> fields riding on the budget record are
untouched -- merge_record unions field names, so they relay through
unchanged.

The resolver lives in its own module (_device.py / sync_device_id.dart)
because _sync_merge needs it for HLC stamping too and importing _sync there
would be a cycle. Dart resolves it asynchronously at startup, before
LogStorageService.init(); currentSyncDeviceId falls back to the compile-time
role constant until then, so a too-early Hlc stamp gets a valid id rather
than crashing.

conftest redirects the new id file in the same change that introduces it --
without that a test mints a uuid into the real state dir and this machine's
live sync identity is decided by whichever test ran first. Verified by
checking ~/.local/share/diet_guard/ before and after: untouched.

Verified live, not just against mocks: the sync timer ran mid-change and
migrated this machine to f8f46da6. All 358 food_log records and all 100
food_bank records are present under the new path (0 missing vs devices/pc/),
and the new log's HLCs carry only its own id -- confirming it did not
re-merge the old path as a peer.

Python: 687 tests, 100% branch coverage. App: 518 tests, analyzer clean.
Pins bumped to crdt-sync-v0.6.0 / crdt_sync_dart-v0.7.0 (pyproject,
requirements.txt, .pre-commit-config.yaml, pubspec), and the new library is
installed into /usr/bin/python's user site-packages so the production timer
does not ImportError on its next tick.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GZH89WEqAjuJT8WZdqc7AP
2026-08-09 17:18:42 +02:00
.github/workflows Build and publish a signed APK on every push to main 2026-08-04 20:55:14 +02:00
app Push under a persisted per-install uuid, not a fixed role id 2026-08-09 17:18:42 +02:00
diet_guard Push under a persisted per-install uuid, not a fixed role id 2026-08-09 17:18:42 +02:00
docs Add change explanation: desktop-web-build 2026-07-20 17:27:42 +02:00
scripts Stop two keyboard tests hanging, and make the CI mirror mirror CI 2026-08-04 21:50:15 +02:00
.gitignore Add CI-mirror pre-push gate + requirements-sync check 2026-07-11 17:58:49 +02:00
.mcp.json Add MCP server exposing diet status + a gated log_meal 2026-07-10 21:36:46 +02:00
.pre-commit-config.yaml Push under a persisted per-install uuid, not a fixed role id 2026-08-09 17:18:42 +02:00
CLAUDE.md Push under a persisted per-install uuid, not a fixed role id 2026-08-09 17:18:42 +02:00
DESIGN_AUDIT_TODO.md Add a design-rules audit against the new safe-design-rules checklist 2026-07-21 15:25:20 +02:00
diet-guard-gate.service Extract diet_guard from testsAndMisc as a standalone repo 2026-06-22 12:18:39 +02:00
diet-guard-gate.timer Extract diet_guard from testsAndMisc as a standalone repo 2026-06-22 12:18:39 +02:00
diet-guard-sync.service Add cross-device log sync (Python half of Milestone 3) 2026-06-22 19:36:27 +02:00
diet-guard-sync.timer Add cross-device log sync (Python half of Milestone 3) 2026-06-22 19:36:27 +02:00
install.sh Add budget-adherence calendar, streaks, and freely-editable synced budget 2026-07-13 21:31:45 +02:00
pyproject.toml Push under a persisted per-install uuid, not a fixed role id 2026-08-09 17:18:42 +02:00
README.md Show weekly and monthly average intake on both devices 2026-08-09 14:59:40 +02:00
requirements.txt Push under a persisted per-install uuid, not a fixed role id 2026-08-09 17:18:42 +02:00

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: with confirm=False it previews the resolved nutrition and target slot and mutates nothing; only confirm=True appends 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.