* refactor(plugins): remove the Sep 2026 decomposition compat layer on schedule The PLUGIN-COMPAT layer (2776813df3+d63e380324+0a5164cebe) kept pre-#102117 import paths alive for external plugins until 2026-09-14. That window closed two weeks ago; since then the loader has already been skipping plugins that use the old paths. This removes the layer itself: - 328 appended `PLUGIN-COMPAT` blocks (lazy `__getattr__` pointer tables, re-exported third-party names, restored dead definitions) and the three re-export stub modules (gateway/startup_watchdog, hermes_cli/observability/relay_runtime, tools/environments/modal_utils) - COMPAT_MANIFEST.md, compat_manifest.json, scripts/check_compat_pointers.py and its lint step - the reporting surfaces: CLI banner notice, `hermes plugins compat`, the `hermes doctor` section, the post-update notice, the Desktop one-time dialog, the loader's pre-import skip and the `plugins.allow_deprecated_imports` escape hatch An external plugin that still imports an old path now fails to load with its ImportError as the reason in `hermes plugins list`, the same path as any broken plugin. hermes_cli/plugin_compat.py stays as three inert stubs (compat_report, removal_in_effect, summary_lines): an already-running pre-removal `hermes update` lazy-imports them after the checkout swap (tests/compat/old_updater_surface.json). In-tree fallout, both already dead: hermes_cli/setup.py::_check_espeak_ng (no callers; its `shutil` came from a compat block) and gateway/config.py::SessionResetPolicy ("retained solely for the scheduled plugin-compat window"). Two test_run_agent patches targeted the removed `run_agent.handle_function_call` pointer; they now patch `model_tools.handle_function_call`, the seam production reads, like every sibling test in that file. * chore: retrigger CI (zero-job startup_failure phantom) * test: drop resolution allowlist rows for the two deleted which() sites hermes_cli/setup.py::_check_espeak_ng (dead) and tools/skillevaluator_scan.py::scanner_available (a restored definition inside a PLUGIN-COMPAT block) no longer exist; the stale-row gate requires their allowlist entries go with them.
118 lines
4.9 KiB
Python
118 lines
4.9 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:
|
|
# utf-8-sig: our BOM-tolerant read fix for the persisted boot log.
|
|
raw = _state_path().read_text(encoding="utf-8-sig")
|
|
data = json.loads(raw)
|
|
boots = data.get("boots", [])
|
|
return [float(t) for t in 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
|