From 81a504a4a0f3c99ff9411a0a549f4adf9af93312 Mon Sep 17 00:00:00 2001 From: kshitij <82637225+kshitijk4poor@users.noreply.github.com> Date: Wed, 18 Mar 2026 09:03:45 +0530 Subject: [PATCH] fix: align status bar skin tests with upstream main Drop rebased test assumptions about theme-mode helpers removed on main and keep the status bar skin integration aligned with the current skin engine model. --- hermes_cli/skin_engine.py | 164 --------------------------- tests/hermes_cli/test_skin_engine.py | 6 +- tests/test_cli_skin_integration.py | 3 - 3 files changed, 1 insertion(+), 172 deletions(-) diff --git a/hermes_cli/skin_engine.py b/hermes_cli/skin_engine.py index 7efbbc685..9f8b38c09 100644 --- a/hermes_cli/skin_engine.py +++ b/hermes_cli/skin_engine.py @@ -189,29 +189,6 @@ _BUILTIN_SKINS: Dict[str, Dict[str, Any]] = { "session_label": "#DAA520", "session_border": "#8B8682", }, - "colors_light": { - "banner_border": "#7A5A00", - "banner_title": "#6B4C00", - "banner_accent": "#7A5500", - "banner_dim": "#8B7355", - "banner_text": "#3D2B00", - "prompt": "#3D2B00", - "ui_accent": "#7A5500", - "ui_label": "#01579B", - "ui_ok": "#1B5E20", - "input_rule": "#7A5A00", - "response_border": "#6B4C00", - "status_bar_bg": "#F2EEE3", - "status_bar_text": "#5C4300", - "status_bar_strong": "#6B4C00", - "status_bar_dim": "#8B7355", - "status_bar_good": "#1B5E20", - "status_bar_warn": "#7A5500", - "status_bar_bad": "#B85C00", - "status_bar_critical": "#B3261E", - "session_label": "#5C4300", - "session_border": "#8B7355", - }, "spinner": { # Empty = use hardcoded defaults in display.py }, @@ -253,29 +230,6 @@ _BUILTIN_SKINS: Dict[str, Dict[str, Any]] = { "session_label": "#C7A96B", "session_border": "#6E584B", }, - "colors_light": { - "banner_border": "#6B1010", - "banner_title": "#5C4300", - "banner_accent": "#8B1A1A", - "banner_dim": "#5C4030", - "banner_text": "#3A1800", - "prompt": "#3A1800", - "ui_accent": "#8B1A1A", - "ui_label": "#5C4300", - "ui_ok": "#1B5E20", - "input_rule": "#6B1010", - "response_border": "#7A1515", - "status_bar_bg": "#F6E7DB", - "status_bar_text": "#5C4300", - "status_bar_strong": "#7A1515", - "status_bar_dim": "#8A6F5A", - "status_bar_good": "#1B5E20", - "status_bar_warn": "#8B4000", - "status_bar_bad": "#8B1A1A", - "status_bar_critical": "#B3261E", - "session_label": "#5C4300", - "session_border": "#5C4A3A", - }, "spinner": { "waiting_faces": ["(⚔)", "(⛨)", "(▲)", "(<>)", "(/)"], "thinking_faces": ["(⚔)", "(⛨)", "(▲)", "(⌁)", "(<>)"], @@ -348,30 +302,6 @@ _BUILTIN_SKINS: Dict[str, Dict[str, Any]] = { "session_label": "#888888", "session_border": "#555555", }, - "colors_light": { - "banner_border": "#333333", - "banner_title": "#222222", - "banner_accent": "#333333", - "banner_dim": "#555555", - "banner_text": "#333333", - "prompt": "#222222", - "ui_accent": "#333333", - "ui_label": "#444444", - "ui_ok": "#444444", - "ui_error": "#333333", - "input_rule": "#333333", - "response_border": "#444444", - "status_bar_bg": "#EEEEEE", - "status_bar_text": "#333333", - "status_bar_strong": "#222222", - "status_bar_dim": "#666666", - "status_bar_good": "#444444", - "status_bar_warn": "#555555", - "status_bar_bad": "#333333", - "status_bar_critical": "#111111", - "session_label": "#444444", - "session_border": "#666666", - }, "spinner": {}, "branding": { "agent_name": "Hermes Agent", @@ -411,29 +341,6 @@ _BUILTIN_SKINS: Dict[str, Dict[str, Any]] = { "session_label": "#7eb8f6", "session_border": "#4b5563", }, - "colors_light": { - "banner_border": "#1A3A7A", - "banner_title": "#1A3570", - "banner_accent": "#1E4090", - "banner_dim": "#3B4555", - "banner_text": "#1A2A50", - "prompt": "#1A2A50", - "ui_accent": "#1A3570", - "ui_label": "#1E3A80", - "ui_ok": "#1B5E20", - "input_rule": "#1A3A7A", - "response_border": "#2A4FA0", - "status_bar_bg": "#E9EEF8", - "status_bar_text": "#1A2A50", - "status_bar_strong": "#1A3570", - "status_bar_dim": "#5A6070", - "status_bar_good": "#1B5E20", - "status_bar_warn": "#8B5E00", - "status_bar_bad": "#B85C38", - "status_bar_critical": "#B3261E", - "session_label": "#1A3570", - "session_border": "#5A6070", - }, "spinner": {}, "branding": { "agent_name": "Hermes Agent", @@ -547,29 +454,6 @@ _BUILTIN_SKINS: Dict[str, Dict[str, Any]] = { "session_label": "#A9DFFF", "session_border": "#496884", }, - "colors_light": { - "banner_border": "#0D3060", - "banner_title": "#0D3060", - "banner_accent": "#154080", - "banner_dim": "#2A4565", - "banner_text": "#0A2850", - "prompt": "#0A2850", - "ui_accent": "#0D3060", - "ui_label": "#0D3060", - "ui_ok": "#1B5E20", - "input_rule": "#0D3060", - "response_border": "#1A5090", - "status_bar_bg": "#E6F4FF", - "status_bar_text": "#0A2850", - "status_bar_strong": "#0D3060", - "status_bar_dim": "#3A5575", - "status_bar_good": "#1B5E20", - "status_bar_warn": "#1A5090", - "status_bar_bad": "#154080", - "status_bar_critical": "#B3261E", - "session_label": "#0D3060", - "session_border": "#3A5575", - }, "spinner": { "waiting_faces": ["(≈)", "(Ψ)", "(∿)", "(◌)", "(◠)"], "thinking_faces": ["(Ψ)", "(∿)", "(≈)", "(⌁)", "(◌)"], @@ -642,31 +526,6 @@ _BUILTIN_SKINS: Dict[str, Dict[str, Any]] = { "session_label": "#919191", "session_border": "#656565", }, - "colors_light": { - "banner_border": "#666666", - "banner_title": "#222222", - "banner_accent": "#333333", - "banner_dim": "#555555", - "banner_text": "#333333", - "prompt": "#222222", - "ui_accent": "#333333", - "ui_label": "#444444", - "ui_ok": "#444444", - "ui_error": "#333333", - "ui_warn": "#444444", - "input_rule": "#666666", - "response_border": "#555555", - "status_bar_bg": "#F0F0F0", - "status_bar_text": "#333333", - "status_bar_strong": "#222222", - "status_bar_dim": "#777777", - "status_bar_good": "#444444", - "status_bar_warn": "#555555", - "status_bar_bad": "#333333", - "status_bar_critical": "#111111", - "session_label": "#444444", - "session_border": "#777777", - }, "spinner": { "waiting_faces": ["(◉)", "(◌)", "(◬)", "(⬤)", "(::)"], "thinking_faces": ["(◉)", "(◬)", "(◌)", "(○)", "(●)"], @@ -740,29 +599,6 @@ _BUILTIN_SKINS: Dict[str, Dict[str, Any]] = { "session_label": "#FFD39A", "session_border": "#6C4724", }, - "colors_light": { - "banner_border": "#7A3511", - "banner_title": "#5C2D00", - "banner_accent": "#8B4000", - "banner_dim": "#5A3A1A", - "banner_text": "#3A1E00", - "prompt": "#3A1E00", - "ui_accent": "#8B4000", - "ui_label": "#5C2D00", - "ui_ok": "#1B5E20", - "input_rule": "#7A3511", - "response_border": "#8B4513", - "status_bar_bg": "#F8EADF", - "status_bar_text": "#3A1E00", - "status_bar_strong": "#5C2D00", - "status_bar_dim": "#6B5540", - "status_bar_good": "#1B5E20", - "status_bar_warn": "#8B4513", - "status_bar_bad": "#8B4000", - "status_bar_critical": "#B3261E", - "session_label": "#5C2D00", - "session_border": "#6B5540", - }, "spinner": { "waiting_faces": ["(✦)", "(▲)", "(◇)", "(<>)", "(🔥)"], "thinking_faces": ["(✦)", "(▲)", "(◇)", "(⌁)", "(🔥)"], diff --git a/tests/hermes_cli/test_skin_engine.py b/tests/hermes_cli/test_skin_engine.py index 1d83fe830..b3fbb8dee 100644 --- a/tests/hermes_cli/test_skin_engine.py +++ b/tests/hermes_cli/test_skin_engine.py @@ -267,9 +267,7 @@ class TestCliBrandingHelpers: assert get_active_goodbye() == "Farewell, warrior! ⚔" def test_prompt_toolkit_style_overrides_cover_tui_classes(self): - from hermes_cli.skin_engine import set_active_skin, set_theme_mode, get_prompt_toolkit_style_overrides - - set_theme_mode("dark") + from hermes_cli.skin_engine import set_active_skin, get_prompt_toolkit_style_overrides set_active_skin("ares") overrides = get_prompt_toolkit_style_overrides() required = { @@ -324,12 +322,10 @@ class TestCliBrandingHelpers: def test_prompt_toolkit_style_overrides_use_skin_colors(self): from hermes_cli.skin_engine import ( set_active_skin, - set_theme_mode, get_active_skin, get_prompt_toolkit_style_overrides, ) - set_theme_mode("dark") set_active_skin("ares") skin = get_active_skin() overrides = get_prompt_toolkit_style_overrides() diff --git a/tests/test_cli_skin_integration.py b/tests/test_cli_skin_integration.py index a4329b01a..3a876f777 100644 --- a/tests/test_cli_skin_integration.py +++ b/tests/test_cli_skin_integration.py @@ -59,9 +59,6 @@ class TestCliSkinPromptIntegration: def test_build_tui_style_dict_uses_skin_overrides(self): cli = _make_cli_stub() - from hermes_cli.skin_engine import set_theme_mode - - set_theme_mode("dark") set_active_skin("ares") skin = get_active_skin() style_dict = cli._build_tui_style_dict()