mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-04-25 00:51:20 +00:00
* feat(steer): /steer <prompt> injects a mid-run note after the next tool call Adds a new slash command that sits between /queue (turn boundary) and interrupt. /steer <text> stashes the message on the running agent and the agent loop appends it to the LAST tool result's content once the current tool batch finishes. The model sees it as part of the tool output on its next iteration. No interrupt is fired, no new user turn is inserted, and no prompt cache invalidation happens beyond the normal per-turn tool-result churn. Message-role alternation is preserved — we only modify an existing role:"tool" message's content. Wiring ------ - hermes_cli/commands.py: register /steer + add to ACTIVE_SESSION_BYPASS_COMMANDS. - run_agent.py: add _pending_steer state, AIAgent.steer(), _drain_pending_steer(), _apply_pending_steer_to_tool_results(); drain at end of both parallel and sequential tool executors; clear on interrupt; return leftover as result['pending_steer'] if the agent exits before another tool batch. - cli.py: /steer handler — route to agent.steer() when running, fall back to the regular queue otherwise; deliver result['pending_steer'] as next turn. - gateway/run.py: running-agent intercept calls running_agent.steer(); idle-agent path strips the prefix and forwards as a regular user message. - tui_gateway/server.py: new session.steer JSON-RPC method. - ui-tui: SessionSteerResponse type + local /steer slash command that calls session.steer when ui.busy, otherwise enqueues for the next turn. Fallbacks --------- - Agent exits mid-steer → surfaces in run_conversation result as pending_steer so CLI/gateway deliver it as the next user turn instead of silently dropping it. - All tools skipped after interrupt → re-stashes pending_steer for the caller. - No active agent → /steer reduces to sending the text as a normal message. Tests ----- - tests/run_agent/test_steer.py — accept/reject, concatenation, drain, last-tool-result injection, multimodal list content, thread safety, cleared-on-interrupt, registry membership, bypass-set membership. - tests/gateway/test_steer_command.py — running agent, pending sentinel, missing steer() method, rejected payload, empty payload. - tests/gateway/test_command_bypass_active_session.py — /steer bypasses the Level-1 base adapter guard. - tests/test_tui_gateway_server.py — session.steer RPC paths. 72/72 targeted tests pass under scripts/run_tests.sh. * feat(steer): register /steer in Discord's native slash tree Discord's app_commands tree is a curated subset of slash commands (not derived from COMMAND_REGISTRY like Telegram/Slack). /steer already works there as plain text (routes through handle_message → base adapter bypass → runner), but registering it here adds Discord's native autocomplete + argument hint UI so users can discover and type it like any other first-class command.
228 lines
8.7 KiB
Python
228 lines
8.7 KiB
Python
"""Tests for AIAgent.steer() — mid-run user message injection.
|
|
|
|
/steer lets the user add a note to the agent's next tool result without
|
|
interrupting the current tool call. The agent sees the note inline with
|
|
tool output on its next iteration, preserving message-role alternation
|
|
and prompt-cache integrity.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import threading
|
|
|
|
import pytest
|
|
|
|
from run_agent import AIAgent
|
|
|
|
|
|
def _bare_agent() -> AIAgent:
|
|
"""Build an AIAgent without running __init__, then install the steer
|
|
state manually — matches the existing object.__new__ stub pattern
|
|
used elsewhere in the test suite.
|
|
"""
|
|
agent = object.__new__(AIAgent)
|
|
agent._pending_steer = None
|
|
agent._pending_steer_lock = threading.Lock()
|
|
return agent
|
|
|
|
|
|
class TestSteerAcceptance:
|
|
def test_accepts_non_empty_text(self):
|
|
agent = _bare_agent()
|
|
assert agent.steer("go ahead and check the logs") is True
|
|
assert agent._pending_steer == "go ahead and check the logs"
|
|
|
|
def test_rejects_empty_string(self):
|
|
agent = _bare_agent()
|
|
assert agent.steer("") is False
|
|
assert agent._pending_steer is None
|
|
|
|
def test_rejects_whitespace_only(self):
|
|
agent = _bare_agent()
|
|
assert agent.steer(" \n\t ") is False
|
|
assert agent._pending_steer is None
|
|
|
|
def test_rejects_none(self):
|
|
agent = _bare_agent()
|
|
assert agent.steer(None) is False # type: ignore[arg-type]
|
|
assert agent._pending_steer is None
|
|
|
|
def test_strips_surrounding_whitespace(self):
|
|
agent = _bare_agent()
|
|
assert agent.steer(" hello world \n") is True
|
|
assert agent._pending_steer == "hello world"
|
|
|
|
def test_concatenates_multiple_steers_with_newlines(self):
|
|
agent = _bare_agent()
|
|
agent.steer("first note")
|
|
agent.steer("second note")
|
|
agent.steer("third note")
|
|
assert agent._pending_steer == "first note\nsecond note\nthird note"
|
|
|
|
|
|
class TestSteerDrain:
|
|
def test_drain_returns_and_clears(self):
|
|
agent = _bare_agent()
|
|
agent.steer("hello")
|
|
assert agent._drain_pending_steer() == "hello"
|
|
assert agent._pending_steer is None
|
|
|
|
def test_drain_on_empty_returns_none(self):
|
|
agent = _bare_agent()
|
|
assert agent._drain_pending_steer() is None
|
|
|
|
|
|
class TestSteerInjection:
|
|
def test_appends_to_last_tool_result(self):
|
|
agent = _bare_agent()
|
|
agent.steer("please also check auth.log")
|
|
messages = [
|
|
{"role": "user", "content": "what's in /var/log?"},
|
|
{"role": "assistant", "tool_calls": [{"id": "a"}, {"id": "b"}]},
|
|
{"role": "tool", "content": "ls output A", "tool_call_id": "a"},
|
|
{"role": "tool", "content": "ls output B", "tool_call_id": "b"},
|
|
]
|
|
agent._apply_pending_steer_to_tool_results(messages, num_tool_msgs=2)
|
|
# The LAST tool result is modified; earlier ones are untouched.
|
|
assert messages[2]["content"] == "ls output A"
|
|
assert "ls output B" in messages[3]["content"]
|
|
assert "[USER STEER" in messages[3]["content"]
|
|
assert "please also check auth.log" in messages[3]["content"]
|
|
# And pending_steer is consumed.
|
|
assert agent._pending_steer is None
|
|
|
|
def test_no_op_when_no_steer_pending(self):
|
|
agent = _bare_agent()
|
|
messages = [
|
|
{"role": "assistant", "tool_calls": [{"id": "a"}]},
|
|
{"role": "tool", "content": "output", "tool_call_id": "a"},
|
|
]
|
|
agent._apply_pending_steer_to_tool_results(messages, num_tool_msgs=1)
|
|
assert messages[-1]["content"] == "output" # unchanged
|
|
|
|
def test_no_op_when_num_tool_msgs_zero(self):
|
|
agent = _bare_agent()
|
|
agent.steer("steer")
|
|
messages = [{"role": "user", "content": "hi"}]
|
|
agent._apply_pending_steer_to_tool_results(messages, num_tool_msgs=0)
|
|
# Steer should remain pending (nothing to drain into)
|
|
assert agent._pending_steer == "steer"
|
|
|
|
def test_marker_is_unambiguous_about_origin(self):
|
|
"""The injection marker must make clear the text is from the user
|
|
and not tool output — this is the cache-safe way to signal
|
|
provenance without violating message-role alternation.
|
|
"""
|
|
agent = _bare_agent()
|
|
agent.steer("stop after next step")
|
|
messages = [{"role": "tool", "content": "x", "tool_call_id": "1"}]
|
|
agent._apply_pending_steer_to_tool_results(messages, num_tool_msgs=1)
|
|
content = messages[-1]["content"]
|
|
assert "USER STEER" in content
|
|
assert "not tool output" in content.lower() or "injected mid-run" in content.lower()
|
|
|
|
def test_multimodal_content_list_preserved(self):
|
|
"""Anthropic-style list content should be preserved, with the steer
|
|
appended as a text block."""
|
|
agent = _bare_agent()
|
|
agent.steer("extra note")
|
|
original_blocks = [{"type": "text", "text": "existing output"}]
|
|
messages = [
|
|
{"role": "tool", "content": list(original_blocks), "tool_call_id": "1"}
|
|
]
|
|
agent._apply_pending_steer_to_tool_results(messages, num_tool_msgs=1)
|
|
new_content = messages[-1]["content"]
|
|
assert isinstance(new_content, list)
|
|
assert len(new_content) == 2
|
|
assert new_content[0] == {"type": "text", "text": "existing output"}
|
|
assert new_content[1]["type"] == "text"
|
|
assert "extra note" in new_content[1]["text"]
|
|
|
|
def test_restashed_when_no_tool_result_in_batch(self):
|
|
"""If the 'batch' contains no tool-role messages (e.g. all skipped
|
|
after an interrupt), the steer should be put back into the pending
|
|
slot so the caller's fallback path can deliver it."""
|
|
agent = _bare_agent()
|
|
agent.steer("ping")
|
|
messages = [
|
|
{"role": "user", "content": "x"},
|
|
{"role": "assistant", "content": "y"},
|
|
]
|
|
# Claim there were N tool msgs, but the tail has none — simulates
|
|
# the interrupt-cancelled case.
|
|
agent._apply_pending_steer_to_tool_results(messages, num_tool_msgs=2)
|
|
# Messages untouched
|
|
assert messages[-1]["content"] == "y"
|
|
# And the steer is back in pending so the fallback can grab it
|
|
assert agent._pending_steer == "ping"
|
|
|
|
|
|
class TestSteerThreadSafety:
|
|
def test_concurrent_steer_calls_preserve_all_text(self):
|
|
agent = _bare_agent()
|
|
N = 200
|
|
|
|
def worker(idx: int) -> None:
|
|
agent.steer(f"note-{idx}")
|
|
|
|
threads = [threading.Thread(target=worker, args=(i,)) for i in range(N)]
|
|
for t in threads:
|
|
t.start()
|
|
for t in threads:
|
|
t.join()
|
|
|
|
text = agent._drain_pending_steer()
|
|
assert text is not None
|
|
# Every single note must be preserved — none dropped by the lock.
|
|
lines = text.split("\n")
|
|
assert len(lines) == N
|
|
assert set(lines) == {f"note-{i}" for i in range(N)}
|
|
|
|
|
|
class TestSteerClearedOnInterrupt:
|
|
def test_clear_interrupt_drops_pending_steer(self):
|
|
"""A hard interrupt supersedes any pending steer — the agent's
|
|
next tool iteration won't happen, so delivering the steer later
|
|
would be surprising."""
|
|
agent = _bare_agent()
|
|
# Minimal surface needed by clear_interrupt()
|
|
agent._interrupt_requested = True
|
|
agent._interrupt_message = None
|
|
agent._interrupt_thread_signal_pending = False
|
|
agent._execution_thread_id = None
|
|
agent._tool_worker_threads = None
|
|
agent._tool_worker_threads_lock = None
|
|
|
|
agent.steer("will be dropped")
|
|
assert agent._pending_steer == "will be dropped"
|
|
|
|
agent.clear_interrupt()
|
|
assert agent._pending_steer is None
|
|
|
|
|
|
class TestSteerCommandRegistry:
|
|
def test_steer_in_command_registry(self):
|
|
"""The /steer slash command must be registered so it reaches all
|
|
platforms (CLI, gateway, TUI autocomplete, Telegram/Slack menus).
|
|
"""
|
|
from hermes_cli.commands import resolve_command, ACTIVE_SESSION_BYPASS_COMMANDS
|
|
|
|
cmd = resolve_command("steer")
|
|
assert cmd is not None
|
|
assert cmd.name == "steer"
|
|
assert cmd.category == "Session"
|
|
assert cmd.args_hint == "<prompt>"
|
|
|
|
def test_steer_in_bypass_set(self):
|
|
"""When the agent is running, /steer MUST bypass the Level-1
|
|
base-adapter queue so it reaches the gateway runner's /steer
|
|
handler. Otherwise it would be queued as user text and only
|
|
delivered at turn end — defeating the whole point.
|
|
"""
|
|
from hermes_cli.commands import ACTIVE_SESSION_BYPASS_COMMANDS, should_bypass_active_session
|
|
|
|
assert "steer" in ACTIVE_SESSION_BYPASS_COMMANDS
|
|
assert should_bypass_active_session("steer") is True
|
|
|
|
|
|
if __name__ == "__main__": # pragma: no cover
|
|
pytest.main([__file__, "-v"])
|