diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 9167d30..8e0ebcf 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -2,7 +2,7 @@ name: diet_guard_app description: "Companion phone app for diet_guard: log meals on the go." publish_to: 'none' -version: 1.0.171+1 +version: 1.0.172+1 environment: sdk: ^3.12.2 diff --git a/diet_guard/_claude_connect.py b/diet_guard/_claude_connect.py index 169bb89..24e2df8 100644 --- a/diet_guard/_claude_connect.py +++ b/diet_guard/_claude_connect.py @@ -1,12 +1,14 @@ """Connecting the relay worker to RTDB, signed in and unlocked. The database URL and API key come from crdt-sync's shared -``~/.config/crdt-sync/firebase.json``; the signed-in session is the worker's -own app, ``~/.config/diet_guard_claude/firebase_auth.json`` (seeded once with -crdt-sync's ``seed_session --app diet_guard_claude``). Never the gate's -``diet_guard`` session file: two processes refreshing one token file corrupt -it. Never ``firebase_client_for``: without a session it falls back to the -dead shared password and fails with a misleading error. +``~/.config/crdt-sync/firebase.json``; the signed-in session is the sync's own, +``~/.config/diet_guard/firebase_auth.json``. Sharing it is safe: the worker's +pull and publish already refresh it through the ordinary sync client, +Firebase does not invalidate an older refresh token when one is reused, and +crdt-sync's ``FileCredentialStore`` writes atomically with a unique temp name +for exactly this several-process case. Never ``firebase_client_for``: without +a session it falls back to the dead shared password and fails with a +misleading error. :func:`connect_sealed` is the worker's only network entry point besides the event stream it returns; ``conftest`` blocks it. @@ -35,7 +37,7 @@ from diet_guard._claude_layout import E2E_LAYOUT, LAYOUT, ROOT if TYPE_CHECKING: from collections.abc import Awaitable, Callable -APP: Final = "diet_guard_claude" +APP: Final = "diet_guard" class RelaySetupError(RuntimeError): @@ -65,8 +67,8 @@ def connect() -> Rtdb: provider = FirebaseTokenProvider(config.api_key, credential_store_for(APP)) if not provider.has_session(): msg = ( - f"no signed-in session in ~/.config/{APP}/firebase_auth.json; seed it " - f"with crdt-sync: python3 -m tool.seed_session ... --app {APP}" + f"no signed-in session in ~/.config/{APP}/firebase_auth.json; sign " + "diet_guard's sync in first (the phone and the gate use the same one)" ) raise RelaySetupError(msg) return Rtdb(config.database_url, token_source(provider), root=ROOT) diff --git a/diet_guard/tests/test_claude_relay.py b/diet_guard/tests/test_claude_relay.py index 234ce2d..207a347 100644 --- a/diet_guard/tests/test_claude_relay.py +++ b/diet_guard/tests/test_claude_relay.py @@ -38,7 +38,7 @@ def _provider(*, session: bool = True, token: str | Exception = "tok") -> Mock: # -- connect -------------------------------------------------------------------- def test_connect_builds_a_client_rooted_at_the_relay() -> None: - """Config and the worker's own session give an Rtdb on the relay root.""" + """Config and the sync's session give an Rtdb on the relay root.""" provider = _provider() with ( patch.object(connect_mod.FirebaseConfig, "load", return_value=CONFIG), @@ -46,7 +46,7 @@ def test_connect_builds_a_client_rooted_at_the_relay() -> None: patch.object(connect_mod, "credential_store_for") as store, ): rtdb = connect_mod.connect() - store.assert_called_once_with("diet_guard_claude") + store.assert_called_once_with("diet_guard") assert rtdb.root == ROOT assert rtdb.sealer is None @@ -62,8 +62,8 @@ def test_connect_without_firebase_config_is_a_setup_error() -> None: connect_mod.connect() -def test_connect_without_a_session_names_the_seed_command() -> None: - """No signed-in session: the error says how to seed one for this app.""" +def test_connect_without_a_session_names_the_session_file() -> None: + """No signed-in session: the error says where the sync's session lives.""" with ( patch.object(connect_mod.FirebaseConfig, "load", return_value=CONFIG), patch.object(connect_mod, "credential_store_for"), @@ -72,7 +72,7 @@ def test_connect_without_a_session_names_the_seed_command() -> None: ), pytest.raises( connect_mod.RelaySetupError, - match=r"seed_session .* --app diet_guard_claude", + match=r"~/.config/diet_guard/firebase_auth.json", ), ): connect_mod.connect() diff --git a/docs/DOCS-claude-relay.md b/docs/DOCS-claude-relay.md index d909576..62ac6aa 100644 --- a/docs/DOCS-claude-relay.md +++ b/docs/DOCS-claude-relay.md @@ -182,13 +182,14 @@ unit lives at the repo root with the other two, `install.sh` installs it). node, so requests that arrived while the PC was off are served in order. - Waits are only for faults: the e2e unlock and a failed pre-pull retry every 60 s / 30 s while something is pending. No idle timer. -- Session: the RTDB stream uses its own Firebase app name `diet_guard_claude` - (`~/.config/diet_guard_claude/firebase_auth.json`), so the stream never - shares a refresh token file with another process. Seed once, see "Deploy". - The pull and publish go through the ordinary sync client, so the worker - also refreshes the gate's `~/.config/diet_guard/firebase_auth.json`, - exactly as the CLI's own publish does. The database URL and API key come - from `~/.config/crdt-sync/firebase.json`; the passphrase from +- Session: the worker shares the sync's own Firebase session, + `~/.config/diet_guard/firebase_auth.json` (app name `diet_guard`); there is + no separate seed. Sharing is safe: the worker's pull and publish already go + through the ordinary sync client and refresh that file, Firebase keeps an + older refresh token valid after a refresh, and crdt-sync's + `FileCredentialStore` saves atomically under a unique temp name for exactly + this several-process case. The database URL and API key come from + `~/.config/crdt-sync/firebase.json`; the passphrase from `~/.config/crdt-sync/password`. - One worker per PC. Claim leases last 300 s and renew every 60 s. - Dependencies (`rtdb_relay`, `httpx`, `claude_agent_sdk`) are imported only @@ -233,9 +234,6 @@ model answer with a grilling round. 1. `/usr/bin/python3 -m pip install --user --break-system-packages -e .` from `~/src/diet-guard` (new deps: `claude-agent-sdk`, `rtdb-relay`, `httpx`); verify `/usr/bin/python3 -c "import claude_agent_sdk, rtdb_relay, httpx"`. -2. Seed the worker's session once (one Google consent): - `python3 -m tool.seed_session --client-id ... --client-secret ... --app diet_guard_claude` - in `~/src/utils/crdt-sync`. -3. `bash install.sh` (copies and enables `diet-guard-claude.service` once - the session file exists). -4. Phone side: [DOCS-claude-relay-phone.md](DOCS-claude-relay-phone.md). +2. `bash install.sh` (copies and enables `diet-guard-claude.service` once + the sync session file exists; no Google consent needed). +3. Phone side: [DOCS-claude-relay-phone.md](DOCS-claude-relay-phone.md). diff --git a/install.sh b/install.sh index 3d25f55..e2770d8 100755 --- a/install.sh +++ b/install.sh @@ -28,9 +28,8 @@ readonly SERVICE_SRC="$SCRIPT_DIR/diet-guard-gate.service" readonly TIMER_SRC="$SCRIPT_DIR/diet-guard-gate.timer" readonly SYNC_SERVICE_SRC="$SCRIPT_DIR/diet-guard-sync.service" readonly CLAUDE_SERVICE_SRC="$SCRIPT_DIR/diet-guard-claude.service" -# The relay worker's own Firebase session (never the gate's: two processes -# refreshing one token file corrupt it). Seeded once, see the step below. -readonly CLAUDE_SESSION_FILE="$HOME/.config/diet_guard_claude/firebase_auth.json" +# The relay worker shares the sync's Firebase session (docs/DOCS-claude-relay.md). +readonly CLAUDE_SESSION_FILE="$HOME/.config/diet_guard/firebase_auth.json" readonly SYSTEMD_USER_DIR="$HOME/.config/systemd/user" readonly DATA_DIR="$HOME/.local/share/diet_guard" readonly BUDGET_FILE="$DATA_DIR/.budget" @@ -88,9 +87,9 @@ else fi # 4b. The "send to Claude" relay worker ------------------------------------ -# Serves the phone's meal requests (docs/DOCS-claude-relay.md). It needs its own -# signed-in Firebase session, which only one Google consent can create, so the -# unit is installed always but started only once the session file exists. +# Serves the phone's meal requests (docs/DOCS-claude-relay.md). It needs the +# sync's signed-in Firebase session, so the unit is installed always but +# started only once the session file exists. echo "[4b/5] Installing the Claude relay worker unit..." cp "$CLAUDE_SERVICE_SRC" "$SYSTEMD_USER_DIR/diet-guard-claude.service" systemctl --user daemon-reload @@ -98,10 +97,8 @@ if [[ -f "$CLAUDE_SESSION_FILE" ]]; then systemctl --user enable --now diet-guard-claude.service echo " Relay worker enabled and started." else - echo " Not started: no session at $CLAUDE_SESSION_FILE. Seed it once (one" - echo " Google consent) in ~/src/utils/crdt-sync:" - echo " python3 -m tool.seed_session --client-id ... --client-secret ... --app diet_guard_claude" - echo " then re-run this installer." + echo " Not started: no sync session at $CLAUDE_SESSION_FILE." + echo " Sign diet_guard's sync in first, then re-run this installer." fi # 5. Set the initial daily budget ---------------------------------------------