From 711bec92198a6b5fa8e5474f67166ab440cd0d40 Mon Sep 17 00:00:00 2001 From: Teknium <127238744+teknium1@users.noreply.github.com> Date: Wed, 2 Sep 2026 22:39:57 -0700 Subject: [PATCH] =?UTF-8?q?refactor(hermes=5Fcli):=20commands=5Fcompletion?= =?UTF-8?q?=20=E2=80=94=20=5Fquiet=20generator=20decorator;=20completion?= =?UTF-8?q?=20=E2=80=94=20single=20profile-action=20source?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hermes_cli/commands_completion.py | 38 +++++++++++++++++++------------ hermes_cli/completion.py | 3 +-- hermes_cli/curses_ui.py | 1 - 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/hermes_cli/commands_completion.py b/hermes_cli/commands_completion.py index 9352bf0ee2..55420dceff 100644 --- a/hermes_cli/commands_completion.py +++ b/hermes_cli/commands_completion.py @@ -6,6 +6,7 @@ stays prompt_toolkit-free for the gateway. from __future__ import annotations +import functools import os import shutil import subprocess @@ -91,27 +92,34 @@ def _split_args(sub_text: str) -> tuple[list[str], str]: # Dynamic argument completers: (sub_text, sub_lower) -> Completion iterator +def _quiet(gen_fn): + """Generator decorator: any exception while producing completions just ends the stream.""" + @functools.wraps(gen_fn) + def wrapper(*args): + try: + yield from gen_fn(*args) + except Exception: + return + return wrapper + + +@_quiet def _skin_completions(sub_text: str, sub_lower: str): """/skin — available skins.""" - try: - from hermes_cli.skin_engine import list_skins - rows = ((s["name"], s.get("description", "") or s.get("source", "")) for s in list_skins()) - yield from _prefix_completions(rows, sub_text) - except Exception: - pass + from hermes_cli.skin_engine import list_skins + rows = ((s["name"], s.get("description", "") or s.get("source", "")) for s in list_skins()) + yield from _prefix_completions(rows, sub_text) +@_quiet def _personality_completions(sub_text: str, sub_lower: str): """/personality — ``none`` plus configured personalities.""" - try: - from hermes_cli.personality import describe_personality - personalities = _personalities_from_cli_config() - rows = chain( - [("none", "clear personality overlay")], - ((name, describe_personality(prompt)) for name, prompt in personalities.items())) - yield from _prefix_completions(rows, sub_text) - except Exception: - pass + from hermes_cli.personality import describe_personality + personalities = _personalities_from_cli_config() + rows = chain( + [("none", "clear personality overlay")], + ((name, describe_personality(prompt)) for name, prompt in personalities.items())) + yield from _prefix_completions(rows, sub_text) def _tools_completions(sub_text: str, sub_lower: str): diff --git a/hermes_cli/completion.py b/hermes_cli/completion.py index 280d7cd3fd..a1d09213de 100644 --- a/hermes_cli/completion.py +++ b/hermes_cli/completion.py @@ -50,7 +50,6 @@ def generate_bash(parser: argparse.ArgumentParser) -> str: if cmd == "profile" and info["subcommands"]: # Complete actions, then profile names for actions that accept a profile argument. subcmds = " ".join(sorted(info["subcommands"])) - profile_actions = " ".join(_PROFILE_NAME_ACTIONS) cases.append( f" profile)\n" f" case \"$prev\" in\n" @@ -58,7 +57,7 @@ def generate_bash(parser: argparse.ArgumentParser) -> str: f" COMPREPLY=($(compgen -W \"{subcmds}\" -- \"$cur\"))\n" f" return\n" f" ;;\n" - f" {profile_actions.replace(' ', '|')})\n" + f" {'|'.join(_PROFILE_NAME_ACTIONS)})\n" f" COMPREPLY=($(compgen -W \"$(_hermes_profiles)\" -- \"$cur\"))\n" f" return\n" f" ;;\n" diff --git a/hermes_cli/curses_ui.py b/hermes_cli/curses_ui.py index 3ce99260ad..928aa958d8 100644 --- a/hermes_cli/curses_ui.py +++ b/hermes_cli/curses_ui.py @@ -715,7 +715,6 @@ def _search_hint(search, searchable: bool, confirm: str, cancel: str, back_enabl def _simple_header(title: str, confirm: str, cancel: str, searchable: bool): """``draw_header`` callback: title on row 0, key hint on row 1, items start on row 3.""" - def _draw_header(stdscr, max_y, max_x, search=None, back_enabled=False): hint = _search_hint(search, searchable, confirm, cancel, back_enabled) _draw_title_and_hint(stdscr, title, hint, max_x)