'/sessions' slash command wiring and visibility issues

Fixes on record

Merged to main. A stamp counts the issues a fix is linked to.

• #56168 fix(cli,doctor): visible /sessions & /history + doctor toolset filter (salvage #36897)

  merged to main

  files: cli.py, hermes_cli/doctor.py, scripts/release.py, tests/cli/test_cli_resume_command.py, tests/hermes_cli/test_doctor.py

  Show the diff

  • cli.py

    @@ -2510,6 +2510,26 @@ def _prepend_note_to_message(message, note: str):
         return message
     
     
    +def _cli_visible_print(text: str = "") -> None:
    +    """Print normally unless prompt_toolkit owns the live terminal.
    +
    +    Bare ``print()`` output is swallowed by ``patch_stdout`` while an
    +    interactive ``Application`` is running, so ``/sessions`` and ``/history``
    +    would render nothing. Route through ``_cprint`` (prompt_toolkit-native)
    +    in that case, and fall back to ``print`` otherwise.
    +    """
    +    try:
    +        from prompt_toolkit.application import get_app_or_none
    +        app = get_app_or_none()
    +    except Exception:
    +        app = None
    +
    +    if app is not None and getattr(app, "_is_running", False):
    +        _cprint(text)
    +    else:
    +        print(text)
    +
    +
     # ---------------------------------------------------------------------------
     # File-drop / local attachment detection — extracted as pure helpers for tests.
     # ---------------------------------------------------------------------------
    @@ -6549,30 +6569,30 @@ def _show_recent_sessions(self, *, reason: str = "history", limit: int = 10) ->
     
             from hermes_cli.main import _relative_time
     
    -        print()
    +        _cli_visible_print()
             if reason == "history":
    -            print("(._.) No messages in the current chat yet — here are recent sessions you can resume:")
    +            _cli_visible_print("(._.) No messages in the current chat yet — here are recent sessions you can resume:")
             else:
    -            print("  Recent sessions:")
    -        print()
    -        print(f"  {'#':<3} {'Title':<32} {'Preview':<40} {'Last Active':<13} {'ID'}")
    -        print(f"  {'─' * 3} {'─' * 32} {'─' * 40} {'─' * 13} {'─' * 24}")
    +            _cli_visible_print("  Recent sessions:")
    +        _cli_visible_print()
    +        _cli_visible_print(f"  {'#':<3} {'Title':<32} {'Preview':<40} {'Last Active':<13} {'ID'}")
    +        _cli_visible_print(f"  {'─' * 3} {'─' * 32} {'─' * 40} {'─' * 13} {'─' * 24}")
             for idx, session in enumerate(sessions, start=1):
                 title = session.get("title") or "—"
                 preview = (session.get("preview") or "")[:38]
                 last_active = _relative_time(session.get("last_active"))
    -            print(f"  {idx:<3} {title:<32} {preview:<40} {last_active:<13} {session['id']}")
    -        print()
    -        print("  Use /resume <number>, /resume <session id>, or /resume <session title> to continue.")
    -        print("  Example: /resume 2")
    -        print()
    +            _cli_visible_print(f"  {idx:<3} {title:<32} {preview:<40} {last_active:<13} {session['id']}")
    +        _cli_visible_print()
    +        _cli_visible_print("  Use /resume <number>, /resume <session id>, or /resume <session title> to continue.")
    +        _cli_visible_print("  Example: /resume 2")
    +        _cli_visible_print()
             return True
     
         def show_history(self):
             """Display conversation history."""
             if not self.conversation_history:
                 if not self._show_recent_sessions(reason="history"):
    -                print("(._.) No conversation history yet.")
    +                _cli_visible_print("(._.) No conversation history yet.")
                 return
     
             preview_limit = 400
    @@ -6601,14 +6621,14 @@ def flush_tool_summary():
                     return
     
                 noun = "message" if hidden_tool_messages == 1 else "messages"
    -            print("\n  [Tools]")
    -            print(f"    ({hidden_tool_messages} tool {noun} hidden)")
    +            _cli_visible_print("\n  [Tools]")
    +            _cli_visible_print(f"    ({hidden_tool_messages} tool {noun} hidden)")
                 hidden_tool_messages = 0
     
    -        print()
    -        print("+" + "-" * 50 + "+")
    -        print("|" + " " * 12 + "(^_^) Conversation History" + " " * 11 + "|")
    -        print("+" + "-" * 50 + "+")
    +        _cli_visible_print()
    +        _cli_visible_print("+" + "-" * 50 + "+")
    +        _cli_visible_print("|" + " " * 12 + "(^_^) Conversation History" + " " * 11 + "|")
    +        _cli_visible_print("+" + "-" * 50 + "+")
     
             for msg in self.conversation_history:
                 role = msg.get("role", "unknown")
    @@ -6627,13 +6647,13 @@ def flush_tool_summary():
                 content_text = "" if content is None else str(content)
     
                 if role == "user":
    -                print(f"\n  [You #{visible_index}]{_ts_suffix(msg)}")
    -                print(
    +                _cli_visible_print(f"\n  [You #{visible_index}]{_ts_suffix(msg)}")
    +                _cli_visible_print(
                         f"    {content_text[:preview_limit]}{'...' if len(content_text) > preview_limit else ''}"
                     )
                     continue
     
    -            print(f"\n  [Hermes #{visible_index}]{_ts_suffix(msg)}")
    +            _cli_visible_print(f"\n  [Hermes #{visible_index}]{_ts_suffix(msg)}")
                 tool_calls = msg.get("tool_calls") or []
                 if content_text:
                     preview = content_text[:preview_limit]
    @@ -6646,10 +6666,10 @@ def flush_tool_summary():
                 else:
                     preview = "(no text response)"
                     suffix = ""
    -            print(f"    {preview}{suffix}")
    +            _cli_visible_print(f"    {preview}{suffix}")
     
             flush_tool_summary()
    -        print()
    +        _cli_visible_print()
         
         def _notify_session_boundary(self, event_type: str) -> None:
             """Fire a session-boundary plugin hook (on_session_finalize or on_session_reset).

  • hermes_cli/doctor.py

    @@ -199,6 +199,32 @@ def _fail_and_issue(text: str, detail: str, fix: str, issues: list[str]) -> None
         issues.append(fix)
     
     
    +def _enabled_cli_toolsets_for_doctor() -> set[str] | None:
    +    """Return toolsets enabled for the CLI, or None if config resolution fails."""
    +    try:
    +        from hermes_cli.config import load_config
    +        from hermes_cli.tools_config import _get_platform_tools
    +
    +        return {str(toolset) for toolset in _get_platform_tools(load_config() or {}, "cli")}
    +    except Exception:
    +        return None
    +
    +
    +def _missing_api_key_toolsets_for_summary(unavailable: list[dict]) -> list[dict]:
    +    """Filter unavailable API-key toolsets to those enabled for the CLI."""
    +    api_key_unavailable = [
    +        item for item in unavailable
    +        if item.get("missing_vars") or item.get("env_vars")
    +    ]
    +    enabled_toolsets = _enabled_cli_toolsets_for_doctor()
    +    if enabled_toolsets is None:
    +        return api_key_unavailable
    +    return [
    +        item for item in api_key_unavailable
    +        if str(item.get("name") or "") in enabled_toolsets
    +    ]
    +
    +
     def _read_pyproject_version() -> str | None:
         """Read the ``version = "..."`` from ``pyproject.toml`` at the project root.
     
    @@ -2161,8 +2187,10 @@ def _probe_azure_entra() -> _ConnectivityResult:
                 else:
                     check_warn(item["name"], "(system dependency not met)")
     
    -        # Count disabled tools with API key requirements
    -        api_disabled = [u for u in unavailable if (u.get("missing_vars") or u.get("env_vars"))]
    +        # Count missing API-key requirements only for toolsets enabled in the
    +        # current CLI platform. Default-off or explicitly disabled toolsets may
    +        # still show warnings above, but should not pollute the final summary.
    +        api_disabled = _missing_api_key_toolsets_for_summary(unavailable)
             if api_disabled:
                 issues.append("Run 'hermes setup' to configure missing API keys for full tool access")
         except Exception as e:

  • scripts/release.py

    @@ -47,6 +47,7 @@
     AUTHOR_MAP = {
         "[redacted:email]": "jnibarger01",  # PR #35130 salvage (ReDoS-bound threat-pattern filler + FTS5 query cap + V4A Move-File approval/traversal targets)
         "[email protected]": "petrichor-op",  # PR #41281 salvage (never persist ephemeral empty-response recovery scaffolding to the SQLite session store / JSON log; filter by flag not position)
    +    "[email protected]": "redactdeveloper",  # PR #36897 salvage (route /sessions & /history through prompt_toolkit-safe print; filter doctor missing-key summary to CLI-enabled toolsets)
         "[redacted:email]": "syahidfrd",  # PR #17059 salvage (tag unverified senders in Slack thread context to mitigate indirect prompt injection)
         "[email protected]": "H2KFORGIVEN",  # PR #22523 salvage (turn-pair preservation: never orphan the last user ask at head_end during compaction)
         "[email protected]": "sgabel",  # PR #13139 salvage (redact secrets in user-facing approval prompts)

  • tests/cli/test_cli_resume_command.py

    @@ -1,3 +1,4 @@
    +from types import SimpleNamespace
     from unittest.mock import MagicMock, patch
     
     from cli import HermesCLI
    @@ -38,6 +39,39 @@ def test_show_recent_sessions_includes_indexes_and_resume_hint(self, capsys):
             assert "/resume 2" in output
             assert "/resume <session title>" in output
     
    +    def test_show_recent_sessions_uses_prompt_toolkit_safe_print(self):
    +        cli_obj = _make_cli()
    +        cli_obj._list_recent_sessions = MagicMock(return_value=[
    +            {"id": "sess_002", "title": "Coding", "preview": "build feature", "last_active": None},
    +        ])
    +
    +        running_app = SimpleNamespace(_is_running=True)
    +        with (
    +            patch("prompt_toolkit.application.get_app_or_none", return_value=running_app),
    +            patch("cli._cprint") as mock_cprint,
    +        ):
    +            shown = cli_obj._show_recent_sessions(reason="sessions")
    +
    +        assert shown is True
    +        printed = "\n".join(call.args[0] for call in mock_cprint.call_args_list)
    +        assert "Recent sessions" in printed
    +        assert "Coding" in printed
    +
    +    def test_show_history_uses_prompt_toolkit_safe_print(self):
    +        cli_obj = _make_cli()
    +        cli_obj.conversation_history = [{"role": "user", "content": "Hello"}]
    +
    +        running_app = SimpleNamespace(_is_running=True)
    +        with (
    +            patch("prompt_toolkit.application.get_app_or_none", return_value=running_app),
    +            patch("cli._cprint") as mock_cprint,
    +        ):
    +            cli_obj.show_history()
    +
    +        printed = "\n".join(call.args[0] for call in mock_cprint.call_args_list)
    +        assert "Conversation History" in printed
    +        assert "Hello" in printed
    +
         def test_handle_resume_by_index_switches_to_numbered_session(self):
             cli_obj = _make_cli()
             cli_obj._list_recent_sessions = MagicMock(return_value=[

  • tests/hermes_cli/test_doctor.py

    @@ -51,6 +51,30 @@ def test_returns_false_when_no_provider_settings(self):
             assert not _has_provider_env_config(content)
     
     
    +class TestDoctorToolAvailabilitySummary:
    +    def test_missing_api_key_summary_ignores_disabled_toolsets(self, monkeypatch):
    +        unavailable = [
    +            {"name": "rl", "missing_vars": ["TINKER_API_KEY"]},
    +            {"name": "web", "missing_vars": ["EXA_API_KEY"]},
    +        ]
    +        monkeypatch.setattr(doctor, "_enabled_cli_toolsets_for_doctor", lambda: {"web"})
    +
    +        filtered = doctor._missing_api_key_toolsets_for_summary(unavailable)
    +
    +        assert [item["name"] for item in filtered] == ["web"]
    +
    +    def test_missing_api_key_summary_falls_back_when_config_unavailable(self, monkeypatch):
    +        unavailable = [
    +            {"name": "rl", "missing_vars": ["TINKER_API_KEY"]},
    +            {"name": "web", "missing_vars": ["EXA_API_KEY"]},
    +        ]
    +        monkeypatch.setattr(doctor, "_enabled_cli_toolsets_for_doctor", lambda: None)
    +
    +        filtered = doctor._missing_api_key_toolsets_for_summary(unavailable)
    +
    +        assert [item["name"] for item in filtered] == ["rl", "web"]
    +
    +
     class TestDoctorEnvFileEncoding:
         """Regression for #18637 (bug 3): `hermes doctor` crashed on Windows
         Chinese locale (GBK) because `.env` was read with Path.read_text() which