mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-29 06:31:32 +00:00
1c3c364287
The CLI status bar tracked /background agent tasks (▶ N) but not shell processes spawned via terminal(background=true). Both kinds of work can run concurrently and a user has no in-bar signal for shell processes. Add an independent indicator (⚙ N) sourced from tools.process_registry.process_registry._running. The two indicators render side-by-side when both are active (▶ 1 │ ⚙ 2), hidden when their count is zero. Renders at all four status-bar tiers (text fallback + prompt_toolkit fragments, narrow + wide widths). The narrow <52 tier still drops both for space — unchanged. New ProcessRegistry.count_running() returns len(_running) without acquiring _lock; CPython dict len is atomic and we're polling on every status-bar tick, so lock-free is the right tradeoff.
191 lines
6.7 KiB
Python
191 lines
6.7 KiB
Python
"""Tests for the /background indicator in the CLI status bar.
|
|
|
|
The classic prompt_toolkit status bar shows `▶ N` when N tasks launched via
|
|
`/background` are still running. Source of truth is `self._background_tasks`
|
|
(a Dict[str, threading.Thread]); entries are removed in the task thread's
|
|
finally block, so len() reflects truly-running tasks.
|
|
"""
|
|
|
|
import threading
|
|
from datetime import datetime
|
|
|
|
from cli import HermesCLI
|
|
|
|
|
|
def _stub_thread() -> threading.Thread:
|
|
"""Return a Thread instance that's never started — pure dict-value stand-in."""
|
|
return threading.Thread(target=lambda: None)
|
|
|
|
|
|
def _make_cli():
|
|
"""Bare-metal HermesCLI for snapshot/build tests (no __init__ side effects)."""
|
|
cli_obj = HermesCLI.__new__(HermesCLI)
|
|
cli_obj.model = "anthropic/claude-opus-4.6"
|
|
cli_obj.agent = None
|
|
cli_obj._background_tasks = {}
|
|
# The snapshot reads session_start to compute duration; supply a stub.
|
|
cli_obj.session_start = datetime.now()
|
|
return cli_obj
|
|
|
|
|
|
def test_snapshot_reports_zero_when_no_background_tasks():
|
|
cli_obj = _make_cli()
|
|
snap = cli_obj._get_status_bar_snapshot()
|
|
assert snap["active_background_tasks"] == 0
|
|
|
|
|
|
def test_snapshot_counts_live_background_tasks():
|
|
cli_obj = _make_cli()
|
|
cli_obj._background_tasks = {"bg_a": _stub_thread(), "bg_b": _stub_thread()}
|
|
snap = cli_obj._get_status_bar_snapshot()
|
|
assert snap["active_background_tasks"] == 2
|
|
|
|
|
|
def test_snapshot_safe_when_background_tasks_attr_missing():
|
|
"""Older HermesCLI instances (tests with __new__, etc.) may lack the attr."""
|
|
cli_obj = HermesCLI.__new__(HermesCLI)
|
|
cli_obj.model = "x"
|
|
cli_obj.agent = None
|
|
cli_obj.session_start = datetime.now()
|
|
# No _background_tasks at all — must not raise.
|
|
snap = cli_obj._get_status_bar_snapshot()
|
|
assert snap["active_background_tasks"] == 0
|
|
|
|
|
|
def test_plain_text_status_omits_indicator_when_idle():
|
|
cli_obj = _make_cli()
|
|
text = cli_obj._build_status_bar_text(width=80)
|
|
assert "▶" not in text
|
|
|
|
|
|
def test_plain_text_status_shows_indicator_when_active():
|
|
cli_obj = _make_cli()
|
|
cli_obj._background_tasks = {"bg_a": _stub_thread()}
|
|
text = cli_obj._build_status_bar_text(width=80)
|
|
assert "▶ 1" in text
|
|
|
|
|
|
def test_plain_text_status_shows_higher_count():
|
|
cli_obj = _make_cli()
|
|
cli_obj._background_tasks = {
|
|
"a": _stub_thread(),
|
|
"b": _stub_thread(),
|
|
"c": _stub_thread(),
|
|
}
|
|
text = cli_obj._build_status_bar_text(width=80)
|
|
assert "▶ 3" in text
|
|
|
|
|
|
def test_narrow_width_omits_bg_indicator():
|
|
"""The narrow tier (<52) is already cramped — bg is secondary, drop it."""
|
|
cli_obj = _make_cli()
|
|
cli_obj._background_tasks = {"bg_a": _stub_thread()}
|
|
text = cli_obj._build_status_bar_text(width=40)
|
|
assert "▶" not in text
|
|
|
|
|
|
def test_fragments_include_bg_segment_when_active():
|
|
cli_obj = _make_cli()
|
|
cli_obj._background_tasks = {"a": _stub_thread(), "b": _stub_thread()}
|
|
cli_obj._status_bar_visible = True
|
|
# _get_status_bar_fragments asks _get_tui_terminal_width(); stub it wide.
|
|
cli_obj._get_tui_terminal_width = lambda: 120 # type: ignore[method-assign]
|
|
frags = cli_obj._get_status_bar_fragments()
|
|
rendered = "".join(text for _style, text in frags)
|
|
assert "▶ 2" in rendered
|
|
|
|
|
|
def test_fragments_omit_bg_segment_when_idle():
|
|
cli_obj = _make_cli()
|
|
cli_obj._status_bar_visible = True
|
|
cli_obj._get_tui_terminal_width = lambda: 120 # type: ignore[method-assign]
|
|
frags = cli_obj._get_status_bar_fragments()
|
|
rendered = "".join(text for _style, text in frags)
|
|
assert "▶" not in rendered
|
|
|
|
|
|
# ── Background terminal-process indicator (⚙ N) ───────────────────────────
|
|
# Source of truth is tools.process_registry.process_registry._running (a dict
|
|
# of currently-running shell processes spawned by terminal(background=true)).
|
|
# Distinct from /background tasks above: ▶ counts agent threads, ⚙ counts
|
|
# shell processes. Both can be active simultaneously.
|
|
|
|
|
|
class _FakeRunningRegistry:
|
|
"""Minimal stand-in for process_registry; exposes count_running()."""
|
|
|
|
def __init__(self, count: int) -> None:
|
|
self._count = count
|
|
|
|
def count_running(self) -> int:
|
|
return self._count
|
|
|
|
|
|
def _patch_process_registry(monkeypatch, count: int) -> None:
|
|
import tools.process_registry as pr_mod
|
|
monkeypatch.setattr(pr_mod, "process_registry", _FakeRunningRegistry(count))
|
|
|
|
|
|
def test_snapshot_reports_zero_when_no_background_processes(monkeypatch):
|
|
cli_obj = _make_cli()
|
|
_patch_process_registry(monkeypatch, 0)
|
|
snap = cli_obj._get_status_bar_snapshot()
|
|
assert snap["active_background_processes"] == 0
|
|
|
|
|
|
def test_snapshot_counts_live_background_processes(monkeypatch):
|
|
cli_obj = _make_cli()
|
|
_patch_process_registry(monkeypatch, 3)
|
|
snap = cli_obj._get_status_bar_snapshot()
|
|
assert snap["active_background_processes"] == 3
|
|
|
|
|
|
def test_snapshot_safe_when_process_registry_raises(monkeypatch):
|
|
"""If count_running() raises the snapshot stays at 0; no propagate."""
|
|
cli_obj = _make_cli()
|
|
import tools.process_registry as pr_mod
|
|
|
|
class _BoomRegistry:
|
|
def count_running(self):
|
|
raise RuntimeError("boom")
|
|
|
|
monkeypatch.setattr(pr_mod, "process_registry", _BoomRegistry())
|
|
snap = cli_obj._get_status_bar_snapshot()
|
|
assert snap["active_background_processes"] == 0
|
|
|
|
|
|
def test_plain_text_status_shows_proc_indicator_when_active(monkeypatch):
|
|
cli_obj = _make_cli()
|
|
_patch_process_registry(monkeypatch, 2)
|
|
text = cli_obj._build_status_bar_text(width=80)
|
|
assert "⚙ 2" in text
|
|
|
|
|
|
def test_plain_text_status_omits_proc_indicator_when_idle(monkeypatch):
|
|
cli_obj = _make_cli()
|
|
_patch_process_registry(monkeypatch, 0)
|
|
text = cli_obj._build_status_bar_text(width=80)
|
|
assert "⚙" not in text
|
|
|
|
|
|
def test_fragments_include_proc_segment_when_active(monkeypatch):
|
|
cli_obj = _make_cli()
|
|
_patch_process_registry(monkeypatch, 1)
|
|
cli_obj._status_bar_visible = True
|
|
cli_obj._get_tui_terminal_width = lambda: 120 # type: ignore[method-assign]
|
|
frags = cli_obj._get_status_bar_fragments()
|
|
rendered = "".join(text for _style, text in frags)
|
|
assert "⚙ 1" in rendered
|
|
|
|
|
|
def test_indicators_independent_agents_and_processes(monkeypatch):
|
|
"""▶ (agent tasks) and ⚙ (shell processes) render side-by-side."""
|
|
cli_obj = _make_cli()
|
|
cli_obj._background_tasks = {"bg_a": _stub_thread()}
|
|
_patch_process_registry(monkeypatch, 2)
|
|
cli_obj._status_bar_visible = True
|
|
cli_obj._get_tui_terminal_width = lambda: 120 # type: ignore[method-assign]
|
|
frags = cli_obj._get_status_bar_fragments()
|
|
rendered = "".join(text for _style, text in frags)
|
|
assert "▶ 1" in rendered
|
|
assert "⚙ 2" in rendered
|