mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-08 13:12:08 +00:00
03bbd37dd7
The MCP serve event bridge polls two files to decide whether there is new conversation activity to surface to MCP clients: the gateway sessions.json index and state.db. Its skip-when-unchanged guard was self-defeating — it refreshed self._sessions_json_mtime with the current value *before* comparing against it, so the sessions.json term was always true and the guard collapsed to a state.db-only check. The impact is silent message loss on the event stream. The gateway commonly persists a message to state.db on one tick and registers the owning conversation in sessions.json a moment later. On that later tick only sessions.json has changed, so the broken guard takes the early return and never processes the freshly-registered chat. Its messages are withheld from every connected MCP client (events_poll / events_wait) until state.db happens to change again — which, for an otherwise-idle conversation, may be never. A polling bridge that quietly swallows new conversations is exactly the failure mode this watcher exists to prevent. The fix is minimal and low-risk: capture the previously-seen sessions.json mtime before the cache refresh and compare against that, so the guard skips only when NEITHER file changed since the last poll. The hot-path mtime optimization is fully preserved (a genuinely idle tick still short-circuits), and all existing EventBridge polling tests continue to pass unchanged. ## What does this PR do? Fixes a logic error in `EventBridge._poll_once` (`mcp_serve.py`) where the "nothing changed, skip this poll" guard compared `sj_mtime` against `self._sessions_json_mtime` *after* that attribute had already been overwritten with `sj_mtime`. The comparison was therefore always true, reducing the intended "skip only if both files are unchanged" check to a state.db-only check and discarding any tick in which only sessions.json changed. The guard now compares against the mtime observed on the previous poll, restoring the intended behavior. ## Related Issue N/A ## Type of Change - [x] 🐛 Bug fix (non-breaking change that fixes an issue) - [ ] ✨ New feature (non-breaking change that adds functionality) - [ ] 🔒 Security fix - [ ] 📝 Documentation update - [ ] ✅ Tests (adding or improving test coverage) - [ ] ♻️ Refactor (no behavior change) - [ ] 🎯 New skill (bundled or hub) ## Changes Made - `mcp_serve.py`: in `EventBridge._poll_once`, snapshot `prev_sessions_json_mtime = self._sessions_json_mtime` before refreshing the cached index, and use it in the skip guard (`sj_mtime == prev_sessions_json_mtime`) so a sessions.json-only change no longer triggers the early return. Added a comment explaining the seam. - `tests/test_mcp_serve.py`: added `TestEventBridgePollE2E::test_poll_picks_up_new_conversation_when_only_sessions_json_changed`, a regression test that reproduces the boundary state (state.db unchanged, sessions.json newly updated) and asserts the new conversation's message is emitted. ## How to Test 1. Reproduce the failure on the old code: with the guard comparing against `self._sessions_json_mtime`, the new test fails — the freshly-registered conversation yields `0` events instead of `1`. 2. Apply the fix and run `pytest tests/test_mcp_serve.py -q` — all 46 tests pass (40 skipped require the optional `mcp` SDK), including the three pre-existing `TestEventBridgePollE2E` polling tests and the new regression guard. 3. `ruff check mcp_serve.py tests/test_mcp_serve.py` and `python scripts/check-windows-footguns.py mcp_serve.py` both report clean. ## Checklist ### Code - [x] I've read the [Contributing Guide](https://github.com/NousResearch/hermes-agent/blob/main/CONTRIBUTING.md) - [x] My commit messages follow [Conventional Commits](https://www.conventionalcommits.org/) (`fix(scope):`, `feat(scope):`, etc.) - [x] I searched for [existing PRs](https://github.com/NousResearch/hermes-agent/pulls) to make sure this isn't a duplicate - [x] My PR contains **only** changes related to this fix/feature (no unrelated commits) - [x] I've run `pytest tests/test_mcp_serve.py -q` and all tests pass - [x] I've added tests for my changes (required for bug fixes, strongly encouraged for features) - [x] I've tested on my platform: macOS 15 (Darwin) ### Documentation & Housekeeping - [x] I've updated relevant documentation (README, `docs/`, docstrings) — or N/A - [x] I've updated `cli-config.yaml.example` if I added/changed config keys — or N/A - [x] I've updated `CONTRIBUTING.md` or `AGENTS.md` if I changed architecture or workflows — or N/A - [x] I've considered cross-platform impact (Windows, macOS) per the [compatibility guide](https://github.com/NousResearch/hermes-agent/blob/main/CONTRIBUTING.md#cross-platform-compatibility) — or N/A - [x] I've updated tool descriptions/schemas if I changed tool behavior — or N/A |
||
|---|---|---|
| .. | ||
| acp | ||
| acp_adapter | ||
| agent | ||
| ci | ||
| cli | ||
| computer_use | ||
| cron | ||
| docker | ||
| e2e | ||
| fakes | ||
| fixtures/plugins/example-dashboard/dashboard | ||
| gateway | ||
| hermes_cli | ||
| hermes_state | ||
| honcho_plugin | ||
| integration | ||
| manual | ||
| openviking_plugin | ||
| plugins | ||
| providers | ||
| run_agent | ||
| scripts | ||
| skills | ||
| stress | ||
| tools | ||
| tui_gateway | ||
| website | ||
| __init__.py | ||
| conftest.py | ||
| run_interrupt_test.py | ||
| test_account_usage.py | ||
| test_assistant_ui_tap_compat.py | ||
| test_atomic_replace_symlinks.py | ||
| test_background_review_session_isolation.py | ||
| test_base_url_hostname.py | ||
| test_batch_runner_checkpoint.py | ||
| test_bitwarden_secrets.py | ||
| test_cli_file_drop.py | ||
| test_cli_manual_compress.py | ||
| test_cli_skin_integration.py | ||
| test_code_skew.py | ||
| test_ctx_halving_fix.py | ||
| test_dashboard_sidecar_close_on_disconnect.py | ||
| test_delegate_cascade_49148.py | ||
| test_desktop_electron_pin.py | ||
| test_desktop_mac_entitlements.py | ||
| test_dispatch_session_id.py | ||
| test_empty_model_fallback.py | ||
| test_empty_session_hygiene.py | ||
| test_env_loader_secret_sources.py | ||
| test_evidence_store.py | ||
| test_fast_safe_load.py | ||
| test_gateway_streaming_nested_config.py | ||
| test_get_tool_definitions_cache_isolation.py | ||
| test_hermes_bootstrap.py | ||
| test_hermes_constants.py | ||
| test_hermes_home_profile_warning.py | ||
| test_hermes_logging.py | ||
| test_hermes_state.py | ||
| test_hermes_state_compression_locks.py | ||
| test_hermes_state_wal_fallback.py | ||
| test_honcho_client_concurrency.py | ||
| test_honcho_client_config.py | ||
| test_honcho_session_context.py | ||
| test_honcho_startup_fail_open.py | ||
| test_install_diverged_update.py | ||
| test_install_lockfile_churn.py | ||
| test_install_no_initial_commit.py | ||
| test_install_ps1_native_stderr_eap.py | ||
| test_install_ps1_python_fallback_venv.py | ||
| test_install_ps1_uv_powershell_host.py | ||
| test_install_sh_browser_install.py | ||
| test_install_sh_install_method_stamp.py | ||
| test_install_sh_node_global_prefix.py | ||
| test_install_sh_pythonpath_sanitization.py | ||
| test_install_sh_root_fhs_uv_python_path.py | ||
| test_install_sh_setup_wizard_tty_probe.py | ||
| test_install_sh_symlink_stomp.py | ||
| test_install_sh_termux_network_prereqs.py | ||
| test_install_unmerged_index.py | ||
| test_ipv4_preference.py | ||
| test_lazy_session_regressions.py | ||
| test_lint_config.py | ||
| test_live_system_guard_self_test.py | ||
| test_mcp_serve.py | ||
| test_mini_swe_runner.py | ||
| test_minimax_model_validation.py | ||
| test_minimax_oauth.py | ||
| test_minisweagent_path.py | ||
| test_model_forces_max_completion_tokens.py | ||
| test_model_picker_scroll.py | ||
| test_model_tools.py | ||
| test_model_tools_async_bridge.py | ||
| test_ollama_num_ctx.py | ||
| test_output_cap_parsing.py | ||
| test_package_json_lazy_deps.py | ||
| test_packaging_metadata.py | ||
| test_plugin_skills.py | ||
| test_plugin_utils.py | ||
| test_process_loop_event_loop_warning.py | ||
| test_profile_isolation_runtime.py | ||
| test_project_metadata.py | ||
| test_retry_utils.py | ||
| test_run_tests_parallel.py | ||
| test_sanitize_tool_error.py | ||
| test_setup_temporary_outputs.py | ||
| test_slash_worker_watchdog.py | ||
| test_sql_injection.py | ||
| test_stale_utils_module_import.py | ||
| test_state_db_malformed_repair.py | ||
| test_subprocess_home_isolation.py | ||
| test_termux_all_extra_compat.py | ||
| test_timezone.py | ||
| test_toolset_distributions.py | ||
| test_toolsets.py | ||
| test_trajectory_compressor.py | ||
| test_trajectory_compressor_async.py | ||
| test_transform_llm_output_hook.py | ||
| test_transform_tool_result_hook.py | ||
| test_tui_gateway_loop_noise.py | ||
| test_tui_gateway_queue_on_busy.py | ||
| test_tui_gateway_server.py | ||
| test_tui_gateway_ws.py | ||
| test_tui_mcp_late_refresh.py | ||
| test_utils_truthy_values.py | ||
| test_web_server.py | ||
| test_wheel_locales_e2e.py | ||
| test_windows_subprocess_no_window_flags.py | ||
| test_yaml_indent_consistency_31999.py | ||
| test_yuanbao_integration.py | ||
| test_yuanbao_markdown.py | ||
| test_yuanbao_pipeline.py | ||
| test_yuanbao_proto.py | ||
| test_yuanbao_shutdown.py | ||