087be00733
The setup provider->model sub-menu (and three sibling pickers) used simple_term_menu.TerminalMenu, whose ESC and arrow-key handling was unreliable across terminals — notably ESC failed to back out of the model selection list on terminals that emit raw escape sequences (e.g. Ghostty). The codebase already notes simple_term_menu 'conflicts with /dev/tty' and causes 'ghost-duplication rendering', and a prior attempt to migrate these (closed PR) confirmed the same root cause. Route all four single-select pickers through the shared, already-hardened curses_radiolist (which decodes raw CSI/SS3 escape sequences and handles ESC consistently, fixed in #35776): - auth.py _prompt_model_selection — model picker; the pricing column header and the unavailable-models block are passed as the radiolist description so they survive the curses screen clear. ESC now cancels. - main.py _prompt_reasoning_effort_selection — reasoning-effort picker. - main.py _model_flow_named_custom — named custom-provider model picker. - main.py _remove_custom_provider — provider-removal picker. simple_term_menu is no longer imported anywhere (only stale comments referenced it; one in setup.py is corrected). The numbered-input fallbacks are unchanged and still trigger on curses errors / non-TTY. Tests: updated test_terminal_menu_fallbacks / test_reasoning_effort_menu / test_custom_provider_model_switch / test_model_provider_persistence to drive the fallback via curses_radiolist errors instead of breaking simple_term_menu. New test_setup_menu_curses_migration.py asserts each picker routes through curses_radiolist, ESC cancels, and the pricing header is preserved. Net -147/+183 (mostly the new test file; production code shrinks by removing TerminalMenu boilerplate).
85 lines
3.1 KiB
Python
85 lines
3.1 KiB
Python
"""Regression tests confirming the setup model/provider/reasoning pickers route
|
|
through the shared curses radiolist (ESC + arrow-key handling that works across
|
|
terminals, incl. Ghostty) instead of simple_term_menu.
|
|
|
|
Guards against silently regressing back to simple_term_menu, whose ESC/arrow
|
|
handling was unreliable in `hermes setup` (the provider->model sub-menu).
|
|
"""
|
|
from unittest.mock import patch
|
|
|
|
|
|
def test_prompt_model_selection_uses_curses_radiolist():
|
|
from hermes_cli.auth import _prompt_model_selection
|
|
|
|
seen = {}
|
|
|
|
def _fake(title, items, *, selected=0, cancel_returns=None, description=None):
|
|
seen["title"] = title
|
|
seen["items"] = items
|
|
return 1 # pick second model
|
|
|
|
with patch("hermes_cli.curses_ui.curses_radiolist", side_effect=_fake), \
|
|
patch("builtins.print"):
|
|
result = _prompt_model_selection(["model-a", "model-b"])
|
|
|
|
assert result == "model-b"
|
|
assert seen["title"] == "Select default model:"
|
|
# Items are the models plus the custom/skip entries.
|
|
assert seen["items"][:2] == ["model-a", "model-b"]
|
|
assert "Skip (keep current)" in seen["items"]
|
|
|
|
|
|
def test_prompt_model_selection_esc_cancels():
|
|
from hermes_cli.auth import _prompt_model_selection
|
|
|
|
# curses_radiolist returns the cancel sentinel (-1) on ESC.
|
|
with patch("hermes_cli.curses_ui.curses_radiolist", return_value=-1), \
|
|
patch("builtins.print"):
|
|
result = _prompt_model_selection(["model-a", "model-b"])
|
|
|
|
assert result is None
|
|
|
|
|
|
def test_reasoning_effort_uses_curses_radiolist():
|
|
from hermes_cli.main import _prompt_reasoning_effort_selection
|
|
|
|
with patch("hermes_cli.curses_ui.curses_radiolist", return_value=2), \
|
|
patch("builtins.print"):
|
|
result = _prompt_reasoning_effort_selection(["low", "medium", "high"], current_effort="")
|
|
|
|
assert result == "high"
|
|
|
|
|
|
def test_reasoning_effort_esc_cancels():
|
|
from hermes_cli.main import _prompt_reasoning_effort_selection
|
|
|
|
with patch("hermes_cli.curses_ui.curses_radiolist", return_value=-1), \
|
|
patch("builtins.print"):
|
|
result = _prompt_reasoning_effort_selection(["low", "medium", "high"], current_effort="")
|
|
|
|
assert result is None
|
|
|
|
|
|
def test_model_selection_with_pricing_passes_description():
|
|
"""When pricing is supplied, the aligned header is passed as the curses
|
|
description (multi-line text above the list), not lost."""
|
|
from hermes_cli.auth import _prompt_model_selection
|
|
|
|
seen = {}
|
|
|
|
def _fake(title, items, *, selected=0, cancel_returns=None, description=None):
|
|
seen["description"] = description
|
|
return len(items) - 1 # Skip
|
|
|
|
pricing = {
|
|
"model-a": {"prompt": "0.000001", "completion": "0.000002"},
|
|
"model-b": {"prompt": "0.000003", "completion": "0.000004"},
|
|
}
|
|
with patch("hermes_cli.curses_ui.curses_radiolist", side_effect=_fake), \
|
|
patch("builtins.print"):
|
|
_prompt_model_selection(["model-a", "model-b"], pricing=pricing)
|
|
|
|
# The description should carry the In/Out price header.
|
|
assert seen["description"] is not None
|
|
assert "In" in seen["description"] and "Out" in seen["description"]
|