ouyangbo/hermes-agent
1
0
Fork 0
Code Issues Pull Requests Actions 9 Packages Projects Releases Wiki Activity

feat(cli): tui status bar per-field toggle + cache/latency/tps

Browse Source 
- Add rolling status bar metrics:
  - cache hit ratio (◈) delta since model/compression reset
    (hit = cache_read / prompt, verified against live logs)
  - avg latency (◷) and throughput (↑ t/s) over last 10 API calls
    (deque in agent, displayed in wide bar only)
- Add display.tui_statusbar_fields list to filter segments:
  model, ctx, ctx_bar, cache_hit, latency, tps, compressions,
  bg_tasks, bg_processes, bg_subagents, goal, duration, prompt,
  idle, focus, yolo, stash, battery, title
  Missing/null -> all enabled (backward compat). Unknown keys ignored.
  Title gated via right-align; stash/battery also gated.

- Wide bar (≥76 cols) respects fields, narrow/medium filtered,
  overflow trim preserved. Battery also respects display.battery.

No private data; mock data in tests.

Test: pytest tests/cli/test_cli_status_bar.py etc. 68 passed,
check-windows-footguns clean.
This commit is contained in:
Turgut Kural
2026-08-29 18:07:43 +03:00
committed by Teknium
parent 4bc7e624d6
commit 3548fc809b
4 changed files with 149 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agent/agent_init.py
+6
View File
@@ -2972,6 +2972,12 @@ def init_agent(
agent.session_estimated_cost_usd = 0.0
agent.session_cost_status = "unknown"
agent.session_cost_source = "none"
# Rolling history for status-bar avg latency / velocity (last 10 calls).
# Stored on the agent so both conversation_loop and codex_runtime share it
# and the CLI snapshot can read it without extra IPC.
from collections import deque as _deque
agent._api_latency_history = _deque(maxlen=10)
agent._api_output_history = _deque(maxlen=10)
# ── Ollama num_ctx injection ──
# Ollama defaults to 2048 context regardless of the model's capabilities.
agent/conversation_loop.py
+10
View File
@@ -4307,6 +4307,16 @@ def run_conversation(
agent.session_cache_read_tokens += canonical_usage.cache_read_tokens
agent.session_cache_write_tokens += canonical_usage.cache_write_tokens
agent.session_reasoning_tokens += canonical_usage.reasoning_tokens
# Rolling history for status-bar averages (last 10).
try:
hist = getattr(agent, "_api_latency_history", None)
if hist is not None:
hist.append(float(api_duration))
ohist = getattr(agent, "_api_output_history", None)
if ohist is not None:
ohist.append(int(canonical_usage.output_tokens or 0))
except Exception:
pass
# Log API call details for debugging/observability
_cache_pct = ""
cli.py
+130 -5
View File
@@ -5680,6 +5680,14 @@ class HermesCLI(CLIAgentSetupMixin, CLICommandsMixin, CLIBillingMixin):
self._background_tasks: Dict[str, threading.Thread] = {}
self._background_task_counter = 0
# Cache-hit ratio baseline — reset on model switch and on
# context compression so the bar reflects the *current* cache
# regime, not a lifetime average that survives invalidation.
self._cache_hit_baseline_prompt = 0
self._cache_hit_baseline_read = 0
self._cache_hit_baseline_model: Optional[str] = None
self._cache_hit_baseline_compressions = 0
def _claim_active_session(self, surface: str = "cli", *, stderr: bool = False) -> bool:
"""Claim a global active-session slot for this CLI process."""
if self._active_session_lease is not None:
@@ -6183,7 +6191,14 @@ class HermesCLI(CLIAgentSetupMixin, CLICommandsMixin, CLIBillingMixin):
Centralises the cache-hit-rate computation so both the plain-text
status bar and the prompt-toolkit fragment path share one formula.
Prefers the baseline-delta percentage computed in
``_get_status_bar_snapshot`` (resets on model switch / compression,
so it reflects the *current* cache regime); falls back to the
session-lifetime ratio when no delta is available.
"""
delta_pct = snapshot.get("cache_hit_pct")
if delta_pct is not None:
return float(delta_pct), f"◎ {float(delta_pct):.{precision}f}%"
cache_read = snapshot.get("session_cache_read_tokens", 0)
prompt_total = snapshot.get("session_prompt_tokens", 0)
if cache_read > 0 and prompt_total > 0:
@@ -6199,6 +6214,7 @@ class HermesCLI(CLIAgentSetupMixin, CLICommandsMixin, CLIBillingMixin):
return "class:status-bar-warn"
return "class:status-bar-bad"
@staticmethod
def _battery_status_style(category: str) -> str:
"""Map a battery colour category to a status-bar style class."""
@@ -6494,6 +6510,96 @@ class HermesCLI(CLIAgentSetupMixin, CLICommandsMixin, CLIBillingMixin):
if context_length:
snapshot["context_percent"] = max(0, min(100, round((context_tokens / context_length) * 100)))
# -- Cache-hit ratio (delta since last reset) --
# Reset baseline on model switch and on compression — both invalidate
# the prompt cache. Formula verified against live logs:
# hit = cache_read / prompt_tokens (prompt = input+cache_read+cache_write)
# see agent/conversation_loop.py:4314 cache=read/prompt (87%)
# and CanonicalUsage.prompt_tokens = input+read+write
try:
base_model = getattr(self, "_cache_hit_baseline_model", None)
base_prompt = int(getattr(self, "_cache_hit_baseline_prompt", 0) or 0)
base_read = int(getattr(self, "_cache_hit_baseline_read", 0) or 0)
base_comps = int(getattr(self, "_cache_hit_baseline_compressions", 0) or 0)
cur_model = snapshot.get("model_name") or model_name
cur_comps = int(snapshot.get("compressions", 0) or 0)
cur_prompt = int(snapshot.get("session_prompt_tokens", 0) or 0)
cur_read = int(snapshot.get("session_cache_read_tokens", 0) or 0)
if base_model is None:
self._cache_hit_baseline_model = cur_model
self._cache_hit_baseline_compressions = cur_comps
base_model = cur_model
base_comps = cur_comps
if cur_model != base_model:
self._cache_hit_baseline_model = cur_model
self._cache_hit_baseline_prompt = cur_prompt
self._cache_hit_baseline_read = cur_read
self._cache_hit_baseline_compressions = cur_comps
base_prompt = cur_prompt
base_read = cur_read
base_comps = cur_comps
if cur_comps != base_comps:
self._cache_hit_baseline_compressions = cur_comps
self._cache_hit_baseline_prompt = cur_prompt
self._cache_hit_baseline_read = cur_read
base_prompt = cur_prompt
base_read = cur_read
delta_prompt = cur_prompt - base_prompt
delta_read = cur_read - base_read
if delta_prompt > 0 and delta_read >= 0:
pct = int(round((delta_read / delta_prompt) * 100))
pct = max(0, min(100, pct))
snapshot["cache_hit_pct"] = pct
snapshot["cache_hit_label"] = f"{pct}%"
elif cur_prompt > 0 and cur_read >= 0 and base_prompt == 0 and base_read == 0:
pct = int(round((cur_read / cur_prompt) * 100)) if cur_prompt else 0
pct = max(0, min(100, pct))
snapshot["cache_hit_pct"] = pct
snapshot["cache_hit_label"] = f"{pct}%"
else:
snapshot["cache_hit_pct"] = None
snapshot["cache_hit_label"] = ""
except Exception:
snapshot["cache_hit_pct"] = None
snapshot["cache_hit_label"] = ""
# -- Rolling avg latency / velocity (last 10 calls) --
# Reads the deque maintained in agent/conversation_loop.py (and
# agent_init). Codex app-server has no latency, so it stays hidden there.
try:
agent_obj = getattr(self, "agent", None)
lhist = list(getattr(agent_obj, "_api_latency_history", []) or []) if agent_obj else []
ohist = list(getattr(agent_obj, "_api_output_history", []) or []) if agent_obj else []
# Keep the two histories aligned (they are appended together).
n = min(len(lhist), len(ohist))
if n:
lhist = lhist[-n:]
ohist = ohist[-n:]
# Simple mean for latency; sum/sum for velocity (true throughput, not mean of ratios).
avg_lat = sum(lhist) / len(lhist) if lhist else None
total_out = sum(ohist)
total_lat = sum(lhist)
avg_vel = (total_out / total_lat) if total_lat > 0 else None
# Guard against NaN / inf from weird provider timings (e.g. -0.8s in logs).
if avg_lat is not None and (avg_lat != avg_lat or avg_lat < 0 or avg_lat > 1e6):
avg_lat = None
if avg_vel is not None and (avg_vel != avg_vel or avg_vel < 0 or avg_vel > 1e6):
avg_vel = None
snapshot["avg_latency"] = float(avg_lat) if avg_lat is not None else None
snapshot["avg_latency_label"] = f"{avg_lat:.1f}s" if avg_lat is not None else ""
snapshot["avg_velocity"] = float(avg_vel) if avg_vel is not None else None
snapshot["avg_velocity_label"] = f"{avg_vel:.0f} t/s" if avg_vel is not None else ""
else:
snapshot["avg_latency"] = None
snapshot["avg_latency_label"] = ""
snapshot["avg_velocity"] = None
snapshot["avg_velocity_label"] = ""
except Exception:
snapshot["avg_latency"] = None
snapshot["avg_latency_label"] = ""
snapshot["avg_velocity"] = None
snapshot["avg_velocity_label"] = ""
return snapshot
def _get_status_bar_session_title(self) -> str:
@@ -7200,9 +7306,10 @@ class HermesCLI(CLIAgentSetupMixin, CLICommandsMixin, CLIBillingMixin):
bar (use built-in defaults, i.e. show everything), or a
``frozenset`` of field names when the list is non-empty.
Available fields: model, context_detail, context_pct, compressions,
bg_tasks, bg_processes, bg_subagents, goal, duration,
prompt_elapsed, idle_since, focus, yolo, total_tokens.
Available fields: model, context_detail, context_pct, cache_hit,
latency, tps, compressions, bg_tasks, bg_processes, bg_subagents,
goal, duration, prompt_elapsed, idle_since, focus, yolo, stash,
battery, title, total_tokens.
``total_tokens`` is opt-in only (never shown by default).
The field order is fixed; the config controls visibility only.
"""
@@ -7241,6 +7348,9 @@ class HermesCLI(CLIAgentSetupMixin, CLICommandsMixin, CLIBillingMixin):
def _ok(name: str) -> bool:
return field_set is None or name in field_set
if not _ok("title"):
session_title = ""
if not _ok("goal"):
goal_segment = ""
if not _ok("focus"):
@@ -7313,6 +7423,12 @@ class HermesCLI(CLIAgentSetupMixin, CLICommandsMixin, CLIBillingMixin):
cache = self._cache_hit_rate(snapshot)
if cache and _ok("cache_hit"):
parts.append(cache[1])
_avg_lat = snapshot.get("avg_latency_label") or ""
if _avg_lat and _ok("latency"):
parts.append(f"◷ {_avg_lat}")
_avg_vel = snapshot.get("avg_velocity_label") or ""
if _avg_vel and _ok("tps"):
parts.append(f"↑ {_avg_vel}")
if compressions and _ok("compressions"):
parts.append(f"🗜️ {compressions}")
bg_count = snapshot.get("active_background_tasks", 0)
@@ -7372,6 +7488,9 @@ class HermesCLI(CLIAgentSetupMixin, CLICommandsMixin, CLIBillingMixin):
def _ok(name: str) -> bool:
return field_set is None or name in field_set
if not _ok("title"):
session_title = ""
if not _ok("goal"):
goal_segment = ""
if not _ok("focus"):
@@ -7469,6 +7588,12 @@ class HermesCLI(CLIAgentSetupMixin, CLICommandsMixin, CLIBillingMixin):
cache = self._cache_hit_rate(snapshot)
if cache and _ok("cache_hit"):
_append(frags, " │ ", (self._cache_hit_rate_style(cache[0]), cache[1]))
_avg_lat = snapshot.get("avg_latency_label") or ""
if _avg_lat and _ok("latency"):
_append(frags, " │ ", ("class:status-bar-dim", f"◷ {_avg_lat}"))
_avg_vel = snapshot.get("avg_velocity_label") or ""
if _avg_vel and _ok("tps"):
_append(frags, " │ ", ("class:status-bar-dim", f"↑ {_avg_vel}"))
if compressions and _ok("compressions"):
_append(frags, " │ ", (self._compression_count_style(compressions), f"🗜️ {compressions}"))
if bg_count and _ok("bg_tasks"):
@@ -7516,7 +7641,7 @@ class HermesCLI(CLIAgentSetupMixin, CLICommandsMixin, CLIBillingMixin):
stash_indicator = self._prompt_stash.indicator()
except Exception:
stash_indicator = ""
if stash_indicator:
if stash_indicator and _ok("stash"):
# Insert before the trailing pad fragment so the bar keeps its
# one-cell right margin.
if frags and frags[-1] == ("class:status-bar", " "):
@@ -7530,7 +7655,7 @@ class HermesCLI(CLIAgentSetupMixin, CLICommandsMixin, CLIBillingMixin):
# Battery is the first status-bar element when enabled: prepend it
# ahead of the leading ⚕ marker in whichever width tier ran above.
if battery_label:
if battery_label and _ok("battery"):
frags[0:0] = [
("class:status-bar", " "),
(battery_style, battery_label),
hermes_cli/config_defaults.py
+3 -2
View File
@@ -1607,8 +1607,9 @@ DEFAULT_CONFIG = {
# only the listed fields appear; the built-in order is preserved
# (the config controls visibility, not ordering). Empty = show the
# default set. Available: model, context_detail, context_pct,
# compressions, bg_tasks, bg_processes, bg_subagents, goal,
# duration, prompt_elapsed, idle_since, focus, yolo, total_tokens.
# cache_hit, latency, tps, compressions, bg_tasks, bg_processes,
# bg_subagents, goal, duration, prompt_elapsed, idle_since, focus,
# yolo, stash, battery, title, total_tokens.
# total_tokens (session Σ) is opt-in only — it never shows unless
# listed here. Narrow terminals still drop wide-mode-only fields
# (context_detail, prompt_elapsed, idle_since) regardless of config.