The Sep 2026 decomposition (PR #102117) makes internal import paths a non-API: names now live in the focused modules that define them. This commit is the ONLY thing keeping the old paths alive, so external plugins have time to update. It is deliberately a single, unsquashed commit: git revert <this sha> removes every shim, stub and manifest at once on the announced date. Nothing in-tree may depend on these pointers: scripts/check_compat_pointers.py (wired into lint.yml) fails CI if it does. What it adds (see COMPAT_MANIFEST.md, compat_manifest.json): - 332 facade modules get one delimited `PLUGIN-COMPAT` block appended at the end of the file - 1,172 moved names resolved lazily via a module `__getattr__` (PEP 562) — never a top-level import, so no import cycles; facades that already had `__getattr__` get a chained one - 592 third-party/stdlib names the old modules used to expose, with their original import statements - 266 public definitions that had been deleted as unused, restored byte-for-byte from the pre-decomposition tree (+40 private helpers and 16 imports pulled in only because a restored definition needs them) - 3 deleted modules recreated as re-export stubs (gateway/startup_watchdog, hermes_cli/observability/ relay_runtime, tools/environments/modal_utils) - private names (`_x`) get no pointer: they were never API (3,792 skipped) Verified: all 335 touched modules import under a fresh HERMES_HOME and every manifest name resolves; the lint reports zero in-tree uses; ruff clean; targeted suites unchanged.
149 lines
6.2 KiB
Python
149 lines
6.2 KiB
Python
"""Auto-resume restart-loop breaker (defense-3).
|
|
|
|
Defenses 1-2 (``_HERMES_GATEWAY`` guard on ``hermes gateway stop|restart`` /
|
|
``terminal_tool``, cron lifecycle filter) stop the agent scheduling its own restart
|
|
but not every SIGTERM source: the supervisor respawns, the gateway auto-resumes the
|
|
restart-interrupted session, whose next turn re-runs the offending logic. Boots are
|
|
persisted to ``<HERMES_HOME>/gateway/restart_loop.json`` and CHAIN while gaps stay
|
|
within ``max_gap_seconds`` (a ~150s watchdog-kill cycle trips like a ~10s loop).
|
|
Tripped → caller SKIPS auto-resume. Any I/O failure fails OPEN, never wedging.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import contextlib
|
|
import json
|
|
import logging
|
|
import time
|
|
from typing import List, Optional
|
|
|
|
from hermes_constants import get_hermes_home
|
|
|
|
logger = logging.getLogger("gateway.run")
|
|
|
|
# A legitimate operator restart (or two) never trips; a ~10s respawn loop does
|
|
# within a few cycles.
|
|
DEFAULT_MAX_RESTARTS = 3
|
|
DEFAULT_WINDOW_SECONDS = 60
|
|
# Longest gap between consecutive restart-interrupted boots still counted as the
|
|
# SAME loop. A fixed-window prune only sees cycles faster than the window (a slower
|
|
# loop drops its history every boot and never trips); chaining on the inter-boot
|
|
# gap is period-agnostic, and real quiet resets it.
|
|
DEFAULT_MAX_GAP_SECONDS = 300
|
|
# Only the newest ``max_restarts`` entries can change a verdict; the rest are forensics.
|
|
_MAX_STORED_BOOTS = 50
|
|
|
|
|
|
def _state_path():
|
|
return get_hermes_home() / "gateway" / "restart_loop.json"
|
|
|
|
|
|
def _load_boots() -> List[float]:
|
|
try:
|
|
data = json.loads(_state_path().read_text(encoding="utf-8"))
|
|
return [float(t) for t in data.get("boots", []) if isinstance(t, (int, float))]
|
|
except (OSError, ValueError, TypeError):
|
|
return []
|
|
|
|
|
|
def _save_boots(boots: List[float]) -> None:
|
|
with contextlib.suppress(OSError):
|
|
path = _state_path()
|
|
path.parent.mkdir(parents=True, exist_ok=True)
|
|
path.write_text(json.dumps({"boots": boots}), encoding="utf-8")
|
|
|
|
|
|
def _chain_gap(window_seconds: int, max_gap_seconds: int) -> float:
|
|
"""Inter-boot gap that still links two boots; floored by ``window_seconds`` so
|
|
widening the window never makes the breaker *less* sensitive."""
|
|
return float(max(1, window_seconds, max_gap_seconds))
|
|
|
|
|
|
def _chain_ending_at(boots: List[float], ts: float, gap: float) -> List[float]:
|
|
"""Unbroken chain of boots leading up to ``ts`` (oldest first): walks backwards
|
|
while each gap stays within ``gap``; the first wider gap ends the chain (older
|
|
boots are a resolved episode). Empty when nothing is recent — how a healthy
|
|
gateway forgets a loop."""
|
|
chain: List[float] = []
|
|
prev = ts
|
|
for t in sorted(boots, reverse=True):
|
|
if t > ts: # clock moved backwards (NTP step, restored file): future entry is adjacent, not a break
|
|
chain.append(t)
|
|
continue
|
|
if prev - t > gap:
|
|
break
|
|
chain.append(t)
|
|
prev = t
|
|
return chain[::-1]
|
|
|
|
|
|
def record_restart_interrupted_boot(
|
|
window_seconds: int = DEFAULT_WINDOW_SECONDS, *, now: Optional[float] = None,
|
|
max_gap_seconds: int = DEFAULT_MAX_GAP_SECONDS,
|
|
) -> List[float]:
|
|
"""Record a restart-interrupted boot; return the pruned chain + now (most recent
|
|
last). A persistence failure returns the in-memory list without raising."""
|
|
ts = time.time() if now is None else now
|
|
boots = _chain_ending_at(_load_boots(), ts, _chain_gap(window_seconds, max_gap_seconds)) + [ts]
|
|
_save_boots(boots[-_MAX_STORED_BOOTS:])
|
|
return boots
|
|
|
|
|
|
def clear() -> None:
|
|
"""Remove the persisted boot log (used on clean shutdown / by tests)."""
|
|
with contextlib.suppress(OSError):
|
|
_state_path().unlink(missing_ok=True)
|
|
|
|
|
|
def check_and_record(
|
|
max_restarts: int = DEFAULT_MAX_RESTARTS, window_seconds: int = DEFAULT_WINDOW_SECONDS, *,
|
|
now: Optional[float] = None, max_gap_seconds: int = DEFAULT_MAX_GAP_SECONDS,
|
|
) -> bool:
|
|
"""Gateway entry point: record this boot; True when the chain reached
|
|
``max_restarts`` and auto-resume should be SKIPPED."""
|
|
boots = record_restart_interrupted_boot(window_seconds, now=now, max_gap_seconds=max_gap_seconds)
|
|
tripped = max_restarts > 0 and len(boots) >= max_restarts
|
|
if tripped:
|
|
logger.warning(
|
|
"Restart-loop breaker TRIPPED: %d chained restart-interrupted gateway boots (no gap wider than %ds; "
|
|
"threshold %d). Skipping auto-resume to break a suspected SIGTERM-respawn loop (#30719, #81642). "
|
|
"Restart-interrupted sessions stay resume-pending and will continue on the next real user message. "
|
|
"If this is a false positive, delete %s.",
|
|
len(boots), int(_chain_gap(window_seconds, max_gap_seconds)), max_restarts, _state_path(),
|
|
)
|
|
return tripped
|
|
|
|
|
|
# ---- BEGIN PLUGIN-COMPAT (revert-scheduled; see COMPAT_MANIFEST.md) ----
|
|
# Names external plugins imported from this module before the Sep 2026 decomposition.
|
|
# Internal code MUST NOT use these (scripts/check_compat_pointers.py fails CI if it does).
|
|
# The whole block is removed by reverting the commit that added it.
|
|
|
|
def is_restart_loop_tripped(
|
|
max_restarts: int = DEFAULT_MAX_RESTARTS,
|
|
window_seconds: int = DEFAULT_WINDOW_SECONDS,
|
|
*,
|
|
now: Optional[float] = None,
|
|
max_gap_seconds: int = DEFAULT_MAX_GAP_SECONDS,
|
|
) -> bool:
|
|
"""Return True if the gateway has restarted ``>= max_restarts`` times with
|
|
restart-interrupted sessions in one unbroken chain ending at ``now``.
|
|
|
|
Reads the persisted boot log written by
|
|
``record_restart_interrupted_boot`` and counts the boots that still chain
|
|
together (consecutive gaps within ``max_gap_seconds``), so the verdict does
|
|
not depend on how fast the crash cycle happens to be.
|
|
Fails OPEN (returns False) on any error — a broken breaker must never
|
|
wedge a healthy gateway.
|
|
"""
|
|
if max_restarts <= 0:
|
|
return False
|
|
ts = time.time() if now is None else now
|
|
gap = _chain_gap(window_seconds, max_gap_seconds)
|
|
try:
|
|
recent = _chain_ending_at(_load_boots(), ts, gap)
|
|
except Exception: # pragma: no cover — _load_boots already guards
|
|
return False
|
|
return len(recent) >= max_restarts
|
|
# ---- END PLUGIN-COMPAT ----
|