# Conflicts: # apps/desktop/e2e/archived-hidden-session-recoverable.spec.ts # apps/desktop/e2e/bot-chat-message-agent-friendly-name.spec.ts # apps/desktop/e2e/bot-mailbox-unreadable-ticket.spec.ts # apps/desktop/e2e/bot-mode-roster-localized.spec.ts # apps/desktop/e2e/bot-mode-row-click-mirrors-registry.spec.ts # apps/desktop/e2e/bot-mode-tab-shows-bot-name.spec.ts # apps/desktop/e2e/bot-roster-group-row-organisation.spec.ts # apps/desktop/e2e/bot-roster-ignores-infra-dirs.spec.ts # apps/desktop/e2e/bot-roster-timestamp-meta.spec.ts # apps/desktop/e2e/bot-roster-user-sections.spec.ts # apps/desktop/e2e/bot-routines-pane-narrow.spec.ts # apps/desktop/e2e/bot-row-open-recent-session.spec.ts # apps/desktop/e2e/bot-tile-ignores-ambient-composer-model.spec.ts # apps/desktop/e2e/group-composer-auto-grow.spec.ts # apps/desktop/e2e/group-create-gate-remote-roster.spec.ts # apps/desktop/e2e/group-prompt-renamed-primary-handle.spec.ts # apps/desktop/e2e/hosted-room-backend-continuity.spec.ts # apps/desktop/e2e/hosted-room-legacy-store-migration.spec.ts # apps/desktop/e2e/settings-scope-chips-bot-title.spec.ts # apps/desktop/e2e/worktree-branch-status.spec.ts # apps/desktop/electron/backend-probes.test.ts # apps/desktop/electron/connection-apply.test.ts # apps/desktop/electron/desktop-electron-pin.test.ts # apps/desktop/electron/desktop-uninstall.test.ts # apps/desktop/electron/gateway-file-download-transport.test.ts # apps/desktop/electron/gateway-stop-before-update.test.ts # apps/desktop/electron/github-api-auth.test.ts # apps/desktop/electron/registry-primary-profile-scope.test.ts # apps/desktop/electron/update-api-check.test.ts # apps/desktop/electron/update-handoff-marker.test.ts # apps/desktop/electron/venv-blocker-scan.test.ts # apps/desktop/scripts/after-extract.test.mjs # apps/desktop/scripts/local-pack-publish.test.mjs # apps/desktop/scripts/tasks-scroll.test.mjs # apps/desktop/src/app/settings/model-settings.test.tsx # apps/desktop/src/app/updates-overlay.blockers.test.tsx # apps/desktop/src/components/desktop-install-overlay.test.tsx # apps/desktop/src/lib/update-copy.test.ts # scripts/ci/check_os_marker_fakes.py # tests-js/desktop-mac-usage-descriptions.test.ts # tests-js/node-engine-alignment.test.ts # tests/agent/lsp/test_install_and_lint_fixes.py # tests/agent/test_command_token_source.py # tests/agent/test_compression_boundary_hook.py # tests/agent/test_create_openai_client_ssl_verify.py # tests/agent/test_custom_provider_ca_probes.py # tests/agent/test_endpoint_blackhole.py # tests/agent/test_estimator_parity.py # tests/agent/test_in_place_compaction.py # tests/agent/test_moa_loop_mode.py # tests/agent/test_model_metadata.py # tests/agent/test_skill_session_platform_gate.py # tests/agent/test_skill_utils.py # tests/agent/test_ssl_ca_guard.py # tests/computer_use/test_doctor.py # tests/cron/test_codex_execution_paths.py # tests/cron/test_cron_bot_chat_delivery.py # tests/cron/test_cron_script.py # tests/cron/test_media_delivery_parity.py # tests/cron/test_misfire_catchup.py # tests/cron/test_parallel_pool.py # tests/cron/test_recurring_eagain_redispatch.py # tests/gateway/test_choice_picker.py # tests/gateway/test_control_socket_windows_live.py # tests/gateway/test_dingtalk.py # tests/gateway/test_feishu.py # tests/gateway/test_feishu_onboard.py # tests/gateway/test_gateway_shutdown.py # tests/gateway/test_matrix.py # tests/gateway/test_model_command_custom_providers.py # tests/gateway/test_reasoning_command.py # tests/gateway/test_runtime_footer.py # tests/gateway/test_session.py # tests/gateway/test_session_hygiene.py # tests/gateway/test_status.py # tests/gateway/test_teams.py # tests/gateway/test_turn_lease.py # tests/gateway/test_whatsapp_connect.py # tests/hermes_cli/test_approvals_command.py # tests/hermes_cli/test_auth_store_lock_concurrent.py # tests/hermes_cli/test_backup.py # tests/hermes_cli/test_banner_git_state.py # tests/hermes_cli/test_certifi_repair.py # tests/hermes_cli/test_cmd_update.py # tests/hermes_cli/test_compat_manifest_targets.py # tests/hermes_cli/test_computer_use_cli.py # tests/hermes_cli/test_cpr_local_leak.py # tests/hermes_cli/test_dashboard_auth_gate.py # tests/hermes_cli/test_dashboard_procs_kill_grace.py # tests/hermes_cli/test_desktop_lifecycle_windows_live.py # tests/hermes_cli/test_doctor.py # tests/hermes_cli/test_doctor_command_install.py # tests/hermes_cli/test_fleet_config_migration_windows_live.py # tests/hermes_cli/test_gateway.py # tests/hermes_cli/test_gateway_platform_gating.py # tests/hermes_cli/test_gateway_restart_loop.py # tests/hermes_cli/test_gateway_task_probe.py # tests/hermes_cli/test_gateway_wsl.py # tests/hermes_cli/test_gui_command.py # tests/hermes_cli/test_install_cua_driver.py # tests/hermes_cli/test_kanban_db.py # tests/hermes_cli/test_lazy_command_exports.py # tests/hermes_cli/test_lazy_refresh_venv_repair.py # tests/hermes_cli/test_linux_desktop_entry.py # tests/hermes_cli/test_local_runtime.py # tests/hermes_cli/test_local_runtime_updates.py # tests/hermes_cli/test_managed_uv.py # tests/hermes_cli/test_mcp_reload_confirm_gate.py # tests/hermes_cli/test_nous_subscription.py # tests/hermes_cli/test_npm_engine.py # tests/hermes_cli/test_personality_none.py # tests/hermes_cli/test_pet_toggle.py # tests/hermes_cli/test_plan_reconciliation_windows_live.py # tests/hermes_cli/test_plugin_event_bus.py # tests/hermes_cli/test_plugin_manifest_v2.py # tests/hermes_cli/test_plugin_packs.py # tests/hermes_cli/test_plugins_cmd.py # tests/hermes_cli/test_plugins_cmd_enable_disable_nested.py # tests/hermes_cli/test_process_identity.py # tests/hermes_cli/test_profiles.py # tests/hermes_cli/test_profiles_sidebar_cache.py # tests/hermes_cli/test_pty_bridge.py # tests/hermes_cli/test_resolve_turn_limit.py # tests/hermes_cli/test_serve_runtime_inventory.py # tests/hermes_cli/test_session_vacuum_config.py # tests/hermes_cli/test_set_config_value.py # tests/hermes_cli/test_signal_handler_kanban_worker.py # tests/hermes_cli/test_slash_confirm_windows.py # tests/hermes_cli/test_stale_pid_guard.py # tests/hermes_cli/test_startup_fast_guards.py # tests/hermes_cli/test_status.py # tests/hermes_cli/test_telegram_managed_bot.py # tests/hermes_cli/test_tools_config.py # tests/hermes_cli/test_update_apply_shallow_count.py # tests/hermes_cli/test_update_autostash.py # tests/hermes_cli/test_update_concurrent_quarantine.py # tests/hermes_cli/test_update_fetch_failure_classifier.py # tests/hermes_cli/test_update_fleet_probe_resume_token.py # tests/hermes_cli/test_update_handoff_backend_reap.py # tests/hermes_cli/test_update_handoff_desktop_rebuild.py # tests/hermes_cli/test_update_head_moved_gate.py # tests/hermes_cli/test_update_host_obligation.py # tests/hermes_cli/test_update_import_guard.py # tests/hermes_cli/test_update_interrupted_recovery.py # tests/hermes_cli/test_update_inventory.py # tests/hermes_cli/test_update_launchd_unloaded_gateway.py # tests/hermes_cli/test_update_missing_configured_deps.py # tests/hermes_cli/test_update_modified_notice.py # tests/hermes_cli/test_update_multiplex_migration_hook.py # tests/hermes_cli/test_update_no_gateway_restart.py # tests/hermes_cli/test_update_orphan_backend_reap.py # tests/hermes_cli/test_update_parked_branch_guard.py # tests/hermes_cli/test_update_post_pull_syntax_guard.py # tests/hermes_cli/test_update_receipt.py # tests/hermes_cli/test_update_self_lock.py # tests/hermes_cli/test_update_shim_fail_closed.py # tests/hermes_cli/test_update_shim_self_lock.py # tests/hermes_cli/test_update_sqlite_remediation.py # tests/hermes_cli/test_update_stale_dashboard.py # tests/hermes_cli/test_update_stale_virtualenv.py # tests/hermes_cli/test_update_venv_health.py # tests/hermes_cli/test_update_venv_ownership_preflight.py # tests/hermes_cli/test_update_wedged_gateway.py # tests/hermes_cli/test_update_yes_flag.py # tests/hermes_cli/test_update_zip_two_phase.py # tests/hermes_cli/test_urllib_security.py # tests/hermes_cli/test_ux_messages_auth_config.py # tests/hermes_cli/test_ux_messages_startup.py # tests/hermes_cli/test_venv_holder_classifier.py # tests/hermes_cli/test_verify_console_scripts.py # tests/hermes_cli/test_verify_core_dependencies.py # tests/hermes_cli/test_web_server.py # tests/hermes_cli/test_web_server_console_ws.py # tests/hermes_cli/test_web_server_ws_ping.py # tests/hermes_cli/test_web_ui_build.py # tests/hermes_state/test_fts_rebuild_admission.py # tests/hermes_state/test_hermes_state.py # tests/plugins/memory/test_memory_lazy_install.py # tests/plugins/test_google_meet_plugin.py # tests/plugins/test_langfuse_plugin.py # tests/plugins/test_security_guidance_plugin.py # tests/plugins/test_transform_llm_output_hook.py # tests/scripts/desktop_update/test_desktop_update_windows_gateway_flag.py # tests/scripts/desktop_update/test_desktop_update_windows_python_handoff.py # tests/scripts/desktop_update/test_desktop_update_windows_timestamp.py # tests/scripts/install/test_install_clone_throttle_fallback.py # tests/scripts/install/test_install_lockfile_churn.py # tests/scripts/install/test_install_no_initial_commit.py # tests/scripts/install/test_install_sh_browser_install.py # tests/scripts/install/test_install_sh_node_prerelease.py # tests/scripts/install/test_install_sh_symlink_stomp.py # tests/scripts/install/test_install_sh_uv_lock_config.py # tests/scripts/install/test_install_unmerged_index.py # tests/scripts/test_contributor_map.py # tests/scripts/test_run_tests_parallel.py # tests/skills/test_competitor_news_monitor_skill.py # tests/skills/test_document_to_action_items_skill.py # tests/skills/test_google_workspace_setup.py # tests/skills/test_google_workspace_setup_deps.py # tests/skills/test_grounded_citations_skill.py # tests/skills/test_ip_as_logo_skill.py # tests/skills/test_live_dashboard_skill.py # tests/skills/test_mcp_oauth_remote_gateway_skill.py # tests/skills/test_office_document_skills.py # tests/skills/test_openclaw_migration.py # tests/skills/test_product_price_monitor_skill.py # tests/skills/test_scrollcraft_skill.py # tests/skills/test_setup_wizard_generator_skill.py # tests/skills/test_weekly_review_planning_skill.py # tests/test_engines_satisfiable.py # tests/test_fast_safe_load.py # tests/test_hermes_bootstrap.py # tests/test_hermes_constants.py # tests/test_hermes_logging.py # tests/test_managed_runtime_resolution.py # tests/test_model_tools_async_bridge.py # tests/test_packaging_build_guard.py # tests/test_packaging_metadata.py # tests/test_yaml_indent_consistency.py # tests/tools/test_approval_timeout_overflow.py # tests/tools/test_base_environment.py # tests/tools/test_bot_mode_dm.py # tests/tools/test_browser_chromium_check.py # tests/tools/test_browser_hardening.py # tests/tools/test_browser_homebrew_paths.py # tests/tools/test_browser_npx_warmup.py # tests/tools/test_browser_orphan_reaper.py # tests/tools/test_browser_real_profile.py # tests/tools/test_browser_use_cli.py # tests/tools/test_clipboard.py # tests/tools/test_code_execution.py # tests/tools/test_code_execution_modes.py # tests/tools/test_code_execution_windows_env.py # tests/tools/test_computer_use.py # tests/tools/test_delegate_liveness_timeout.py # tests/tools/test_execute_code_approval_cluster.py # tests/tools/test_execution_flag_detection.py # tests/tools/test_fal_common.py # tests/tools/test_file_operations.py # tests/tools/test_file_tools.py # tests/tools/test_file_tools_cwd_resolution.py # tests/tools/test_file_tools_live.py # tests/tools/test_lazy_deps.py # tests/tools/test_lazy_deps_durable_target.py # tests/tools/test_lazy_deps_managed.py # tests/tools/test_local_env_blocklist.py # tests/tools/test_local_tempdir.py # tests/tools/test_macos_protected_search.py # tests/tools/test_mcp_npx_cached_bin.py # tests/tools/test_oneshot_completion_linger.py # tests/tools/test_process_registry.py # tests/tools/test_read_file_schema_gating.py # tests/tools/test_skill_improvements.py # tests/tools/test_skills_sync.py # tests/tools/test_termux_api_detection.py # tests/tools/test_tirith_security.py # tests/tools/test_transcription_tools.py # tests/tools/test_tts_streaming.py # tests/tools/test_wake_word.py # tests/tui_gateway/test_compute_host_borrowed_lease.py # tests/tui_gateway/test_compute_host_turn_protocol.py # tests/tui_gateway/test_isolated_orphan_activity.py # tests/tui_gateway/test_protocol.py # tests/tui_gateway/test_slash_worker_profile_home.py # tests/tui_gateway/test_subprocess_encoding.py # tests/tui_gateway/test_tui_gateway_server.py # ui-tui/src/__tests__/terminalParity.test.ts # ui-tui/src/__tests__/termuxComposerLayout.test.ts # ui-tui/src/__tests__/textInputFastEcho.test.ts
461 lines
18 KiB
Python
461 lines
18 KiB
Python
"""Deferred platform plugins must still register their *client* tools.
|
|
|
|
Issue #78050: a bundled ``kind: platform`` plugin is registered as a deferred
|
|
loader so ``hermes chat`` doesn't import ~20 gateway SDKs. The a2a plugin ships
|
|
two independent things behind that one deferral — an inbound adapter (heavy)
|
|
and five outbound client tools (``a2a_call``, ``a2a_discover``, ``a2a_list``,
|
|
``a2a_history``, ``a2a_orchestrate``). Deferring the plugin deferred both, so
|
|
in a CLI/TUI process the client tools never registered at all:
|
|
``resolve_toolset("a2a")`` returned ``[]`` and the toolset was absent from the
|
|
``hermes tools`` checklist. The same tools worked in gateway/web processes only
|
|
because those materialize every platform at startup.
|
|
|
|
Client tools that live in a dedicated ``tools`` submodule are now registered at
|
|
discovery time; the adapter stays deferred.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
import hermes_yaml as yaml
|
|
|
|
|
|
A2A_CLIENT_TOOLS = {
|
|
"a2a_call",
|
|
"a2a_discover",
|
|
"a2a_history",
|
|
"a2a_list",
|
|
"a2a_orchestrate",
|
|
}
|
|
|
|
|
|
# ── synthetic platform plugin helpers ──────────────────────────────────────
|
|
|
|
|
|
def _write_platform_plugin(
|
|
root: Path,
|
|
platform: str,
|
|
*,
|
|
with_tools_module: bool,
|
|
declares_provides_tools: "bool | None" = None,
|
|
) -> "object":
|
|
"""Create a bundled-style platform plugin and return its manifest.
|
|
|
|
The adapter import is the expensive thing we must NOT trigger: it is
|
|
modelled as ``adapter.py`` setting a module-level sentinel, imported from
|
|
inside ``register()`` exactly as the real a2a plugin does.
|
|
|
|
``declares_provides_tools`` controls the manifest opt-in independently of
|
|
whether a ``tools.py`` exists on disk, so a test can pin what actually
|
|
triggers pre-registration. Defaults to following ``with_tools_module``,
|
|
which is the shape a real plugin ships.
|
|
"""
|
|
from hermes_cli.plugins import PluginManifest
|
|
|
|
if declares_provides_tools is None:
|
|
declares_provides_tools = with_tools_module
|
|
provides_tools = [f"{platform}_call"] if declares_provides_tools else []
|
|
|
|
plugin_dir = root / platform
|
|
plugin_dir.mkdir(parents=True, exist_ok=True)
|
|
manifest_data = {
|
|
"name": f"{platform}-platform",
|
|
"kind": "platform",
|
|
"version": "1.0.0",
|
|
}
|
|
if provides_tools:
|
|
manifest_data["provides_tools"] = provides_tools
|
|
(plugin_dir / "plugin.yaml").write_text(
|
|
yaml.safe_dump(manifest_data),
|
|
encoding="utf-8",
|
|
)
|
|
|
|
# Sentinels let the tests prove what was and wasn't imported.
|
|
(plugin_dir / "adapter.py").write_text(
|
|
"import _deferred_probe\n"
|
|
"_deferred_probe.adapter_imports += 1\n",
|
|
encoding="utf-8",
|
|
)
|
|
init_body = [
|
|
"import _deferred_probe",
|
|
"_deferred_probe.package_execs += 1",
|
|
"",
|
|
"def register(ctx):",
|
|
" from . import adapter # noqa: F401 (heavy import, deferred)",
|
|
]
|
|
if with_tools_module:
|
|
(plugin_dir / "tools.py").write_text(
|
|
"import _deferred_probe\n"
|
|
"_deferred_probe.tools_execs += 1\n"
|
|
"\n"
|
|
"\n"
|
|
"def _handler(**kwargs):\n"
|
|
" return 'ok'\n"
|
|
"\n"
|
|
"\n"
|
|
"def register_tools(ctx):\n"
|
|
f" ctx.register_tool(\n"
|
|
f" name='{platform}_call',\n"
|
|
f" toolset='{platform}',\n"
|
|
" schema={'type': 'function', 'function': {'name': "
|
|
f"'{platform}_call', 'description': 'call a peer', 'parameters': "
|
|
"{'type': 'object', 'properties': {}}}},\n"
|
|
" handler=_handler,\n"
|
|
" description='call a peer',\n"
|
|
" )\n",
|
|
encoding="utf-8",
|
|
)
|
|
init_body.append(" from .tools import register_tools")
|
|
init_body.append(" register_tools(ctx)")
|
|
(plugin_dir / "__init__.py").write_text("\n".join(init_body) + "\n", encoding="utf-8")
|
|
|
|
return PluginManifest(
|
|
name=f"{platform}-platform",
|
|
kind="platform",
|
|
source="bundled",
|
|
path=str(plugin_dir),
|
|
key=f"{platform}-platform",
|
|
provides_tools=provides_tools,
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def probe(monkeypatch):
|
|
"""A module the synthetic plugin can count imports into."""
|
|
import types
|
|
|
|
mod = types.ModuleType("_deferred_probe")
|
|
mod.package_execs = 0
|
|
mod.adapter_imports = 0
|
|
mod.tools_execs = 0
|
|
monkeypatch.setitem(sys.modules, "_deferred_probe", mod)
|
|
return mod
|
|
|
|
|
|
@pytest.fixture
|
|
def clean_registry():
|
|
"""Undo everything a synthetic plugin leaves behind.
|
|
|
|
Each test writes a fresh plugin to its own tmp_path but reuses the
|
|
``probeplat`` name, so the imported ``hermes_plugins.*`` modules have to go
|
|
too — otherwise the next test's ``import_module`` returns the previous
|
|
test's cached submodule instead of reading the new file.
|
|
"""
|
|
from gateway.platform_registry import platform_registry
|
|
from tools.registry import registry
|
|
|
|
before_tools = set(registry._tools)
|
|
before_modules = set(sys.modules)
|
|
yield
|
|
for name in set(registry._tools) - before_tools:
|
|
registry._tools.pop(name, None)
|
|
for platform in ("probeplat", "barefoot", "quietplat", "promiseplat"):
|
|
platform_registry.unregister(platform)
|
|
for name in set(sys.modules) - before_modules:
|
|
if name.startswith("hermes_plugins."):
|
|
sys.modules.pop(name, None)
|
|
|
|
|
|
# ── the reported symptom, against the real a2a plugin ──────────────────────
|
|
|
|
|
|
class TestA2AClientToolsInCliProcess:
|
|
"""The issue's exact repro: a CLI/TUI process, no gateway startup."""
|
|
|
|
|
|
def test_a2a_toolset_resolves_without_materializing_the_platform(self):
|
|
from hermes_cli.plugins import PluginManager
|
|
from toolsets import resolve_toolset
|
|
|
|
mgr = PluginManager()
|
|
mgr.discover_and_load()
|
|
|
|
a2a = mgr._plugins.get("platforms/a2a") # bundled platforms key by category path (#27548)
|
|
assert a2a is not None, "bundled a2a platform plugin was not discovered"
|
|
|
|
# The whole point of the deferral is preserved: the inbound adapter is
|
|
# still not imported in a CLI process.
|
|
assert a2a.deferred is True
|
|
|
|
# ...but the outbound client tools are now reachable. Before the fix
|
|
# this was [] until a gateway/web process called all_entries().
|
|
assert set(resolve_toolset("a2a")) == A2A_CLIENT_TOOLS
|
|
|
|
def test_a2a_appears_in_the_hermes_tools_checklist(self):
|
|
"""`a2a` is in _DEFAULT_OFF_TOOLSETS, so it must be tickable.
|
|
|
|
Every other member of that set (homeassistant, spotify, video_gen,
|
|
x_search, ...) renders a checkbox; a2a rendered nothing, so the
|
|
documented opt-in path had nothing to tick.
|
|
"""
|
|
from hermes_cli.plugins import discover_plugins, get_plugin_toolsets
|
|
|
|
# get_plugin_toolsets() reads the process-wide manager, which is what
|
|
# the `hermes tools` checklist does.
|
|
discover_plugins()
|
|
|
|
assert "a2a" in {key for key, _, _ in get_plugin_toolsets()}
|
|
|
|
def test_platform_bundle_includes_the_client_tools(self):
|
|
"""``hermes-a2a`` sessions get the client tools too.
|
|
|
|
The bundle path read the tool registry behind a deliberately cheap
|
|
``is_registered()`` check, so a deferred platform's own tools were
|
|
dropped from its bundle as well.
|
|
"""
|
|
from hermes_cli.plugins import PluginManager
|
|
from toolsets import resolve_toolset
|
|
|
|
mgr = PluginManager()
|
|
mgr.discover_and_load()
|
|
|
|
assert A2A_CLIENT_TOOLS.issubset(set(resolve_toolset("hermes-a2a")))
|
|
|
|
|
|
# ── the general mechanism ──────────────────────────────────────────────────
|
|
|
|
|
|
class TestDeferredPlatformToolPreregistration:
|
|
def test_tools_module_registers_without_importing_the_adapter(
|
|
self, tmp_path, probe, clean_registry
|
|
):
|
|
from hermes_cli.plugins import PluginManager
|
|
from toolsets import resolve_toolset
|
|
|
|
manifest = _write_platform_plugin(tmp_path, "probeplat", with_tools_module=True)
|
|
|
|
mgr = PluginManager()
|
|
mgr._register_deferred_platform(manifest)
|
|
|
|
assert resolve_toolset("probeplat") == ["probeplat_call"]
|
|
# The expensive half stayed deferred — that's what makes this safe.
|
|
assert probe.adapter_imports == 0
|
|
assert probe.tools_execs == 1
|
|
assert mgr._plugins["probeplat-platform"].deferred is True
|
|
|
|
def test_plugin_without_tools_module_stays_fully_deferred(
|
|
self, tmp_path, probe, clean_registry
|
|
):
|
|
"""No ``tools.py`` means no behaviour change at all — nothing imported."""
|
|
from hermes_cli.plugins import PluginManager
|
|
|
|
manifest = _write_platform_plugin(tmp_path, "barefoot", with_tools_module=False)
|
|
|
|
mgr = PluginManager()
|
|
mgr._register_deferred_platform(manifest)
|
|
|
|
assert probe.package_execs == 0
|
|
assert probe.adapter_imports == 0
|
|
assert mgr._plugins["barefoot-platform"].tools_registered == []
|
|
|
|
def test_tools_module_alone_does_not_opt_a_platform_in(
|
|
self, tmp_path, probe, clean_registry
|
|
):
|
|
"""``provides_tools`` is the trigger, not the presence of a file.
|
|
|
|
A platform is free to keep internal helpers in ``tools.py``; without
|
|
the manifest declaring what it publishes, discovery must not import
|
|
the package at all. Otherwise a plugin opts into an eager import by
|
|
naming a file, and the contract is invisible to anyone reading the
|
|
manifest.
|
|
"""
|
|
from hermes_cli.plugins import PluginManager
|
|
|
|
manifest = _write_platform_plugin(
|
|
tmp_path,
|
|
"quietplat",
|
|
with_tools_module=True,
|
|
declares_provides_tools=False,
|
|
)
|
|
|
|
mgr = PluginManager()
|
|
mgr._register_deferred_platform(manifest)
|
|
|
|
assert probe.package_execs == 0
|
|
assert probe.tools_execs == 0
|
|
assert probe.adapter_imports == 0
|
|
assert mgr._plugins["quietplat-platform"].deferred is True
|
|
assert mgr._plugins["quietplat-platform"].tools_registered == []
|
|
|
|
def test_package_body_runs_once_across_discovery_and_materialization(
|
|
self, tmp_path, probe, clean_registry
|
|
):
|
|
"""Pre-importing the package must not double-execute it later.
|
|
|
|
Discovery imports ``<plugin>/__init__.py`` to reach ``tools.py``; when
|
|
the gateway later materializes the adapter, ``_load_plugin`` reuses
|
|
that module instead of re-running its body.
|
|
"""
|
|
from gateway.platform_registry import platform_registry
|
|
from hermes_cli.plugins import PluginManager
|
|
|
|
manifest = _write_platform_plugin(tmp_path, "probeplat", with_tools_module=True)
|
|
|
|
mgr = PluginManager()
|
|
mgr._register_deferred_platform(manifest)
|
|
assert probe.package_execs == 1
|
|
|
|
# What gateway/web startup does.
|
|
platform_registry.get("probeplat")
|
|
|
|
assert probe.package_execs == 1
|
|
assert probe.adapter_imports == 1
|
|
|
|
def test_tools_stay_attributed_after_materialization(
|
|
self, tmp_path, probe, clean_registry
|
|
):
|
|
"""`hermes plugins list` must still credit the pre-registered tools.
|
|
|
|
``_load_plugin`` attributes tools by diffing the registry around
|
|
``register()``. Tools registered at discovery are already in the
|
|
"before" snapshot, so the diff alone would report zero.
|
|
"""
|
|
from gateway.platform_registry import platform_registry
|
|
from hermes_cli.plugins import PluginManager
|
|
|
|
manifest = _write_platform_plugin(tmp_path, "probeplat", with_tools_module=True)
|
|
|
|
mgr = PluginManager()
|
|
mgr._register_deferred_platform(manifest)
|
|
assert mgr._plugins["probeplat-platform"].tools_registered == ["probeplat_call"]
|
|
|
|
platform_registry.get("probeplat")
|
|
|
|
loaded = mgr._plugins["probeplat-platform"]
|
|
assert loaded.tools_registered == ["probeplat_call"]
|
|
assert loaded.enabled is True
|
|
|
|
def test_broken_tools_module_does_not_break_discovery(
|
|
self, tmp_path, probe, clean_registry, caplog
|
|
):
|
|
"""A plugin whose ``tools.py`` raises degrades to the old behaviour.
|
|
|
|
Degrading quietly is not enough: the degraded state IS the #78050
|
|
symptom (declared tools absent from the session), so it has to be
|
|
visible without enabling debug logging to find it.
|
|
"""
|
|
from hermes_cli.plugins import PluginManager
|
|
|
|
manifest = _write_platform_plugin(tmp_path, "probeplat", with_tools_module=True)
|
|
(Path(manifest.path) / "tools.py").write_text(
|
|
"raise RuntimeError('boom')\n", encoding="utf-8"
|
|
)
|
|
|
|
mgr = PluginManager()
|
|
with caplog.at_level(logging.WARNING, logger="hermes_cli.plugins"):
|
|
mgr._register_deferred_platform(manifest) # must not raise
|
|
|
|
assert mgr._plugins["probeplat-platform"].deferred is True
|
|
assert mgr._plugins["probeplat-platform"].tools_registered == []
|
|
assert any(
|
|
"probeplat-platform" in r.message and r.levelno == logging.WARNING
|
|
for r in caplog.records
|
|
), caplog.text
|
|
|
|
def test_partially_registered_tools_are_still_attributed(
|
|
self, tmp_path, probe, clean_registry, caplog
|
|
):
|
|
"""Tools registered before a mid-way failure are live — credit them.
|
|
|
|
`register_tools` is not transactional: whatever it registered before
|
|
raising stays in the registry. Leaving those unattributed makes
|
|
`hermes plugins list` under-report what the process is carrying, and
|
|
`_load_plugin`'s own diff cannot recover them later because they are
|
|
already inside its "before" snapshot.
|
|
"""
|
|
from hermes_cli.plugins import PluginManager
|
|
|
|
manifest = _write_platform_plugin(tmp_path, "probeplat", with_tools_module=True)
|
|
tools_py = (Path(manifest.path) / "tools.py").read_text(encoding="utf-8")
|
|
(Path(manifest.path) / "tools.py").write_text(
|
|
tools_py + " raise RuntimeError('boom after the first tool')\n",
|
|
encoding="utf-8",
|
|
)
|
|
|
|
mgr = PluginManager()
|
|
with caplog.at_level(logging.WARNING, logger="hermes_cli.plugins"):
|
|
mgr._register_deferred_platform(manifest) # must not raise
|
|
|
|
# Attribution without a live tool would be a lie, so check the registry
|
|
# itself rather than only the bookkeeping maps.
|
|
from toolsets import resolve_toolset
|
|
|
|
assert resolve_toolset("probeplat") == ["probeplat_call"]
|
|
assert mgr._plugins["probeplat-platform"].tools_registered == ["probeplat_call"]
|
|
assert mgr._predeclared_tools["probeplat-platform"] == ["probeplat_call"]
|
|
assert mgr._plugins["probeplat-platform"].deferred is True
|
|
assert any(r.levelno == logging.WARNING for r in caplog.records), caplog.text
|
|
|
|
def test_failed_materialization_tears_down_pre_registered_tools(
|
|
self, tmp_path, probe, clean_registry, caplog
|
|
):
|
|
"""A failed materialize takes the pre-registered tools down with it.
|
|
|
|
The synthetic plugin's ``register()`` calls the same broken
|
|
``register_tools`` without catching, so materializing raises.
|
|
|
|
``_load_plugin_scoped``'s failure path sweeps the *whole* ownership
|
|
ledger for this plugin key — not the ``registration_start:`` slice —
|
|
and disposes it, so the discovery-time client tools go with the failed
|
|
adapter. Attribution and the registry therefore agree at zero: `hermes
|
|
plugins list` reports no tools because the process really is serving
|
|
none.
|
|
|
|
``enabled`` stays False on purpose: the adapter genuinely did not load.
|
|
"""
|
|
from gateway.platform_registry import platform_registry
|
|
from hermes_cli.plugins import PluginManager
|
|
from toolsets import resolve_toolset
|
|
|
|
manifest = _write_platform_plugin(tmp_path, "probeplat", with_tools_module=True)
|
|
tools_py = (Path(manifest.path) / "tools.py").read_text(encoding="utf-8")
|
|
(Path(manifest.path) / "tools.py").write_text(
|
|
tools_py + " raise RuntimeError('boom after the first tool')\n",
|
|
encoding="utf-8",
|
|
)
|
|
|
|
mgr = PluginManager()
|
|
with caplog.at_level(logging.WARNING, logger="hermes_cli.plugins"):
|
|
mgr._register_deferred_platform(manifest)
|
|
platform_registry.get("probeplat") # gateway startup; register() raises
|
|
|
|
loaded = mgr._plugins["probeplat-platform"]
|
|
assert resolve_toolset("probeplat") == []
|
|
assert loaded.tools_registered == []
|
|
assert loaded.enabled is False
|
|
assert loaded.error
|
|
# The bookkeeping entry must not outlive the failed load attempt.
|
|
assert "probeplat-platform" not in mgr._predeclared_tools
|
|
|
|
def test_declared_tools_with_no_tools_module_warns(
|
|
self, tmp_path, probe, clean_registry, caplog
|
|
):
|
|
"""A manifest promising tools it cannot deliver must say so.
|
|
|
|
Returning silently here leaves the operator with exactly the bug this
|
|
path fixes and no thread to pull on.
|
|
"""
|
|
from hermes_cli.plugins import PluginManager
|
|
|
|
manifest = _write_platform_plugin(
|
|
tmp_path,
|
|
"promiseplat",
|
|
with_tools_module=False,
|
|
declares_provides_tools=True,
|
|
)
|
|
|
|
mgr = PluginManager()
|
|
with caplog.at_level(logging.WARNING, logger="hermes_cli.plugins"):
|
|
mgr._register_deferred_platform(manifest)
|
|
|
|
assert probe.package_execs == 0
|
|
assert mgr._plugins["promiseplat-platform"].tools_registered == []
|
|
assert any(
|
|
"promiseplat-platform" in r.message and "provides_tools" in r.message
|
|
for r in caplog.records
|
|
), caplog.text
|