a5bd246865
* 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.
84 lines
3.3 KiB
Python
84 lines
3.3 KiB
Python
"""Terminal Environment Registry.
|
|
|
|
Central map of registered pluggable terminal backends, populated by plugins via
|
|
:meth:`PluginContext.register_terminal_environment_provider` and consumed by
|
|
:func:`tools.terminal_tool_backends._create_environment` plus the classification helpers across the
|
|
terminal/file/approval/prompt surfaces. Unlike the image/video/web/browser registries there
|
|
is **no active-provider resolution**: the active backend is whatever ``TERMINAL_ENV`` /
|
|
``terminal.backend`` names. Built-in names are reserved (registration raises) so a plugin can
|
|
never shadow the in-tree docker/modal/... implementations. Scope semantics mirror
|
|
:mod:`agent.browser_registry` (per-profile scope or the global base map).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
from typing import List, Optional
|
|
|
|
from agent.provider_registry import ProviderRegistry, lower_key
|
|
from agent.terminal_env_provider import TerminalEnvironmentProvider
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
#: Names owned by in-tree backends in tools/environments/ — never
|
|
#: registrable by plugins. Includes internal-mode aliases (managed_modal).
|
|
BUILTIN_BACKEND_NAMES = frozenset({
|
|
"local", "docker", "singularity", "modal", "managed_modal",
|
|
"daytona", "vercel_sandbox", "ssh",
|
|
})
|
|
|
|
|
|
def _reject_builtin_collision(name: str) -> None:
|
|
raise ValueError(f"Terminal backend name '{name}' is reserved for the built-in {name} backend "
|
|
"and cannot be registered by a plugin")
|
|
|
|
|
|
_registry: ProviderRegistry[TerminalEnvironmentProvider] = ProviderRegistry(
|
|
label="Terminal environment",
|
|
provider_cls=TerminalEnvironmentProvider,
|
|
logger=logger,
|
|
normalize=lower_key,
|
|
builtin_names=BUILTIN_BACKEND_NAMES,
|
|
on_builtin_collision=_reject_builtin_collision,
|
|
)
|
|
_registry.export(globals())
|
|
|
|
|
|
def plugin_backend_names(*, scope: Optional[str] = None) -> List[str]:
|
|
"""Names of all registered plugin backends (sorted)."""
|
|
return [p.name.strip().lower() for p in _registry.list_providers(scope=scope)]
|
|
|
|
|
|
def provider_flag(name: str, attr: str, default=False):
|
|
"""Read a classification attribute off the provider for *name*.
|
|
|
|
Fail-soft: unknown backend or a raising property returns *default* so a misbehaving
|
|
plugin degrades to built-in-equivalent behavior instead of taking the terminal tool down.
|
|
"""
|
|
provider = _registry.get_provider(name)
|
|
if provider is None:
|
|
return default
|
|
try:
|
|
return getattr(provider, attr, default)
|
|
except Exception:
|
|
logger.debug("Terminal environment provider '%s' attribute '%s' raised", name, attr, exc_info=True)
|
|
return default
|
|
|
|
|
|
def plugin_strip_env_keys() -> frozenset:
|
|
"""Union of every registered provider's ``strip_env_keys`` — across ALL scopes, not
|
|
just the active backend: a token in the process environment is strippable regardless of
|
|
which backend is selected (as MODAL_*/DAYTONA_API_KEY sit in the static tier-1 set)."""
|
|
keys: set = set()
|
|
with _registry._lock:
|
|
all_providers = list(_registry._providers.values())
|
|
for scoped in _registry._scoped_providers.values():
|
|
all_providers.extend(scoped.values())
|
|
for provider in all_providers:
|
|
try:
|
|
keys.update(provider.strip_env_keys)
|
|
except Exception:
|
|
logger.debug("Terminal environment provider strip_env_keys raised", exc_info=True)
|
|
return frozenset(keys)
|