mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-08 03:01:47 +00:00
fix(tui): run plugin slash commands live
This commit is contained in:
parent
167b5648ea
commit
7e780f4832
2 changed files with 51 additions and 3 deletions
|
|
@ -391,6 +391,36 @@ def test_slash_exec_rejects_skill_commands(server):
|
||||||
assert "skill command" in resp["error"]["message"]
|
assert "skill command" in resp["error"]["message"]
|
||||||
|
|
||||||
|
|
||||||
|
def test_slash_exec_handles_plugin_commands_in_live_gateway(server):
|
||||||
|
"""Plugin slash commands return normal slash.exec output without using the worker."""
|
||||||
|
sid = "test-session"
|
||||||
|
|
||||||
|
class Worker:
|
||||||
|
def __init__(self):
|
||||||
|
self.calls = []
|
||||||
|
|
||||||
|
def run(self, cmd):
|
||||||
|
self.calls.append(cmd)
|
||||||
|
return f"worker:{cmd}"
|
||||||
|
|
||||||
|
worker = Worker()
|
||||||
|
server._sessions[sid] = {"session_key": sid, "agent": None, "slash_worker": worker}
|
||||||
|
|
||||||
|
with patch(
|
||||||
|
"hermes_cli.plugins.get_plugin_command_handler",
|
||||||
|
lambda name: (lambda arg: f"plugin:{arg}") if name == "plugin-cmd" else None,
|
||||||
|
):
|
||||||
|
resp = server.handle_request({
|
||||||
|
"id": "r-plugin-slash",
|
||||||
|
"method": "slash.exec",
|
||||||
|
"params": {"command": "plugin-cmd hello", "session_id": sid},
|
||||||
|
})
|
||||||
|
|
||||||
|
assert "error" not in resp
|
||||||
|
assert resp["result"] == {"output": "plugin:hello"}
|
||||||
|
assert worker.calls == []
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize("cmd", ["retry", "queue hello", "q hello", "steer fix the test", "plan"])
|
@pytest.mark.parametrize("cmd", ["retry", "queue hello", "q hello", "steer fix the test", "plan"])
|
||||||
def test_slash_exec_rejects_pending_input_commands(server, cmd):
|
def test_slash_exec_rejects_pending_input_commands(server, cmd):
|
||||||
"""slash.exec must reject commands that use _pending_input in the CLI."""
|
"""slash.exec must reject commands that use _pending_input in the CLI."""
|
||||||
|
|
|
||||||
|
|
@ -5165,9 +5165,13 @@ def _(rid, params: dict) -> dict:
|
||||||
return _err(rid, 4004, "empty command")
|
return _err(rid, 4004, "empty command")
|
||||||
|
|
||||||
# Skill slash commands and _pending_input commands must NOT go through the
|
# Skill slash commands and _pending_input commands must NOT go through the
|
||||||
# slash worker — see _PENDING_INPUT_COMMANDS definition above.
|
# slash worker — see _PENDING_INPUT_COMMANDS definition above. Plugin
|
||||||
_cmd_parts = cmd.split() if not cmd.startswith("/") else cmd.lstrip("/").split()
|
# commands must also avoid the worker, but unlike skills/pending-input they
|
||||||
_cmd_base = _cmd_parts[0] if _cmd_parts else ""
|
# still return normal slash.exec output so the TUI keeps the pager path.
|
||||||
|
_cmd_text = cmd.lstrip("/") if cmd.startswith("/") else cmd
|
||||||
|
_cmd_parts = _cmd_text.split(maxsplit=1)
|
||||||
|
_cmd_base = (_cmd_parts[0] if _cmd_parts else "").lower()
|
||||||
|
_cmd_arg = _cmd_parts[1] if len(_cmd_parts) > 1 else ""
|
||||||
|
|
||||||
if _cmd_base in _PENDING_INPUT_COMMANDS:
|
if _cmd_base in _PENDING_INPUT_COMMANDS:
|
||||||
return _err(
|
return _err(
|
||||||
|
|
@ -5185,6 +5189,20 @@ def _(rid, params: dict) -> dict:
|
||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
try:
|
||||||
|
from hermes_cli.plugins import (
|
||||||
|
get_plugin_command_handler,
|
||||||
|
resolve_plugin_command_result,
|
||||||
|
)
|
||||||
|
|
||||||
|
if _cmd_base:
|
||||||
|
plugin_handler = get_plugin_command_handler(_cmd_base)
|
||||||
|
if plugin_handler:
|
||||||
|
result = resolve_plugin_command_result(plugin_handler(_cmd_arg))
|
||||||
|
return _ok(rid, {"output": str(result or "(no output)")})
|
||||||
|
except Exception as e:
|
||||||
|
return _err(rid, 4018, f"plugin command error: {e}")
|
||||||
|
|
||||||
worker = session.get("slash_worker")
|
worker = session.get("slash_worker")
|
||||||
if not worker:
|
if not worker:
|
||||||
try:
|
try:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue