rich-click 1.9.0.dev2__tar.gz → 1.9.0.dev3__tar.gz

{rich_click-1.9.0.dev2/src/rich_click.egg-info → rich_click-1.9.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rich-click
-Version: 1.9.0.dev2
+Version: 1.9.0.dev3
 Summary: Format click help output nicely with rich
 Author-email: Phil Ewels <phil@ewels.co.uk>
 Maintainer-email: Phil Ewels <phil@ewels.co.uk>, Daniel Reeves <xdanielreeves@gmail.com>
@@ -57,6 +57,7 @@ Requires-Dist: pytest>=8.3.5; extra == "dev"
 Requires-Dist: pytest-cov>=5; extra == "dev"
 Requires-Dist: rich-codex>=1.2.11; extra == "dev"
 Requires-Dist: ruff>=0.12.4; extra == "dev"
+Requires-Dist: typer>=0.15; extra == "dev"
 Requires-Dist: types-setuptools>=75.8.0.20250110; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: markdown-include>=0.8.1; extra == "docs"
@@ -70,6 +71,7 @@ Requires-Dist: mkdocs-material-extensions>=1.3.1; extra == "docs"
 Requires-Dist: mkdocs-rss-plugin>=1.15; extra == "docs"
 Requires-Dist: mkdocstrings[python]>=0.26.1; extra == "docs"
 Requires-Dist: rich-codex>=1.2.11; extra == "docs"
+Requires-Dist: typer>=0.15; extra == "docs"
 Dynamic: license-file
 
 <p align="center">
@@ -109,12 +111,12 @@ Click, formatted with Rich, with minimal customization required.
 - 🌈 Rich command-line formatting of click help and error messages
 - 😌 Same API as Click: usage is simply `import rich_click as click`
 - 🎨 Over 100 themes that can be set by developers and end-users (`export RICH_CLICK_THEME=...`)
-- 💻 CLI tool to run on _other people's_ tools (prefix the command with `rich-click`)
+- 💻 CLI tool to run on _other people's_ Click and Typer CLIs (prefix the command with `rich-click`)
 - 📦 Export help text as HTML or SVG
 - 🎁 Group commands and options into named panels
 - ❌ Well formatted error messages
 - 💫 Extensive customization
-- 🤖 IDE autocomplete of Click decorators for smooth developer experience.
+- 🤖 IDE autocomplete of Click decorators for smooth developer experience
 
 ## Installation
 

{rich_click-1.9.0.dev2 → rich_click-1.9.0.dev3}/README.md

@@ -35,12 +35,12 @@ Click, formatted with Rich, with minimal customization required.
 - 🌈 Rich command-line formatting of click help and error messages
 - 😌 Same API as Click: usage is simply `import rich_click as click`
 - 🎨 Over 100 themes that can be set by developers and end-users (`export RICH_CLICK_THEME=...`)
-- 💻 CLI tool to run on _other people's_ tools (prefix the command with `rich-click`)
+- 💻 CLI tool to run on _other people's_ Click and Typer CLIs (prefix the command with `rich-click`)
 - 📦 Export help text as HTML or SVG
 - 🎁 Group commands and options into named panels
 - ❌ Well formatted error messages
 - 💫 Extensive customization
-- 🤖 IDE autocomplete of Click decorators for smooth developer experience.
+- 🤖 IDE autocomplete of Click decorators for smooth developer experience
 
 ## Installation
 

{rich_click-1.9.0.dev2 → rich_click-1.9.0.dev3}/pyproject.toml

@@ -46,6 +46,7 @@ optional-dependencies.dev = [
     "pytest-cov>=5",
     "rich-codex>=1.2.11",
     "ruff>=0.12.4",
+    "typer>=0.15",
     "types-setuptools>=75.8.0.20250110",
 ]
 optional-dependencies.docs = [
@@ -60,6 +61,7 @@ optional-dependencies.docs = [
     "mkdocs-rss-plugin>=1.15",
     "mkdocstrings[python]>=0.26.1",
     "rich-codex>=1.2.11",
+    "typer>=0.15",
 ]
 urls.Documentation = "https://github.com/ewels/rich-click"
 urls.Homepage = "https://github.com/ewels/rich-click"

{rich_click-1.9.0.dev2 → rich_click-1.9.0.dev3}/src/rich_click/__init__.py

@@ -8,7 +8,7 @@ customization required.
 from __future__ import annotations
 
 
-__version__ = "1.9.0.dev2"
+__version__ = "1.9.0.dev3"
 
 # Import the entire click API here.
 # We need to manually import these instead of `from click import *` to force

rich_click-1.9.0.dev3/src/rich_click/_internal_types.py

@@ -0,0 +1,250 @@
+"""
+Contains types for .pyi files.
+Import from this at your own risk.
+"""
+
+from __future__ import annotations
+
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Dict,
+    Iterable,
+    List,
+    Literal,
+    Mapping,
+    MutableMapping,
+    Optional,
+    Tuple,
+    TypedDict,
+    Union,
+)
+
+from rich_click.utils import CommandGroupDict, OptionGroupDict
+
+
+if TYPE_CHECKING:
+    import sys
+
+    from rich.align import AlignMethod
+    from rich.box import Box
+    from rich.console import Console, JustifyMethod
+    from rich.padding import PaddingDimensions
+    from rich.style import StyleType
+    from rich.text import Text, TextType
+
+    from rich_click.rich_help_configuration import (
+        CommandColumnType,
+        CommandHelpSectionType,
+        OptionColumnType,
+        OptionHelpSectionType,
+        RichHelpConfiguration,
+    )
+
+    if sys.version_info < (3, 11):
+        from typing_extensions import NotRequired
+    else:
+        from typing import NotRequired
+
+
+class RichContextSettingsDict(TypedDict):
+    obj: NotRequired["Any | None"]
+    auto_envvar_prefix: NotRequired[Optional[str]]
+    default_map: NotRequired[MutableMapping[str, Any] | None]
+    terminal_width: NotRequired[Optional[int]]
+    max_content_width: NotRequired[Optional[int]]
+    resilient_parsing: NotRequired[bool]
+    allow_extra_args: NotRequired[Optional[bool]]
+    allow_interspersed_args: NotRequired[Optional[bool]]
+    ignore_unknown_options: NotRequired[Optional[bool]]
+    help_option_names: NotRequired[Optional[List[str]]]
+    token_normalize_func: NotRequired[Callable[[str], str] | None]
+    color: NotRequired[Optional[bool]]
+    show_default: NotRequired[Optional[bool]]
+    rich_console: NotRequired[Optional["Console"]]
+    rich_help_config: NotRequired[Optional[Union[Mapping[str, Any], RichHelpConfiguration]]]
+    export_console_as: NotRequired[Optional[Literal["html", "svg", "text"]]]
+    errors_in_output_format: NotRequired[Optional[bool]]
+    help_to_stderr: NotRequired[Optional[bool]]
+
+
+class TableKwargs(TypedDict):
+    title: NotRequired[Optional["TextType"]]
+    caption: NotRequired[Optional["TextType"]]
+    width: NotRequired[Optional[int]]
+    min_width: NotRequired[Optional[int]]
+    box: NotRequired[Optional[Union[str, "Box"]]]
+    safe_box: NotRequired[Optional[bool]]
+    padding: NotRequired["PaddingDimensions"]
+    collapse_padding: NotRequired[bool]
+    pad_edge: NotRequired[bool]
+    expand: NotRequired[bool]
+    show_header: NotRequired[bool]
+    show_footer: NotRequired[bool]
+    show_edge: NotRequired[bool]
+    show_lines: NotRequired[bool]
+    leading: NotRequired[int]
+    style: NotRequired["StyleType"]
+    row_styles: NotRequired[Optional[Iterable["StyleType"]]]
+    header_style: NotRequired[Optional["StyleType"]]
+    footer_style: NotRequired[Optional["StyleType"]]
+    border_style: NotRequired[Optional["StyleType"]]
+    title_style: NotRequired[Optional["StyleType"]]
+    caption_style: NotRequired[Optional["StyleType"]]
+    title_justify: NotRequired["JustifyMethod"]
+    caption_justify: NotRequired["JustifyMethod"]
+    highlight: NotRequired[bool]
+
+
+class PanelKwargs(TypedDict):
+    box: NotRequired[Union[str, "Box"]]
+    title: NotRequired[Optional["TextType"]]
+    title_align: NotRequired["AlignMethod"]
+    subtitle: NotRequired[Optional["TextType"]]
+    subtitle_align: NotRequired["AlignMethod"]
+    safe_box: NotRequired[Optional[bool]]
+    expand: NotRequired[bool]
+    style: NotRequired["StyleType"]
+    border_style: NotRequired["StyleType"]
+    width: NotRequired[Optional[int]]
+    height: NotRequired[Optional[int]]
+    padding: NotRequired["PaddingDimensions"]
+    highlight: NotRequired[bool]
+
+
+class RichHelpConfigurationDict(TypedDict):
+    """Typed dict for rich_config() kwargs."""
+
+    theme: NotRequired[Optional[str]]
+    enable_theme_env_var: NotRequired[bool]
+    style_option: NotRequired["StyleType"]
+    style_option_negative: NotRequired[Optional["StyleType"]]
+    style_argument: NotRequired["StyleType"]
+    style_command: NotRequired["StyleType"]
+    style_command_aliases: NotRequired["StyleType"]
+    style_switch: NotRequired["StyleType"]
+    style_switch_negative: NotRequired[Optional["StyleType"]]
+    style_metavar: NotRequired["StyleType"]
+    style_metavar_append: NotRequired["StyleType"]
+    style_metavar_separator: NotRequired["StyleType"]
+    style_range_append: NotRequired["StyleType"]
+    style_header_text: NotRequired["StyleType"]
+    style_epilog_text: NotRequired["StyleType"]
+    style_footer_text: NotRequired["StyleType"]
+    style_usage: NotRequired["StyleType"]
+    style_usage_command: NotRequired["StyleType"]
+    style_usage_separator: NotRequired["StyleType"]
+    style_deprecated: NotRequired["StyleType"]
+    style_helptext_first_line: NotRequired["StyleType"]
+    style_helptext: NotRequired["StyleType"]
+    style_option_help: NotRequired["StyleType"]
+    style_command_help: NotRequired["StyleType"]
+    style_option_default: NotRequired["StyleType"]
+    style_option_envvar: NotRequired["StyleType"]
+    style_required_short: NotRequired["StyleType"]
+    style_required_long: NotRequired["StyleType"]
+    style_options_panel_border: NotRequired["StyleType"]
+    style_options_panel_box: NotRequired[Optional[Union[str, "Box"]]]
+    style_options_panel_help_style: NotRequired["StyleType"]
+    style_options_panel_title_style: NotRequired["StyleType"]
+    style_options_panel_padding: NotRequired["PaddingDimensions"]
+    style_options_panel_style: NotRequired["StyleType"]
+    align_options_panel: NotRequired["AlignMethod"]
+    style_options_table_show_lines: NotRequired[bool]
+    style_options_table_leading: NotRequired[int]
+    style_options_table_pad_edge: NotRequired[bool]
+    style_options_table_padding: NotRequired["PaddingDimensions"]
+    style_options_table_expand: NotRequired[bool]
+    style_options_table_box: NotRequired[Optional[Union[str, "Box"]]]
+    style_options_table_row_styles: NotRequired[Optional[List["StyleType"]]]
+    style_options_table_border_style: NotRequired[Optional["StyleType"]]
+    style_commands_panel_border: NotRequired["StyleType"]
+    panel_inline_help_in_title: NotRequired[bool]
+    panel_inline_help_delimiter: NotRequired[str]
+    style_commands_panel_box: NotRequired[Optional[Union[str, "Box"]]]
+    style_commands_panel_help_style: NotRequired["StyleType"]
+    style_commands_panel_title_style: NotRequired["StyleType"]
+    style_commands_panel_padding: NotRequired["PaddingDimensions"]
+    style_commands_panel_style: NotRequired["StyleType"]
+    align_commands_panel: NotRequired[AlignMethod]
+    style_commands_table_show_lines: NotRequired[bool]
+    style_commands_table_leading: NotRequired[int]
+    style_commands_table_pad_edge: NotRequired[bool]
+    style_commands_table_padding: NotRequired["PaddingDimensions"]
+    style_commands_table_expand: NotRequired[bool]
+    style_commands_table_box: NotRequired[Optional[Union[str, "Box"]]]
+    style_commands_table_row_styles: NotRequired[Optional[List["StyleType"]]]
+    style_commands_table_border_style: NotRequired[Optional["StyleType"]]
+    style_commands_table_column_width_ratio: NotRequired[Optional[Union[Tuple[None, None], Tuple[int, int]]]]
+    style_errors_panel_border: NotRequired["StyleType"]
+    style_errors_panel_box: NotRequired[Optional[Union[str, "Box"]]]
+    align_errors_panel: NotRequired[AlignMethod]
+    style_errors_suggestion: NotRequired["StyleType"]
+    style_errors_suggestion_command: NotRequired["StyleType"]
+    style_aborted: NotRequired["StyleType"]
+    style_padding_usage: NotRequired["StyleType"]
+    style_padding_helptext: NotRequired["StyleType"]
+    style_padding_epilog: NotRequired["StyleType"]
+
+    panel_title_padding: NotRequired[int]
+    width: NotRequired[Optional[int]]
+    max_width: NotRequired[Optional[int]]
+    color_system: NotRequired[Optional[Literal["auto", "standard", "256", "truecolor", "windows"]]]
+    force_terminal: NotRequired[Optional[bool]]
+    options_table_column_types: NotRequired[List["OptionColumnType"]]
+    commands_table_column_types: NotRequired[List["CommandColumnType"]]
+    options_table_help_sections: NotRequired[List["OptionHelpSectionType"]]
+    commands_table_help_sections: NotRequired[List["CommandHelpSectionType"]]
+
+    header_text: NotRequired[Optional[Union[str, "Text"]]]
+    footer_text: NotRequired[Optional[Union[str, "Text"]]]
+    panel_title_string: NotRequired[str]
+    deprecated_string: NotRequired[str]
+    deprecated_with_reason_string: NotRequired[str]
+    default_string: NotRequired[str]
+    envvar_string: NotRequired[str]
+    required_short_string: NotRequired[str]
+    required_long_string: NotRequired[str]
+    range_string: NotRequired[str]
+    append_metavars_help_string: NotRequired[str]
+    append_range_help_string: NotRequired[str]
+    arguments_panel_title: NotRequired[str]
+    options_panel_title: NotRequired[str]
+    commands_panel_title: NotRequired[str]
+    errors_panel_title: NotRequired[str]
+    delimiter_comma: NotRequired[str]
+    delimiter_slash: NotRequired[str]
+    errors_suggestion: NotRequired[Optional[Union[str, Text]]]
+    errors_epilogue: NotRequired[Optional[Union[str, Text]]]
+    aborted_text: NotRequired[str]
+    padding_header_text: NotRequired["PaddingDimensions"]
+    padding_helptext: NotRequired["PaddingDimensions"]
+    padding_helptext_deprecated: NotRequired["PaddingDimensions"]
+    padding_helptext_first_line: NotRequired["PaddingDimensions"]
+    padding_usage: NotRequired["PaddingDimensions"]
+    padding_epilog: NotRequired["PaddingDimensions"]
+    padding_footer_text: NotRequired["PaddingDimensions"]
+    padding_errors_panel: NotRequired["PaddingDimensions"]
+    padding_errors_suggestion: NotRequired["PaddingDimensions"]
+    padding_errors_epilogue: NotRequired["PaddingDimensions"]
+
+    # Behaviours
+    show_arguments: NotRequired[Optional[bool]]
+    show_metavars_column: NotRequired[Optional[bool]]
+    commands_before_options: NotRequired[bool]
+    append_metavars_help: NotRequired[Optional[bool]]
+    group_arguments_options: NotRequired[bool]
+    option_envvar_first: NotRequired[Optional[bool]]
+    text_markup: NotRequired[Literal["ansi", "rich", "markdown", None]]
+    text_kwargs: NotRequired[Optional[Dict[str, Any]]]
+    text_emojis: NotRequired[bool]
+    text_paragraph_linebreaks: NotRequired[Optional[Literal["\n", "\n\n"]]]
+    use_markdown: NotRequired[Optional[bool]]
+    use_markdown_emoji: NotRequired[Optional[bool]]
+    use_rich_markup: NotRequired[Optional[bool]]
+    command_groups: NotRequired[Dict[str, List[CommandGroupDict]]]
+    option_groups: NotRequired[Dict[str, List[OptionGroupDict]]]
+    use_click_short_help: NotRequired[bool]
+    highlighter_patterns: NotRequired[List[str]]
+    legacy_windows: NotRequired[Optional[bool]]

{rich_click-1.9.0.dev2 → rich_click-1.9.0.dev3}/src/rich_click/cli.py

@@ -4,15 +4,18 @@ from __future__ import annotations
 
 import os
 import sys
+import warnings
+from contextlib import contextmanager
 from functools import wraps
 from gettext import gettext
 from importlib import (
     import_module,
     metadata,  # type: ignore[import,unused-ignore]
 )
-from typing import Any, Dict, List, Literal, Optional, Tuple
+from typing import Any, Dict, Generator, List, Literal, Optional, Tuple
 
 import click
+from click.core import ParameterSource
 
 from rich_click.decorators import argument as _rich_argument
 from rich_click.decorators import command as _rich_command
@@ -20,10 +23,18 @@ from rich_click.decorators import option as _rich_option
 from rich_click.decorators import option_panel, pass_context
 from rich_click.decorators import version_option as _rich_version_option
 from rich_click.patch import patch as _patch
+from rich_click.rich_click_theme import COLORS, FORMATS, RichClickThemeNotFound, get_theme
 from rich_click.rich_context import RichContext
 from rich_click.rich_help_configuration import RichHelpConfiguration
 
 
+DISABLE_WARNINGS_NOTE = (
+    "[red]You can pass [b]--suppress-warnings[/b] to the rich-click CLI"
+    " or set the [b]RICH_CLICK_CLI_SUPPRESS_WARNINGS[/b] environment variable"
+    " to disable this message.[/red]"
+)
+
+
 def entry_points(*, group: str) -> "metadata.EntryPoints":  # type: ignore[name-defined]
     """entry_points function that is compatible with Python 3.7+."""
     if sys.version_info >= (3, 10):
@@ -118,10 +129,9 @@ def _get_module_path_and_function_name(script: str, suppress_warnings: bool) ->
             " and you have set a custom PYTHONPATH."
             f"\n\nThe selected script is '{module_path}:{function_name}', which is being executed now."
             "\n\nIt is safer and recommended that you specify the MODULE:CLICK_COMMAND"
-            f" ('{module_path}:{function_name}') instead of the script ('{script}'), like this:"
+            f" ('{module_path}:{function_name}') instead of the script ('{script}'), like this:[/]"
             f"\n\n>>> {' '.join(_args)}"
-            "\n\nAlternatively, you can pass --suppress-warnings to the rich-click CLI,"
-            " which will disable this message.[/]",
+            f"\n\n{DISABLE_WARNINGS_NOTE}",
         )
 
     if ":" in script and not module_path:
@@ -145,8 +155,6 @@ def list_themes(ctx: RichContext, param: click.Parameter, value: bool) -> None:
         from rich.table import Table
         from rich.text import Text
 
-        from rich_click.rich_theme import THEMES
-
         formatter = ctx.make_formatter()
 
         console = Console(
@@ -171,21 +179,21 @@ def list_themes(ctx: RichContext, param: click.Parameter, value: bool) -> None:
                     _theme = None
             else:
                 _theme = selected
-            if "-" in _theme:
-                c, f, *_ = _theme.split("-")
-                from rich_click.rich_theme import THEMES
-
-                if _theme in THEMES:
-                    found = True
-            elif _theme is not None:
-                from rich_click.rich_theme import COLORS, FORMATS
-
-                if _theme in FORMATS:
-                    f = _theme
-                    found = True
-                elif _theme in COLORS:
-                    c = _theme
+            if _theme:
+                try:
+                    get_theme(_theme)
+                except RichClickThemeNotFound:
+                    found = False
+                else:
                     found = True
+                    if "-" in _theme:
+                        c, f, *_ = _theme.split("-")
+                    elif _theme in FORMATS:
+                        f = _theme
+                        found = True
+                    elif _theme in COLORS:
+                        c = _theme
+                        found = True
 
         if selected is None:
             selected_text = "[red bold]RICH_CLICK_THEME[/] is not set"
@@ -194,8 +202,8 @@ def list_themes(ctx: RichContext, param: click.Parameter, value: bool) -> None:
         else:
             selected_text = (
                 f"[blue bold]RICH_CLICK_THEME[/blue bold]=[blue]{selected!r}[/blue]"
-                f"\n\n[b]Colors:[/b] {c}"
-                f"\n[b]Format:[/b] {f}"
+                f"\n\n[b]Colors:[/b] {c or '[dim](null)[/]'}"
+                f"\n[b]Format:[/b] {f or '[dim](null)[/]'}"
             )
 
         colors = Table(
@@ -211,83 +219,16 @@ def list_themes(ctx: RichContext, param: click.Parameter, value: bool) -> None:
         )
         colors.columns[0].max_width = 1
         colors.columns[1].style = "bold"
-        colors.add_row(
-            "✓" if c == "default" or c is None else "",
-            "default",
-            "[cyan]▓▓[/] [yellow]▓▓[/] [green]▓▓[/]",
-            "[b](Default)[/b] Original rich-click colors",
-        )
-        colors.add_row(
-            "✓" if c == "solarized" else "",
-            "solarized",
-            "[bright_green]▓▓[/] [bright_red]▓▓[/] [bright_cyan]▓▓[/]",
-            "Bright, colorful, vibrant accents",
-        )
-        colors.add_row(
-            "✓" if c == "nord" else "",
-            "nord",
-            "[blue]▓▓[/] [bright_blue]▓▓[/] [cyan]▓▓[/]",
-            "Many shades of cool colors",
-        )
-        colors.add_row(
-            "✓" if c == "star" else "",
-            "star",
-            "[yellow]▓▓[/] [blue]▓▓[/] [default]▓▓[/]",
-            "Litestar theme; royal feel",
-        )
-        colors.add_row(
-            "✓" if c == "quartz" else "",
-            "quartz",
-            "[magenta]▓▓[/] [dim magenta]▓▓[/] [blue]▓▓[/]",
-            "Dark and radiant",
-        )
-        colors.add_row(
-            "✓" if c == "quartz2" else "",
-            "quartz2",
-            "[magenta]▓▓[/] [blue]▓▓[/] [yellow]▓▓[/]",
-            "Remix of 'quartz' with accents",
-        )
-        colors.add_row(
-            "✓" if c == "cargo" else "",
-            "cargo",
-            "[green]▓▓[/] [cyan]▓▓[/] [default]▓▓[/]",
-            "Cargo CLI theme; legible and bold",
-        )
-        colors.add_row(
-            "✓" if c == "forest" else "",
-            "forest",
-            "[green]▓▓[/] [yellow]▓▓[/] [cyan]▓▓[/]",
-            "Earthy tones with analogous colors",
-        )
-        colors.add_row(
-            "✓" if c == "dracula" else "",
-            "dracula",
-            "[magenta]▓▓[/] [red]▓▓[/] [yellow]▓▓[/]",
-            "Vibrant high-contract dark theme",
-        )
-        colors.add_row(
-            "✓" if c == "dracula2" else "",
-            "dracula2",
-            "[magenta on black]▓▓[/] [red on black]▓▓[/] [black]▓▓[/]",
-            "Dracula theme with forced black background",
-        )
-        for _c in ["red", "green", "yellow", "blue", "magenta", "cyan"]:
+        for r in COLORS.values():
+            if r.hidden:
+                continue
+            selected_row = c == r.name or (c is None and r.name == "default")
             colors.add_row(
-                "✓" if c == f"{_c}1" else "",
-                f"{_c}1",
-                f"[default]▓▓[/] [{_c}]▓▓[/] [dim {_c}]▓▓[/]",
-                f"Simple theme with {_c} accents on section headers",
+                "*" if selected_row else "",
+                r.name,
+                " ".join([f"[{_}]▓▓[/]" for _ in r.primary_colors[:3]]),
+                r.description,
             )
-            colors.add_row(
-                "✓" if c == f"{_c}2" else "",
-                f"{_c}2",
-                f"[{_c}]▓▓[/] [default]▓▓[/] [dim]▓▓[/]",
-                f"Simple theme with {_c} accents on object names",
-            )
-        colors.add_row(
-            "✓" if c == "mono" else "", "mono", "[default]▓▓[/] [dim]▓▓[/]", "Monochromatic theme with no colors"
-        )
-        colors.add_row("✓" if c == "plain" else "", "plain", "[default]▓▓[/]", "No style at all")
 
         formats = Table(
             "",
@@ -300,13 +241,9 @@ def list_themes(ctx: RichContext, param: click.Parameter, value: bool) -> None:
             expand=True,
         )
         formats.columns[1].style = "bold"
-        formats.add_row(
-            "✓" if f == "box" or f is None else "", "box", "[b](Default)[/b] Original rich-click format with boxes"
-        )
-        formats.add_row("✓" if f == "slim" else "", "slim", "Simple, classic, no-fuss CLI format")
-        formats.add_row("✓" if f == "modern" else "", "modern", "Beautiful modern look")
-        formats.add_row("✓" if f == "robo" else "", "robo", "Spacious with sharp corners")
-        formats.add_row("✓" if f == "nu" else "", "nu", "Great balance of compactness, legibility, and style")
+        for r in FORMATS.values():
+            selected_row = f == r.name or (f is None and r.name == "box")
+            formats.add_row("*" if selected_row else "", r.name, r.description)
 
         how_to_use = Padding(
             Text("\n\n", overflow="fold").join(
@@ -398,6 +335,8 @@ def list_themes(ctx: RichContext, param: click.Parameter, value: bool) -> None:
     "--suppress-warnings/--do-not-suppress-warnings",
     is_flag=True,
     default=False,
+    envvar="RICH_CLICK_CLI_SUPPRESS_WARNINGS",
+    show_envvar=True,
     panel="Advanced Options",
     help="Suppress warnings when there are conflicting entry_points." " This situation is extremely rare.",
 )
@@ -406,7 +345,8 @@ def list_themes(ctx: RichContext, param: click.Parameter, value: bool) -> None:
     is_flag=True,
     default=True,
     panel="Advanced Options",
-    help="If set, patch [code]rich_click.Command[/code], not just [code]click.Command[/code].",
+    help="If set, patch [reverse][option][b]rich_click.Command[/][/][/],"
+    " not just [reverse][option][b]click.Command[/][/][/].",
 )
 @_rich_option(
     "--themes",
@@ -467,14 +407,23 @@ https://ewels.github.io/rich-click/latest/documentation/rich_click_cli/[/]
 
     >>> [command]rich-click[/] [argument]my_package[/] [argument]cmd[/] [option]--foo[/] 3
     """  # noqa: D401
-    if rich_config:
-        if theme:
-            rich_config.setdefault("theme", theme)
-        cfg = RichHelpConfiguration.load_from_globals(**rich_config)
-    elif theme:
-        cfg = RichHelpConfiguration.load_from_globals(theme=theme)
-    else:
-        cfg = RichHelpConfiguration.load_from_globals()
+    try:
+        if rich_config:
+            if theme:
+                rich_config.setdefault("theme", theme)
+                import rich_click.rich_click as rc
+
+                rc._THEME_FROM_CLI = theme
+            cfg = RichHelpConfiguration.load_from_globals(**rich_config)
+        elif theme:
+            import rich_click.rich_click as rc
+
+            rc._THEME_FROM_CLI = theme
+            cfg = RichHelpConfiguration.load_from_globals(theme=theme)
+        else:
+            cfg = RichHelpConfiguration.load_from_globals()
+    except RichClickThemeNotFound as e:
+        raise click.ClickException(e.args[0] if e.args else "Theme not found")
 
     if (show_help or not script_and_args) and not ctx.resilient_parsing:
         cfg.use_markdown = False
@@ -488,21 +437,27 @@ https://ewels.github.io/rich-click/latest/documentation/rich_click_cli/[/]
             ctx.exit(2)
         ctx.exit(0)
 
-    if theme:
-        import rich_click.rich_click as rc
-
-        rc._THEME_FROM_CLI = theme
-    if rich_config:
-        if theme:
-            rich_config.setdefault("theme", theme)
-        cfg = RichHelpConfiguration.load_from_globals(**rich_config)
-    elif theme:
-        cfg = RichHelpConfiguration.load_from_globals(theme=theme)
-    else:
-        cfg = RichHelpConfiguration.load_from_globals()
+    @contextmanager
+    def patch_ctx() -> Generator[None, None, None]:
+        if ctx.get_parameter_source("typer") != ParameterSource.ENVIRONMENT:
+            try:
+                with warnings.catch_warnings():
+                    warnings.filterwarnings("error", category=ImportWarning)
+                    yield
+            except ImportWarning as e:
+                if not suppress_warnings and any("Typer" in a for a in e.args):
+                    import rich
+
+                    rich.print(
+                        f"[red]WARNING: Attempted to patch Typer, but Typer is not installed.[/red]"
+                        f"\n\n{DISABLE_WARNINGS_NOTE}"
+                    )
+        else:
+            yield
 
     # patch click before importing the program function
-    _patch(rich_config=cfg, patch_rich_click=patch_rich_click)
+    with patch_ctx():
+        _patch(rich_config=cfg, patch_rich_click=patch_rich_click)
 
     script, *args = script_and_args
 
@@ -526,8 +481,8 @@ https://ewels.github.io/rich-click/latest/documentation/rich_click_cli/[/]
                     # and PYTHONPATH does not include ".".
                     sys.path.append(os.path.abspath("."))
                     module = import_module(module_path)
-                except ModuleNotFoundError:
-                    raise click.ClickException(f"Module '{module_path}' not found.")
+                except ModuleNotFoundError as e:
+                    raise click.ClickException(e.args[0] if e.args else "Unknown error")
             try:
                 f = getattr(module, function_name)
             except AttributeError:
@@ -541,8 +496,8 @@ https://ewels.github.io/rich-click/latest/documentation/rich_click_cli/[/]
 
             try:
                 runpy.run_path(module_path, run_name="__main__")
-            except ImportError:
-                raise click.ClickException(f"File '{module_path}' not found.")
+            except ImportError as e:
+                raise click.ClickException(e.args[0] if e.args else "Unknown error")
 
     else:
 
@@ -557,8 +512,8 @@ https://ewels.github.io/rich-click/latest/documentation/rich_click_cli/[/]
                 sys.path.append(os.path.abspath("."))
                 try:
                     runpy.run_module(module_path, run_name="__main__")
-                except ImportError:
-                    raise click.ClickException(f"Module '{module_path}' not found.")
+                except ImportError as e:
+                    raise click.ClickException(e.args[0] if e.args else "Unknown error")
 
     prog = module_path.split(".", 1)[0]
     sys.argv = [prog, *args]