The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(update): a corrected source update is retried past a failed launch sync's backoff
Teknium3e0a0e1f1a5e
diff --git a/hermes_cli/venv_sync.py b/hermes_cli/venv_sync.pyindex d5c4487a213..efbf252bdca 100644--- a/hermes_cli/venv_sync.py+++ b/hermes_cli/venv_sync.py@@ -197,24 +197,53 @@ def _completion_attempts_path(project_root: Path) -> Path:return completion_pending_path(project_root).with_name("source-completion-attempts")-def _record_completion_attempt(root: Path, *, failed: bool) -> None:+#: What a launch-time dependency sync consumes. A failed sync is recorded against+#: these inputs (#139952): relaunching over the same inputs repeats the same doomed+#: repair and backs off, while a corrected source update is a fresh repair.+_SYNC_INPUTS = ("pyproject.toml", "uv.lock", "pm/lock.json")+++def _sync_inputs_digest(root: Path) -> str:+ import hashlib++ digest = hashlib.sha256()+ for name in _SYNC_INPUTS:+ try:+ digest.update((root / name).read_bytes())+ except OSError:+ digest.update(b"-")+ digest.update(b"\0")+ return digest.hexdigest()+++def _read_completion_attempts(record: Path) -> tuple[int, str | None]:+ """``(attempts, inputs digest or None)``; raises OSError/ValueError when unreadable."""+ lines = record.read_text(encoding="utf-8-sig").split()+ return int(lines[0]) if lines else 0, lines[1] if len(lines) > 1 else None+++def _record_completion_attempt(root: Path, *, failed: bool, inputs: str | None = None) -> None:"""Track consecutive completion-tail failures beside the pending marker.The pending marker itself is armed *before* the tail runs (a crash betweenthe dependency commit and the tail must leave the obligation), so themarker alone cannot distinguish "never tried" from "tried and failed Ntimes". The attempts record can: success clears both, failure bumps it.+ *inputs* (a failed dependency sync's input digest) restarts the count when+ the failures before it were for other inputs."""record = _completion_attempts_path(root)if not failed:record.unlink(missing_ok=True)returntry:- attempts = int(record.read_text(encoding="utf-8-sig").strip() or "0") + 1+ attempts, recorded = _read_completion_attempts(record)except (OSError, ValueError):- attempts = 1+ attempts, recorded = 0, None+ if inputs is not None and recorded is not None and recorded != inputs:+ attempts = 0try:- record.write_text(f"{attempts}\n", encoding="utf-8")+ record.write_text(f"{attempts + 1}\n" + (f"{inputs}\n" if inputs else ""), encoding="utf-8")except OSError:pass # a read-only install state degrades to unbounded retries, never blocks boot@@ -230,10 +259,11 @@ def completion_retry_state(project_root: Path, *, now=None) -> tuple[bool, int,record = _completion_attempts_path(project_root)try:- attempts = int(record.read_text(encoding="utf-8-sig").strip() or "0")+ attempts, inputs = _read_completion_attempts(record)except (OSError, ValueError):return True, 0, 0- if attempts <= 0:+ if attempts <= 0 or (inputs is not None and inputs != _sync_inputs_digest(project_root)):+ # Failed syncs of other inputs say nothing about this tree's repair.return True, 0, 0if attempts >= COMPLETION_RETRY_MAX_ATTEMPTS:return False, attempts, 0@@ -518,7 +548,7 @@ def _finish_source_update(root: Path, *, current: bool, pending: Path) -> None:# it, every Desktop relaunch bypasses the retry backoff and starts# the same expensive repair again.if not completed:- _record_completion_attempt(root, failed=True)+ _record_completion_attempt(root, failed=True, inputs=_sync_inputs_digest(root))raiseif completed:clear_completion(root)diff --git a/tests/hermes_cli/test_update_launch_completion.py b/tests/hermes_cli/test_update_launch_completion.pyindex db0d6c92dda..fd5f1cd36ff 100644--- a/tests/hermes_cli/test_update_launch_completion.py+++ b/tests/hermes_cli/test_update_launch_completion.py@@ -349,19 +349,34 @@ def test_failed_launch_keeps_previous_completion_and_retries(tmp_path, monkeypatassert not (root / ".update-incomplete").exists()-def test_failed_dependency_sync_counts_toward_completion_retry_limit(tmp_path, monkeypatch):- """A failure before the completion child still leaves an armed tail to bound (#139952)."""+def test_failed_dependency_sync_backs_off_only_for_the_same_inputs(tmp_path, monkeypatch):+ """A failed launch sync counts toward the retry bound, so relaunches stop redoing the same+ failing repair (#139952); a corrected source update is a different repair and runs."""import pm+ from hermes_cli import _launchersroot = _self_checkout(tmp_path, monkeypatch)+ syncs = []++ def failing_sync(*args, **kwargs):+ syncs.append(args)+ raise RuntimeError("sync failed")+monkeypatch.setattr(pm, "venv_is_current", lambda **kw: False)- monkeypatch.setattr(pm, "sync_venv", lambda *args, **kwargs: (_ for _ in ()).throw(RuntimeError("sync failed")))+ monkeypatch.setattr(pm, "sync_venv", failing_sync)+ monkeypatch.setattr(_launchers, "resolve_store_python", lambda _, **__: Path(sys.executable))+ for _ in range(venv_sync.COMPLETION_RETRY_BACKOFF_ATTEMPTS):+ with pytest.raises(RuntimeError, match="sync failed"):+ venv_sync.prepare_launch(root, [])+ assert venv_sync.completion_pending_path(root).is_file()++ assert venv_sync.prepare_launch(root, []) == Path(sys.executable)+ assert len(syncs) == venv_sync.COMPLETION_RETRY_BACKOFF_ATTEMPTS, "the same failing repair re-ran"+ (root / "uv.lock").write_text("# corrected source update\n", encoding="utf-8")with pytest.raises(RuntimeError, match="sync failed"):venv_sync.prepare_launch(root, [])-- assert venv_sync.completion_pending_path(root).is_file()- assert venv_sync._completion_attempts_path(root).read_text(encoding="utf-8").strip() == "1"+ assert len(syncs) == venv_sync.COMPLETION_RETRY_BACKOFF_ATTEMPTS + 1, "changed inputs were not retried"def test_blessed_legacy_install_is_adopted_before_sync(tmp_path, monkeypatch, completion_tail):