* 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.
149 lines
6.7 KiB
Python
149 lines
6.7 KiB
Python
"""Gateway response filtering helpers.
|
|
|
|
These decide whether a completed agent turn should be delivered to the chat,
|
|
not what should be persisted in conversation history.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import unicodedata
|
|
from typing import Any, Optional
|
|
|
|
# Exact whole-response markers meaning "the agent intentionally chose not to
|
|
# reply". Keep small and explicit; arbitrary empty output remains an
|
|
# error/empty-response path, not silence. A lane that does not think in English
|
|
# translates the sentinel rather than dropping it, and the whole control token
|
|
# then reaches the user as content, so the translated forms are carried here
|
|
# too. zh-Hans is the only non-English locale this project ships documentation
|
|
# for, which is where the list stops.
|
|
LIVE_GATEWAY_SILENT_MARKERS = frozenset({
|
|
"[SILENT]", "SILENT", "NO_REPLY", "NO REPLY",
|
|
"[静默]", "静默", "[沉默]", "沉默",
|
|
})
|
|
|
|
# Bracketed markers drive the autonomous lane's prefix rule ("[SILENT] nothing
|
|
# new this tick"). Derived from the set above so a new marker cannot be added to
|
|
# one rule and forgotten in the other.
|
|
_BRACKETED_SILENCE_MARKERS = tuple(
|
|
sorted(m for m in LIVE_GATEWAY_SILENT_MARKERS if m.startswith("["))
|
|
)
|
|
|
|
# The persisted user-row kind of a self-injected MessageEvent(internal=True) turn — the only
|
|
# machinery kind the gateway produces; only these may vanish on a bare silence marker.
|
|
INTERNAL_NOTIFICATION_DISPLAY_KIND = "internal_notification"
|
|
MACHINERY_DISPLAY_KINDS = frozenset({INTERNAL_NOTIFICATION_DISPLAY_KIND})
|
|
|
|
# Longer than any marker could plausibly be, even with stray punctuation.
|
|
_MARKER_LENGTH_CAP = 64
|
|
|
|
|
|
def _canonical_silence_candidate(text: str) -> str:
|
|
return " ".join(text.strip().upper().split())
|
|
|
|
|
|
def _is_edge_punctuation(ch: str) -> bool:
|
|
# Square brackets stay structural so malformed ``[SILENT`` cannot become ``SILENT``.
|
|
return ch not in "[]" and unicodedata.category(ch).startswith("P")
|
|
|
|
|
|
def _strip_edge_silence_punctuation(text: str) -> str:
|
|
"""Strip stray edge punctuation (``.NO_REPLY``, ``*NO_REPLY*``) without erasing marker structure."""
|
|
start, end = 0, len(text)
|
|
while start < end and _is_edge_punctuation(text[start]):
|
|
start += 1
|
|
while end > start and _is_edge_punctuation(text[end - 1]):
|
|
end -= 1
|
|
return text[start:end].strip()
|
|
|
|
|
|
def _canonical_silence_candidates(text: Any) -> tuple[str, ...]:
|
|
"""Canonical forms of a short marker-sized response; ``()`` when not a candidate at all."""
|
|
stripped = text.strip() if isinstance(text, str) else ""
|
|
if not 0 < len(stripped) <= _MARKER_LENGTH_CAP:
|
|
return ()
|
|
depunctuated = _strip_edge_silence_punctuation(stripped)
|
|
forms = (stripped,) if depunctuated == stripped else (stripped, depunctuated)
|
|
return tuple(_canonical_silence_candidate(f) for f in forms)
|
|
|
|
|
|
def is_intentional_silence_response(response: Any) -> bool:
|
|
"""True only when ``response`` is exactly a silence marker.
|
|
|
|
Prose that merely mentions ``NO_REPLY`` must be delivered normally. A blank
|
|
response is not silence either — that is the empty-response failure path.
|
|
"""
|
|
return any(c in LIVE_GATEWAY_SILENT_MARKERS for c in _canonical_silence_candidates(response))
|
|
|
|
|
|
def is_autonomous_silence_response(response: Any) -> bool:
|
|
"""Loose silence matcher for autonomous lanes (cron, webhook).
|
|
|
|
Models reliably bracket ``[SILENT]`` with a short note, so unlike the
|
|
interactive EXACT rule this also suppresses when a marker sits on its own
|
|
first/last line or the bracketed sentinel opens the response (``[SILENT] No
|
|
changes detected``). A token buried mid-sentence is still delivered.
|
|
Shares :data:`LIVE_GATEWAY_SILENT_MARKERS` so the two sets cannot drift.
|
|
"""
|
|
stripped = response.strip() if isinstance(response, str) else ""
|
|
if not stripped:
|
|
return False
|
|
lines = [ln for ln in stripped.splitlines() if ln.strip()]
|
|
# Bracketed form only for the prefix rule, so a bare "Silent retry succeeded" is NOT swallowed.
|
|
# Same de-punctuating forms as the interactive rule, so ``【静默】`` / ``静默。`` cannot
|
|
# be suppressed in chat yet delivered by cron.
|
|
return stripped.upper().startswith(_BRACKETED_SILENCE_MARKERS) or any(
|
|
is_intentional_silence_response(c) for c in (stripped, lines[0], lines[-1])
|
|
)
|
|
|
|
|
|
def is_intentional_silence_agent_result(agent_result: dict | None, response: Any) -> bool:
|
|
"""Silence markers suppress delivery only for successful agent turns."""
|
|
return isinstance(agent_result, dict) and not agent_result.get("failed") and is_intentional_silence_response(response)
|
|
|
|
|
|
def display_kind_for_event(event: Any) -> str | None:
|
|
"""The persisted user-row kind for a gateway turn: only self-injected events are machinery.
|
|
|
|
A scheduled heartbeat prompt is self-injected too (``_heartbeat_session_id`` is stamped only
|
|
by the gateway poller, never inferred from inbound text), but it deliberately stays
|
|
non-internal so authorization and the emergency stop still apply to it.
|
|
"""
|
|
if getattr(event, "internal", False) or getattr(event, "_heartbeat_session_id", None):
|
|
return INTERNAL_NOTIFICATION_DISPLAY_KIND
|
|
return None
|
|
|
|
|
|
def is_machinery_display_kind(display_kind: Any) -> bool:
|
|
"""Only a machinery turn may vanish on a bare silence marker; a human turn gets a visible fallback.
|
|
|
|
The caller passes the current turn's persisted display kind instead of inferring it from the
|
|
transcript: the inbound user row is not persisted yet, and a previous internal row must never
|
|
authorize silence on a human turn.
|
|
"""
|
|
return display_kind in MACHINERY_DISPLAY_KINDS
|
|
|
|
|
|
def silence_allowed(display_kind: Any, reply_expected: Optional[bool] = None) -> bool:
|
|
"""Whether a successful bare silence marker may remain silent for this turn."""
|
|
return is_machinery_display_kind(display_kind) or reply_expected is False
|
|
|
|
|
|
def reply_expected_metadata(reply_expected: Optional[bool]) -> dict:
|
|
"""The persisted user row's ``reply_expected`` key, only when the adapter knew; crash recovery
|
|
reads it back to judge a silence marker as the live turn did."""
|
|
return {} if reply_expected is None else {"reply_expected": reply_expected}
|
|
|
|
|
|
def is_partial_silence_marker(text: Any) -> bool:
|
|
"""True while streamed ``text`` could still resolve to a silence marker.
|
|
|
|
A buffer whose canonical form is a non-empty *prefix* of a marker (``"NO"`` on
|
|
the way to ``"NO_REPLY"``, or an exact marker not yet terminated by stream-end)
|
|
is held back so a raw marker is never shown and then retracted. Divergence
|
|
from every marker, or exceeding the cap, resumes normal streaming.
|
|
"""
|
|
return any(
|
|
c and any(marker.startswith(c) for marker in LIVE_GATEWAY_SILENT_MARKERS)
|
|
for c in _canonical_silence_candidates(text)
|
|
)
|