_sync.py 498 -> 165, into siblings that each own one concern:
_sync_client.py picking a backend and building the remote store
_sync_banks.py pull/merge/push for the food bank and the budget
_sync_paths.py the kuhyx/syncs wire layout, shared by both
_sync_errors.py SyncError, so _sync and _sync_client need not import
each other
The patch targets moved with the code they guard, which is the whole risk of
this commit. unittest.mock.patch and monkeypatch.setattr both bind to a
*module object*, so a patch left pointing at _sync after CONFIG_FILE and
SYNC_TOKEN_FILE moved to _sync_client redirects nothing. That is not
hypothetical here: the first run of the suite took 9m18s instead of 7s and
raised 401s, because tests were reaching the real GitHub API with a fake
token. Repointed:
conftest SYNC_TOKEN_FILE, CONFIG_FILE -> _sync_client
test_sync* GitHubSyncClient (30 patch sites) -> _sync_client
test_backend mirror/firebase_client_for -> _sync_client
The repo's own _test_guard caught the same leak independently, which is the
behaviour worth keeping: two guards, both fail-closed.
test_sync.py 482 -> 205, splitting the budget and pull/revision classes into
siblings and the shared fakes into _sync_fakes.py.
conftest.py 284 -> 155, moving the Tk/gatelock fixtures to _gate_fixtures.py.
Importing them back is what registers them (pytest_plugins is an error in a
non-root conftest), and they are named in __all__ because ruff's autofix
otherwise deletes the "unused" import and silently disables Tk blocking --
it did exactly that once here. Verified afterwards with a canary asserting
_gatelock.tk is still a MagicMock, not merely that the suite passes.
Verified: 692 tests / 100% coverage unchanged; ~/.local/share/diet_guard
byte-identical before and after the run; cd /tmp && python3 -m diet_guard sync
-> 402 entries, exit 0. Gate 47 -> 44.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01MK3HCZrM75sRHL1gL8usve
|
||
|---|---|---|
| .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 | ||
| diet-guard-sync.timer | ||
| install.sh | ||
| LICENSE | ||
| pyproject.toml | ||
| README.md | ||
| refactor_claude_todo.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.