teknium1
b70e0f4603
The runtime already registers nothing for an explicit empty include list
(fb1ec36a4b), but every CLI reader still coerced `[]` to "no filter":
`hermes mcp list` printed "all", `hermes mcp configure` and `hermes tools`
pre-checked every tool (so confirming the picker silently re-enabled all of
them), and a catalog reinstall pre-checked the manifest defaults over the
user's zero-tool choice.
`_tool_filters` now returns the list whenever the key holds a list; only an
absent/non-list key is None. The pickers and list output branch on `is not
None`, matching `tools/mcp_tool_registration.py`.
Fixes #12865. Builds on #13096 (@dingn42) and #52874 (@Bartok9).
93 lines
2.9 KiB
Python
93 lines
2.9 KiB
Python
"""Tests for MCP tools interactive configuration in hermes_cli.tools_config."""
|
|
|
|
from unittest.mock import patch
|
|
|
|
from hermes_cli.tools_config import _configure_mcp_tools_interactive
|
|
|
|
# Patch targets: imports happen inside the function body, so patch at source
|
|
_PROBE = "tools.mcp_tool_discovery.probe_mcp_server_tools"
|
|
_CHECKLIST = "hermes_cli.curses_ui.curses_checklist"
|
|
_SAVE = "hermes_cli.tools_config.save_config"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_disabling_tool_writes_include_list(capsys):
|
|
"""Unchecking a tool produces an include list of the still-chosen tools.
|
|
|
|
Standardized on tools.include (whitelist) across the codebase — the
|
|
catalog flow, `hermes mcp configure`, and this UI all write the same
|
|
shape so users don\'t see config drift across UIs.
|
|
"""
|
|
config = {
|
|
"mcp_servers": {
|
|
"github": {"command": "npx"},
|
|
}
|
|
}
|
|
tools = [
|
|
("create_issue", "Create an issue"),
|
|
("delete_repo", "Delete a repo"),
|
|
("search_repos", "Search repos"),
|
|
]
|
|
|
|
# User unchecks delete_repo (index 1)
|
|
with patch(_PROBE, return_value={"github": tools}), \
|
|
patch(_CHECKLIST, return_value={0, 2}), \
|
|
patch(_SAVE) as mock_save:
|
|
_configure_mcp_tools_interactive(config)
|
|
|
|
mock_save.assert_called_once()
|
|
tools_cfg = config["mcp_servers"]["github"]["tools"]
|
|
assert tools_cfg["include"] == ["create_issue", "search_repos"]
|
|
assert "exclude" not in tools_cfg
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_empty_tools_server_skipped(capsys):
|
|
"""Server with no tools shows info message and skips checklist."""
|
|
config = {
|
|
"mcp_servers": {
|
|
"empty": {"command": "npx"},
|
|
}
|
|
}
|
|
checklist_calls = []
|
|
|
|
def fake_checklist(title, labels, pre_selected, **kwargs):
|
|
checklist_calls.append(title)
|
|
return pre_selected
|
|
|
|
with patch(_PROBE, return_value={"empty": []}), \
|
|
patch(_CHECKLIST, side_effect=fake_checklist), \
|
|
patch(_SAVE):
|
|
_configure_mcp_tools_interactive(config)
|
|
|
|
assert len(checklist_calls) == 0
|
|
captured = capsys.readouterr()
|
|
assert "no tools found" in captured.out
|
|
|
|
|
|
def test_empty_include_reopens_with_nothing_preselected():
|
|
"""``include: []`` is the runtime's block-all whitelist; the picker must not reopen it as
|
|
"all tools enabled" and must persist it when the user keeps zero tools checked (#12865)."""
|
|
config = {"mcp_servers": {"github": {"command": "npx", "tools": {"include": []}}}}
|
|
tools = [("create_issue", "Create an issue"), ("search_repos", "Search repos")]
|
|
|
|
with patch(_PROBE, return_value={"github": tools}), \
|
|
patch(_CHECKLIST, side_effect=lambda title, labels, pre, **kw: pre) as checklist, \
|
|
patch(_SAVE) as mock_save:
|
|
_configure_mcp_tools_interactive(config)
|
|
|
|
assert checklist.call_args.args[2] == set()
|
|
mock_save.assert_not_called()
|
|
assert config["mcp_servers"]["github"]["tools"] == {"include": []}
|
|
|