feat(cli/utils): Add semantic colors to interactive prompts

tony · tony · commit 05ee4e343a16 · 2026-01-03T11:43:15.000-06:00
Apply semantic color system to prompt utilities:
- prompt(): default value [path] uses info() (cyan)
- prompt_bool(): choice indicator [Y/n] uses muted() (blue)
- prompt_choices(): options list (a, b) uses muted(), default uses info()

Fix circular import between utils.py and _colors.py by using
lazy import of style() inside _colorize() method.

Includes 7 function-based tests for prompt color output.
diff --git a/src/tmuxp/cli/_colors.py b/src/tmuxp/cli/_colors.py
@@ -34,8 +34,6 @@
 import os
 import sys
 
-from .utils import style
-
 
 class ColorMode(enum.Enum):
     """Color output modes for CLI.
@@ -178,6 +176,9 @@ def _colorize(self, text: str, fg: str, bold: bool = False) -> str:
             Colorized text if enabled, plain text otherwise.
         """
         if self._enabled:
+            # Lazy import to avoid circular dependency with utils.py
+            from .utils import style
+
             return style(text, fg=fg, bold=bold)
         return text
 
diff --git a/src/tmuxp/cli/utils.py b/src/tmuxp/cli/utils.py
@@ -8,6 +8,8 @@
 
 from tmuxp import log
 
+from ._colors import ColorMode, Colors
+
 if t.TYPE_CHECKING:
     from collections.abc import Callable, Sequence
     from typing import TypeAlias
@@ -59,7 +61,8 @@ def prompt(
     `flask-script <https://github.com/techniq/flask-script>`_. See the
     `flask-script license <https://github.com/techniq/flask-script/blob/master/LICENSE>`_.
     """
-    prompt_ = name + ((default and f" [{default}]") or "")
+    colors = Colors(ColorMode.AUTO)
+    prompt_ = name + ((default and " " + colors.info(f"[{default}]")) or "")
     prompt_ += (name.endswith("?") and " ") or ": "
     while True:
         rv = input(prompt_) or default
@@ -99,6 +102,7 @@ def prompt_bool(
     -------
     bool
     """
+    colors = Colors(ColorMode.AUTO)
     yes_choices = yes_choices or ("y", "yes", "1", "on", "true", "t")
     no_choices = no_choices or ("n", "no", "0", "off", "false", "f")
 
@@ -109,7 +113,7 @@ def prompt_bool(
     else:
         prompt_choice = "y/N"
 
-    prompt_ = name + f" [{prompt_choice}]"
+    prompt_ = name + " " + colors.muted(f"[{prompt_choice}]")
     prompt_ += (name.endswith("?") and " ") or ": "
 
     while True:
@@ -151,6 +155,7 @@ def prompt_choices(
     -------
     str
     """
+    colors = Colors(ColorMode.AUTO)
     choices_: list[str] = []
     options: list[str] = []
 
@@ -162,8 +167,13 @@ def prompt_choices(
             choice = choice[0]
         choices_.append(choice)
 
+    choices_str = colors.muted(f"({', '.join(options)})")
+    default_str = " " + colors.info(f"[{default}]") if default else ""
+    prompt_text = f"{name} - {choices_str}{default_str}"
+
     while True:
-        rv = prompt(name + " - ({})".format(", ".join(options)), default=default)
+        prompt_ = prompt_text + ": "
+        rv = input(prompt_) or default
         if not rv or rv == default:
             return default
         rv = rv.lower()
diff --git a/tests/cli/test_prompt_colors.py b/tests/cli/test_prompt_colors.py
@@ -0,0 +1,93 @@
+"""Tests for colored prompt utilities."""
+
+from __future__ import annotations
+
+import pytest
+
+from tmuxp.cli._colors import ColorMode, Colors
+
+
+def test_prompt_bool_choice_indicator_muted(monkeypatch: pytest.MonkeyPatch) -> None:
+    """Verify [Y/n] uses muted color (blue)."""
+    monkeypatch.delenv("NO_COLOR", raising=False)
+    colors = Colors(ColorMode.ALWAYS)
+
+    # Test the muted color is applied to choice indicators
+    result = colors.muted("[Y/n]")
+    assert "\033[34m" in result  # blue foreground
+    assert "[Y/n]" in result
+    assert result.endswith("\033[0m")
+
+
+def test_prompt_bool_choice_indicator_variants(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Verify all choice indicator variants are colored."""
+    monkeypatch.delenv("NO_COLOR", raising=False)
+    colors = Colors(ColorMode.ALWAYS)
+
+    for indicator in ["[Y/n]", "[y/N]", "[y/n]"]:
+        result = colors.muted(indicator)
+        assert "\033[34m" in result
+        assert indicator in result
+
+
+def test_prompt_default_value_uses_info(monkeypatch: pytest.MonkeyPatch) -> None:
+    """Verify default path uses info color (cyan)."""
+    monkeypatch.delenv("NO_COLOR", raising=False)
+    colors = Colors(ColorMode.ALWAYS)
+
+    path = "/home/user/.tmuxp/session.yaml"
+    result = colors.info(f"[{path}]")
+    assert "\033[36m" in result  # cyan foreground
+    assert path in result
+    assert result.endswith("\033[0m")
+
+
+def test_prompt_choices_list_muted(monkeypatch: pytest.MonkeyPatch) -> None:
+    """Verify (yaml, json) uses muted color (blue)."""
+    monkeypatch.delenv("NO_COLOR", raising=False)
+    colors = Colors(ColorMode.ALWAYS)
+
+    choices = "(yaml, json)"
+    result = colors.muted(choices)
+    assert "\033[34m" in result  # blue foreground
+    assert choices in result
+
+
+def test_prompts_respect_no_color_env(monkeypatch: pytest.MonkeyPatch) -> None:
+    """Verify NO_COLOR disables prompt colors."""
+    monkeypatch.setenv("NO_COLOR", "1")
+    colors = Colors(ColorMode.AUTO)
+
+    assert colors.muted("[Y/n]") == "[Y/n]"
+    assert colors.info("[default]") == "[default]"
+
+
+def test_prompt_combined_format(monkeypatch: pytest.MonkeyPatch) -> None:
+    """Verify combined prompt format with choices and default."""
+    monkeypatch.delenv("NO_COLOR", raising=False)
+    colors = Colors(ColorMode.ALWAYS)
+
+    name = "Convert to"
+    choices_str = colors.muted("(yaml, json)")
+    default_str = colors.info("[yaml]")
+    prompt = f"{name} - {choices_str} {default_str}"
+
+    # Should contain both blue (muted) and cyan (info) ANSI codes
+    assert "\033[34m" in prompt  # blue for choices
+    assert "\033[36m" in prompt  # cyan for default
+    assert "Convert to" in prompt
+    assert "yaml, json" in prompt
+
+
+def test_prompt_colors_disabled_returns_plain_text(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Verify disabled colors return plain text without ANSI codes."""
+    colors = Colors(ColorMode.NEVER)
+
+    assert colors.muted("[Y/n]") == "[Y/n]"
+    assert colors.info("[/path/to/file]") == "[/path/to/file]"
+    assert "\033[" not in colors.muted("test")
+    assert "\033[" not in colors.info("test")
